471 files changed, 121226 insertions, 1 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
Binary files differ
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
Binary files differ
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
diff --git a/src/internal/CSharp.Build.props b/src/internal/CSharp.Build.props
new file mode 100644
index 00000000..81d24ad1
--- /dev/null
+++ b/src/internal/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/internal/Cpp.Build.props b/src/internal/Cpp.Build.props
new file mode 100644
index 00000000..44a042c7
--- /dev/null
+++ b/src/internal/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/internal/Directory.Build.props b/src/internal/Directory.Build.props
new file mode 100644
index 00000000..f83cc154
--- /dev/null
+++ b/src/internal/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/internal/Directory.Build.targets b/src/internal/Directory.Build.targets
new file mode 100644
index 00000000..cb988931
--- /dev/null
+++ b/src/internal/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/internal/MessagesToMessages/MessagesToMessages.csproj b/src/internal/MessagesToMessages/MessagesToMessages.csproj
new file mode 100644
index 00000000..ce1697ae
--- /dev/null
+++ b/src/internal/MessagesToMessages/MessagesToMessages.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+</Project>
diff --git a/src/internal/MessagesToMessages/Program.cs b/src/internal/MessagesToMessages/Program.cs
new file mode 100644
index 00000000..2d5a3777
--- /dev/null
+++ b/src/internal/MessagesToMessages/Program.cs
@@ -0,0 +1,261 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Xml.Linq;
+namespace MessagesToMessages
+{
+    class Program
+    {
+        static readonly XNamespace ns = "http://schemas.microsoft.com/genmsgs/2004/07/messages";
+        static readonly XName ClassDefinition = ns + "Class";
+        static readonly XName MessageDefinition = ns + "Message";
+        static readonly XName InstanceDefinition = ns + "Instance";
+        static readonly XName ParameterDefinition = ns + "Parameter";
+        static readonly XName Id = "Id";
+        static readonly XName Level = "Level";
+        static readonly XName Number = "Number";
+        static readonly XName SourceLineNumbers = "SourceLineNumbers";
+        static readonly XName Type = "Type";
+        static readonly XName Name = "Name";
+        static void Main(string[] args)
+        {
+            if (args.Length == 0)
+            {
+                return;
+            }
+            else if (args.Length < 2)
+            {
+                Console.WriteLine("Need to specify output folder as well.");
+            }
+            else if (!Directory.Exists(args[1]))
+            {
+                Console.WriteLine("Output folder does not exist: {0}", args[1]);
+            }
+            var messages = ReadXml(Path.GetFullPath(args[0]));
+            foreach (var m in messages.GroupBy(m => m.Level))
+            {
+                var className = m.First().ClassName;
+                var result = GenerateCs(className, m.Key, m);
+                var path = Path.Combine(args[1], className + ".cs");
+                File.WriteAllText(path, result);
+            }
+        }
+        private static IEnumerable<Message> ReadXml(string inputPath)
+        {
+            var doc = XDocument.Load(inputPath);
+            foreach (var xClass in doc.Root.Descendants(ClassDefinition))
+            {
+                var name = xClass.Attribute(Name)?.Value;
+                var level = xClass.Attribute(Level)?.Value;
+                if (String.IsNullOrEmpty(name))
+                {
+                    name = level + "Messages";
+                }
+                if (String.IsNullOrEmpty(level))
+                {
+                    if (name.EndsWith("Errors", StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        level = "Error";
+                    }
+                    else if (name.EndsWith("Verboses", StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        level = "Verbose";
+                    }
+                    else if (name.EndsWith("Warnings", StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        level = "Warning";
+                    }
+                }
+                var unique = new HashSet<string>();
+                var lastNumber = 0;
+                foreach (var xMessage in xClass.Elements(MessageDefinition))
+                {
+                    var id = xMessage.Attribute(Id).Value;
+                    if (!unique.Add(id))
+                    {
+                        Console.WriteLine("Duplicated message: {0}", id);
+                    }
+                    if (!Int32.TryParse(xMessage.Attribute(Number)?.Value, out var number))
+                    {
+                        number = lastNumber;
+                    }
+                    lastNumber = number + 1;
+                    var sln = xMessage.Attribute(SourceLineNumbers)?.Value != "no";
+                    var suffix = 0;
+                    foreach (var xInstance in xMessage.Elements(InstanceDefinition))
+                    {
+                        var value = xInstance.Value.Trim();
+                        var parameters = xInstance.Elements(ParameterDefinition).Select(ReadParameter).ToList();
+                        yield return new Message { Id = id, ClassName = name, Level = level, Number = number, Parameters = parameters, SourceLineNumbers = sln, Value = value, Suffix = suffix == 0 ? String.Empty : suffix.ToString() };
+                        ++suffix;
+                    }
+                }
+            }
+        }
+        private static Parameter ReadParameter(XElement element)
+        {
+            var name = element.Attribute(Name)?.Value;
+            var type = element.Attribute(Type)?.Value ?? "string";
+            if (type.StartsWith("System."))
+            {
+                type = type.Substring(7);
+            }
+            switch (type)
+            {
+                case "String":
+                    type = "string";
+                    break;
+                case "Int32":
+                    type = "int";
+                    break;
+                case "Int64":
+                    type = "long";
+                    break;
+            }
+            return new Parameter { Name = name, Type = type };
+        }
+        private static string GenerateCs(string className, string level, IEnumerable<Message> messages)
+        {
+            var header = String.Join(Environment.NewLine,
+                "// 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.Data",
+                "{",
+                "    using System;",
+                "    using System.Resources;",
+                "",
+                "    public static class {0}",
+                "    {");
+            var messageFormat = String.Join(Environment.NewLine,
+                "        public static Message {0}({1})",
+                "        {{",
+                "            return Message({4}, Ids.{0}, \"{3}\"{2});",
+                "        }}",
+                "");
+            var endMessagesFormat = String.Join(Environment.NewLine,
+                "        private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)",
+                "        {{",
+                "            return new Message(sourceLineNumber, MessageLevel.{0}, (int)id, format, args);",
+                "        }}",
+                "",
+                "        private static Message Message(SourceLineNumber sourceLineNumber, Ids id, ResourceManager resourceManager, string resourceName, params object[] args)",
+                "        {{",
+                "            return new Message(sourceLineNumber, MessageLevel.{0}, (int)id, resourceManager, resourceName, args);",
+                "        }}",
+                "",
+                "        public enum Ids",
+                "        {{");
+            var idEnumFormat =
+                "            {0} = {1},";
+            var footer = String.Join(Environment.NewLine,
+                "        }",
+                "    }",
+                "}",
+                "");
+            var sb = new StringBuilder();
+            sb.AppendLine(header.Replace("{0}", className));
+            foreach (var message in messages.OrderBy(m => m.Id))
+            {
+                var paramsWithTypes = String.Join(", ", message.Parameters.Select(p => $"{p.Type} {p.Name}"));
+                var paramsWithoutTypes = String.Join(", ", message.Parameters.Select(p => p.Name));
+                if (message.SourceLineNumbers)
+                {
+                    paramsWithTypes = String.IsNullOrEmpty(paramsWithTypes)
+                        ? "SourceLineNumber sourceLineNumbers"
+                        : "SourceLineNumber sourceLineNumbers, " + paramsWithTypes;
+                }
+                if (!String.IsNullOrEmpty(paramsWithoutTypes))
+                {
+                    paramsWithoutTypes = ", " + paramsWithoutTypes;
+                }
+                sb.AppendFormat(messageFormat, message.Id, paramsWithTypes, paramsWithoutTypes, ToCSharpString(message.Value), message.SourceLineNumbers ? "sourceLineNumbers" : "null");
+                sb.AppendLine();
+            }
+            sb.AppendFormat(endMessagesFormat, level);
+            sb.AppendLine();
+            var unique = new HashSet<int>();
+            foreach (var message in messages.OrderBy(m => m.Number))
+            {
+                if (unique.Add(message.Number))
+                {
+                    sb.AppendFormat(idEnumFormat, message.Id, message.Number);
+                    sb.AppendLine();
+                }
+            }
+            sb.Append(footer);
+            return sb.ToString();
+        }
+        private static string ToCSharpString(string value)
+        {
+            return value.Replace("\\", "\\\\").Replace("\"", "\\\"").Replace("\r", "\\r").Replace("\n", "\\n").Replace("\t", "\\t");
+        }
+        private class Message
+        {
+            public string Id { get; set; }
+            public string Suffix { get; set; }
+            public string ClassName { get; set; }
+            public string Level { get; set; }
+            public int Number { get; set; }
+            public bool SourceLineNumbers { get; set; }
+            public string Value { get; set; }
+            public IEnumerable<Parameter> Parameters { get; set; }
+        }
+        private class Parameter
+        {
+            public string Name { get; set; }
+            public string Type { get; set; }
+        }
+    }
+}
diff --git a/src/internal/MessagesToMessages/Properties/launchSettings.json b/src/internal/MessagesToMessages/Properties/launchSettings.json
new file mode 100644
index 00000000..dc7570f6
--- /dev/null
+++ b/src/internal/MessagesToMessages/Properties/launchSettings.json
@@ -0,0 +1,9 @@
+{
+  "profiles": {
+    "TablesAndSymbols": {
+      "commandName": "Project",
+      "commandLineArgs": "E:\\src\\wixtoolset\\Core\\src\\WixToolset.Core\\Data\\messages.xml E:\\src\\wixtoolset\\Data\\src\\WixToolset.Data",
+      "workingDirectory": "E:\\src\\wixtoolset\\Core\\src\\WixToolset.Core\\"
+    }
+  }
+}
+\ No newline at end of file
diff --git a/src/internal/MessagesToMessages/SimpleJson.cs b/src/internal/MessagesToMessages/SimpleJson.cs
new file mode 100644
index 00000000..3d956f6e
--- /dev/null
+++ b/src/internal/MessagesToMessages/SimpleJson.cs
@@ -0,0 +1,2127 @@
+//-----------------------------------------------------------------------
+// <copyright file="SimpleJson.cs" company="The Outercurve Foundation">
+//    Copyright (c) 2011, The Outercurve Foundation.
+//
+//    Licensed under the MIT License (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//      http://www.opensource.org/licenses/mit-license.php
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+// </copyright>
+// <author>Nathan Totten (ntotten.com), Jim Zimmerman (jimzimmerman.com) and Prabir Shrestha (prabir.me)</author>
+// <website>https://github.com/facebook-csharp-sdk/simple-json</website>
+//-----------------------------------------------------------------------
+// VERSION:
+// NOTE: uncomment the following line to make SimpleJson class internal.
+#define SIMPLE_JSON_INTERNAL
+// NOTE: uncomment the following line to make JsonArray and JsonObject class internal.
+#define SIMPLE_JSON_OBJARRAYINTERNAL
+// NOTE: uncomment the following line to enable dynamic support.
+//#define SIMPLE_JSON_DYNAMIC
+// NOTE: uncomment the following line to enable DataContract support.
+//#define SIMPLE_JSON_DATACONTRACT
+// NOTE: uncomment the following line to enable IReadOnlyCollection<T> and IReadOnlyList<T> support.
+//#define SIMPLE_JSON_READONLY_COLLECTIONS
+// NOTE: uncomment the following line to disable linq expressions/compiled lambda (better performance) instead of method.invoke().
+// define if you are using .net framework <= 3.0 or < WP7.5
+//#define SIMPLE_JSON_NO_LINQ_EXPRESSION
+// NOTE: uncomment the following line if you are compiling under Window Metro style application/library.
+// usually already defined in properties
+//#define NETFX_CORE;
+// If you are targetting WinStore, WP8 and NET4.5+ PCL make sure to #define SIMPLE_JSON_TYPEINFO;
+// original json parsing code from http://techblog.procurios.nl/k/618/news/view/14605/14863/How-do-I-write-my-own-parser-for-JSON.html
+#if NETFX_CORE
+#define SIMPLE_JSON_TYPEINFO
+#endif
+using System;
+using System.CodeDom.Compiler;
+using System.Collections;
+using System.Collections.Generic;
+#if !SIMPLE_JSON_NO_LINQ_EXPRESSION
+using System.Linq.Expressions;
+#endif
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+#if SIMPLE_JSON_DYNAMIC
+using System.Dynamic;
+#endif
+using System.Globalization;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Text;
+using SimpleJson.Reflection;
+// ReSharper disable LoopCanBeConvertedToQuery
+// ReSharper disable RedundantExplicitArrayCreation
+// ReSharper disable SuggestUseVarKeywordEvident
+namespace SimpleJson
+{
+    /// <summary>
+    /// Represents the json array.
+    /// </summary>
+    [GeneratedCode("simple-json", "1.0.0")]
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix")]
+#if SIMPLE_JSON_OBJARRAYINTERNAL
+    internal
+#else
+    public
+#endif
+ class JsonArray : List<object>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JsonArray"/> class. 
+        /// </summary>
+        public JsonArray() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JsonArray"/> class. 
+        /// </summary>
+        /// <param name="capacity">The capacity of the json array.</param>
+        public JsonArray(int capacity) : base(capacity) { }
+        /// <summary>
+        /// The json representation of the array.
+        /// </summary>
+        /// <returns>The json representation of the array.</returns>
+        public override string ToString()
+        {
+            return SimpleJson.SerializeObject(this) ?? string.Empty;
+        }
+    }
+    /// <summary>
+    /// Represents the json object.
+    /// </summary>
+    [GeneratedCode("simple-json", "1.0.0")]
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix")]
+#if SIMPLE_JSON_OBJARRAYINTERNAL
+    internal
+#else
+    public
+#endif
+ class JsonObject :
+#if SIMPLE_JSON_DYNAMIC
+ DynamicObject,
+#endif
+ IDictionary<string, object>
+    {
+        /// <summary>
+        /// The internal member dictionary.
+        /// </summary>
+        private readonly Dictionary<string, object> _members;
+        /// <summary>
+        /// Initializes a new instance of <see cref="JsonObject"/>.
+        /// </summary>
+        public JsonObject()
+        {
+            _members = new Dictionary<string, object>();
+        }
+        /// <summary>
+        /// Initializes a new instance of <see cref="JsonObject"/>.
+        /// </summary>
+        /// <param name="comparer">The <see cref="T:System.Collections.Generic.IEqualityComparer`1"/> implementation to use when comparing keys, or null to use the default <see cref="T:System.Collections.Generic.EqualityComparer`1"/> for the type of the key.</param>
+        public JsonObject(IEqualityComparer<string> comparer)
+        {
+            _members = new Dictionary<string, object>(comparer);
+        }
+        /// <summary>
+        /// Gets the <see cref="System.Object"/> at the specified index.
+        /// </summary>
+        /// <value></value>
+        public object this[int index]
+        {
+            get { return GetAtIndex(_members, index); }
+        }
+        internal static object GetAtIndex(IDictionary<string, object> obj, int index)
+        {
+            if (obj == null)
+                throw new ArgumentNullException("obj");
+            if (index >= obj.Count)
+                throw new ArgumentOutOfRangeException("index");
+            int i = 0;
+            foreach (KeyValuePair<string, object> o in obj)
+                if (i++ == index) return o.Value;
+            return null;
+        }
+        /// <summary>
+        /// Adds the specified key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="value">The value.</param>
+        public void Add(string key, object value)
+        {
+            _members.Add(key, value);
+        }
+        /// <summary>
+        /// Determines whether the specified key contains key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <returns>
+        ///     <c>true</c> if the specified key contains key; otherwise, <c>false</c>.
+        /// </returns>
+        public bool ContainsKey(string key)
+        {
+            return _members.ContainsKey(key);
+        }
+        /// <summary>
+        /// Gets the keys.
+        /// </summary>
+        /// <value>The keys.</value>
+        public ICollection<string> Keys
+        {
+            get { return _members.Keys; }
+        }
+        /// <summary>
+        /// Removes the specified key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <returns></returns>
+        public bool Remove(string key)
+        {
+            return _members.Remove(key);
+        }
+        /// <summary>
+        /// Tries the get value.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="value">The value.</param>
+        /// <returns></returns>
+        public bool TryGetValue(string key, out object value)
+        {
+            return _members.TryGetValue(key, out value);
+        }
+        /// <summary>
+        /// Gets the values.
+        /// </summary>
+        /// <value>The values.</value>
+        public ICollection<object> Values
+        {
+            get { return _members.Values; }
+        }
+        /// <summary>
+        /// Gets or sets the <see cref="System.Object"/> with the specified key.
+        /// </summary>
+        /// <value></value>
+        public object this[string key]
+        {
+            get { return _members[key]; }
+            set { _members[key] = value; }
+        }
+        /// <summary>
+        /// Adds the specified item.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        public void Add(KeyValuePair<string, object> item)
+        {
+            _members.Add(item.Key, item.Value);
+        }
+        /// <summary>
+        /// Clears this instance.
+        /// </summary>
+        public void Clear()
+        {
+            _members.Clear();
+        }
+        /// <summary>
+        /// Determines whether [contains] [the specified item].
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <returns>
+        ///     <c>true</c> if [contains] [the specified item]; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Contains(KeyValuePair<string, object> item)
+        {
+            return _members.ContainsKey(item.Key) && _members[item.Key] == item.Value;
+        }
+        /// <summary>
+        /// Copies to.
+        /// </summary>
+        /// <param name="array">The array.</param>
+        /// <param name="arrayIndex">Index of the array.</param>
+        public void CopyTo(KeyValuePair<string, object>[] array, int arrayIndex)
+        {
+            if (array == null) throw new ArgumentNullException("array");
+            int num = Count;
+            foreach (KeyValuePair<string, object> kvp in this)
+            {
+                array[arrayIndex++] = kvp;
+                if (--num <= 0)
+                    return;
+            }
+        }
+        /// <summary>
+        /// Gets the count.
+        /// </summary>
+        /// <value>The count.</value>
+        public int Count
+        {
+            get { return _members.Count; }
+        }
+        /// <summary>
+        /// Gets a value indicating whether this instance is read only.
+        /// </summary>
+        /// <value>
+        ///     <c>true</c> if this instance is read only; otherwise, <c>false</c>.
+        /// </value>
+        public bool IsReadOnly
+        {
+            get { return false; }
+        }
+        /// <summary>
+        /// Removes the specified item.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <returns></returns>
+        public bool Remove(KeyValuePair<string, object> item)
+        {
+            return _members.Remove(item.Key);
+        }
+        /// <summary>
+        /// Gets the enumerator.
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
+        {
+            return _members.GetEnumerator();
+        }
+        /// <summary>
+        /// Returns an enumerator that iterates through a collection.
+        /// </summary>
+        /// <returns>
+        /// An <see cref="T:System.Collections.IEnumerator"/> object that can be used to iterate through the collection.
+        /// </returns>
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return _members.GetEnumerator();
+        }
+        /// <summary>
+        /// Returns a json <see cref="T:System.String"/> that represents the current <see cref="T:System.Object"/>.
+        /// </summary>
+        /// <returns>
+        /// A json <see cref="T:System.String"/> that represents the current <see cref="T:System.Object"/>.
+        /// </returns>
+        public override string ToString()
+        {
+            return SimpleJson.SerializeObject(this);
+        }
+#if SIMPLE_JSON_DYNAMIC
+        /// <summary>
+        /// Provides implementation for type conversion operations. Classes derived from the <see cref="T:System.Dynamic.DynamicObject"/> class can override this method to specify dynamic behavior for operations that convert an object from one type to another.
+        /// </summary>
+        /// <param name="binder">Provides information about the conversion operation. The binder.Type property provides the type to which the object must be converted. For example, for the statement (String)sampleObject in C# (CType(sampleObject, Type) in Visual Basic), where sampleObject is an instance of the class derived from the <see cref="T:System.Dynamic.DynamicObject"/> class, binder.Type returns the <see cref="T:System.String"/> type. The binder.Explicit property provides information about the kind of conversion that occurs. It returns true for explicit conversion and false for implicit conversion.</param>
+        /// <param name="result">The result of the type conversion operation.</param>
+        /// <returns>
+        /// Alwasy returns true.
+        /// </returns>
+        public override bool TryConvert(ConvertBinder binder, out object result)
+        {
+            // <pex>
+            if (binder == null)
+                throw new ArgumentNullException("binder");
+            // </pex>
+            Type targetType = binder.Type;
+            if ((targetType == typeof(IEnumerable)) ||
+                (targetType == typeof(IEnumerable<KeyValuePair<string, object>>)) ||
+                (targetType == typeof(IDictionary<string, object>)) ||
+                (targetType == typeof(IDictionary)))
+            {
+                result = this;
+                return true;
+            }
+            return base.TryConvert(binder, out result);
+        }
+        /// <summary>
+        /// Provides the implementation for operations that delete an object member. This method is not intended for use in C# or Visual Basic.
+        /// </summary>
+        /// <param name="binder">Provides information about the deletion.</param>
+        /// <returns>
+        /// Alwasy returns true.
+        /// </returns>
+        public override bool TryDeleteMember(DeleteMemberBinder binder)
+        {
+            // <pex>
+            if (binder == null)
+                throw new ArgumentNullException("binder");
+            // </pex>
+            return _members.Remove(binder.Name);
+        }
+        /// <summary>
+        /// Provides the implementation for operations that get a value by index. Classes derived from the <see cref="T:System.Dynamic.DynamicObject"/> class can override this method to specify dynamic behavior for indexing operations.
+        /// </summary>
+        /// <param name="binder">Provides information about the operation.</param>
+        /// <param name="indexes">The indexes that are used in the operation. For example, for the sampleObject[3] operation in C# (sampleObject(3) in Visual Basic), where sampleObject is derived from the DynamicObject class, <paramref name="indexes"/> is equal to 3.</param>
+        /// <param name="result">The result of the index operation.</param>
+        /// <returns>
+        /// Alwasy returns true.
+        /// </returns>
+        public override bool TryGetIndex(GetIndexBinder binder, object[] indexes, out object result)
+        {
+            if (indexes == null) throw new ArgumentNullException("indexes");
+            if (indexes.Length == 1)
+            {
+                result = ((IDictionary<string, object>)this)[(string)indexes[0]];
+                return true;
+            }
+            result = null;
+            return true;
+        }
+        /// <summary>
+        /// Provides the implementation for operations that get member values. Classes derived from the <see cref="T:System.Dynamic.DynamicObject"/> class can override this method to specify dynamic behavior for operations such as getting a value for a property.
+        /// </summary>
+        /// <param name="binder">Provides information about the object that called the dynamic operation. The binder.Name property provides the name of the member on which the dynamic operation is performed. For example, for the Console.WriteLine(sampleObject.SampleProperty) statement, where sampleObject is an instance of the class derived from the <see cref="T:System.Dynamic.DynamicObject"/> class, binder.Name returns "SampleProperty". The binder.IgnoreCase property specifies whether the member name is case-sensitive.</param>
+        /// <param name="result">The result of the get operation. For example, if the method is called for a property, you can assign the property value to <paramref name="result"/>.</param>
+        /// <returns>
+        /// Alwasy returns true.
+        /// </returns>
+        public override bool TryGetMember(GetMemberBinder binder, out object result)
+        {
+            object value;
+            if (_members.TryGetValue(binder.Name, out value))
+            {
+                result = value;
+                return true;
+            }
+            result = null;
+            return true;
+        }
+        /// <summary>
+        /// Provides the implementation for operations that set a value by index. Classes derived from the <see cref="T:System.Dynamic.DynamicObject"/> class can override this method to specify dynamic behavior for operations that access objects by a specified index.
+        /// </summary>
+        /// <param name="binder">Provides information about the operation.</param>
+        /// <param name="indexes">The indexes that are used in the operation. For example, for the sampleObject[3] = 10 operation in C# (sampleObject(3) = 10 in Visual Basic), where sampleObject is derived from the <see cref="T:System.Dynamic.DynamicObject"/> class, <paramref name="indexes"/> is equal to 3.</param>
+        /// <param name="value">The value to set to the object that has the specified index. For example, for the sampleObject[3] = 10 operation in C# (sampleObject(3) = 10 in Visual Basic), where sampleObject is derived from the <see cref="T:System.Dynamic.DynamicObject"/> class, <paramref name="value"/> is equal to 10.</param>
+        /// <returns>
+        /// true if the operation is successful; otherwise, false. If this method returns false, the run-time binder of the language determines the behavior. (In most cases, a language-specific run-time exception is thrown.
+        /// </returns>
+        public override bool TrySetIndex(SetIndexBinder binder, object[] indexes, object value)
+        {
+            if (indexes == null) throw new ArgumentNullException("indexes");
+            if (indexes.Length == 1)
+            {
+                ((IDictionary<string, object>)this)[(string)indexes[0]] = value;
+                return true;
+            }
+            return base.TrySetIndex(binder, indexes, value);
+        }
+        /// <summary>
+        /// Provides the implementation for operations that set member values. Classes derived from the <see cref="T:System.Dynamic.DynamicObject"/> class can override this method to specify dynamic behavior for operations such as setting a value for a property.
+        /// </summary>
+        /// <param name="binder">Provides information about the object that called the dynamic operation. The binder.Name property provides the name of the member to which the value is being assigned. For example, for the statement sampleObject.SampleProperty = "Test", where sampleObject is an instance of the class derived from the <see cref="T:System.Dynamic.DynamicObject"/> class, binder.Name returns "SampleProperty". The binder.IgnoreCase property specifies whether the member name is case-sensitive.</param>
+        /// <param name="value">The value to set to the member. For example, for sampleObject.SampleProperty = "Test", where sampleObject is an instance of the class derived from the <see cref="T:System.Dynamic.DynamicObject"/> class, the <paramref name="value"/> is "Test".</param>
+        /// <returns>
+        /// true if the operation is successful; otherwise, false. If this method returns false, the run-time binder of the language determines the behavior. (In most cases, a language-specific run-time exception is thrown.)
+        /// </returns>
+        public override bool TrySetMember(SetMemberBinder binder, object value)
+        {
+            // <pex>
+            if (binder == null)
+                throw new ArgumentNullException("binder");
+            // </pex>
+            _members[binder.Name] = value;
+            return true;
+        }
+        /// <summary>
+        /// Returns the enumeration of all dynamic member names.
+        /// </summary>
+        /// <returns>
+        /// A sequence that contains dynamic member names.
+        /// </returns>
+        public override IEnumerable<string> GetDynamicMemberNames()
+        {
+            foreach (var key in Keys)
+                yield return key;
+        }
+#endif
+    }
+}
+namespace SimpleJson
+{
+    /// <summary>
+    /// This class encodes and decodes JSON strings.
+    /// Spec. details, see http://www.json.org/
+    /// 
+    /// JSON uses Arrays and Objects. These correspond here to the datatypes JsonArray(IList&lt;object>) and JsonObject(IDictionary&lt;string,object>).
+    /// All numbers are parsed to doubles.
+    /// </summary>
+    [GeneratedCode("simple-json", "1.0.0")]
+#if SIMPLE_JSON_INTERNAL
+    internal
+#else
+    public
+#endif
+ static class SimpleJson
+    {
+        private const int TOKEN_NONE = 0;
+        private const int TOKEN_CURLY_OPEN = 1;
+        private const int TOKEN_CURLY_CLOSE = 2;
+        private const int TOKEN_SQUARED_OPEN = 3;
+        private const int TOKEN_SQUARED_CLOSE = 4;
+        private const int TOKEN_COLON = 5;
+        private const int TOKEN_COMMA = 6;
+        private const int TOKEN_STRING = 7;
+        private const int TOKEN_NUMBER = 8;
+        private const int TOKEN_TRUE = 9;
+        private const int TOKEN_FALSE = 10;
+        private const int TOKEN_NULL = 11;
+        private const int BUILDER_CAPACITY = 2000;
+        private static readonly char[] EscapeTable;
+        private static readonly char[] EscapeCharacters = new char[] { '"', '\\', '\b', '\f', '\n', '\r', '\t' };
+        private static readonly string EscapeCharactersString = new string(EscapeCharacters);
+        static SimpleJson()
+        {
+            EscapeTable = new char[93];
+            EscapeTable['"'] = '"';
+            EscapeTable['\\'] = '\\';
+            EscapeTable['\b'] = 'b';
+            EscapeTable['\f'] = 'f';
+            EscapeTable['\n'] = 'n';
+            EscapeTable['\r'] = 'r';
+            EscapeTable['\t'] = 't';
+        }
+        /// <summary>
+        /// Parses the string json into a value
+        /// </summary>
+        /// <param name="json">A JSON string.</param>
+        /// <returns>An IList&lt;object>, a IDictionary&lt;string,object>, a double, a string, null, true, or false</returns>
+        public static object DeserializeObject(string json)
+        {
+            object obj;
+            if (TryDeserializeObject(json, out obj))
+                return obj;
+            throw new SerializationException("Invalid JSON string");
+        }
+        /// <summary>
+        /// Try parsing the json string into a value.
+        /// </summary>
+        /// <param name="json">
+        /// A JSON string.
+        /// </param>
+        /// <param name="obj">
+        /// The object.
+        /// </param>
+        /// <returns>
+        /// Returns true if successfull otherwise false.
+        /// </returns>
+        [SuppressMessage("Microsoft.Design", "CA1007:UseGenericsWhereAppropriate", Justification = "Need to support .NET 2")]
+        public static bool TryDeserializeObject(string json, out object obj)
+        {
+            bool success = true;
+            if (json != null)
+            {
+                char[] charArray = json.ToCharArray();
+                int index = 0;
+                obj = ParseValue(charArray, ref index, ref success);
+            }
+            else
+                obj = null;
+            return success;
+        }
+        public static object DeserializeObject(string json, Type type, IJsonSerializerStrategy jsonSerializerStrategy)
+        {
+            object jsonObject = DeserializeObject(json);
+            return type == null || jsonObject != null && ReflectionUtils.IsAssignableFrom(jsonObject.GetType(), type)
+                       ? jsonObject
+                       : (jsonSerializerStrategy ?? CurrentJsonSerializerStrategy).DeserializeObject(jsonObject, type);
+        }
+        public static object DeserializeObject(string json, Type type)
+        {
+            return DeserializeObject(json, type, null);
+        }
+        public static T DeserializeObject<T>(string json, IJsonSerializerStrategy jsonSerializerStrategy)
+        {
+            return (T)DeserializeObject(json, typeof(T), jsonSerializerStrategy);
+        }
+        public static T DeserializeObject<T>(string json)
+        {
+            return (T)DeserializeObject(json, typeof(T), null);
+        }
+        /// <summary>
+        /// Converts a IDictionary&lt;string,object> / IList&lt;object> object into a JSON string
+        /// </summary>
+        /// <param name="json">A IDictionary&lt;string,object> / IList&lt;object></param>
+        /// <param name="jsonSerializerStrategy">Serializer strategy to use</param>
+        /// <returns>A JSON encoded string, or null if object 'json' is not serializable</returns>
+        public static string SerializeObject(object json, IJsonSerializerStrategy jsonSerializerStrategy)
+        {
+            StringBuilder builder = new StringBuilder(BUILDER_CAPACITY);
+            bool success = SerializeValue(jsonSerializerStrategy, json, builder);
+            return (success ? builder.ToString() : null);
+        }
+        public static string SerializeObject(object json)
+        {
+            return SerializeObject(json, CurrentJsonSerializerStrategy);
+        }
+        public static string EscapeToJavascriptString(string jsonString)
+        {
+            if (string.IsNullOrEmpty(jsonString))
+                return jsonString;
+            StringBuilder sb = new StringBuilder();
+            char c;
+            for (int i = 0; i < jsonString.Length;)
+            {
+                c = jsonString[i++];
+                if (c == '\\')
+                {
+                    int remainingLength = jsonString.Length - i;
+                    if (remainingLength >= 2)
+                    {
+                        char lookahead = jsonString[i];
+                        if (lookahead == '\\')
+                        {
+                            sb.Append('\\');
+                            ++i;
+                        }
+                        else if (lookahead == '"')
+                        {
+                            sb.Append("\"");
+                            ++i;
+                        }
+                        else if (lookahead == 't')
+                        {
+                            sb.Append('\t');
+                            ++i;
+                        }
+                        else if (lookahead == 'b')
+                        {
+                            sb.Append('\b');
+                            ++i;
+                        }
+                        else if (lookahead == 'n')
+                        {
+                            sb.Append('\n');
+                            ++i;
+                        }
+                        else if (lookahead == 'r')
+                        {
+                            sb.Append('\r');
+                            ++i;
+                        }
+                    }
+                }
+                else
+                {
+                    sb.Append(c);
+                }
+            }
+            return sb.ToString();
+        }
+        static IDictionary<string, object> ParseObject(char[] json, ref int index, ref bool success)
+        {
+            IDictionary<string, object> table = new JsonObject();
+            int token;
+            // {
+            NextToken(json, ref index);
+            bool done = false;
+            while (!done)
+            {
+                token = LookAhead(json, index);
+                if (token == TOKEN_NONE)
+                {
+                    success = false;
+                    return null;
+                }
+                else if (token == TOKEN_COMMA)
+                    NextToken(json, ref index);
+                else if (token == TOKEN_CURLY_CLOSE)
+                {
+                    NextToken(json, ref index);
+                    return table;
+                }
+                else
+                {
+                    // name
+                    string name = ParseString(json, ref index, ref success);
+                    if (!success)
+                    {
+                        success = false;
+                        return null;
+                    }
+                    // :
+                    token = NextToken(json, ref index);
+                    if (token != TOKEN_COLON)
+                    {
+                        success = false;
+                        return null;
+                    }
+                    // value
+                    object value = ParseValue(json, ref index, ref success);
+                    if (!success)
+                    {
+                        success = false;
+                        return null;
+                    }
+                    table[name] = value;
+                }
+            }
+            return table;
+        }
+        static JsonArray ParseArray(char[] json, ref int index, ref bool success)
+        {
+            JsonArray array = new JsonArray();
+            // [
+            NextToken(json, ref index);
+            bool done = false;
+            while (!done)
+            {
+                int token = LookAhead(json, index);
+                if (token == TOKEN_NONE)
+                {
+                    success = false;
+                    return null;
+                }
+                else if (token == TOKEN_COMMA)
+                    NextToken(json, ref index);
+                else if (token == TOKEN_SQUARED_CLOSE)
+                {
+                    NextToken(json, ref index);
+                    break;
+                }
+                else
+                {
+                    object value = ParseValue(json, ref index, ref success);
+                    if (!success)
+                        return null;
+                    array.Add(value);
+                }
+            }
+            return array;
+        }
+        static object ParseValue(char[] json, ref int index, ref bool success)
+        {
+            switch (LookAhead(json, index))
+            {
+                case TOKEN_STRING:
+                    return ParseString(json, ref index, ref success);
+                case TOKEN_NUMBER:
+                    return ParseNumber(json, ref index, ref success);
+                case TOKEN_CURLY_OPEN:
+                    return ParseObject(json, ref index, ref success);
+                case TOKEN_SQUARED_OPEN:
+                    return ParseArray(json, ref index, ref success);
+                case TOKEN_TRUE:
+                    NextToken(json, ref index);
+                    return true;
+                case TOKEN_FALSE:
+                    NextToken(json, ref index);
+                    return false;
+                case TOKEN_NULL:
+                    NextToken(json, ref index);
+                    return null;
+                case TOKEN_NONE:
+                    break;
+            }
+            success = false;
+            return null;
+        }
+        static string ParseString(char[] json, ref int index, ref bool success)
+        {
+            StringBuilder s = new StringBuilder(BUILDER_CAPACITY);
+            char c;
+            EatWhitespace(json, ref index);
+            // "
+            c = json[index++];
+            bool complete = false;
+            while (!complete)
+            {
+                if (index == json.Length)
+                    break;
+                c = json[index++];
+                if (c == '"')
+                {
+                    complete = true;
+                    break;
+                }
+                else if (c == '\\')
+                {
+                    if (index == json.Length)
+                        break;
+                    c = json[index++];
+                    if (c == '"')
+                        s.Append('"');
+                    else if (c == '\\')
+                        s.Append('\\');
+                    else if (c == '/')
+                        s.Append('/');
+                    else if (c == 'b')
+                        s.Append('\b');
+                    else if (c == 'f')
+                        s.Append('\f');
+                    else if (c == 'n')
+                        s.Append('\n');
+                    else if (c == 'r')
+                        s.Append('\r');
+                    else if (c == 't')
+                        s.Append('\t');
+                    else if (c == 'u')
+                    {
+                        int remainingLength = json.Length - index;
+                        if (remainingLength >= 4)
+                        {
+                            // parse the 32 bit hex into an integer codepoint
+                            uint codePoint;
+                            if (!(success = UInt32.TryParse(new string(json, index, 4), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out codePoint)))
+                                return "";
+                            // convert the integer codepoint to a unicode char and add to string
+                            if (0xD800 <= codePoint && codePoint <= 0xDBFF)  // if high surrogate
+                            {
+                                index += 4; // skip 4 chars
+                                remainingLength = json.Length - index;
+                                if (remainingLength >= 6)
+                                {
+                                    uint lowCodePoint;
+                                    if (new string(json, index, 2) == "\\u" && UInt32.TryParse(new string(json, index + 2, 4), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out lowCodePoint))
+                                    {
+                                        if (0xDC00 <= lowCodePoint && lowCodePoint <= 0xDFFF)    // if low surrogate
+                                        {
+                                            s.Append((char)codePoint);
+                                            s.Append((char)lowCodePoint);
+                                            index += 6; // skip 6 chars
+                                            continue;
+                                        }
+                                    }
+                                }
+                                success = false;    // invalid surrogate pair
+                                return "";
+                            }
+                            s.Append(ConvertFromUtf32((int)codePoint));
+                            // skip 4 chars
+                            index += 4;
+                        }
+                        else
+                            break;
+                    }
+                }
+                else
+                    s.Append(c);
+            }
+            if (!complete)
+            {
+                success = false;
+                return null;
+            }
+            return s.ToString();
+        }
+        private static string ConvertFromUtf32(int utf32)
+        {
+            // http://www.java2s.com/Open-Source/CSharp/2.6.4-mono-.net-core/System/System/Char.cs.htm
+            if (utf32 < 0 || utf32 > 0x10FFFF)
+                throw new ArgumentOutOfRangeException("utf32", "The argument must be from 0 to 0x10FFFF.");
+            if (0xD800 <= utf32 && utf32 <= 0xDFFF)
+                throw new ArgumentOutOfRangeException("utf32", "The argument must not be in surrogate pair range.");
+            if (utf32 < 0x10000)
+                return new string((char)utf32, 1);
+            utf32 -= 0x10000;
+            return new string(new char[] { (char)((utf32 >> 10) + 0xD800), (char)(utf32 % 0x0400 + 0xDC00) });
+        }
+        static object ParseNumber(char[] json, ref int index, ref bool success)
+        {
+            EatWhitespace(json, ref index);
+            int lastIndex = GetLastIndexOfNumber(json, index);
+            int charLength = (lastIndex - index) + 1;
+            object returnNumber;
+            string str = new string(json, index, charLength);
+            if (str.IndexOf(".", StringComparison.OrdinalIgnoreCase) != -1 || str.IndexOf("e", StringComparison.OrdinalIgnoreCase) != -1)
+            {
+                double number;
+                success = double.TryParse(new string(json, index, charLength), NumberStyles.Any, CultureInfo.InvariantCulture, out number);
+                returnNumber = number;
+            }
+            else
+            {
+                long number;
+                success = long.TryParse(new string(json, index, charLength), NumberStyles.Any, CultureInfo.InvariantCulture, out number);
+                returnNumber = number;
+            }
+            index = lastIndex + 1;
+            return returnNumber;
+        }
+        static int GetLastIndexOfNumber(char[] json, int index)
+        {
+            int lastIndex;
+            for (lastIndex = index; lastIndex < json.Length; lastIndex++)
+                if ("0123456789+-.eE".IndexOf(json[lastIndex]) == -1) break;
+            return lastIndex - 1;
+        }
+        static void EatWhitespace(char[] json, ref int index)
+        {
+            for (; index < json.Length; index++)
+                if (" \t\n\r\b\f".IndexOf(json[index]) == -1) break;
+        }
+        static int LookAhead(char[] json, int index)
+        {
+            int saveIndex = index;
+            return NextToken(json, ref saveIndex);
+        }
+        [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        static int NextToken(char[] json, ref int index)
+        {
+            EatWhitespace(json, ref index);
+            if (index == json.Length)
+                return TOKEN_NONE;
+            char c = json[index];
+            index++;
+            switch (c)
+            {
+                case '{':
+                    return TOKEN_CURLY_OPEN;
+                case '}':
+                    return TOKEN_CURLY_CLOSE;
+                case '[':
+                    return TOKEN_SQUARED_OPEN;
+                case ']':
+                    return TOKEN_SQUARED_CLOSE;
+                case ',':
+                    return TOKEN_COMMA;
+                case '"':
+                    return TOKEN_STRING;
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                case '8':
+                case '9':
+                case '-':
+                    return TOKEN_NUMBER;
+                case ':':
+                    return TOKEN_COLON;
+            }
+            index--;
+            int remainingLength = json.Length - index;
+            // false
+            if (remainingLength >= 5)
+            {
+                if (json[index] == 'f' && json[index + 1] == 'a' && json[index + 2] == 'l' && json[index + 3] == 's' && json[index + 4] == 'e')
+                {
+                    index += 5;
+                    return TOKEN_FALSE;
+                }
+            }
+            // true
+            if (remainingLength >= 4)
+            {
+                if (json[index] == 't' && json[index + 1] == 'r' && json[index + 2] == 'u' && json[index + 3] == 'e')
+                {
+                    index += 4;
+                    return TOKEN_TRUE;
+                }
+            }
+            // null
+            if (remainingLength >= 4)
+            {
+                if (json[index] == 'n' && json[index + 1] == 'u' && json[index + 2] == 'l' && json[index + 3] == 'l')
+                {
+                    index += 4;
+                    return TOKEN_NULL;
+                }
+            }
+            return TOKEN_NONE;
+        }
+        static bool SerializeValue(IJsonSerializerStrategy jsonSerializerStrategy, object value, StringBuilder builder)
+        {
+            bool success = true;
+            string stringValue = value as string;
+            if (stringValue != null)
+                success = SerializeString(stringValue, builder);
+            else
+            {
+                IDictionary<string, object> dict = value as IDictionary<string, object>;
+                if (dict != null)
+                {
+                    success = SerializeObject(jsonSerializerStrategy, dict.Keys, dict.Values, builder);
+                }
+                else
+                {
+                    IDictionary<string, string> stringDictionary = value as IDictionary<string, string>;
+                    if (stringDictionary != null)
+                    {
+                        success = SerializeObject(jsonSerializerStrategy, stringDictionary.Keys, stringDictionary.Values, builder);
+                    }
+                    else
+                    {
+                        IEnumerable enumerableValue = value as IEnumerable;
+                        if (enumerableValue != null)
+                            success = SerializeArray(jsonSerializerStrategy, enumerableValue, builder);
+                        else if (IsNumeric(value))
+                            success = SerializeNumber(value, builder);
+                        else if (value is bool)
+                            builder.Append((bool)value ? "true" : "false");
+                        else if (value == null)
+                            builder.Append("null");
+                        else
+                        {
+                            object serializedObject;
+                            success = jsonSerializerStrategy.TrySerializeNonPrimitiveObject(value, out serializedObject);
+                            if (success)
+                                SerializeValue(jsonSerializerStrategy, serializedObject, builder);
+                        }
+                    }
+                }
+            }
+            return success;
+        }
+        static bool SerializeObject(IJsonSerializerStrategy jsonSerializerStrategy, IEnumerable keys, IEnumerable values, StringBuilder builder)
+        {
+            builder.Append("{");
+            IEnumerator ke = keys.GetEnumerator();
+            IEnumerator ve = values.GetEnumerator();
+            bool first = true;
+            while (ke.MoveNext() && ve.MoveNext())
+            {
+                object key = ke.Current;
+                object value = ve.Current;
+                if (!first)
+                    builder.Append(",");
+                string stringKey = key as string;
+                if (stringKey != null)
+                    SerializeString(stringKey, builder);
+                else
+                    if (!SerializeValue(jsonSerializerStrategy, value, builder)) return false;
+                builder.Append(":");
+                if (!SerializeValue(jsonSerializerStrategy, value, builder))
+                    return false;
+                first = false;
+            }
+            builder.Append("}");
+            return true;
+        }
+        static bool SerializeArray(IJsonSerializerStrategy jsonSerializerStrategy, IEnumerable anArray, StringBuilder builder)
+        {
+            builder.Append("[");
+            bool first = true;
+            foreach (object value in anArray)
+            {
+                if (!first)
+                    builder.Append(",");
+                if (!SerializeValue(jsonSerializerStrategy, value, builder))
+                    return false;
+                first = false;
+            }
+            builder.Append("]");
+            return true;
+        }
+        static bool SerializeString(string aString, StringBuilder builder)
+        {
+            // Happy path if there's nothing to be escaped. IndexOfAny is highly optimized (and unmanaged)
+            if (aString.IndexOfAny(EscapeCharacters) == -1)
+            {
+                builder.Append('"');
+                builder.Append(aString);
+                builder.Append('"');
+                return true;
+            }
+            builder.Append('"');
+            int safeCharacterCount = 0;
+            char[] charArray = aString.ToCharArray();
+            for (int i = 0; i < charArray.Length; i++)
+            {
+                char c = charArray[i];
+                // Non ascii characters are fine, buffer them up and send them to the builder
+                // in larger chunks if possible. The escape table is a 1:1 translation table
+                // with \0 [default(char)] denoting a safe character.
+                if (c >= EscapeTable.Length || EscapeTable[c] == default(char))
+                {
+                    safeCharacterCount++;
+                }
+                else
+                {
+                    if (safeCharacterCount > 0)
+                    {
+                        builder.Append(charArray, i - safeCharacterCount, safeCharacterCount);
+                        safeCharacterCount = 0;
+                    }
+                    builder.Append('\\');
+                    builder.Append(EscapeTable[c]);
+                }
+            }
+            if (safeCharacterCount > 0)
+            {
+                builder.Append(charArray, charArray.Length - safeCharacterCount, safeCharacterCount);
+            }
+            builder.Append('"');
+            return true;
+        }
+        static bool SerializeNumber(object number, StringBuilder builder)
+        {
+            if (number is long)
+                builder.Append(((long)number).ToString(CultureInfo.InvariantCulture));
+            else if (number is ulong)
+                builder.Append(((ulong)number).ToString(CultureInfo.InvariantCulture));
+            else if (number is int)
+                builder.Append(((int)number).ToString(CultureInfo.InvariantCulture));
+            else if (number is uint)
+                builder.Append(((uint)number).ToString(CultureInfo.InvariantCulture));
+            else if (number is decimal)
+                builder.Append(((decimal)number).ToString(CultureInfo.InvariantCulture));
+            else if (number is float)
+                builder.Append(((float)number).ToString(CultureInfo.InvariantCulture));
+            else
+                builder.Append(Convert.ToDouble(number, CultureInfo.InvariantCulture).ToString("r", CultureInfo.InvariantCulture));
+            return true;
+        }
+        /// <summary>
+        /// Determines if a given object is numeric in any way
+        /// (can be integer, double, null, etc).
+        /// </summary>
+        static bool IsNumeric(object value)
+        {
+            if (value is sbyte) return true;
+            if (value is byte) return true;
+            if (value is short) return true;
+            if (value is ushort) return true;
+            if (value is int) return true;
+            if (value is uint) return true;
+            if (value is long) return true;
+            if (value is ulong) return true;
+            if (value is float) return true;
+            if (value is double) return true;
+            if (value is decimal) return true;
+            return false;
+        }
+        private static IJsonSerializerStrategy _currentJsonSerializerStrategy;
+        public static IJsonSerializerStrategy CurrentJsonSerializerStrategy
+        {
+            get
+            {
+                return _currentJsonSerializerStrategy ??
+                    (_currentJsonSerializerStrategy =
+#if SIMPLE_JSON_DATACONTRACT
+ DataContractJsonSerializerStrategy
+#else
+ PocoJsonSerializerStrategy
+#endif
+);
+            }
+            set
+            {
+                _currentJsonSerializerStrategy = value;
+            }
+        }
+        private static PocoJsonSerializerStrategy _pocoJsonSerializerStrategy;
+        [EditorBrowsable(EditorBrowsableState.Advanced)]
+        public static PocoJsonSerializerStrategy PocoJsonSerializerStrategy
+        {
+            get
+            {
+                return _pocoJsonSerializerStrategy ?? (_pocoJsonSerializerStrategy = new PocoJsonSerializerStrategy());
+            }
+        }
+#if SIMPLE_JSON_DATACONTRACT
+        private static DataContractJsonSerializerStrategy _dataContractJsonSerializerStrategy;
+        [System.ComponentModel.EditorBrowsable(EditorBrowsableState.Advanced)]
+        public static DataContractJsonSerializerStrategy DataContractJsonSerializerStrategy
+        {
+            get
+            {
+                return _dataContractJsonSerializerStrategy ?? (_dataContractJsonSerializerStrategy = new DataContractJsonSerializerStrategy());
+            }
+        }
+#endif
+    }
+    [GeneratedCode("simple-json", "1.0.0")]
+#if SIMPLE_JSON_INTERNAL
+    internal
+#else
+    public
+#endif
+ interface IJsonSerializerStrategy
+    {
+        [SuppressMessage("Microsoft.Design", "CA1007:UseGenericsWhereAppropriate", Justification = "Need to support .NET 2")]
+        bool TrySerializeNonPrimitiveObject(object input, out object output);
+        object DeserializeObject(object value, Type type);
+    }
+    [GeneratedCode("simple-json", "1.0.0")]
+#if SIMPLE_JSON_INTERNAL
+    internal
+#else
+    public
+#endif
+ class PocoJsonSerializerStrategy : IJsonSerializerStrategy
+    {
+        internal IDictionary<Type, ReflectionUtils.ConstructorDelegate> ConstructorCache;
+        internal IDictionary<Type, IDictionary<string, ReflectionUtils.GetDelegate>> GetCache;
+        internal IDictionary<Type, IDictionary<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>>> SetCache;
+        internal static readonly Type[] EmptyTypes = new Type[0];
+        internal static readonly Type[] ArrayConstructorParameterTypes = new Type[] { typeof(int) };
+        private static readonly string[] Iso8601Format = new string[]
+                                                             {
+                                                                 @"yyyy-MM-dd\THH:mm:ss.FFFFFFF\Z",
+                                                                 @"yyyy-MM-dd\THH:mm:ss\Z",
+                                                                 @"yyyy-MM-dd\THH:mm:ssK"
+                                                             };
+        public PocoJsonSerializerStrategy()
+        {
+            ConstructorCache = new ReflectionUtils.ThreadSafeDictionary<Type, ReflectionUtils.ConstructorDelegate>(ContructorDelegateFactory);
+            GetCache = new ReflectionUtils.ThreadSafeDictionary<Type, IDictionary<string, ReflectionUtils.GetDelegate>>(GetterValueFactory);
+            SetCache = new ReflectionUtils.ThreadSafeDictionary<Type, IDictionary<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>>>(SetterValueFactory);
+        }
+        protected virtual string MapClrMemberNameToJsonFieldName(string clrPropertyName)
+        {
+            return clrPropertyName;
+        }
+        internal virtual ReflectionUtils.ConstructorDelegate ContructorDelegateFactory(Type key)
+        {
+            return ReflectionUtils.GetContructor(key, key.IsArray ? ArrayConstructorParameterTypes : EmptyTypes);
+        }
+        internal virtual IDictionary<string, ReflectionUtils.GetDelegate> GetterValueFactory(Type type)
+        {
+            IDictionary<string, ReflectionUtils.GetDelegate> result = new Dictionary<string, ReflectionUtils.GetDelegate>();
+            foreach (PropertyInfo propertyInfo in ReflectionUtils.GetProperties(type))
+            {
+                if (propertyInfo.CanRead)
+                {
+                    MethodInfo getMethod = ReflectionUtils.GetGetterMethodInfo(propertyInfo);
+                    if (getMethod.IsStatic || !getMethod.IsPublic)
+                        continue;
+                    result[MapClrMemberNameToJsonFieldName(propertyInfo.Name)] = ReflectionUtils.GetGetMethod(propertyInfo);
+                }
+            }
+            foreach (FieldInfo fieldInfo in ReflectionUtils.GetFields(type))
+            {
+                if (fieldInfo.IsStatic || !fieldInfo.IsPublic)
+                    continue;
+                result[MapClrMemberNameToJsonFieldName(fieldInfo.Name)] = ReflectionUtils.GetGetMethod(fieldInfo);
+            }
+            return result;
+        }
+        internal virtual IDictionary<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>> SetterValueFactory(Type type)
+        {
+            IDictionary<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>> result = new Dictionary<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>>();
+            foreach (PropertyInfo propertyInfo in ReflectionUtils.GetProperties(type))
+            {
+                if (propertyInfo.CanWrite)
+                {
+                    MethodInfo setMethod = ReflectionUtils.GetSetterMethodInfo(propertyInfo);
+                    if (setMethod.IsStatic || !setMethod.IsPublic)
+                        continue;
+                    result[MapClrMemberNameToJsonFieldName(propertyInfo.Name)] = new KeyValuePair<Type, ReflectionUtils.SetDelegate>(propertyInfo.PropertyType, ReflectionUtils.GetSetMethod(propertyInfo));
+                }
+            }
+            foreach (FieldInfo fieldInfo in ReflectionUtils.GetFields(type))
+            {
+                if (fieldInfo.IsInitOnly || fieldInfo.IsStatic || !fieldInfo.IsPublic)
+                    continue;
+                result[MapClrMemberNameToJsonFieldName(fieldInfo.Name)] = new KeyValuePair<Type, ReflectionUtils.SetDelegate>(fieldInfo.FieldType, ReflectionUtils.GetSetMethod(fieldInfo));
+            }
+            return result;
+        }
+        public virtual bool TrySerializeNonPrimitiveObject(object input, out object output)
+        {
+            return TrySerializeKnownTypes(input, out output) || TrySerializeUnknownTypes(input, out output);
+        }
+        [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        public virtual object DeserializeObject(object value, Type type)
+        {
+            if (type == null) throw new ArgumentNullException("type");
+            string str = value as string;
+            if (type == typeof(Guid) && string.IsNullOrEmpty(str))
+                return default(Guid);
+            if (value == null)
+                return null;
+            object obj = null;
+            if (str != null)
+            {
+                if (str.Length != 0) // We know it can't be null now.
+                {
+                    if (type == typeof(DateTime) || (ReflectionUtils.IsNullableType(type) && Nullable.GetUnderlyingType(type) == typeof(DateTime)))
+                        return DateTime.ParseExact(str, Iso8601Format, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal);
+                    if (type == typeof(DateTimeOffset) || (ReflectionUtils.IsNullableType(type) && Nullable.GetUnderlyingType(type) == typeof(DateTimeOffset)))
+                        return DateTimeOffset.ParseExact(str, Iso8601Format, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal);
+                    if (type == typeof(Guid) || (ReflectionUtils.IsNullableType(type) && Nullable.GetUnderlyingType(type) == typeof(Guid)))
+                        return new Guid(str);
+                    if (type == typeof(Uri))
+                    {
+                        bool isValid = Uri.IsWellFormedUriString(str, UriKind.RelativeOrAbsolute);
+                        Uri result;
+                        if (isValid && Uri.TryCreate(str, UriKind.RelativeOrAbsolute, out result))
+                            return result;
+                        return null;
+                    }
+                    if (type == typeof(string))
+                        return str;
+                    return Convert.ChangeType(str, type, CultureInfo.InvariantCulture);
+                }
+                else
+                {
+                    if (type == typeof(Guid))
+                        obj = default(Guid);
+                    else if (ReflectionUtils.IsNullableType(type) && Nullable.GetUnderlyingType(type) == typeof(Guid))
+                        obj = null;
+                    else
+                        obj = str;
+                }
+                // Empty string case
+                if (!ReflectionUtils.IsNullableType(type) && Nullable.GetUnderlyingType(type) == typeof(Guid))
+                    return str;
+            }
+            else if (value is bool)
+                return value;
+            bool valueIsLong = value is long;
+            bool valueIsDouble = value is double;
+            if ((valueIsLong && type == typeof(long)) || (valueIsDouble && type == typeof(double)))
+                return value;
+            if ((valueIsDouble && type != typeof(double)) || (valueIsLong && type != typeof(long)))
+            {
+                obj = type == typeof(int) || type == typeof(long) || type == typeof(double) || type == typeof(float) || type == typeof(bool) || type == typeof(decimal) || type == typeof(byte) || type == typeof(short)
+                            ? Convert.ChangeType(value, type, CultureInfo.InvariantCulture)
+                            : value;
+            }
+            else
+            {
+                IDictionary<string, object> objects = value as IDictionary<string, object>;
+                if (objects != null)
+                {
+                    IDictionary<string, object> jsonObject = objects;
+                    if (ReflectionUtils.IsTypeDictionary(type))
+                    {
+                        // if dictionary then
+                        Type[] types = ReflectionUtils.GetGenericTypeArguments(type);
+                        Type keyType = types[0];
+                        Type valueType = types[1];
+                        Type genericType = typeof(Dictionary<,>).MakeGenericType(keyType, valueType);
+                        IDictionary dict = (IDictionary)ConstructorCache[genericType]();
+                        foreach (KeyValuePair<string, object> kvp in jsonObject)
+                            dict.Add(kvp.Key, DeserializeObject(kvp.Value, valueType));
+                        obj = dict;
+                    }
+                    else
+                    {
+                        if (type == typeof(object))
+                            obj = value;
+                        else
+                        {
+                            obj = ConstructorCache[type]();
+                            foreach (KeyValuePair<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>> setter in SetCache[type])
+                            {
+                                object jsonValue;
+                                if (jsonObject.TryGetValue(setter.Key, out jsonValue))
+                                {
+                                    jsonValue = DeserializeObject(jsonValue, setter.Value.Key);
+                                    setter.Value.Value(obj, jsonValue);
+                                }
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    IList<object> valueAsList = value as IList<object>;
+                    if (valueAsList != null)
+                    {
+                        IList<object> jsonObject = valueAsList;
+                        IList list = null;
+                        if (type.IsArray)
+                        {
+                            list = (IList)ConstructorCache[type](jsonObject.Count);
+                            int i = 0;
+                            foreach (object o in jsonObject)
+                                list[i++] = DeserializeObject(o, type.GetElementType());
+                        }
+                        else if (ReflectionUtils.IsTypeGenericeCollectionInterface(type) || ReflectionUtils.IsAssignableFrom(typeof(IList), type))
+                        {
+                            Type innerType = ReflectionUtils.GetGenericListElementType(type);
+                            list = (IList)(ConstructorCache[type] ?? ConstructorCache[typeof(List<>).MakeGenericType(innerType)])(jsonObject.Count);
+                            foreach (object o in jsonObject)
+                                list.Add(DeserializeObject(o, innerType));
+                        }
+                        obj = list;
+                    }
+                }
+                return obj;
+            }
+            if (ReflectionUtils.IsNullableType(type))
+                return ReflectionUtils.ToNullableType(obj, type);
+            return obj;
+        }
+        protected virtual object SerializeEnum(Enum p)
+        {
+            return Convert.ToDouble(p, CultureInfo.InvariantCulture);
+        }
+        [SuppressMessage("Microsoft.Design", "CA1007:UseGenericsWhereAppropriate", Justification = "Need to support .NET 2")]
+        protected virtual bool TrySerializeKnownTypes(object input, out object output)
+        {
+            bool returnValue = true;
+            if (input is DateTime)
+                output = ((DateTime)input).ToUniversalTime().ToString(Iso8601Format[0], CultureInfo.InvariantCulture);
+            else if (input is DateTimeOffset)
+                output = ((DateTimeOffset)input).ToUniversalTime().ToString(Iso8601Format[0], CultureInfo.InvariantCulture);
+            else if (input is Guid)
+                output = ((Guid)input).ToString("D");
+            else if (input is Uri)
+                output = input.ToString();
+            else
+            {
+                Enum inputEnum = input as Enum;
+                if (inputEnum != null)
+                    output = SerializeEnum(inputEnum);
+                else
+                {
+                    returnValue = false;
+                    output = null;
+                }
+            }
+            return returnValue;
+        }
+        [SuppressMessage("Microsoft.Design", "CA1007:UseGenericsWhereAppropriate", Justification = "Need to support .NET 2")]
+        protected virtual bool TrySerializeUnknownTypes(object input, out object output)
+        {
+            if (input == null) throw new ArgumentNullException("input");
+            output = null;
+            Type type = input.GetType();
+            if (type.FullName == null)
+                return false;
+            IDictionary<string, object> obj = new JsonObject();
+            IDictionary<string, ReflectionUtils.GetDelegate> getters = GetCache[type];
+            foreach (KeyValuePair<string, ReflectionUtils.GetDelegate> getter in getters)
+            {
+                if (getter.Value != null)
+                    obj.Add(MapClrMemberNameToJsonFieldName(getter.Key), getter.Value(input));
+            }
+            output = obj;
+            return true;
+        }
+    }
+#if SIMPLE_JSON_DATACONTRACT
+    [GeneratedCode("simple-json", "1.0.0")]
+#if SIMPLE_JSON_INTERNAL
+    internal
+#else
+    public
+#endif
+ class DataContractJsonSerializerStrategy : PocoJsonSerializerStrategy
+    {
+        public DataContractJsonSerializerStrategy()
+        {
+            GetCache = new ReflectionUtils.ThreadSafeDictionary<Type, IDictionary<string, ReflectionUtils.GetDelegate>>(GetterValueFactory);
+            SetCache = new ReflectionUtils.ThreadSafeDictionary<Type, IDictionary<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>>>(SetterValueFactory);
+        }
+        internal override IDictionary<string, ReflectionUtils.GetDelegate> GetterValueFactory(Type type)
+        {
+            bool hasDataContract = ReflectionUtils.GetAttribute(type, typeof(DataContractAttribute)) != null;
+            if (!hasDataContract)
+                return base.GetterValueFactory(type);
+            string jsonKey;
+            IDictionary<string, ReflectionUtils.GetDelegate> result = new Dictionary<string, ReflectionUtils.GetDelegate>();
+            foreach (PropertyInfo propertyInfo in ReflectionUtils.GetProperties(type))
+            {
+                if (propertyInfo.CanRead)
+                {
+                    MethodInfo getMethod = ReflectionUtils.GetGetterMethodInfo(propertyInfo);
+                    if (!getMethod.IsStatic && CanAdd(propertyInfo, out jsonKey))
+                        result[jsonKey] = ReflectionUtils.GetGetMethod(propertyInfo);
+                }
+            }
+            foreach (FieldInfo fieldInfo in ReflectionUtils.GetFields(type))
+            {
+                if (!fieldInfo.IsStatic && CanAdd(fieldInfo, out jsonKey))
+                    result[jsonKey] = ReflectionUtils.GetGetMethod(fieldInfo);
+            }
+            return result;
+        }
+        internal override IDictionary<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>> SetterValueFactory(Type type)
+        {
+            bool hasDataContract = ReflectionUtils.GetAttribute(type, typeof(DataContractAttribute)) != null;
+            if (!hasDataContract)
+                return base.SetterValueFactory(type);
+            string jsonKey;
+            IDictionary<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>> result = new Dictionary<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>>();
+            foreach (PropertyInfo propertyInfo in ReflectionUtils.GetProperties(type))
+            {
+                if (propertyInfo.CanWrite)
+                {
+                    MethodInfo setMethod = ReflectionUtils.GetSetterMethodInfo(propertyInfo);
+                    if (!setMethod.IsStatic && CanAdd(propertyInfo, out jsonKey))
+                        result[jsonKey] = new KeyValuePair<Type, ReflectionUtils.SetDelegate>(propertyInfo.PropertyType, ReflectionUtils.GetSetMethod(propertyInfo));
+                }
+            }
+            foreach (FieldInfo fieldInfo in ReflectionUtils.GetFields(type))
+            {
+                if (!fieldInfo.IsInitOnly && !fieldInfo.IsStatic && CanAdd(fieldInfo, out jsonKey))
+                    result[jsonKey] = new KeyValuePair<Type, ReflectionUtils.SetDelegate>(fieldInfo.FieldType, ReflectionUtils.GetSetMethod(fieldInfo));
+            }
+            // todo implement sorting for DATACONTRACT.
+            return result;
+        }
+        private static bool CanAdd(MemberInfo info, out string jsonKey)
+        {
+            jsonKey = null;
+            if (ReflectionUtils.GetAttribute(info, typeof(IgnoreDataMemberAttribute)) != null)
+                return false;
+            DataMemberAttribute dataMemberAttribute = (DataMemberAttribute)ReflectionUtils.GetAttribute(info, typeof(DataMemberAttribute));
+            if (dataMemberAttribute == null)
+                return false;
+            jsonKey = string.IsNullOrEmpty(dataMemberAttribute.Name) ? info.Name : dataMemberAttribute.Name;
+            return true;
+        }
+    }
+#endif
+    namespace Reflection
+    {
+        // This class is meant to be copied into other libraries. So we want to exclude it from Code Analysis rules
+        // that might be in place in the target project.
+        [GeneratedCode("reflection-utils", "1.0.0")]
+#if SIMPLE_JSON_REFLECTION_UTILS_PUBLIC
+        public
+#else
+        internal
+#endif
+ class ReflectionUtils
+        {
+            private static readonly object[] EmptyObjects = new object[] { };
+            public delegate object GetDelegate(object source);
+            public delegate void SetDelegate(object source, object value);
+            public delegate object ConstructorDelegate(params object[] args);
+            public delegate TValue ThreadSafeDictionaryValueFactory<TKey, TValue>(TKey key);
+#if SIMPLE_JSON_TYPEINFO
+            public static TypeInfo GetTypeInfo(Type type)
+            {
+                return type.GetTypeInfo();
+            }
+#else
+            public static Type GetTypeInfo(Type type)
+            {
+                return type;
+            }
+#endif
+            public static Attribute GetAttribute(MemberInfo info, Type type)
+            {
+#if SIMPLE_JSON_TYPEINFO
+                if (info == null || type == null || !info.IsDefined(type))
+                    return null;
+                return info.GetCustomAttribute(type);
+#else
+                if (info == null || type == null || !Attribute.IsDefined(info, type))
+                    return null;
+                return Attribute.GetCustomAttribute(info, type);
+#endif
+            }
+            public static Type GetGenericListElementType(Type type)
+            {
+                IEnumerable<Type> interfaces;
+#if SIMPLE_JSON_TYPEINFO
+                interfaces = type.GetTypeInfo().ImplementedInterfaces;
+#else
+                interfaces = type.GetInterfaces();
+#endif
+                foreach (Type implementedInterface in interfaces)
+                {
+                    if (IsTypeGeneric(implementedInterface) &&
+                        implementedInterface.GetGenericTypeDefinition() == typeof(IList<>))
+                    {
+                        return GetGenericTypeArguments(implementedInterface)[0];
+                    }
+                }
+                return GetGenericTypeArguments(type)[0];
+            }
+            public static Attribute GetAttribute(Type objectType, Type attributeType)
+            {
+#if SIMPLE_JSON_TYPEINFO
+                if (objectType == null || attributeType == null || !objectType.GetTypeInfo().IsDefined(attributeType))
+                    return null;
+                return objectType.GetTypeInfo().GetCustomAttribute(attributeType);
+#else
+                if (objectType == null || attributeType == null || !Attribute.IsDefined(objectType, attributeType))
+                    return null;
+                return Attribute.GetCustomAttribute(objectType, attributeType);
+#endif
+            }
+            public static Type[] GetGenericTypeArguments(Type type)
+            {
+#if SIMPLE_JSON_TYPEINFO
+                return type.GetTypeInfo().GenericTypeArguments;
+#else
+                return type.GetGenericArguments();
+#endif
+            }
+            public static bool IsTypeGeneric(Type type)
+            {
+                return GetTypeInfo(type).IsGenericType;
+            }
+            public static bool IsTypeGenericeCollectionInterface(Type type)
+            {
+                if (!IsTypeGeneric(type))
+                    return false;
+                Type genericDefinition = type.GetGenericTypeDefinition();
+                return (genericDefinition == typeof(IList<>)
+                    || genericDefinition == typeof(ICollection<>)
+                    || genericDefinition == typeof(IEnumerable<>)
+#if SIMPLE_JSON_READONLY_COLLECTIONS
+                    || genericDefinition == typeof(IReadOnlyCollection<>)
+                    || genericDefinition == typeof(IReadOnlyList<>)
+#endif
+                    );
+            }
+            public static bool IsAssignableFrom(Type type1, Type type2)
+            {
+                return GetTypeInfo(type1).IsAssignableFrom(GetTypeInfo(type2));
+            }
+            public static bool IsTypeDictionary(Type type)
+            {
+#if SIMPLE_JSON_TYPEINFO
+                if (typeof(IDictionary<,>).GetTypeInfo().IsAssignableFrom(type.GetTypeInfo()))
+                    return true;
+#else
+                if (typeof(System.Collections.IDictionary).IsAssignableFrom(type))
+                    return true;
+#endif
+                if (!GetTypeInfo(type).IsGenericType)
+                    return false;
+                Type genericDefinition = type.GetGenericTypeDefinition();
+                return genericDefinition == typeof(IDictionary<,>);
+            }
+            public static bool IsNullableType(Type type)
+            {
+                return GetTypeInfo(type).IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>);
+            }
+            public static object ToNullableType(object obj, Type nullableType)
+            {
+                return obj == null ? null : Convert.ChangeType(obj, Nullable.GetUnderlyingType(nullableType), CultureInfo.InvariantCulture);
+            }
+            public static bool IsValueType(Type type)
+            {
+                return GetTypeInfo(type).IsValueType;
+            }
+            public static IEnumerable<ConstructorInfo> GetConstructors(Type type)
+            {
+#if SIMPLE_JSON_TYPEINFO
+                return type.GetTypeInfo().DeclaredConstructors;
+#else
+                return type.GetConstructors();
+#endif
+            }
+            public static ConstructorInfo GetConstructorInfo(Type type, params Type[] argsType)
+            {
+                IEnumerable<ConstructorInfo> constructorInfos = GetConstructors(type);
+                int i;
+                bool matches;
+                foreach (ConstructorInfo constructorInfo in constructorInfos)
+                {
+                    ParameterInfo[] parameters = constructorInfo.GetParameters();
+                    if (argsType.Length != parameters.Length)
+                        continue;
+                    i = 0;
+                    matches = true;
+                    foreach (ParameterInfo parameterInfo in constructorInfo.GetParameters())
+                    {
+                        if (parameterInfo.ParameterType != argsType[i])
+                        {
+                            matches = false;
+                            break;
+                        }
+                    }
+                    if (matches)
+                        return constructorInfo;
+                }
+                return null;
+            }
+            public static IEnumerable<PropertyInfo> GetProperties(Type type)
+            {
+#if SIMPLE_JSON_TYPEINFO
+                return type.GetRuntimeProperties();
+#else
+                return type.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static);
+#endif
+            }
+            public static IEnumerable<FieldInfo> GetFields(Type type)
+            {
+#if SIMPLE_JSON_TYPEINFO
+                return type.GetRuntimeFields();
+#else
+                return type.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static);
+#endif
+            }
+            public static MethodInfo GetGetterMethodInfo(PropertyInfo propertyInfo)
+            {
+#if SIMPLE_JSON_TYPEINFO
+                return propertyInfo.GetMethod;
+#else
+                return propertyInfo.GetGetMethod(true);
+#endif
+            }
+            public static MethodInfo GetSetterMethodInfo(PropertyInfo propertyInfo)
+            {
+#if SIMPLE_JSON_TYPEINFO
+                return propertyInfo.SetMethod;
+#else
+                return propertyInfo.GetSetMethod(true);
+#endif
+            }
+            public static ConstructorDelegate GetContructor(ConstructorInfo constructorInfo)
+            {
+#if SIMPLE_JSON_NO_LINQ_EXPRESSION
+                return GetConstructorByReflection(constructorInfo);
+#else
+                return GetConstructorByExpression(constructorInfo);
+#endif
+            }
+            public static ConstructorDelegate GetContructor(Type type, params Type[] argsType)
+            {
+#if SIMPLE_JSON_NO_LINQ_EXPRESSION
+                return GetConstructorByReflection(type, argsType);
+#else
+                return GetConstructorByExpression(type, argsType);
+#endif
+            }
+            public static ConstructorDelegate GetConstructorByReflection(ConstructorInfo constructorInfo)
+            {
+                return delegate (object[] args) { return constructorInfo.Invoke(args); };
+            }
+            public static ConstructorDelegate GetConstructorByReflection(Type type, params Type[] argsType)
+            {
+                ConstructorInfo constructorInfo = GetConstructorInfo(type, argsType);
+                return constructorInfo == null ? null : GetConstructorByReflection(constructorInfo);
+            }
+#if !SIMPLE_JSON_NO_LINQ_EXPRESSION
+            public static ConstructorDelegate GetConstructorByExpression(ConstructorInfo constructorInfo)
+            {
+                ParameterInfo[] paramsInfo = constructorInfo.GetParameters();
+                ParameterExpression param = Expression.Parameter(typeof(object[]), "args");
+                Expression[] argsExp = new Expression[paramsInfo.Length];
+                for (int i = 0; i < paramsInfo.Length; i++)
+                {
+                    Expression index = Expression.Constant(i);
+                    Type paramType = paramsInfo[i].ParameterType;
+                    Expression paramAccessorExp = Expression.ArrayIndex(param, index);
+                    Expression paramCastExp = Expression.Convert(paramAccessorExp, paramType);
+                    argsExp[i] = paramCastExp;
+                }
+                NewExpression newExp = Expression.New(constructorInfo, argsExp);
+                Expression<Func<object[], object>> lambda = Expression.Lambda<Func<object[], object>>(newExp, param);
+                Func<object[], object> compiledLambda = lambda.Compile();
+                return delegate (object[] args) { return compiledLambda(args); };
+            }
+            public static ConstructorDelegate GetConstructorByExpression(Type type, params Type[] argsType)
+            {
+                ConstructorInfo constructorInfo = GetConstructorInfo(type, argsType);
+                return constructorInfo == null ? null : GetConstructorByExpression(constructorInfo);
+            }
+#endif
+            public static GetDelegate GetGetMethod(PropertyInfo propertyInfo)
+            {
+#if SIMPLE_JSON_NO_LINQ_EXPRESSION
+                return GetGetMethodByReflection(propertyInfo);
+#else
+                return GetGetMethodByExpression(propertyInfo);
+#endif
+            }
+            public static GetDelegate GetGetMethod(FieldInfo fieldInfo)
+            {
+#if SIMPLE_JSON_NO_LINQ_EXPRESSION
+                return GetGetMethodByReflection(fieldInfo);
+#else
+                return GetGetMethodByExpression(fieldInfo);
+#endif
+            }
+            public static GetDelegate GetGetMethodByReflection(PropertyInfo propertyInfo)
+            {
+                MethodInfo methodInfo = GetGetterMethodInfo(propertyInfo);
+                return delegate (object source) { return methodInfo.Invoke(source, EmptyObjects); };
+            }
+            public static GetDelegate GetGetMethodByReflection(FieldInfo fieldInfo)
+            {
+                return delegate (object source) { return fieldInfo.GetValue(source); };
+            }
+#if !SIMPLE_JSON_NO_LINQ_EXPRESSION
+            public static GetDelegate GetGetMethodByExpression(PropertyInfo propertyInfo)
+            {
+                MethodInfo getMethodInfo = GetGetterMethodInfo(propertyInfo);
+                ParameterExpression instance = Expression.Parameter(typeof(object), "instance");
+                UnaryExpression instanceCast = (!IsValueType(propertyInfo.DeclaringType)) ? Expression.TypeAs(instance, propertyInfo.DeclaringType) : Expression.Convert(instance, propertyInfo.DeclaringType);
+                Func<object, object> compiled = Expression.Lambda<Func<object, object>>(Expression.TypeAs(Expression.Call(instanceCast, getMethodInfo), typeof(object)), instance).Compile();
+                return delegate (object source) { return compiled(source); };
+            }
+            public static GetDelegate GetGetMethodByExpression(FieldInfo fieldInfo)
+            {
+                ParameterExpression instance = Expression.Parameter(typeof(object), "instance");
+                MemberExpression member = Expression.Field(Expression.Convert(instance, fieldInfo.DeclaringType), fieldInfo);
+                GetDelegate compiled = Expression.Lambda<GetDelegate>(Expression.Convert(member, typeof(object)), instance).Compile();
+                return delegate (object source) { return compiled(source); };
+            }
+#endif
+            public static SetDelegate GetSetMethod(PropertyInfo propertyInfo)
+            {
+#if SIMPLE_JSON_NO_LINQ_EXPRESSION
+                return GetSetMethodByReflection(propertyInfo);
+#else
+                return GetSetMethodByExpression(propertyInfo);
+#endif
+            }
+            public static SetDelegate GetSetMethod(FieldInfo fieldInfo)
+            {
+#if SIMPLE_JSON_NO_LINQ_EXPRESSION
+                return GetSetMethodByReflection(fieldInfo);
+#else
+                return GetSetMethodByExpression(fieldInfo);
+#endif
+            }
+            public static SetDelegate GetSetMethodByReflection(PropertyInfo propertyInfo)
+            {
+                MethodInfo methodInfo = GetSetterMethodInfo(propertyInfo);
+                return delegate (object source, object value) { methodInfo.Invoke(source, new object[] { value }); };
+            }
+            public static SetDelegate GetSetMethodByReflection(FieldInfo fieldInfo)
+            {
+                return delegate (object source, object value) { fieldInfo.SetValue(source, value); };
+            }
+#if !SIMPLE_JSON_NO_LINQ_EXPRESSION
+            public static SetDelegate GetSetMethodByExpression(PropertyInfo propertyInfo)
+            {
+                MethodInfo setMethodInfo = GetSetterMethodInfo(propertyInfo);
+                ParameterExpression instance = Expression.Parameter(typeof(object), "instance");
+                ParameterExpression value = Expression.Parameter(typeof(object), "value");
+                UnaryExpression instanceCast = (!IsValueType(propertyInfo.DeclaringType)) ? Expression.TypeAs(instance, propertyInfo.DeclaringType) : Expression.Convert(instance, propertyInfo.DeclaringType);
+                UnaryExpression valueCast = (!IsValueType(propertyInfo.PropertyType)) ? Expression.TypeAs(value, propertyInfo.PropertyType) : Expression.Convert(value, propertyInfo.PropertyType);
+                Action<object, object> compiled = Expression.Lambda<Action<object, object>>(Expression.Call(instanceCast, setMethodInfo, valueCast), new ParameterExpression[] { instance, value }).Compile();
+                return delegate (object source, object val) { compiled(source, val); };
+            }
+            public static SetDelegate GetSetMethodByExpression(FieldInfo fieldInfo)
+            {
+                ParameterExpression instance = Expression.Parameter(typeof(object), "instance");
+                ParameterExpression value = Expression.Parameter(typeof(object), "value");
+                Action<object, object> compiled = Expression.Lambda<Action<object, object>>(
+                    Assign(Expression.Field(Expression.Convert(instance, fieldInfo.DeclaringType), fieldInfo), Expression.Convert(value, fieldInfo.FieldType)), instance, value).Compile();
+                return delegate (object source, object val) { compiled(source, val); };
+            }
+            public static BinaryExpression Assign(Expression left, Expression right)
+            {
+#if SIMPLE_JSON_TYPEINFO
+                return Expression.Assign(left, right);
+#else
+                MethodInfo assign = typeof(Assigner<>).MakeGenericType(left.Type).GetMethod("Assign");
+                BinaryExpression assignExpr = Expression.Add(left, right, assign);
+                return assignExpr;
+#endif
+            }
+            private static class Assigner<T>
+            {
+                public static T Assign(ref T left, T right)
+                {
+                    return (left = right);
+                }
+            }
+#endif
+            public sealed class ThreadSafeDictionary<TKey, TValue> : IDictionary<TKey, TValue>
+            {
+                private readonly object _lock = new object();
+                private readonly ThreadSafeDictionaryValueFactory<TKey, TValue> _valueFactory;
+                private Dictionary<TKey, TValue> _dictionary;
+                public ThreadSafeDictionary(ThreadSafeDictionaryValueFactory<TKey, TValue> valueFactory)
+                {
+                    _valueFactory = valueFactory;
+                }
+                private TValue Get(TKey key)
+                {
+                    if (_dictionary == null)
+                        return AddValue(key);
+                    TValue value;
+                    if (!_dictionary.TryGetValue(key, out value))
+                        return AddValue(key);
+                    return value;
+                }
+                private TValue AddValue(TKey key)
+                {
+                    TValue value = _valueFactory(key);
+                    lock (_lock)
+                    {
+                        if (_dictionary == null)
+                        {
+                            _dictionary = new Dictionary<TKey, TValue>();
+                            _dictionary[key] = value;
+                        }
+                        else
+                        {
+                            TValue val;
+                            if (_dictionary.TryGetValue(key, out val))
+                                return val;
+                            Dictionary<TKey, TValue> dict = new Dictionary<TKey, TValue>(_dictionary);
+                            dict[key] = value;
+                            _dictionary = dict;
+                        }
+                    }
+                    return value;
+                }
+                public void Add(TKey key, TValue value)
+                {
+                    throw new NotImplementedException();
+                }
+                public bool ContainsKey(TKey key)
+                {
+                    return _dictionary.ContainsKey(key);
+                }
+                public ICollection<TKey> Keys
+                {
+                    get { return _dictionary.Keys; }
+                }
+                public bool Remove(TKey key)
+                {
+                    throw new NotImplementedException();
+                }
+                public bool TryGetValue(TKey key, out TValue value)
+                {
+                    value = this[key];
+                    return true;
+                }
+                public ICollection<TValue> Values
+                {
+                    get { return _dictionary.Values; }
+                }
+                public TValue this[TKey key]
+                {
+                    get { return Get(key); }
+                    set { throw new NotImplementedException(); }
+                }
+                public void Add(KeyValuePair<TKey, TValue> item)
+                {
+                    throw new NotImplementedException();
+                }
+                public void Clear()
+                {
+                    throw new NotImplementedException();
+                }
+                public bool Contains(KeyValuePair<TKey, TValue> item)
+                {
+                    throw new NotImplementedException();
+                }
+                public void CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex)
+                {
+                    throw new NotImplementedException();
+                }
+                public int Count
+                {
+                    get { return _dictionary.Count; }
+                }
+                public bool IsReadOnly
+                {
+                    get { throw new NotImplementedException(); }
+                }
+                public bool Remove(KeyValuePair<TKey, TValue> item)
+                {
+                    throw new NotImplementedException();
+                }
+                public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()
+                {
+                    return _dictionary.GetEnumerator();
+                }
+                System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+                {
+                    return _dictionary.GetEnumerator();
+                }
+            }
+        }
+    }
+}
+// ReSharper restore LoopCanBeConvertedToQuery
+// ReSharper restore RedundantExplicitArrayCreation
+// ReSharper restore SuggestUseVarKeywordEvident
+\ No newline at end of file
diff --git a/src/internal/README.md b/src/internal/README.md
new file mode 100644
index 00000000..da42c09e
--- /dev/null
+++ b/src/internal/README.md
@@ -0,0 +1,2 @@
+# WixBuildTools
+Internal shared props/targets/tools used to build the WiX Toolset
diff --git a/src/internal/TablesAndTuples/ColumnDefinitionEnums.cs b/src/internal/TablesAndTuples/ColumnDefinitionEnums.cs
new file mode 100644
index 00000000..1499500e
--- /dev/null
+++ b/src/internal/TablesAndTuples/ColumnDefinitionEnums.cs
@@ -0,0 +1,56 @@
+namespace TablesAndSymbols
+{
+    public enum ColumnCategory
+    {
+        Unknown,
+        Text,
+        UpperCase,
+        LowerCase,
+        Integer,
+        DoubleInteger,
+        TimeDate,
+        Identifier,
+        Property,
+        Filename,
+        WildCardFilename,
+        Path,
+        Paths,
+        AnyPath,
+        DefaultDir,
+        RegPath,
+        Formatted,
+        Template,
+        Condition,
+        Guid,
+        Version,
+        Language,
+        Binary,
+        CustomSource,
+        Cabinet,
+        Shortcut,
+        FormattedSDDLText,
+    }
+    public enum ColumnModularizeType
+    {
+        None,
+        Column,
+        Icon,
+        CompanionFile,
+        Condition,
+        ControlEventArgument,
+        ControlText,
+        Property,
+        SemicolonDelimited,
+    }
+    public enum ColumnType
+    {
+        Unknown,
+        String,
+        Localized,
+        Number,
+        Object,
+        Preserved,
+    }
+}
diff --git a/src/internal/TablesAndTuples/Program.cs b/src/internal/TablesAndTuples/Program.cs
new file mode 100644
index 00000000..634acf9d
--- /dev/null
+++ b/src/internal/TablesAndTuples/Program.cs
@@ -0,0 +1,528 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Xml.Linq;
+using SimpleJson;
+namespace TablesAndSymbols
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            if (args.Length == 0)
+            {
+                return;
+            }
+            else if (Path.GetExtension(args[0]) == ".xml")
+            {
+                if (args.Length < 2)
+                {
+                    Console.WriteLine("Need to specify output json file as well.");
+                    return;
+                }
+                if (Path.GetExtension(args[1]) != ".json")
+                {
+                    Console.WriteLine("Output needs to be .json");
+                    return;
+                }
+                string prefix = null;
+                if (args.Length > 2)
+                {
+                    prefix = args[2];
+                }
+                var csFile = Path.Combine(Path.GetDirectoryName(args[1]), String.Concat(prefix ?? "WindowsInstaller", "TableDefinitions.cs"));
+                ReadXmlWriteJson(Path.GetFullPath(args[0]), Path.GetFullPath(args[1]), Path.GetFullPath(csFile), prefix);
+            }
+            else if (Path.GetExtension(args[0]) == ".json")
+            {
+                string prefix = null;
+                if (args.Length < 2)
+                {
+                    Console.WriteLine("Need to specify output folder.");
+                    return;
+                }
+                else if (args.Length > 2)
+                {
+                    prefix = args[2];
+                }
+                ReadJsonWriteCs(Path.GetFullPath(args[0]), Path.GetFullPath(args[1]), prefix);
+            }
+        }
+        private static void ReadXmlWriteJson(string inputPath, string outputPath, string csOutputPath, string prefix)
+        {
+            var tableDefinitions = ReadXmlWriteCs(inputPath, csOutputPath, prefix);
+            var array = new JsonArray();
+            foreach (var tableDefinition in tableDefinitions)
+            {
+                if (tableDefinition.Symbolless)
+                {
+                    continue;
+                }
+                var symbolType = tableDefinition.SymbolDefinitionName;
+                var fields = new JsonArray();
+                var firstField = true;
+                foreach (var columnDefinition in tableDefinition.Columns)
+                {
+                    if (firstField)
+                    {
+                        firstField = false;
+                        if (tableDefinition.SymbolIdIsPrimaryKey)
+                        {
+                            continue;
+                        }
+                    }
+                    var fieldName = columnDefinition.Name;
+                    fieldName = Regex.Replace(fieldName, "^([^_]+)_([^_]*)$", x =>
+                    {
+                        return $"{x.Groups[2].Value}{x.Groups[1].Value}Ref";
+                    });
+                    var type = columnDefinition.Type.ToString().ToLower();
+                    if (type == "localized")
+                    {
+                        type = "string";
+                    }
+                    else if (type == "object")
+                    {
+                        type = "path";
+                    }
+                    else if (columnDefinition.Type == ColumnType.Number && columnDefinition.Length == 2 &&
+                             columnDefinition.MinValue == 0 && columnDefinition.MaxValue == 1)
+                    {
+                        type = "bool";
+                    }
+                    if (columnDefinition.Type == ColumnType.Number && columnDefinition.Nullable)
+                    {
+                        type += "?";
+                    }
+                    var field = new JsonObject
+                    {
+                        { fieldName, type }
+                    };
+                    fields.Add(field);
+                }
+                var obj = new JsonObject
+                {
+                    { symbolType, fields }
+                };
+                array.Add(obj);
+            }
+            array.Sort(CompareSymbolDefinitions);
+            var strat = new PocoJsonSerializerStrategy();
+            var json = SimpleJson.SimpleJson.SerializeObject(array, strat);
+            Directory.CreateDirectory(Path.GetDirectoryName(outputPath));
+            File.WriteAllText(outputPath, json);
+        }
+        private static List<WixTableDefinition> ReadXmlWriteCs(string inputPath, string outputPath, string prefix)
+        {
+            var tableDefinitions = WixTableDefinition.LoadCollection(inputPath);
+            var text = GenerateCsTableDefinitionsFileText(prefix, tableDefinitions);
+            Console.WriteLine("Writing: {0}", outputPath);
+            File.WriteAllText(outputPath, text);
+            return tableDefinitions;
+        }
+        private static void ReadJsonWriteCs(string inputPath, string outputFolder, string prefix)
+        {
+            var json = File.ReadAllText(inputPath);
+            var symbols = SimpleJson.SimpleJson.DeserializeObject(json) as JsonArray;
+            var symbolNames = new List<string>();
+            foreach (var symbolDefinition in symbols.Cast<JsonObject>())
+            {
+                var symbolName = symbolDefinition.Keys.Single();
+                var fields = symbolDefinition.Values.Single() as JsonArray;
+                var list = GetFields(fields).ToList();
+                symbolNames.Add(symbolName);
+                var text = GenerateSymbolFileText(prefix, symbolName, list);
+                var pathSymbol = Path.Combine(outputFolder, symbolName + "Symbol.cs");
+                Console.WriteLine("Writing: {0}", pathSymbol);
+                File.WriteAllText(pathSymbol, text);
+            }
+            var content = SymbolNamesFileContent(prefix, symbolNames);
+            var pathNames = Path.Combine(outputFolder, String.Concat(prefix, "SymbolDefinitions.cs"));
+            Console.WriteLine("Writing: {0}", pathNames);
+            File.WriteAllText(pathNames, content);
+        }
+        private static IEnumerable<(string Name, string Type, string ClrType, string AsFunction)> GetFields(JsonArray fields)
+        {
+            foreach (var field in fields.Cast<JsonObject>())
+            {
+                var fieldName = field.Keys.Single();
+                var fieldType = field.Values.Single() as string;
+                var clrType = ConvertToClrType(fieldType);
+                fieldType = ConvertToFieldType(fieldType);
+                var asFunction = $"As{(clrType.Contains("?") ? "Nullable" : "")}{fieldType}()";
+                yield return (Name: fieldName, Type: fieldType, ClrType: clrType, AsFunction: asFunction);
+            }
+        }
+        private static string GenerateCsTableDefinitionsFileText(string prefix, List<WixTableDefinition> tableDefinitions)
+        {
+            var ns = prefix ?? "Data";
+            var startClassDef = String.Join(Environment.NewLine,
+                "// 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.{1}",
+                "{",
+                "    using WixToolset.Data.WindowsInstaller;",
+                "",
+                "    public static class {2}TableDefinitions",
+                "    {");
+            var startTableDef = String.Join(Environment.NewLine,
+                "        public static readonly TableDefinition {1} = new TableDefinition(",
+                "            \"{2}\",",
+                "            {3},",
+                "            new[]",
+                "            {");
+            var columnDef =
+                "                new ColumnDefinition(\"{1}\", ColumnType.{2}, {3}, primaryKey: {4}, nullable: {5}, ColumnCategory.{6}";
+            var endColumnsDef = String.Join(Environment.NewLine,
+                "            },");
+            var unrealDef =
+                "            unreal: true,";
+            var endTableDef = String.Join(Environment.NewLine,
+                "            symbolIdIsPrimaryKey: {1}",
+                "        );",
+                "");
+            var startAllTablesDef = String.Join(Environment.NewLine,
+                "        public static readonly TableDefinition[] All = new[]",
+                "        {");
+            var allTableDef =
+                "            {1},";
+            var endAllTablesDef =
+                "        };";
+            var endClassDef = String.Join(Environment.NewLine,
+                "    }",
+                "}");
+            var sb = new StringBuilder();
+            sb.AppendLine(startClassDef.Replace("{1}", ns).Replace("{2}", prefix));
+            foreach (var tableDefinition in tableDefinitions)
+            {
+                var symbolDefinition = tableDefinition.Symbolless ? "null" : $"{prefix}SymbolDefinitions.{tableDefinition.SymbolDefinitionName}";
+                sb.AppendLine(startTableDef.Replace("{1}", tableDefinition.VariableName).Replace("{2}", tableDefinition.Name).Replace("{3}", symbolDefinition));
+                foreach (var columnDefinition in tableDefinition.Columns)
+                {
+                    sb.Append(columnDef.Replace("{1}", columnDefinition.Name).Replace("{2}", columnDefinition.Type.ToString()).Replace("{3}", columnDefinition.Length.ToString())
+                        .Replace("{4}", columnDefinition.PrimaryKey.ToString().ToLower()).Replace("{5}", columnDefinition.Nullable.ToString().ToLower()).Replace("{6}", columnDefinition.Category.ToString()));
+                    if (columnDefinition.MinValue.HasValue)
+                    {
+                        sb.AppendFormat(", minValue: {0}", columnDefinition.MinValue.Value);
+                    }
+                    if (columnDefinition.MaxValue.HasValue)
+                    {
+                        sb.AppendFormat(", maxValue: {0}", columnDefinition.MaxValue.Value);
+                    }
+                    if (!String.IsNullOrEmpty(columnDefinition.KeyTable))
+                    {
+                        sb.AppendFormat(", keyTable: \"{0}\"", columnDefinition.KeyTable);
+                    }
+                    if (columnDefinition.KeyColumn.HasValue)
+                    {
+                        sb.AppendFormat(", keyColumn: {0}", columnDefinition.KeyColumn.Value);
+                    }
+                    if (!String.IsNullOrEmpty(columnDefinition.Possibilities))
+                    {
+                        sb.AppendFormat(", possibilities: \"{0}\"", columnDefinition.Possibilities);
+                    }
+                    if (!String.IsNullOrEmpty(columnDefinition.Description))
+                    {
+                        sb.AppendFormat(", description: \"{0}\"", columnDefinition.Description.Replace("\\", "\\\\").Replace("\"", "\\\""));
+                    }
+                    if (columnDefinition.ModularizeType.HasValue && columnDefinition.ModularizeType.Value != ColumnModularizeType.None)
+                    {
+                        sb.AppendFormat(", modularizeType: ColumnModularizeType.{0}", columnDefinition.ModularizeType.ToString());
+                    }
+                    if (columnDefinition.ForceLocalizable)
+                    {
+                        sb.Append(", forceLocalizable: true");
+                    }
+                    if (columnDefinition.UseCData)
+                    {
+                        sb.Append(", useCData: true");
+                    }
+                    if (columnDefinition.Unreal)
+                    {
+                        sb.Append(", unreal: true");
+                    }
+                    sb.AppendLine("),");
+                }
+                sb.AppendLine(endColumnsDef);
+                if (tableDefinition.Unreal)
+                {
+                    sb.AppendLine(unrealDef);
+                }
+                sb.AppendLine(endTableDef.Replace("{1}", tableDefinition.SymbolIdIsPrimaryKey.ToString().ToLower()));
+            }
+            sb.AppendLine(startAllTablesDef);
+            foreach (var tableDefinition in tableDefinitions)
+            {
+                sb.AppendLine(allTableDef.Replace("{1}", tableDefinition.VariableName));
+            }
+            sb.AppendLine(endAllTablesDef);
+            sb.AppendLine(endClassDef);
+            return sb.ToString();
+        }
+        private static string GenerateSymbolFileText(string prefix, string symbolName, List<(string Name, string Type, string ClrType, string AsFunction)> symbolFields)
+        {
+            var ns = prefix ?? "Data";
+            var toString = String.IsNullOrEmpty(prefix) ? null : ".ToString()";
+            var startFileDef = String.Join(Environment.NewLine,
+                "// 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.{2}",
+                "{");
+            var usingDataDef =
+                "    using WixToolset.Data;";
+            var startSymbolDef = String.Join(Environment.NewLine,
+                "    using WixToolset.{2}.Symbols;",
+                "",
+                "    public static partial class {3}SymbolDefinitions",
+                "    {",
+                "        public static readonly IntermediateSymbolDefinition {1} = new IntermediateSymbolDefinition(",
+                "            {3}SymbolDefinitionType.{1}{4},",
+                "            new{5}[]",
+                "            {");
+            var fieldDef =
+                "                new IntermediateFieldDefinition(nameof({1}SymbolFields.{2}), IntermediateFieldType.{3}),";
+            var endSymbolDef = String.Join(Environment.NewLine,
+                "            },",
+                "            typeof({1}Symbol));",
+                "    }",
+                "}",
+                "",
+                "namespace WixToolset.{2}.Symbols",
+                "{");
+            var startEnumDef = String.Join(Environment.NewLine,
+                "    public enum {1}SymbolFields",
+                "    {");
+            var fieldEnum =
+                "        {2},";
+            var startSymbol = String.Join(Environment.NewLine,
+                "    }",
+                "",
+                "    public class {1}Symbol : IntermediateSymbol",
+                "    {",
+                "        public {1}Symbol() : base({3}SymbolDefinitions.{1}, null, null)",
+                "        {",
+                "        }",
+                "",
+                "        public {1}Symbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base({3}SymbolDefinitions.{1}, sourceLineNumber, id)",
+                "        {",
+                "        }",
+                "",
+                "        public IntermediateField this[{1}SymbolFields index] => this.Fields[(int)index];");
+            var fieldProp = String.Join(Environment.NewLine,
+                "",
+                "        public {4} {2}",
+                "        {",
+                "            get => {6}this.Fields[(int){1}SymbolFields.{2}]{5};",
+                "            set => this.Set((int){1}SymbolFields.{2}, value);",
+                "        }");
+            var endSymbol = String.Join(Environment.NewLine,
+                "    }",
+                "}");
+            var sb = new StringBuilder();
+            sb.AppendLine(startFileDef.Replace("{2}", ns));
+            if (ns != "Data")
+            {
+                sb.AppendLine(usingDataDef);
+            }
+            sb.AppendLine(startSymbolDef.Replace("{1}", symbolName).Replace("{2}", ns).Replace("{3}", prefix).Replace("{4}", toString).Replace("{5}", symbolFields.Any() ? null : " IntermediateFieldDefinition"));
+            foreach (var field in symbolFields)
+            {
+                sb.AppendLine(fieldDef.Replace("{1}", symbolName).Replace("{2}", field.Name).Replace("{3}", field.Type));
+            }
+            sb.AppendLine(endSymbolDef.Replace("{1}", symbolName).Replace("{2}", ns).Replace("{3}", prefix));
+            if (ns != "Data")
+            {
+                sb.AppendLine(usingDataDef);
+                sb.AppendLine();
+            }
+            sb.AppendLine(startEnumDef.Replace("{1}", symbolName));
+            foreach (var field in symbolFields)
+            {
+                sb.AppendLine(fieldEnum.Replace("{1}", symbolName).Replace("{2}", field.Name));
+            }
+            sb.AppendLine(startSymbol.Replace("{1}", symbolName).Replace("{2}", ns).Replace("{3}", prefix));
+            foreach (var field in symbolFields)
+            {
+                var useCast = ns == "Data" && field.AsFunction != "AsPath()";
+                var cast = useCast ? $"({field.ClrType})" : null;
+                var asFunction = useCast ? null : $".{field.AsFunction}";
+                sb.AppendLine(fieldProp.Replace("{1}", symbolName).Replace("{2}", field.Name).Replace("{3}", field.Type).Replace("{4}", field.ClrType).Replace("{5}", asFunction).Replace("{6}", cast));
+            }
+            sb.Append(endSymbol);
+            return sb.ToString();
+        }
+        private static string SymbolNamesFileContent(string prefix, List<string> symbolNames)
+        {
+            var ns = prefix ?? "Data";
+            var header = String.Join(Environment.NewLine,
+                "// 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.{2}",
+                "{",
+                "    using System;",
+                "    using WixToolset.Data;",
+                "",
+                "    public enum {3}SymbolDefinitionType",
+                "    {");
+            var namesFormat =
+                "        {1},";
+            var midpoint = String.Join(Environment.NewLine,
+                "    }",
+                "",
+                "    public static partial class {3}SymbolDefinitions",
+                "    {",
+                "        public static readonly Version Version = new Version(\"4.0.0\");",
+                "",
+                "        public static IntermediateSymbolDefinition ByName(string name)",
+                "        {",
+                "            if (!Enum.TryParse(name, out {3}SymbolDefinitionType type))",
+                "            {",
+                "                return null;",
+                "            }",
+                "",
+                "            return ByType(type);",
+                "        }",
+                "",
+                "        public static IntermediateSymbolDefinition ByType({3}SymbolDefinitionType type)",
+                "        {",
+                "            switch (type)",
+                "            {");
+            var caseFormat = String.Join(Environment.NewLine,
+                "                case {3}SymbolDefinitionType.{1}:",
+                "                    return {3}SymbolDefinitions.{1};",
+                "");
+            var footer = String.Join(Environment.NewLine,
+                "                default:",
+                "                    throw new ArgumentOutOfRangeException(nameof(type));",
+                "            }",
+                "        }",
+                "    }",
+                "}");
+            var sb = new StringBuilder();
+            sb.AppendLine(header.Replace("{2}", ns).Replace("{3}", prefix));
+            foreach (var symbolName in symbolNames)
+            {
+                sb.AppendLine(namesFormat.Replace("{1}", symbolName).Replace("{2}", ns).Replace("{3}", prefix));
+            }
+            sb.AppendLine(midpoint.Replace("{2}", ns).Replace("{3}", prefix));
+            foreach (var symbolName in symbolNames)
+            {
+                sb.AppendLine(caseFormat.Replace("{1}", symbolName).Replace("{2}", ns).Replace("{3}", prefix));
+            }
+            sb.AppendLine(footer);
+            return sb.ToString();
+        }
+        private static string ConvertToFieldType(string fieldType)
+        {
+            switch (fieldType.ToLowerInvariant())
+            {
+                case "bool":
+                    return "Bool";
+                case "bool?":
+                    return "Number";
+                case "string":
+                case "preserved":
+                    return "String";
+                case "number":
+                case "number?":
+                    return "Number";
+                case "path":
+                    return "Path";
+            }
+            throw new ArgumentException(fieldType);
+        }
+        private static string ConvertToClrType(string fieldType)
+        {
+            switch (fieldType.ToLowerInvariant())
+            {
+                case "bool":
+                    return "bool";
+                case "bool?":
+                    return "bool?";
+                case "string":
+                case "preserved":
+                    return "string";
+                case "number":
+                    return "int";
+                case "number?":
+                    return "int?";
+                case "path":
+                    return "IntermediateFieldPathValue";
+            }
+            throw new ArgumentException(fieldType);
+        }
+        private static int CompareSymbolDefinitions(object x, object y)
+        {
+            var first = (JsonObject)x;
+            var second = (JsonObject)y;
+            var firstType = first.Keys.Single();
+            var secondType = second.Keys.Single();
+            return firstType.CompareTo(secondType);
+        }
+    }
+}
diff --git a/src/internal/TablesAndTuples/SimpleJson.cs b/src/internal/TablesAndTuples/SimpleJson.cs
new file mode 100644
index 00000000..3d956f6e
--- /dev/null
+++ b/src/internal/TablesAndTuples/SimpleJson.cs
@@ -0,0 +1,2127 @@
+//-----------------------------------------------------------------------
+// <copyright file="SimpleJson.cs" company="The Outercurve Foundation">
+//    Copyright (c) 2011, The Outercurve Foundation.
+//
+//    Licensed under the MIT License (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+//      http://www.opensource.org/licenses/mit-license.php
+//
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+// </copyright>
+// <author>Nathan Totten (ntotten.com), Jim Zimmerman (jimzimmerman.com) and Prabir Shrestha (prabir.me)</author>
+// <website>https://github.com/facebook-csharp-sdk/simple-json</website>
+//-----------------------------------------------------------------------
+// VERSION:
+// NOTE: uncomment the following line to make SimpleJson class internal.
+#define SIMPLE_JSON_INTERNAL
+// NOTE: uncomment the following line to make JsonArray and JsonObject class internal.
+#define SIMPLE_JSON_OBJARRAYINTERNAL
+// NOTE: uncomment the following line to enable dynamic support.
+//#define SIMPLE_JSON_DYNAMIC
+// NOTE: uncomment the following line to enable DataContract support.
+//#define SIMPLE_JSON_DATACONTRACT
+// NOTE: uncomment the following line to enable IReadOnlyCollection<T> and IReadOnlyList<T> support.
+//#define SIMPLE_JSON_READONLY_COLLECTIONS
+// NOTE: uncomment the following line to disable linq expressions/compiled lambda (better performance) instead of method.invoke().
+// define if you are using .net framework <= 3.0 or < WP7.5
+//#define SIMPLE_JSON_NO_LINQ_EXPRESSION
+// NOTE: uncomment the following line if you are compiling under Window Metro style application/library.
+// usually already defined in properties
+//#define NETFX_CORE;
+// If you are targetting WinStore, WP8 and NET4.5+ PCL make sure to #define SIMPLE_JSON_TYPEINFO;
+// original json parsing code from http://techblog.procurios.nl/k/618/news/view/14605/14863/How-do-I-write-my-own-parser-for-JSON.html
+#if NETFX_CORE
+#define SIMPLE_JSON_TYPEINFO
+#endif
+using System;
+using System.CodeDom.Compiler;
+using System.Collections;
+using System.Collections.Generic;
+#if !SIMPLE_JSON_NO_LINQ_EXPRESSION
+using System.Linq.Expressions;
+#endif
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+#if SIMPLE_JSON_DYNAMIC
+using System.Dynamic;
+#endif
+using System.Globalization;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Text;
+using SimpleJson.Reflection;
+// ReSharper disable LoopCanBeConvertedToQuery
+// ReSharper disable RedundantExplicitArrayCreation
+// ReSharper disable SuggestUseVarKeywordEvident
+namespace SimpleJson
+{
+    /// <summary>
+    /// Represents the json array.
+    /// </summary>
+    [GeneratedCode("simple-json", "1.0.0")]
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix")]
+#if SIMPLE_JSON_OBJARRAYINTERNAL
+    internal
+#else
+    public
+#endif
+ class JsonArray : List<object>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JsonArray"/> class. 
+        /// </summary>
+        public JsonArray() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JsonArray"/> class. 
+        /// </summary>
+        /// <param name="capacity">The capacity of the json array.</param>
+        public JsonArray(int capacity) : base(capacity) { }
+        /// <summary>
+        /// The json representation of the array.
+        /// </summary>
+        /// <returns>The json representation of the array.</returns>
+        public override string ToString()
+        {
+            return SimpleJson.SerializeObject(this) ?? string.Empty;
+        }
+    }
+    /// <summary>
+    /// Represents the json object.
+    /// </summary>
+    [GeneratedCode("simple-json", "1.0.0")]
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix")]
+#if SIMPLE_JSON_OBJARRAYINTERNAL
+    internal
+#else
+    public
+#endif
+ class JsonObject :
+#if SIMPLE_JSON_DYNAMIC
+ DynamicObject,
+#endif
+ IDictionary<string, object>
+    {
+        /// <summary>
+        /// The internal member dictionary.
+        /// </summary>
+        private readonly Dictionary<string, object> _members;
+        /// <summary>
+        /// Initializes a new instance of <see cref="JsonObject"/>.
+        /// </summary>
+        public JsonObject()
+        {
+            _members = new Dictionary<string, object>();
+        }
+        /// <summary>
+        /// Initializes a new instance of <see cref="JsonObject"/>.
+        /// </summary>
+        /// <param name="comparer">The <see cref="T:System.Collections.Generic.IEqualityComparer`1"/> implementation to use when comparing keys, or null to use the default <see cref="T:System.Collections.Generic.EqualityComparer`1"/> for the type of the key.</param>
+        public JsonObject(IEqualityComparer<string> comparer)
+        {
+            _members = new Dictionary<string, object>(comparer);
+        }
+        /// <summary>
+        /// Gets the <see cref="System.Object"/> at the specified index.
+        /// </summary>
+        /// <value></value>
+        public object this[int index]
+        {
+            get { return GetAtIndex(_members, index); }
+        }
+        internal static object GetAtIndex(IDictionary<string, object> obj, int index)
+        {
+            if (obj == null)
+                throw new ArgumentNullException("obj");
+            if (index >= obj.Count)
+                throw new ArgumentOutOfRangeException("index");
+            int i = 0;
+            foreach (KeyValuePair<string, object> o in obj)
+                if (i++ == index) return o.Value;
+            return null;
+        }
+        /// <summary>
+        /// Adds the specified key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="value">The value.</param>
+        public void Add(string key, object value)
+        {
+            _members.Add(key, value);
+        }
+        /// <summary>
+        /// Determines whether the specified key contains key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <returns>
+        ///     <c>true</c> if the specified key contains key; otherwise, <c>false</c>.
+        /// </returns>
+        public bool ContainsKey(string key)
+        {
+            return _members.ContainsKey(key);
+        }
+        /// <summary>
+        /// Gets the keys.
+        /// </summary>
+        /// <value>The keys.</value>
+        public ICollection<string> Keys
+        {
+            get { return _members.Keys; }
+        }
+        /// <summary>
+        /// Removes the specified key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <returns></returns>
+        public bool Remove(string key)
+        {
+            return _members.Remove(key);
+        }
+        /// <summary>
+        /// Tries the get value.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="value">The value.</param>
+        /// <returns></returns>
+        public bool TryGetValue(string key, out object value)
+        {
+            return _members.TryGetValue(key, out value);
+        }
+        /// <summary>
+        /// Gets the values.
+        /// </summary>
+        /// <value>The values.</value>
+        public ICollection<object> Values
+        {
+            get { return _members.Values; }
+        }
+        /// <summary>
+        /// Gets or sets the <see cref="System.Object"/> with the specified key.
+        /// </summary>
+        /// <value></value>
+        public object this[string key]
+        {
+            get { return _members[key]; }
+            set { _members[key] = value; }
+        }
+        /// <summary>
+        /// Adds the specified item.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        public void Add(KeyValuePair<string, object> item)
+        {
+            _members.Add(item.Key, item.Value);
+        }
+        /// <summary>
+        /// Clears this instance.
+        /// </summary>
+        public void Clear()
+        {
+            _members.Clear();
+        }
+        /// <summary>
+        /// Determines whether [contains] [the specified item].
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <returns>
+        ///     <c>true</c> if [contains] [the specified item]; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Contains(KeyValuePair<string, object> item)
+        {
+            return _members.ContainsKey(item.Key) && _members[item.Key] == item.Value;
+        }
+        /// <summary>
+        /// Copies to.
+        /// </summary>
+        /// <param name="array">The array.</param>
+        /// <param name="arrayIndex">Index of the array.</param>
+        public void CopyTo(KeyValuePair<string, object>[] array, int arrayIndex)
+        {
+            if (array == null) throw new ArgumentNullException("array");
+            int num = Count;
+            foreach (KeyValuePair<string, object> kvp in this)
+            {
+                array[arrayIndex++] = kvp;
+                if (--num <= 0)
+                    return;
+            }
+        }
+        /// <summary>
+        /// Gets the count.
+        /// </summary>
+        /// <value>The count.</value>
+        public int Count
+        {
+            get { return _members.Count; }
+        }
+        /// <summary>
+        /// Gets a value indicating whether this instance is read only.
+        /// </summary>
+        /// <value>
+        ///     <c>true</c> if this instance is read only; otherwise, <c>false</c>.
+        /// </value>
+        public bool IsReadOnly
+        {
+            get { return false; }
+        }
+        /// <summary>
+        /// Removes the specified item.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <returns></returns>
+        public bool Remove(KeyValuePair<string, object> item)
+        {
+            return _members.Remove(item.Key);
+        }
+        /// <summary>
+        /// Gets the enumerator.
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
+        {
+            return _members.GetEnumerator();
+        }
+        /// <summary>
+        /// Returns an enumerator that iterates through a collection.
+        /// </summary>
+        /// <returns>
+        /// An <see cref="T:System.Collections.IEnumerator"/> object that can be used to iterate through the collection.
+        /// </returns>
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return _members.GetEnumerator();
+        }
+        /// <summary>
+        /// Returns a json <see cref="T:System.String"/> that represents the current <see cref="T:System.Object"/>.
+        /// </summary>
+        /// <returns>
+        /// A json <see cref="T:System.String"/> that represents the current <see cref="T:System.Object"/>.
+        /// </returns>
+        public override string ToString()
+        {
+            return SimpleJson.SerializeObject(this);
+        }
+#if SIMPLE_JSON_DYNAMIC
+        /// <summary>
+        /// Provides implementation for type conversion operations. Classes derived from the <see cref="T:System.Dynamic.DynamicObject"/> class can override this method to specify dynamic behavior for operations that convert an object from one type to another.
+        /// </summary>
+        /// <param name="binder">Provides information about the conversion operation. The binder.Type property provides the type to which the object must be converted. For example, for the statement (String)sampleObject in C# (CType(sampleObject, Type) in Visual Basic), where sampleObject is an instance of the class derived from the <see cref="T:System.Dynamic.DynamicObject"/> class, binder.Type returns the <see cref="T:System.String"/> type. The binder.Explicit property provides information about the kind of conversion that occurs. It returns true for explicit conversion and false for implicit conversion.</param>
+        /// <param name="result">The result of the type conversion operation.</param>
+        /// <returns>
+        /// Alwasy returns true.
+        /// </returns>
+        public override bool TryConvert(ConvertBinder binder, out object result)
+        {
+            // <pex>
+            if (binder == null)
+                throw new ArgumentNullException("binder");
+            // </pex>
+            Type targetType = binder.Type;
+            if ((targetType == typeof(IEnumerable)) ||
+                (targetType == typeof(IEnumerable<KeyValuePair<string, object>>)) ||
+                (targetType == typeof(IDictionary<string, object>)) ||
+                (targetType == typeof(IDictionary)))
+            {
+                result = this;
+                return true;
+            }
+            return base.TryConvert(binder, out result);
+        }
+        /// <summary>
+        /// Provides the implementation for operations that delete an object member. This method is not intended for use in C# or Visual Basic.
+        /// </summary>
+        /// <param name="binder">Provides information about the deletion.</param>
+        /// <returns>
+        /// Alwasy returns true.
+        /// </returns>
+        public override bool TryDeleteMember(DeleteMemberBinder binder)
+        {
+            // <pex>
+            if (binder == null)
+                throw new ArgumentNullException("binder");
+            // </pex>
+            return _members.Remove(binder.Name);
+        }
+        /// <summary>
+        /// Provides the implementation for operations that get a value by index. Classes derived from the <see cref="T:System.Dynamic.DynamicObject"/> class can override this method to specify dynamic behavior for indexing operations.
+        /// </summary>
+        /// <param name="binder">Provides information about the operation.</param>
+        /// <param name="indexes">The indexes that are used in the operation. For example, for the sampleObject[3] operation in C# (sampleObject(3) in Visual Basic), where sampleObject is derived from the DynamicObject class, <paramref name="indexes"/> is equal to 3.</param>
+        /// <param name="result">The result of the index operation.</param>
+        /// <returns>
+        /// Alwasy returns true.
+        /// </returns>
+        public override bool TryGetIndex(GetIndexBinder binder, object[] indexes, out object result)
+        {
+            if (indexes == null) throw new ArgumentNullException("indexes");
+            if (indexes.Length == 1)
+            {
+                result = ((IDictionary<string, object>)this)[(string)indexes[0]];
+                return true;
+            }
+            result = null;
+            return true;
+        }
+        /// <summary>
+        /// Provides the implementation for operations that get member values. Classes derived from the <see cref="T:System.Dynamic.DynamicObject"/> class can override this method to specify dynamic behavior for operations such as getting a value for a property.
+        /// </summary>
+        /// <param name="binder">Provides information about the object that called the dynamic operation. The binder.Name property provides the name of the member on which the dynamic operation is performed. For example, for the Console.WriteLine(sampleObject.SampleProperty) statement, where sampleObject is an instance of the class derived from the <see cref="T:System.Dynamic.DynamicObject"/> class, binder.Name returns "SampleProperty". The binder.IgnoreCase property specifies whether the member name is case-sensitive.</param>
+        /// <param name="result">The result of the get operation. For example, if the method is called for a property, you can assign the property value to <paramref name="result"/>.</param>
+        /// <returns>
+        /// Alwasy returns true.
+        /// </returns>
+        public override bool TryGetMember(GetMemberBinder binder, out object result)
+        {
+            object value;
+            if (_members.TryGetValue(binder.Name, out value))
+            {
+                result = value;
+                return true;
+            }
+            result = null;
+            return true;
+        }
+        /// <summary>
+        /// Provides the implementation for operations that set a value by index. Classes derived from the <see cref="T:System.Dynamic.DynamicObject"/> class can override this method to specify dynamic behavior for operations that access objects by a specified index.
+        /// </summary>
+        /// <param name="binder">Provides information about the operation.</param>
+        /// <param name="indexes">The indexes that are used in the operation. For example, for the sampleObject[3] = 10 operation in C# (sampleObject(3) = 10 in Visual Basic), where sampleObject is derived from the <see cref="T:System.Dynamic.DynamicObject"/> class, <paramref name="indexes"/> is equal to 3.</param>
+        /// <param name="value">The value to set to the object that has the specified index. For example, for the sampleObject[3] = 10 operation in C# (sampleObject(3) = 10 in Visual Basic), where sampleObject is derived from the <see cref="T:System.Dynamic.DynamicObject"/> class, <paramref name="value"/> is equal to 10.</param>
+        /// <returns>
+        /// true if the operation is successful; otherwise, false. If this method returns false, the run-time binder of the language determines the behavior. (In most cases, a language-specific run-time exception is thrown.
+        /// </returns>
+        public override bool TrySetIndex(SetIndexBinder binder, object[] indexes, object value)
+        {
+            if (indexes == null) throw new ArgumentNullException("indexes");
+            if (indexes.Length == 1)
+            {
+                ((IDictionary<string, object>)this)[(string)indexes[0]] = value;
+                return true;
+            }
+            return base.TrySetIndex(binder, indexes, value);
+        }
+        /// <summary>
+        /// Provides the implementation for operations that set member values. Classes derived from the <see cref="T:System.Dynamic.DynamicObject"/> class can override this method to specify dynamic behavior for operations such as setting a value for a property.
+        /// </summary>
+        /// <param name="binder">Provides information about the object that called the dynamic operation. The binder.Name property provides the name of the member to which the value is being assigned. For example, for the statement sampleObject.SampleProperty = "Test", where sampleObject is an instance of the class derived from the <see cref="T:System.Dynamic.DynamicObject"/> class, binder.Name returns "SampleProperty". The binder.IgnoreCase property specifies whether the member name is case-sensitive.</param>
+        /// <param name="value">The value to set to the member. For example, for sampleObject.SampleProperty = "Test", where sampleObject is an instance of the class derived from the <see cref="T:System.Dynamic.DynamicObject"/> class, the <paramref name="value"/> is "Test".</param>
+        /// <returns>
+        /// true if the operation is successful; otherwise, false. If this method returns false, the run-time binder of the language determines the behavior. (In most cases, a language-specific run-time exception is thrown.)
+        /// </returns>
+        public override bool TrySetMember(SetMemberBinder binder, object value)
+        {
+            // <pex>
+            if (binder == null)
+                throw new ArgumentNullException("binder");
+            // </pex>
+            _members[binder.Name] = value;
+            return true;
+        }
+        /// <summary>
+        /// Returns the enumeration of all dynamic member names.
+        /// </summary>
+        /// <returns>
+        /// A sequence that contains dynamic member names.
+        /// </returns>
+        public override IEnumerable<string> GetDynamicMemberNames()
+        {
+            foreach (var key in Keys)
+                yield return key;
+        }
+#endif
+    }
+}
+namespace SimpleJson
+{
+    /// <summary>
+    /// This class encodes and decodes JSON strings.
+    /// Spec. details, see http://www.json.org/
+    /// 
+    /// JSON uses Arrays and Objects. These correspond here to the datatypes JsonArray(IList&lt;object>) and JsonObject(IDictionary&lt;string,object>).
+    /// All numbers are parsed to doubles.
+    /// </summary>
+    [GeneratedCode("simple-json", "1.0.0")]
+#if SIMPLE_JSON_INTERNAL
+    internal
+#else
+    public
+#endif
+ static class SimpleJson
+    {
+        private const int TOKEN_NONE = 0;
+        private const int TOKEN_CURLY_OPEN = 1;
+        private const int TOKEN_CURLY_CLOSE = 2;
+        private const int TOKEN_SQUARED_OPEN = 3;
+        private const int TOKEN_SQUARED_CLOSE = 4;
+        private const int TOKEN_COLON = 5;
+        private const int TOKEN_COMMA = 6;
+        private const int TOKEN_STRING = 7;
+        private const int TOKEN_NUMBER = 8;
+        private const int TOKEN_TRUE = 9;
+        private const int TOKEN_FALSE = 10;
+        private const int TOKEN_NULL = 11;
+        private const int BUILDER_CAPACITY = 2000;
+        private static readonly char[] EscapeTable;
+        private static readonly char[] EscapeCharacters = new char[] { '"', '\\', '\b', '\f', '\n', '\r', '\t' };
+        private static readonly string EscapeCharactersString = new string(EscapeCharacters);
+        static SimpleJson()
+        {
+            EscapeTable = new char[93];
+            EscapeTable['"'] = '"';
+            EscapeTable['\\'] = '\\';
+            EscapeTable['\b'] = 'b';
+            EscapeTable['\f'] = 'f';
+            EscapeTable['\n'] = 'n';
+            EscapeTable['\r'] = 'r';
+            EscapeTable['\t'] = 't';
+        }
+        /// <summary>
+        /// Parses the string json into a value
+        /// </summary>
+        /// <param name="json">A JSON string.</param>
+        /// <returns>An IList&lt;object>, a IDictionary&lt;string,object>, a double, a string, null, true, or false</returns>
+        public static object DeserializeObject(string json)
+        {
+            object obj;
+            if (TryDeserializeObject(json, out obj))
+                return obj;
+            throw new SerializationException("Invalid JSON string");
+        }
+        /// <summary>
+        /// Try parsing the json string into a value.
+        /// </summary>
+        /// <param name="json">
+        /// A JSON string.
+        /// </param>
+        /// <param name="obj">
+        /// The object.
+        /// </param>
+        /// <returns>
+        /// Returns true if successfull otherwise false.
+        /// </returns>
+        [SuppressMessage("Microsoft.Design", "CA1007:UseGenericsWhereAppropriate", Justification = "Need to support .NET 2")]
+        public static bool TryDeserializeObject(string json, out object obj)
+        {
+            bool success = true;
+            if (json != null)
+            {
+                char[] charArray = json.ToCharArray();
+                int index = 0;
+                obj = ParseValue(charArray, ref index, ref success);
+            }
+            else
+                obj = null;
+            return success;
+        }
+        public static object DeserializeObject(string json, Type type, IJsonSerializerStrategy jsonSerializerStrategy)
+        {
+            object jsonObject = DeserializeObject(json);
+            return type == null || jsonObject != null && ReflectionUtils.IsAssignableFrom(jsonObject.GetType(), type)
+                       ? jsonObject
+                       : (jsonSerializerStrategy ?? CurrentJsonSerializerStrategy).DeserializeObject(jsonObject, type);
+        }
+        public static object DeserializeObject(string json, Type type)
+        {
+            return DeserializeObject(json, type, null);
+        }
+        public static T DeserializeObject<T>(string json, IJsonSerializerStrategy jsonSerializerStrategy)
+        {
+            return (T)DeserializeObject(json, typeof(T), jsonSerializerStrategy);
+        }
+        public static T DeserializeObject<T>(string json)
+        {
+            return (T)DeserializeObject(json, typeof(T), null);
+        }
+        /// <summary>
+        /// Converts a IDictionary&lt;string,object> / IList&lt;object> object into a JSON string
+        /// </summary>
+        /// <param name="json">A IDictionary&lt;string,object> / IList&lt;object></param>
+        /// <param name="jsonSerializerStrategy">Serializer strategy to use</param>
+        /// <returns>A JSON encoded string, or null if object 'json' is not serializable</returns>
+        public static string SerializeObject(object json, IJsonSerializerStrategy jsonSerializerStrategy)
+        {
+            StringBuilder builder = new StringBuilder(BUILDER_CAPACITY);
+            bool success = SerializeValue(jsonSerializerStrategy, json, builder);
+            return (success ? builder.ToString() : null);
+        }
+        public static string SerializeObject(object json)
+        {
+            return SerializeObject(json, CurrentJsonSerializerStrategy);
+        }
+        public static string EscapeToJavascriptString(string jsonString)
+        {
+            if (string.IsNullOrEmpty(jsonString))
+                return jsonString;
+            StringBuilder sb = new StringBuilder();
+            char c;
+            for (int i = 0; i < jsonString.Length;)
+            {
+                c = jsonString[i++];
+                if (c == '\\')
+                {
+                    int remainingLength = jsonString.Length - i;
+                    if (remainingLength >= 2)
+                    {
+                        char lookahead = jsonString[i];
+                        if (lookahead == '\\')
+                        {
+                            sb.Append('\\');
+                            ++i;
+                        }
+                        else if (lookahead == '"')
+                        {
+                            sb.Append("\"");
+                            ++i;
+                        }
+                        else if (lookahead == 't')
+                        {
+                            sb.Append('\t');
+                            ++i;
+                        }
+                        else if (lookahead == 'b')
+                        {
+                            sb.Append('\b');
+                            ++i;
+                        }
+                        else if (lookahead == 'n')
+                        {
+                            sb.Append('\n');
+                            ++i;
+                        }
+                        else if (lookahead == 'r')
+                        {
+                            sb.Append('\r');
+                            ++i;
+                        }
+                    }
+                }
+                else
+                {
+                    sb.Append(c);
+                }
+            }
+            return sb.ToString();
+        }
+        static IDictionary<string, object> ParseObject(char[] json, ref int index, ref bool success)
+        {
+            IDictionary<string, object> table = new JsonObject();
+            int token;
+            // {
+            NextToken(json, ref index);
+            bool done = false;
+            while (!done)
+            {
+                token = LookAhead(json, index);
+                if (token == TOKEN_NONE)
+                {
+                    success = false;
+                    return null;
+                }
+                else if (token == TOKEN_COMMA)
+                    NextToken(json, ref index);
+                else if (token == TOKEN_CURLY_CLOSE)
+                {
+                    NextToken(json, ref index);
+                    return table;
+                }
+                else
+                {
+                    // name
+                    string name = ParseString(json, ref index, ref success);
+                    if (!success)
+                    {
+                        success = false;
+                        return null;
+                    }
+                    // :
+                    token = NextToken(json, ref index);
+                    if (token != TOKEN_COLON)
+                    {
+                        success = false;
+                        return null;
+                    }
+                    // value
+                    object value = ParseValue(json, ref index, ref success);
+                    if (!success)
+                    {
+                        success = false;
+                        return null;
+                    }
+                    table[name] = value;
+                }
+            }
+            return table;
+        }
+        static JsonArray ParseArray(char[] json, ref int index, ref bool success)
+        {
+            JsonArray array = new JsonArray();
+            // [
+            NextToken(json, ref index);
+            bool done = false;
+            while (!done)
+            {
+                int token = LookAhead(json, index);
+                if (token == TOKEN_NONE)
+                {
+                    success = false;
+                    return null;
+                }
+                else if (token == TOKEN_COMMA)
+                    NextToken(json, ref index);
+                else if (token == TOKEN_SQUARED_CLOSE)
+                {
+                    NextToken(json, ref index);
+                    break;
+                }
+                else
+                {
+                    object value = ParseValue(json, ref index, ref success);
+                    if (!success)
+                        return null;
+                    array.Add(value);
+                }
+            }
+            return array;
+        }
+        static object ParseValue(char[] json, ref int index, ref bool success)
+        {
+            switch (LookAhead(json, index))
+            {
+                case TOKEN_STRING:
+                    return ParseString(json, ref index, ref success);
+                case TOKEN_NUMBER:
+                    return ParseNumber(json, ref index, ref success);
+                case TOKEN_CURLY_OPEN:
+                    return ParseObject(json, ref index, ref success);
+                case TOKEN_SQUARED_OPEN:
+                    return ParseArray(json, ref index, ref success);
+                case TOKEN_TRUE:
+                    NextToken(json, ref index);
+                    return true;
+                case TOKEN_FALSE:
+                    NextToken(json, ref index);
+                    return false;
+                case TOKEN_NULL:
+                    NextToken(json, ref index);
+                    return null;
+                case TOKEN_NONE:
+                    break;
+            }
+            success = false;
+            return null;
+        }
+        static string ParseString(char[] json, ref int index, ref bool success)
+        {
+            StringBuilder s = new StringBuilder(BUILDER_CAPACITY);
+            char c;
+            EatWhitespace(json, ref index);
+            // "
+            c = json[index++];
+            bool complete = false;
+            while (!complete)
+            {
+                if (index == json.Length)
+                    break;
+                c = json[index++];
+                if (c == '"')
+                {
+                    complete = true;
+                    break;
+                }
+                else if (c == '\\')
+                {
+                    if (index == json.Length)
+                        break;
+                    c = json[index++];
+                    if (c == '"')
+                        s.Append('"');
+                    else if (c == '\\')
+                        s.Append('\\');
+                    else if (c == '/')
+                        s.Append('/');
+                    else if (c == 'b')
+                        s.Append('\b');
+                    else if (c == 'f')
+                        s.Append('\f');
+                    else if (c == 'n')
+                        s.Append('\n');
+                    else if (c == 'r')
+                        s.Append('\r');
+                    else if (c == 't')
+                        s.Append('\t');
+                    else if (c == 'u')
+                    {
+                        int remainingLength = json.Length - index;
+                        if (remainingLength >= 4)
+                        {
+                            // parse the 32 bit hex into an integer codepoint
+                            uint codePoint;
+                            if (!(success = UInt32.TryParse(new string(json, index, 4), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out codePoint)))
+                                return "";
+                            // convert the integer codepoint to a unicode char and add to string
+                            if (0xD800 <= codePoint && codePoint <= 0xDBFF)  // if high surrogate
+                            {
+                                index += 4; // skip 4 chars
+                                remainingLength = json.Length - index;
+                                if (remainingLength >= 6)
+                                {
+                                    uint lowCodePoint;
+                                    if (new string(json, index, 2) == "\\u" && UInt32.TryParse(new string(json, index + 2, 4), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out lowCodePoint))
+                                    {
+                                        if (0xDC00 <= lowCodePoint && lowCodePoint <= 0xDFFF)    // if low surrogate
+                                        {
+                                            s.Append((char)codePoint);
+                                            s.Append((char)lowCodePoint);
+                                            index += 6; // skip 6 chars
+                                            continue;
+                                        }
+                                    }
+                                }
+                                success = false;    // invalid surrogate pair
+                                return "";
+                            }
+                            s.Append(ConvertFromUtf32((int)codePoint));
+                            // skip 4 chars
+                            index += 4;
+                        }
+                        else
+                            break;
+                    }
+                }
+                else
+                    s.Append(c);
+            }
+            if (!complete)
+            {
+                success = false;
+                return null;
+            }
+            return s.ToString();
+        }
+        private static string ConvertFromUtf32(int utf32)
+        {
+            // http://www.java2s.com/Open-Source/CSharp/2.6.4-mono-.net-core/System/System/Char.cs.htm
+            if (utf32 < 0 || utf32 > 0x10FFFF)
+                throw new ArgumentOutOfRangeException("utf32", "The argument must be from 0 to 0x10FFFF.");
+            if (0xD800 <= utf32 && utf32 <= 0xDFFF)
+                throw new ArgumentOutOfRangeException("utf32", "The argument must not be in surrogate pair range.");
+            if (utf32 < 0x10000)
+                return new string((char)utf32, 1);
+            utf32 -= 0x10000;
+            return new string(new char[] { (char)((utf32 >> 10) + 0xD800), (char)(utf32 % 0x0400 + 0xDC00) });
+        }
+        static object ParseNumber(char[] json, ref int index, ref bool success)
+        {
+            EatWhitespace(json, ref index);
+            int lastIndex = GetLastIndexOfNumber(json, index);
+            int charLength = (lastIndex - index) + 1;
+            object returnNumber;
+            string str = new string(json, index, charLength);
+            if (str.IndexOf(".", StringComparison.OrdinalIgnoreCase) != -1 || str.IndexOf("e", StringComparison.OrdinalIgnoreCase) != -1)
+            {
+                double number;
+                success = double.TryParse(new string(json, index, charLength), NumberStyles.Any, CultureInfo.InvariantCulture, out number);
+                returnNumber = number;
+            }
+            else
+            {
+                long number;
+                success = long.TryParse(new string(json, index, charLength), NumberStyles.Any, CultureInfo.InvariantCulture, out number);
+                returnNumber = number;
+            }
+            index = lastIndex + 1;
+            return returnNumber;
+        }
+        static int GetLastIndexOfNumber(char[] json, int index)
+        {
+            int lastIndex;
+            for (lastIndex = index; lastIndex < json.Length; lastIndex++)
+                if ("0123456789+-.eE".IndexOf(json[lastIndex]) == -1) break;
+            return lastIndex - 1;
+        }
+        static void EatWhitespace(char[] json, ref int index)
+        {
+            for (; index < json.Length; index++)
+                if (" \t\n\r\b\f".IndexOf(json[index]) == -1) break;
+        }
+        static int LookAhead(char[] json, int index)
+        {
+            int saveIndex = index;
+            return NextToken(json, ref saveIndex);
+        }
+        [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        static int NextToken(char[] json, ref int index)
+        {
+            EatWhitespace(json, ref index);
+            if (index == json.Length)
+                return TOKEN_NONE;
+            char c = json[index];
+            index++;
+            switch (c)
+            {
+                case '{':
+                    return TOKEN_CURLY_OPEN;
+                case '}':
+                    return TOKEN_CURLY_CLOSE;
+                case '[':
+                    return TOKEN_SQUARED_OPEN;
+                case ']':
+                    return TOKEN_SQUARED_CLOSE;
+                case ',':
+                    return TOKEN_COMMA;
+                case '"':
+                    return TOKEN_STRING;
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                case '8':
+                case '9':
+                case '-':
+                    return TOKEN_NUMBER;
+                case ':':
+                    return TOKEN_COLON;
+            }
+            index--;
+            int remainingLength = json.Length - index;
+            // false
+            if (remainingLength >= 5)
+            {
+                if (json[index] == 'f' && json[index + 1] == 'a' && json[index + 2] == 'l' && json[index + 3] == 's' && json[index + 4] == 'e')
+                {
+                    index += 5;
+                    return TOKEN_FALSE;
+                }
+            }
+            // true
+            if (remainingLength >= 4)
+            {
+                if (json[index] == 't' && json[index + 1] == 'r' && json[index + 2] == 'u' && json[index + 3] == 'e')
+                {
+                    index += 4;
+                    return TOKEN_TRUE;
+                }
+            }
+            // null
+            if (remainingLength >= 4)
+            {
+                if (json[index] == 'n' && json[index + 1] == 'u' && json[index + 2] == 'l' && json[index + 3] == 'l')
+                {
+                    index += 4;
+                    return TOKEN_NULL;
+                }
+            }
+            return TOKEN_NONE;
+        }
+        static bool SerializeValue(IJsonSerializerStrategy jsonSerializerStrategy, object value, StringBuilder builder)
+        {
+            bool success = true;
+            string stringValue = value as string;
+            if (stringValue != null)
+                success = SerializeString(stringValue, builder);
+            else
+            {
+                IDictionary<string, object> dict = value as IDictionary<string, object>;
+                if (dict != null)
+                {
+                    success = SerializeObject(jsonSerializerStrategy, dict.Keys, dict.Values, builder);
+                }
+                else
+                {
+                    IDictionary<string, string> stringDictionary = value as IDictionary<string, string>;
+                    if (stringDictionary != null)
+                    {
+                        success = SerializeObject(jsonSerializerStrategy, stringDictionary.Keys, stringDictionary.Values, builder);
+                    }
+                    else
+                    {
+                        IEnumerable enumerableValue = value as IEnumerable;
+                        if (enumerableValue != null)
+                            success = SerializeArray(jsonSerializerStrategy, enumerableValue, builder);
+                        else if (IsNumeric(value))
+                            success = SerializeNumber(value, builder);
+                        else if (value is bool)
+                            builder.Append((bool)value ? "true" : "false");
+                        else if (value == null)
+                            builder.Append("null");
+                        else
+                        {
+                            object serializedObject;
+                            success = jsonSerializerStrategy.TrySerializeNonPrimitiveObject(value, out serializedObject);
+                            if (success)
+                                SerializeValue(jsonSerializerStrategy, serializedObject, builder);
+                        }
+                    }
+                }
+            }
+            return success;
+        }
+        static bool SerializeObject(IJsonSerializerStrategy jsonSerializerStrategy, IEnumerable keys, IEnumerable values, StringBuilder builder)
+        {
+            builder.Append("{");
+            IEnumerator ke = keys.GetEnumerator();
+            IEnumerator ve = values.GetEnumerator();
+            bool first = true;
+            while (ke.MoveNext() && ve.MoveNext())
+            {
+                object key = ke.Current;
+                object value = ve.Current;
+                if (!first)
+                    builder.Append(",");
+                string stringKey = key as string;
+                if (stringKey != null)
+                    SerializeString(stringKey, builder);
+                else
+                    if (!SerializeValue(jsonSerializerStrategy, value, builder)) return false;
+                builder.Append(":");
+                if (!SerializeValue(jsonSerializerStrategy, value, builder))
+                    return false;
+                first = false;
+            }
+            builder.Append("}");
+            return true;
+        }
+        static bool SerializeArray(IJsonSerializerStrategy jsonSerializerStrategy, IEnumerable anArray, StringBuilder builder)
+        {
+            builder.Append("[");
+            bool first = true;
+            foreach (object value in anArray)
+            {
+                if (!first)
+                    builder.Append(",");
+                if (!SerializeValue(jsonSerializerStrategy, value, builder))
+                    return false;
+                first = false;
+            }
+            builder.Append("]");
+            return true;
+        }
+        static bool SerializeString(string aString, StringBuilder builder)
+        {
+            // Happy path if there's nothing to be escaped. IndexOfAny is highly optimized (and unmanaged)
+            if (aString.IndexOfAny(EscapeCharacters) == -1)
+            {
+                builder.Append('"');
+                builder.Append(aString);
+                builder.Append('"');
+                return true;
+            }
+            builder.Append('"');
+            int safeCharacterCount = 0;
+            char[] charArray = aString.ToCharArray();
+            for (int i = 0; i < charArray.Length; i++)
+            {
+                char c = charArray[i];
+                // Non ascii characters are fine, buffer them up and send them to the builder
+                // in larger chunks if possible. The escape table is a 1:1 translation table
+                // with \0 [default(char)] denoting a safe character.
+                if (c >= EscapeTable.Length || EscapeTable[c] == default(char))
+                {
+                    safeCharacterCount++;
+                }
+                else
+                {
+                    if (safeCharacterCount > 0)
+                    {
+                        builder.Append(charArray, i - safeCharacterCount, safeCharacterCount);
+                        safeCharacterCount = 0;
+                    }
+                    builder.Append('\\');
+                    builder.Append(EscapeTable[c]);
+                }
+            }
+            if (safeCharacterCount > 0)
+            {
+                builder.Append(charArray, charArray.Length - safeCharacterCount, safeCharacterCount);
+            }
+            builder.Append('"');
+            return true;
+        }
+        static bool SerializeNumber(object number, StringBuilder builder)
+        {
+            if (number is long)
+                builder.Append(((long)number).ToString(CultureInfo.InvariantCulture));
+            else if (number is ulong)
+                builder.Append(((ulong)number).ToString(CultureInfo.InvariantCulture));
+            else if (number is int)
+                builder.Append(((int)number).ToString(CultureInfo.InvariantCulture));
+            else if (number is uint)
+                builder.Append(((uint)number).ToString(CultureInfo.InvariantCulture));
+            else if (number is decimal)
+                builder.Append(((decimal)number).ToString(CultureInfo.InvariantCulture));
+            else if (number is float)
+                builder.Append(((float)number).ToString(CultureInfo.InvariantCulture));
+            else
+                builder.Append(Convert.ToDouble(number, CultureInfo.InvariantCulture).ToString("r", CultureInfo.InvariantCulture));
+            return true;
+        }
+        /// <summary>
+        /// Determines if a given object is numeric in any way
+        /// (can be integer, double, null, etc).
+        /// </summary>
+        static bool IsNumeric(object value)
+        {
+            if (value is sbyte) return true;
+            if (value is byte) return true;
+            if (value is short) return true;
+            if (value is ushort) return true;
+            if (value is int) return true;
+            if (value is uint) return true;
+            if (value is long) return true;
+            if (value is ulong) return true;
+            if (value is float) return true;
+            if (value is double) return true;
+            if (value is decimal) return true;
+            return false;
+        }
+        private static IJsonSerializerStrategy _currentJsonSerializerStrategy;
+        public static IJsonSerializerStrategy CurrentJsonSerializerStrategy
+        {
+            get
+            {
+                return _currentJsonSerializerStrategy ??
+                    (_currentJsonSerializerStrategy =
+#if SIMPLE_JSON_DATACONTRACT
+ DataContractJsonSerializerStrategy
+#else
+ PocoJsonSerializerStrategy
+#endif
+);
+            }
+            set
+            {
+                _currentJsonSerializerStrategy = value;
+            }
+        }
+        private static PocoJsonSerializerStrategy _pocoJsonSerializerStrategy;
+        [EditorBrowsable(EditorBrowsableState.Advanced)]
+        public static PocoJsonSerializerStrategy PocoJsonSerializerStrategy
+        {
+            get
+            {
+                return _pocoJsonSerializerStrategy ?? (_pocoJsonSerializerStrategy = new PocoJsonSerializerStrategy());
+            }
+        }
+#if SIMPLE_JSON_DATACONTRACT
+        private static DataContractJsonSerializerStrategy _dataContractJsonSerializerStrategy;
+        [System.ComponentModel.EditorBrowsable(EditorBrowsableState.Advanced)]
+        public static DataContractJsonSerializerStrategy DataContractJsonSerializerStrategy
+        {
+            get
+            {
+                return _dataContractJsonSerializerStrategy ?? (_dataContractJsonSerializerStrategy = new DataContractJsonSerializerStrategy());
+            }
+        }
+#endif
+    }
+    [GeneratedCode("simple-json", "1.0.0")]
+#if SIMPLE_JSON_INTERNAL
+    internal
+#else
+    public
+#endif
+ interface IJsonSerializerStrategy
+    {
+        [SuppressMessage("Microsoft.Design", "CA1007:UseGenericsWhereAppropriate", Justification = "Need to support .NET 2")]
+        bool TrySerializeNonPrimitiveObject(object input, out object output);
+        object DeserializeObject(object value, Type type);
+    }
+    [GeneratedCode("simple-json", "1.0.0")]
+#if SIMPLE_JSON_INTERNAL
+    internal
+#else
+    public
+#endif
+ class PocoJsonSerializerStrategy : IJsonSerializerStrategy
+    {
+        internal IDictionary<Type, ReflectionUtils.ConstructorDelegate> ConstructorCache;
+        internal IDictionary<Type, IDictionary<string, ReflectionUtils.GetDelegate>> GetCache;
+        internal IDictionary<Type, IDictionary<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>>> SetCache;
+        internal static readonly Type[] EmptyTypes = new Type[0];
+        internal static readonly Type[] ArrayConstructorParameterTypes = new Type[] { typeof(int) };
+        private static readonly string[] Iso8601Format = new string[]
+                                                             {
+                                                                 @"yyyy-MM-dd\THH:mm:ss.FFFFFFF\Z",
+                                                                 @"yyyy-MM-dd\THH:mm:ss\Z",
+                                                                 @"yyyy-MM-dd\THH:mm:ssK"
+                                                             };
+        public PocoJsonSerializerStrategy()
+        {
+            ConstructorCache = new ReflectionUtils.ThreadSafeDictionary<Type, ReflectionUtils.ConstructorDelegate>(ContructorDelegateFactory);
+            GetCache = new ReflectionUtils.ThreadSafeDictionary<Type, IDictionary<string, ReflectionUtils.GetDelegate>>(GetterValueFactory);
+            SetCache = new ReflectionUtils.ThreadSafeDictionary<Type, IDictionary<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>>>(SetterValueFactory);
+        }
+        protected virtual string MapClrMemberNameToJsonFieldName(string clrPropertyName)
+        {
+            return clrPropertyName;
+        }
+        internal virtual ReflectionUtils.ConstructorDelegate ContructorDelegateFactory(Type key)
+        {
+            return ReflectionUtils.GetContructor(key, key.IsArray ? ArrayConstructorParameterTypes : EmptyTypes);
+        }
+        internal virtual IDictionary<string, ReflectionUtils.GetDelegate> GetterValueFactory(Type type)
+        {
+            IDictionary<string, ReflectionUtils.GetDelegate> result = new Dictionary<string, ReflectionUtils.GetDelegate>();
+            foreach (PropertyInfo propertyInfo in ReflectionUtils.GetProperties(type))
+            {
+                if (propertyInfo.CanRead)
+                {
+                    MethodInfo getMethod = ReflectionUtils.GetGetterMethodInfo(propertyInfo);
+                    if (getMethod.IsStatic || !getMethod.IsPublic)
+                        continue;
+                    result[MapClrMemberNameToJsonFieldName(propertyInfo.Name)] = ReflectionUtils.GetGetMethod(propertyInfo);
+                }
+            }
+            foreach (FieldInfo fieldInfo in ReflectionUtils.GetFields(type))
+            {
+                if (fieldInfo.IsStatic || !fieldInfo.IsPublic)
+                    continue;
+                result[MapClrMemberNameToJsonFieldName(fieldInfo.Name)] = ReflectionUtils.GetGetMethod(fieldInfo);
+            }
+            return result;
+        }
+        internal virtual IDictionary<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>> SetterValueFactory(Type type)
+        {
+            IDictionary<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>> result = new Dictionary<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>>();
+            foreach (PropertyInfo propertyInfo in ReflectionUtils.GetProperties(type))
+            {
+                if (propertyInfo.CanWrite)
+                {
+                    MethodInfo setMethod = ReflectionUtils.GetSetterMethodInfo(propertyInfo);
+                    if (setMethod.IsStatic || !setMethod.IsPublic)
+                        continue;
+                    result[MapClrMemberNameToJsonFieldName(propertyInfo.Name)] = new KeyValuePair<Type, ReflectionUtils.SetDelegate>(propertyInfo.PropertyType, ReflectionUtils.GetSetMethod(propertyInfo));
+                }
+            }
+            foreach (FieldInfo fieldInfo in ReflectionUtils.GetFields(type))
+            {
+                if (fieldInfo.IsInitOnly || fieldInfo.IsStatic || !fieldInfo.IsPublic)
+                    continue;
+                result[MapClrMemberNameToJsonFieldName(fieldInfo.Name)] = new KeyValuePair<Type, ReflectionUtils.SetDelegate>(fieldInfo.FieldType, ReflectionUtils.GetSetMethod(fieldInfo));
+            }
+            return result;
+        }
+        public virtual bool TrySerializeNonPrimitiveObject(object input, out object output)
+        {
+            return TrySerializeKnownTypes(input, out output) || TrySerializeUnknownTypes(input, out output);
+        }
+        [SuppressMessage("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        public virtual object DeserializeObject(object value, Type type)
+        {
+            if (type == null) throw new ArgumentNullException("type");
+            string str = value as string;
+            if (type == typeof(Guid) && string.IsNullOrEmpty(str))
+                return default(Guid);
+            if (value == null)
+                return null;
+            object obj = null;
+            if (str != null)
+            {
+                if (str.Length != 0) // We know it can't be null now.
+                {
+                    if (type == typeof(DateTime) || (ReflectionUtils.IsNullableType(type) && Nullable.GetUnderlyingType(type) == typeof(DateTime)))
+                        return DateTime.ParseExact(str, Iso8601Format, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal);
+                    if (type == typeof(DateTimeOffset) || (ReflectionUtils.IsNullableType(type) && Nullable.GetUnderlyingType(type) == typeof(DateTimeOffset)))
+                        return DateTimeOffset.ParseExact(str, Iso8601Format, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal);
+                    if (type == typeof(Guid) || (ReflectionUtils.IsNullableType(type) && Nullable.GetUnderlyingType(type) == typeof(Guid)))
+                        return new Guid(str);
+                    if (type == typeof(Uri))
+                    {
+                        bool isValid = Uri.IsWellFormedUriString(str, UriKind.RelativeOrAbsolute);
+                        Uri result;
+                        if (isValid && Uri.TryCreate(str, UriKind.RelativeOrAbsolute, out result))
+                            return result;
+                        return null;
+                    }
+                    if (type == typeof(string))
+                        return str;
+                    return Convert.ChangeType(str, type, CultureInfo.InvariantCulture);
+                }
+                else
+                {
+                    if (type == typeof(Guid))
+                        obj = default(Guid);
+                    else if (ReflectionUtils.IsNullableType(type) && Nullable.GetUnderlyingType(type) == typeof(Guid))
+                        obj = null;
+                    else
+                        obj = str;
+                }
+                // Empty string case
+                if (!ReflectionUtils.IsNullableType(type) && Nullable.GetUnderlyingType(type) == typeof(Guid))
+                    return str;
+            }
+            else if (value is bool)
+                return value;
+            bool valueIsLong = value is long;
+            bool valueIsDouble = value is double;
+            if ((valueIsLong && type == typeof(long)) || (valueIsDouble && type == typeof(double)))
+                return value;
+            if ((valueIsDouble && type != typeof(double)) || (valueIsLong && type != typeof(long)))
+            {
+                obj = type == typeof(int) || type == typeof(long) || type == typeof(double) || type == typeof(float) || type == typeof(bool) || type == typeof(decimal) || type == typeof(byte) || type == typeof(short)
+                            ? Convert.ChangeType(value, type, CultureInfo.InvariantCulture)
+                            : value;
+            }
+            else
+            {
+                IDictionary<string, object> objects = value as IDictionary<string, object>;
+                if (objects != null)
+                {
+                    IDictionary<string, object> jsonObject = objects;
+                    if (ReflectionUtils.IsTypeDictionary(type))
+                    {
+                        // if dictionary then
+                        Type[] types = ReflectionUtils.GetGenericTypeArguments(type);
+                        Type keyType = types[0];
+                        Type valueType = types[1];
+                        Type genericType = typeof(Dictionary<,>).MakeGenericType(keyType, valueType);
+                        IDictionary dict = (IDictionary)ConstructorCache[genericType]();
+                        foreach (KeyValuePair<string, object> kvp in jsonObject)
+                            dict.Add(kvp.Key, DeserializeObject(kvp.Value, valueType));
+                        obj = dict;
+                    }
+                    else
+                    {
+                        if (type == typeof(object))
+                            obj = value;
+                        else
+                        {
+                            obj = ConstructorCache[type]();
+                            foreach (KeyValuePair<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>> setter in SetCache[type])
+                            {
+                                object jsonValue;
+                                if (jsonObject.TryGetValue(setter.Key, out jsonValue))
+                                {
+                                    jsonValue = DeserializeObject(jsonValue, setter.Value.Key);
+                                    setter.Value.Value(obj, jsonValue);
+                                }
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    IList<object> valueAsList = value as IList<object>;
+                    if (valueAsList != null)
+                    {
+                        IList<object> jsonObject = valueAsList;
+                        IList list = null;
+                        if (type.IsArray)
+                        {
+                            list = (IList)ConstructorCache[type](jsonObject.Count);
+                            int i = 0;
+                            foreach (object o in jsonObject)
+                                list[i++] = DeserializeObject(o, type.GetElementType());
+                        }
+                        else if (ReflectionUtils.IsTypeGenericeCollectionInterface(type) || ReflectionUtils.IsAssignableFrom(typeof(IList), type))
+                        {
+                            Type innerType = ReflectionUtils.GetGenericListElementType(type);
+                            list = (IList)(ConstructorCache[type] ?? ConstructorCache[typeof(List<>).MakeGenericType(innerType)])(jsonObject.Count);
+                            foreach (object o in jsonObject)
+                                list.Add(DeserializeObject(o, innerType));
+                        }
+                        obj = list;
+                    }
+                }
+                return obj;
+            }
+            if (ReflectionUtils.IsNullableType(type))
+                return ReflectionUtils.ToNullableType(obj, type);
+            return obj;
+        }
+        protected virtual object SerializeEnum(Enum p)
+        {
+            return Convert.ToDouble(p, CultureInfo.InvariantCulture);
+        }
+        [SuppressMessage("Microsoft.Design", "CA1007:UseGenericsWhereAppropriate", Justification = "Need to support .NET 2")]
+        protected virtual bool TrySerializeKnownTypes(object input, out object output)
+        {
+            bool returnValue = true;
+            if (input is DateTime)
+                output = ((DateTime)input).ToUniversalTime().ToString(Iso8601Format[0], CultureInfo.InvariantCulture);
+            else if (input is DateTimeOffset)
+                output = ((DateTimeOffset)input).ToUniversalTime().ToString(Iso8601Format[0], CultureInfo.InvariantCulture);
+            else if (input is Guid)
+                output = ((Guid)input).ToString("D");
+            else if (input is Uri)
+                output = input.ToString();
+            else
+            {
+                Enum inputEnum = input as Enum;
+                if (inputEnum != null)
+                    output = SerializeEnum(inputEnum);
+                else
+                {
+                    returnValue = false;
+                    output = null;
+                }
+            }
+            return returnValue;
+        }
+        [SuppressMessage("Microsoft.Design", "CA1007:UseGenericsWhereAppropriate", Justification = "Need to support .NET 2")]
+        protected virtual bool TrySerializeUnknownTypes(object input, out object output)
+        {
+            if (input == null) throw new ArgumentNullException("input");
+            output = null;
+            Type type = input.GetType();
+            if (type.FullName == null)
+                return false;
+            IDictionary<string, object> obj = new JsonObject();
+            IDictionary<string, ReflectionUtils.GetDelegate> getters = GetCache[type];
+            foreach (KeyValuePair<string, ReflectionUtils.GetDelegate> getter in getters)
+            {
+                if (getter.Value != null)
+                    obj.Add(MapClrMemberNameToJsonFieldName(getter.Key), getter.Value(input));
+            }
+            output = obj;
+            return true;
+        }
+    }
+#if SIMPLE_JSON_DATACONTRACT
+    [GeneratedCode("simple-json", "1.0.0")]
+#if SIMPLE_JSON_INTERNAL
+    internal
+#else
+    public
+#endif
+ class DataContractJsonSerializerStrategy : PocoJsonSerializerStrategy
+    {
+        public DataContractJsonSerializerStrategy()
+        {
+            GetCache = new ReflectionUtils.ThreadSafeDictionary<Type, IDictionary<string, ReflectionUtils.GetDelegate>>(GetterValueFactory);
+            SetCache = new ReflectionUtils.ThreadSafeDictionary<Type, IDictionary<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>>>(SetterValueFactory);
+        }
+        internal override IDictionary<string, ReflectionUtils.GetDelegate> GetterValueFactory(Type type)
+        {
+            bool hasDataContract = ReflectionUtils.GetAttribute(type, typeof(DataContractAttribute)) != null;
+            if (!hasDataContract)
+                return base.GetterValueFactory(type);
+            string jsonKey;
+            IDictionary<string, ReflectionUtils.GetDelegate> result = new Dictionary<string, ReflectionUtils.GetDelegate>();
+            foreach (PropertyInfo propertyInfo in ReflectionUtils.GetProperties(type))
+            {
+                if (propertyInfo.CanRead)
+                {
+                    MethodInfo getMethod = ReflectionUtils.GetGetterMethodInfo(propertyInfo);
+                    if (!getMethod.IsStatic && CanAdd(propertyInfo, out jsonKey))
+                        result[jsonKey] = ReflectionUtils.GetGetMethod(propertyInfo);
+                }
+            }
+            foreach (FieldInfo fieldInfo in ReflectionUtils.GetFields(type))
+            {
+                if (!fieldInfo.IsStatic && CanAdd(fieldInfo, out jsonKey))
+                    result[jsonKey] = ReflectionUtils.GetGetMethod(fieldInfo);
+            }
+            return result;
+        }
+        internal override IDictionary<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>> SetterValueFactory(Type type)
+        {
+            bool hasDataContract = ReflectionUtils.GetAttribute(type, typeof(DataContractAttribute)) != null;
+            if (!hasDataContract)
+                return base.SetterValueFactory(type);
+            string jsonKey;
+            IDictionary<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>> result = new Dictionary<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>>();
+            foreach (PropertyInfo propertyInfo in ReflectionUtils.GetProperties(type))
+            {
+                if (propertyInfo.CanWrite)
+                {
+                    MethodInfo setMethod = ReflectionUtils.GetSetterMethodInfo(propertyInfo);
+                    if (!setMethod.IsStatic && CanAdd(propertyInfo, out jsonKey))
+                        result[jsonKey] = new KeyValuePair<Type, ReflectionUtils.SetDelegate>(propertyInfo.PropertyType, ReflectionUtils.GetSetMethod(propertyInfo));
+                }
+            }
+            foreach (FieldInfo fieldInfo in ReflectionUtils.GetFields(type))
+            {
+                if (!fieldInfo.IsInitOnly && !fieldInfo.IsStatic && CanAdd(fieldInfo, out jsonKey))
+                    result[jsonKey] = new KeyValuePair<Type, ReflectionUtils.SetDelegate>(fieldInfo.FieldType, ReflectionUtils.GetSetMethod(fieldInfo));
+            }
+            // todo implement sorting for DATACONTRACT.
+            return result;
+        }
+        private static bool CanAdd(MemberInfo info, out string jsonKey)
+        {
+            jsonKey = null;
+            if (ReflectionUtils.GetAttribute(info, typeof(IgnoreDataMemberAttribute)) != null)
+                return false;
+            DataMemberAttribute dataMemberAttribute = (DataMemberAttribute)ReflectionUtils.GetAttribute(info, typeof(DataMemberAttribute));
+            if (dataMemberAttribute == null)
+                return false;
+            jsonKey = string.IsNullOrEmpty(dataMemberAttribute.Name) ? info.Name : dataMemberAttribute.Name;
+            return true;
+        }
+    }
+#endif
+    namespace Reflection
+    {
+        // This class is meant to be copied into other libraries. So we want to exclude it from Code Analysis rules
+        // that might be in place in the target project.
+        [GeneratedCode("reflection-utils", "1.0.0")]
+#if SIMPLE_JSON_REFLECTION_UTILS_PUBLIC
+        public
+#else
+        internal
+#endif
+ class ReflectionUtils
+        {
+            private static readonly object[] EmptyObjects = new object[] { };
+            public delegate object GetDelegate(object source);
+            public delegate void SetDelegate(object source, object value);
+            public delegate object ConstructorDelegate(params object[] args);
+            public delegate TValue ThreadSafeDictionaryValueFactory<TKey, TValue>(TKey key);
+#if SIMPLE_JSON_TYPEINFO
+            public static TypeInfo GetTypeInfo(Type type)
+            {
+                return type.GetTypeInfo();
+            }
+#else
+            public static Type GetTypeInfo(Type type)
+            {
+                return type;
+            }
+#endif
+            public static Attribute GetAttribute(MemberInfo info, Type type)
+            {
+#if SIMPLE_JSON_TYPEINFO
+                if (info == null || type == null || !info.IsDefined(type))
+                    return null;
+                return info.GetCustomAttribute(type);
+#else
+                if (info == null || type == null || !Attribute.IsDefined(info, type))
+                    return null;
+                return Attribute.GetCustomAttribute(info, type);
+#endif
+            }
+            public static Type GetGenericListElementType(Type type)
+            {
+                IEnumerable<Type> interfaces;
+#if SIMPLE_JSON_TYPEINFO
+                interfaces = type.GetTypeInfo().ImplementedInterfaces;
+#else
+                interfaces = type.GetInterfaces();
+#endif
+                foreach (Type implementedInterface in interfaces)
+                {
+                    if (IsTypeGeneric(implementedInterface) &&
+                        implementedInterface.GetGenericTypeDefinition() == typeof(IList<>))
+                    {
+                        return GetGenericTypeArguments(implementedInterface)[0];
+                    }
+                }
+                return GetGenericTypeArguments(type)[0];
+            }
+            public static Attribute GetAttribute(Type objectType, Type attributeType)
+            {
+#if SIMPLE_JSON_TYPEINFO
+                if (objectType == null || attributeType == null || !objectType.GetTypeInfo().IsDefined(attributeType))
+                    return null;
+                return objectType.GetTypeInfo().GetCustomAttribute(attributeType);
+#else
+                if (objectType == null || attributeType == null || !Attribute.IsDefined(objectType, attributeType))
+                    return null;
+                return Attribute.GetCustomAttribute(objectType, attributeType);
+#endif
+            }
+            public static Type[] GetGenericTypeArguments(Type type)
+            {
+#if SIMPLE_JSON_TYPEINFO
+                return type.GetTypeInfo().GenericTypeArguments;
+#else
+                return type.GetGenericArguments();
+#endif
+            }
+            public static bool IsTypeGeneric(Type type)
+            {
+                return GetTypeInfo(type).IsGenericType;
+            }
+            public static bool IsTypeGenericeCollectionInterface(Type type)
+            {
+                if (!IsTypeGeneric(type))
+                    return false;
+                Type genericDefinition = type.GetGenericTypeDefinition();
+                return (genericDefinition == typeof(IList<>)
+                    || genericDefinition == typeof(ICollection<>)
+                    || genericDefinition == typeof(IEnumerable<>)
+#if SIMPLE_JSON_READONLY_COLLECTIONS
+                    || genericDefinition == typeof(IReadOnlyCollection<>)
+                    || genericDefinition == typeof(IReadOnlyList<>)
+#endif
+                    );
+            }
+            public static bool IsAssignableFrom(Type type1, Type type2)
+            {
+                return GetTypeInfo(type1).IsAssignableFrom(GetTypeInfo(type2));
+            }
+            public static bool IsTypeDictionary(Type type)
+            {
+#if SIMPLE_JSON_TYPEINFO
+                if (typeof(IDictionary<,>).GetTypeInfo().IsAssignableFrom(type.GetTypeInfo()))
+                    return true;
+#else
+                if (typeof(System.Collections.IDictionary).IsAssignableFrom(type))
+                    return true;
+#endif
+                if (!GetTypeInfo(type).IsGenericType)
+                    return false;
+                Type genericDefinition = type.GetGenericTypeDefinition();
+                return genericDefinition == typeof(IDictionary<,>);
+            }
+            public static bool IsNullableType(Type type)
+            {
+                return GetTypeInfo(type).IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>);
+            }
+            public static object ToNullableType(object obj, Type nullableType)
+            {
+                return obj == null ? null : Convert.ChangeType(obj, Nullable.GetUnderlyingType(nullableType), CultureInfo.InvariantCulture);
+            }
+            public static bool IsValueType(Type type)
+            {
+                return GetTypeInfo(type).IsValueType;
+            }
+            public static IEnumerable<ConstructorInfo> GetConstructors(Type type)
+            {
+#if SIMPLE_JSON_TYPEINFO
+                return type.GetTypeInfo().DeclaredConstructors;
+#else
+                return type.GetConstructors();
+#endif
+            }
+            public static ConstructorInfo GetConstructorInfo(Type type, params Type[] argsType)
+            {
+                IEnumerable<ConstructorInfo> constructorInfos = GetConstructors(type);
+                int i;
+                bool matches;
+                foreach (ConstructorInfo constructorInfo in constructorInfos)
+                {
+                    ParameterInfo[] parameters = constructorInfo.GetParameters();
+                    if (argsType.Length != parameters.Length)
+                        continue;
+                    i = 0;
+                    matches = true;
+                    foreach (ParameterInfo parameterInfo in constructorInfo.GetParameters())
+                    {
+                        if (parameterInfo.ParameterType != argsType[i])
+                        {
+                            matches = false;
+                            break;
+                        }
+                    }
+                    if (matches)
+                        return constructorInfo;
+                }
+                return null;
+            }
+            public static IEnumerable<PropertyInfo> GetProperties(Type type)
+            {
+#if SIMPLE_JSON_TYPEINFO
+                return type.GetRuntimeProperties();
+#else
+                return type.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static);
+#endif
+            }
+            public static IEnumerable<FieldInfo> GetFields(Type type)
+            {
+#if SIMPLE_JSON_TYPEINFO
+                return type.GetRuntimeFields();
+#else
+                return type.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static);
+#endif
+            }
+            public static MethodInfo GetGetterMethodInfo(PropertyInfo propertyInfo)
+            {
+#if SIMPLE_JSON_TYPEINFO
+                return propertyInfo.GetMethod;
+#else
+                return propertyInfo.GetGetMethod(true);
+#endif
+            }
+            public static MethodInfo GetSetterMethodInfo(PropertyInfo propertyInfo)
+            {
+#if SIMPLE_JSON_TYPEINFO
+                return propertyInfo.SetMethod;
+#else
+                return propertyInfo.GetSetMethod(true);
+#endif
+            }
+            public static ConstructorDelegate GetContructor(ConstructorInfo constructorInfo)
+            {
+#if SIMPLE_JSON_NO_LINQ_EXPRESSION
+                return GetConstructorByReflection(constructorInfo);
+#else
+                return GetConstructorByExpression(constructorInfo);
+#endif
+            }
+            public static ConstructorDelegate GetContructor(Type type, params Type[] argsType)
+            {
+#if SIMPLE_JSON_NO_LINQ_EXPRESSION
+                return GetConstructorByReflection(type, argsType);
+#else
+                return GetConstructorByExpression(type, argsType);
+#endif
+            }
+            public static ConstructorDelegate GetConstructorByReflection(ConstructorInfo constructorInfo)
+            {
+                return delegate (object[] args) { return constructorInfo.Invoke(args); };
+            }
+            public static ConstructorDelegate GetConstructorByReflection(Type type, params Type[] argsType)
+            {
+                ConstructorInfo constructorInfo = GetConstructorInfo(type, argsType);
+                return constructorInfo == null ? null : GetConstructorByReflection(constructorInfo);
+            }
+#if !SIMPLE_JSON_NO_LINQ_EXPRESSION
+            public static ConstructorDelegate GetConstructorByExpression(ConstructorInfo constructorInfo)
+            {
+                ParameterInfo[] paramsInfo = constructorInfo.GetParameters();
+                ParameterExpression param = Expression.Parameter(typeof(object[]), "args");
+                Expression[] argsExp = new Expression[paramsInfo.Length];
+                for (int i = 0; i < paramsInfo.Length; i++)
+                {
+                    Expression index = Expression.Constant(i);
+                    Type paramType = paramsInfo[i].ParameterType;
+                    Expression paramAccessorExp = Expression.ArrayIndex(param, index);
+                    Expression paramCastExp = Expression.Convert(paramAccessorExp, paramType);
+                    argsExp[i] = paramCastExp;
+                }
+                NewExpression newExp = Expression.New(constructorInfo, argsExp);
+                Expression<Func<object[], object>> lambda = Expression.Lambda<Func<object[], object>>(newExp, param);
+                Func<object[], object> compiledLambda = lambda.Compile();
+                return delegate (object[] args) { return compiledLambda(args); };
+            }
+            public static ConstructorDelegate GetConstructorByExpression(Type type, params Type[] argsType)
+            {
+                ConstructorInfo constructorInfo = GetConstructorInfo(type, argsType);
+                return constructorInfo == null ? null : GetConstructorByExpression(constructorInfo);
+            }
+#endif
+            public static GetDelegate GetGetMethod(PropertyInfo propertyInfo)
+            {
+#if SIMPLE_JSON_NO_LINQ_EXPRESSION
+                return GetGetMethodByReflection(propertyInfo);
+#else
+                return GetGetMethodByExpression(propertyInfo);
+#endif
+            }
+            public static GetDelegate GetGetMethod(FieldInfo fieldInfo)
+            {
+#if SIMPLE_JSON_NO_LINQ_EXPRESSION
+                return GetGetMethodByReflection(fieldInfo);
+#else
+                return GetGetMethodByExpression(fieldInfo);
+#endif
+            }
+            public static GetDelegate GetGetMethodByReflection(PropertyInfo propertyInfo)
+            {
+                MethodInfo methodInfo = GetGetterMethodInfo(propertyInfo);
+                return delegate (object source) { return methodInfo.Invoke(source, EmptyObjects); };
+            }
+            public static GetDelegate GetGetMethodByReflection(FieldInfo fieldInfo)
+            {
+                return delegate (object source) { return fieldInfo.GetValue(source); };
+            }
+#if !SIMPLE_JSON_NO_LINQ_EXPRESSION
+            public static GetDelegate GetGetMethodByExpression(PropertyInfo propertyInfo)
+            {
+                MethodInfo getMethodInfo = GetGetterMethodInfo(propertyInfo);
+                ParameterExpression instance = Expression.Parameter(typeof(object), "instance");
+                UnaryExpression instanceCast = (!IsValueType(propertyInfo.DeclaringType)) ? Expression.TypeAs(instance, propertyInfo.DeclaringType) : Expression.Convert(instance, propertyInfo.DeclaringType);
+                Func<object, object> compiled = Expression.Lambda<Func<object, object>>(Expression.TypeAs(Expression.Call(instanceCast, getMethodInfo), typeof(object)), instance).Compile();
+                return delegate (object source) { return compiled(source); };
+            }
+            public static GetDelegate GetGetMethodByExpression(FieldInfo fieldInfo)
+            {
+                ParameterExpression instance = Expression.Parameter(typeof(object), "instance");
+                MemberExpression member = Expression.Field(Expression.Convert(instance, fieldInfo.DeclaringType), fieldInfo);
+                GetDelegate compiled = Expression.Lambda<GetDelegate>(Expression.Convert(member, typeof(object)), instance).Compile();
+                return delegate (object source) { return compiled(source); };
+            }
+#endif
+            public static SetDelegate GetSetMethod(PropertyInfo propertyInfo)
+            {
+#if SIMPLE_JSON_NO_LINQ_EXPRESSION
+                return GetSetMethodByReflection(propertyInfo);
+#else
+                return GetSetMethodByExpression(propertyInfo);
+#endif
+            }
+            public static SetDelegate GetSetMethod(FieldInfo fieldInfo)
+            {
+#if SIMPLE_JSON_NO_LINQ_EXPRESSION
+                return GetSetMethodByReflection(fieldInfo);
+#else
+                return GetSetMethodByExpression(fieldInfo);
+#endif
+            }
+            public static SetDelegate GetSetMethodByReflection(PropertyInfo propertyInfo)
+            {
+                MethodInfo methodInfo = GetSetterMethodInfo(propertyInfo);
+                return delegate (object source, object value) { methodInfo.Invoke(source, new object[] { value }); };
+            }
+            public static SetDelegate GetSetMethodByReflection(FieldInfo fieldInfo)
+            {
+                return delegate (object source, object value) { fieldInfo.SetValue(source, value); };
+            }
+#if !SIMPLE_JSON_NO_LINQ_EXPRESSION
+            public static SetDelegate GetSetMethodByExpression(PropertyInfo propertyInfo)
+            {
+                MethodInfo setMethodInfo = GetSetterMethodInfo(propertyInfo);
+                ParameterExpression instance = Expression.Parameter(typeof(object), "instance");
+                ParameterExpression value = Expression.Parameter(typeof(object), "value");
+                UnaryExpression instanceCast = (!IsValueType(propertyInfo.DeclaringType)) ? Expression.TypeAs(instance, propertyInfo.DeclaringType) : Expression.Convert(instance, propertyInfo.DeclaringType);
+                UnaryExpression valueCast = (!IsValueType(propertyInfo.PropertyType)) ? Expression.TypeAs(value, propertyInfo.PropertyType) : Expression.Convert(value, propertyInfo.PropertyType);
+                Action<object, object> compiled = Expression.Lambda<Action<object, object>>(Expression.Call(instanceCast, setMethodInfo, valueCast), new ParameterExpression[] { instance, value }).Compile();
+                return delegate (object source, object val) { compiled(source, val); };
+            }
+            public static SetDelegate GetSetMethodByExpression(FieldInfo fieldInfo)
+            {
+                ParameterExpression instance = Expression.Parameter(typeof(object), "instance");
+                ParameterExpression value = Expression.Parameter(typeof(object), "value");
+                Action<object, object> compiled = Expression.Lambda<Action<object, object>>(
+                    Assign(Expression.Field(Expression.Convert(instance, fieldInfo.DeclaringType), fieldInfo), Expression.Convert(value, fieldInfo.FieldType)), instance, value).Compile();
+                return delegate (object source, object val) { compiled(source, val); };
+            }
+            public static BinaryExpression Assign(Expression left, Expression right)
+            {
+#if SIMPLE_JSON_TYPEINFO
+                return Expression.Assign(left, right);
+#else
+                MethodInfo assign = typeof(Assigner<>).MakeGenericType(left.Type).GetMethod("Assign");
+                BinaryExpression assignExpr = Expression.Add(left, right, assign);
+                return assignExpr;
+#endif
+            }
+            private static class Assigner<T>
+            {
+                public static T Assign(ref T left, T right)
+                {
+                    return (left = right);
+                }
+            }
+#endif
+            public sealed class ThreadSafeDictionary<TKey, TValue> : IDictionary<TKey, TValue>
+            {
+                private readonly object _lock = new object();
+                private readonly ThreadSafeDictionaryValueFactory<TKey, TValue> _valueFactory;
+                private Dictionary<TKey, TValue> _dictionary;
+                public ThreadSafeDictionary(ThreadSafeDictionaryValueFactory<TKey, TValue> valueFactory)
+                {
+                    _valueFactory = valueFactory;
+                }
+                private TValue Get(TKey key)
+                {
+                    if (_dictionary == null)
+                        return AddValue(key);
+                    TValue value;
+                    if (!_dictionary.TryGetValue(key, out value))
+                        return AddValue(key);
+                    return value;
+                }
+                private TValue AddValue(TKey key)
+                {
+                    TValue value = _valueFactory(key);
+                    lock (_lock)
+                    {
+                        if (_dictionary == null)
+                        {
+                            _dictionary = new Dictionary<TKey, TValue>();
+                            _dictionary[key] = value;
+                        }
+                        else
+                        {
+                            TValue val;
+                            if (_dictionary.TryGetValue(key, out val))
+                                return val;
+                            Dictionary<TKey, TValue> dict = new Dictionary<TKey, TValue>(_dictionary);
+                            dict[key] = value;
+                            _dictionary = dict;
+                        }
+                    }
+                    return value;
+                }
+                public void Add(TKey key, TValue value)
+                {
+                    throw new NotImplementedException();
+                }
+                public bool ContainsKey(TKey key)
+                {
+                    return _dictionary.ContainsKey(key);
+                }
+                public ICollection<TKey> Keys
+                {
+                    get { return _dictionary.Keys; }
+                }
+                public bool Remove(TKey key)
+                {
+                    throw new NotImplementedException();
+                }
+                public bool TryGetValue(TKey key, out TValue value)
+                {
+                    value = this[key];
+                    return true;
+                }
+                public ICollection<TValue> Values
+                {
+                    get { return _dictionary.Values; }
+                }
+                public TValue this[TKey key]
+                {
+                    get { return Get(key); }
+                    set { throw new NotImplementedException(); }
+                }
+                public void Add(KeyValuePair<TKey, TValue> item)
+                {
+                    throw new NotImplementedException();
+                }
+                public void Clear()
+                {
+                    throw new NotImplementedException();
+                }
+                public bool Contains(KeyValuePair<TKey, TValue> item)
+                {
+                    throw new NotImplementedException();
+                }
+                public void CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex)
+                {
+                    throw new NotImplementedException();
+                }
+                public int Count
+                {
+                    get { return _dictionary.Count; }
+                }
+                public bool IsReadOnly
+                {
+                    get { throw new NotImplementedException(); }
+                }
+                public bool Remove(KeyValuePair<TKey, TValue> item)
+                {
+                    throw new NotImplementedException();
+                }
+                public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()
+                {
+                    return _dictionary.GetEnumerator();
+                }
+                System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+                {
+                    return _dictionary.GetEnumerator();
+                }
+            }
+        }
+    }
+}
+// ReSharper restore LoopCanBeConvertedToQuery
+// ReSharper restore RedundantExplicitArrayCreation
+// ReSharper restore SuggestUseVarKeywordEvident
+\ No newline at end of file
diff --git a/src/internal/TablesAndTuples/TablesAndTuples.csproj b/src/internal/TablesAndTuples/TablesAndTuples.csproj
new file mode 100644
index 00000000..ce1697ae
--- /dev/null
+++ b/src/internal/TablesAndTuples/TablesAndTuples.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+</Project>
diff --git a/src/internal/TablesAndTuples/WixColumnDefinition.cs b/src/internal/TablesAndTuples/WixColumnDefinition.cs
new file mode 100644
index 00000000..2d60c9dc
--- /dev/null
+++ b/src/internal/TablesAndTuples/WixColumnDefinition.cs
@@ -0,0 +1,296 @@
+using System;
+using System.Xml;
+namespace TablesAndSymbols
+{
+    class WixColumnDefinition
+    {
+        public WixColumnDefinition(string name, ColumnType type, int length, bool primaryKey, bool nullable, ColumnCategory category, long? minValue = null, long? maxValue = null, string keyTable = null, int? keyColumn = null, string possibilities = null, string description = null, ColumnModularizeType? modularizeType = null, bool forceLocalizable = false, bool useCData = false, bool unreal = false)
+        {
+            this.Name = name;
+            this.Type = type;
+            this.Length = length;
+            this.PrimaryKey = primaryKey;
+            this.Nullable = nullable;
+            this.ModularizeType = modularizeType;
+            this.ForceLocalizable = forceLocalizable;
+            this.MinValue = minValue;
+            this.MaxValue = maxValue;
+            this.KeyTable = keyTable;
+            this.KeyColumn = keyColumn;
+            this.Category = category;
+            this.Possibilities = possibilities;
+            this.Description = description;
+            this.UseCData = useCData;
+            this.Unreal = unreal;
+        }
+        public string Name { get; }
+        public ColumnType Type { get; }
+        public int Length { get; }
+        public bool PrimaryKey { get; }
+        public bool Nullable { get; }
+        public ColumnModularizeType? ModularizeType { get; }
+        public bool ForceLocalizable { get; }
+        public long? MinValue { get; }
+        public long? MaxValue { get; }
+        public string KeyTable { get; }
+        public int? KeyColumn { get; }
+        public ColumnCategory Category { get; }
+        public string Possibilities { get; }
+        public string Description { get; }
+        public bool UseCData { get; }
+        public bool Unreal { get; }
+        internal static WixColumnDefinition Read(XmlReader reader)
+        {
+            if (!reader.LocalName.Equals("columnDefinition"))
+            {
+                throw new XmlException();
+            }
+            ColumnCategory category = ColumnCategory.Unknown;
+            string description = null;
+            bool empty = reader.IsEmptyElement;
+            int? keyColumn = null;
+            string keyTable = null;
+            int length = -1;
+            bool localizable = false;
+            long? maxValue = null;
+            long? minValue = null;
+            var modularize = ColumnModularizeType.None;
+            string name = null;
+            bool nullable = false;
+            string possibilities = null;
+            bool primaryKey = false;
+            var type = ColumnType.Unknown;
+            bool useCData = false;
+            bool unreal = false;
+            // parse the attributes
+            while (reader.MoveToNextAttribute())
+            {
+                switch (reader.LocalName)
+                {
+                    case "category":
+                        switch (reader.Value)
+                        {
+                            case "anyPath":
+                                category = ColumnCategory.AnyPath;
+                                break;
+                            case "binary":
+                                category = ColumnCategory.Binary;
+                                break;
+                            case "cabinet":
+                                category = ColumnCategory.Cabinet;
+                                break;
+                            case "condition":
+                                category = ColumnCategory.Condition;
+                                break;
+                            case "customSource":
+                                category = ColumnCategory.CustomSource;
+                                break;
+                            case "defaultDir":
+                                category = ColumnCategory.DefaultDir;
+                                break;
+                            case "doubleInteger":
+                                category = ColumnCategory.DoubleInteger;
+                                break;
+                            case "filename":
+                                category = ColumnCategory.Filename;
+                                break;
+                            case "formatted":
+                                category = ColumnCategory.Formatted;
+                                break;
+                            case "formattedSddl":
+                                category = ColumnCategory.FormattedSDDLText;
+                                break;
+                            case "guid":
+                                category = ColumnCategory.Guid;
+                                break;
+                            case "identifier":
+                                category = ColumnCategory.Identifier;
+                                break;
+                            case "integer":
+                                category = ColumnCategory.Integer;
+                                break;
+                            case "language":
+                                category = ColumnCategory.Language;
+                                break;
+                            case "lowerCase":
+                                category = ColumnCategory.LowerCase;
+                                break;
+                            case "path":
+                                category = ColumnCategory.Path;
+                                break;
+                            case "paths":
+                                category = ColumnCategory.Paths;
+                                break;
+                            case "property":
+                                category = ColumnCategory.Property;
+                                break;
+                            case "regPath":
+                                category = ColumnCategory.RegPath;
+                                break;
+                            case "shortcut":
+                                category = ColumnCategory.Shortcut;
+                                break;
+                            case "template":
+                                category = ColumnCategory.Template;
+                                break;
+                            case "text":
+                                category = ColumnCategory.Text;
+                                break;
+                            case "timeDate":
+                                category = ColumnCategory.TimeDate;
+                                break;
+                            case "upperCase":
+                                category = ColumnCategory.UpperCase;
+                                break;
+                            case "version":
+                                category = ColumnCategory.Version;
+                                break;
+                            case "wildCardFilename":
+                                category = ColumnCategory.WildCardFilename;
+                                break;
+                            default:
+                                throw new InvalidOperationException();
+                        }
+                        break;
+                    case "description":
+                        description = reader.Value;
+                        break;
+                    case "keyColumn":
+                        keyColumn = Convert.ToInt32(reader.Value, 10);
+                        break;
+                    case "keyTable":
+                        keyTable = reader.Value;
+                        break;
+                    case "length":
+                        length = Convert.ToInt32(reader.Value, 10);
+                        break;
+                    case "localizable":
+                        localizable = reader.Value.Equals("yes");
+                        break;
+                    case "maxValue":
+                        maxValue = Convert.ToInt32(reader.Value, 10);
+                        break;
+                    case "minValue":
+                        minValue = Convert.ToInt32(reader.Value, 10);
+                        break;
+                    case "modularize":
+                        switch (reader.Value)
+                        {
+                            case "column":
+                                modularize = ColumnModularizeType.Column;
+                                break;
+                            case "companionFile":
+                                modularize = ColumnModularizeType.CompanionFile;
+                                break;
+                            case "condition":
+                                modularize = ColumnModularizeType.Condition;
+                                break;
+                            case "controlEventArgument":
+                                modularize = ColumnModularizeType.ControlEventArgument;
+                                break;
+                            case "controlText":
+                                modularize = ColumnModularizeType.ControlText;
+                                break;
+                            case "icon":
+                                modularize = ColumnModularizeType.Icon;
+                                break;
+                            case "none":
+                                modularize = ColumnModularizeType.None;
+                                break;
+                            case "property":
+                                modularize = ColumnModularizeType.Property;
+                                break;
+                            case "semicolonDelimited":
+                                modularize = ColumnModularizeType.SemicolonDelimited;
+                                break;
+                            default:
+                                throw new XmlException();
+                        }
+                        break;
+                    case "name":
+                        switch (reader.Value)
+                        {
+                            case "CREATE":
+                            case "DELETE":
+                            case "DROP":
+                            case "INSERT":
+                                throw new XmlException();
+                            default:
+                                name = reader.Value;
+                                break;
+                        }
+                        break;
+                    case "nullable":
+                        nullable = reader.Value.Equals("yes");
+                        break;
+                    case "primaryKey":
+                        primaryKey = reader.Value.Equals("yes");
+                        break;
+                    case "set":
+                        possibilities = reader.Value;
+                        break;
+                    case "type":
+                        switch (reader.Value)
+                        {
+                            case "localized":
+                                type = ColumnType.Localized;
+                                break;
+                            case "number":
+                                type = ColumnType.Number;
+                                break;
+                            case "object":
+                                type = ColumnType.Object;
+                                break;
+                            case "string":
+                                type = ColumnType.String;
+                                break;
+                            case "preserved":
+                                type = ColumnType.Preserved;
+                                break;
+                            default:
+                                throw new XmlException();
+                        }
+                        break;
+                    case "useCData":
+                        useCData = reader.Value.Equals("yes");
+                        break;
+                    case "unreal":
+                        unreal = reader.Value.Equals("yes");
+                        break;
+                }
+            }
+            // parse the child elements (there should be none)
+            if (!empty)
+            {
+                bool done = false;
+                while (!done && reader.Read())
+                {
+                    switch (reader.NodeType)
+                    {
+                        case XmlNodeType.Element:
+                            throw new XmlException();
+                        case XmlNodeType.EndElement:
+                            done = true;
+                            break;
+                    }
+                }
+                if (!done)
+                {
+                    throw new XmlException();
+                }
+            }
+            WixColumnDefinition columnDefinition = new WixColumnDefinition(name, type, length, primaryKey, nullable, category, minValue, maxValue, keyTable, keyColumn, possibilities, description, modularize, localizable, useCData, unreal);
+            return columnDefinition;
+        }
+    }
+}
diff --git a/src/internal/TablesAndTuples/WixTableDefinition.cs b/src/internal/TablesAndTuples/WixTableDefinition.cs
new file mode 100644
index 00000000..61dcbb0a
--- /dev/null
+++ b/src/internal/TablesAndTuples/WixTableDefinition.cs
@@ -0,0 +1,169 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml;
+namespace TablesAndSymbols
+{
+    class WixTableDefinition
+    {
+        public WixTableDefinition(string name, IEnumerable<WixColumnDefinition> columns, bool unreal, bool symbolless, string symbolDefinitionName, bool? symbolIdIsPrimaryKey)
+        {
+            this.Name = name;
+            this.VariableName = name.Replace("_", "");
+            this.Unreal = unreal;
+            this.Columns = columns?.ToArray();
+            this.Symbolless = symbolless;
+            this.SymbolDefinitionName = symbolless ? null : symbolDefinitionName ?? this.VariableName;
+            this.SymbolIdIsPrimaryKey = symbolIdIsPrimaryKey ?? DeriveSymbolIdIsPrimaryKey(this.Columns);
+        }
+        public string Name { get; }
+        public string VariableName { get; }
+        public string SymbolDefinitionName { get; }
+        public bool Unreal { get; }
+        public WixColumnDefinition[] Columns { get; }
+        public bool SymbolIdIsPrimaryKey { get; }
+        public bool Symbolless { get; }
+        static WixTableDefinition Read(XmlReader reader)
+        {
+            var empty = reader.IsEmptyElement;
+            string name = null;
+            string symbolDefinitionName = null;
+            var unreal = false;
+            bool? symbolIdIsPrimaryKey = null;
+            var symbolless = false;
+            while (reader.MoveToNextAttribute())
+            {
+                switch (reader.LocalName)
+                {
+                    case "name":
+                        name = reader.Value;
+                        break;
+                    case "symbolDefinitionName":
+                        symbolDefinitionName = reader.Value;
+                        break;
+                    case "symbolIdIsPrimaryKey":
+                        symbolIdIsPrimaryKey = reader.Value.Equals("yes");
+                        break;
+                    case "symbolless":
+                        symbolless = reader.Value.Equals("yes");
+                        break;
+                    case "unreal":
+                        unreal = reader.Value.Equals("yes");
+                        break;
+                }
+            }
+            if (null == name)
+            {
+                throw new XmlException();
+            }
+            var columns = new List<WixColumnDefinition>();
+            // parse the child elements
+            if (!empty)
+            {
+                var done = false;
+                while (!done && reader.Read())
+                {
+                    switch (reader.NodeType)
+                    {
+                        case XmlNodeType.Element:
+                            switch (reader.LocalName)
+                            {
+                                case "columnDefinition":
+                                    var columnDefinition = WixColumnDefinition.Read(reader);
+                                    columns.Add(columnDefinition);
+                                    break;
+                                default:
+                                    throw new XmlException();
+                            }
+                            break;
+                        case XmlNodeType.EndElement:
+                            done = true;
+                            break;
+                    }
+                }
+                if (!done)
+                {
+                    throw new XmlException();
+                }
+            }
+            return new WixTableDefinition(name, columns.ToArray(), unreal, symbolless, symbolDefinitionName, symbolIdIsPrimaryKey);
+        }
+        static bool DeriveSymbolIdIsPrimaryKey(WixColumnDefinition[] columns)
+        {
+            return columns[0].PrimaryKey &&
+                   columns[0].Type == ColumnType.String &&
+                   columns[0].Category == ColumnCategory.Identifier &&
+                   !columns[0].Name.EndsWith("_") &&
+                   (columns.Length == 1 || !columns.Skip(1).Any(t => t.PrimaryKey));
+        }
+        public static List<WixTableDefinition> LoadCollection(string inputPath)
+        {
+            using (var reader = XmlReader.Create(inputPath))
+            {
+                reader.MoveToContent();
+                if ("tableDefinitions" != reader.LocalName)
+                {
+                    throw new XmlException();
+                }
+                var empty = reader.IsEmptyElement;
+                var tableDefinitions = new List<WixTableDefinition>();
+                while (reader.MoveToNextAttribute())
+                {
+                }
+                // parse the child elements
+                if (!empty)
+                {
+                    var done = false;
+                    while (!done && reader.Read())
+                    {
+                        switch (reader.NodeType)
+                        {
+                            case XmlNodeType.Element:
+                                switch (reader.LocalName)
+                                {
+                                    case "tableDefinition":
+                                        tableDefinitions.Add(WixTableDefinition.Read(reader));
+                                        break;
+                                    default:
+                                        throw new XmlException();
+                                }
+                                break;
+                            case XmlNodeType.EndElement:
+                                done = true;
+                                break;
+                        }
+                    }
+                    if (!done)
+                    {
+                        throw new XmlException();
+                    }
+                }
+                return tableDefinitions;
+            }
+        }
+    }
+}
diff --git a/src/internal/WixBuildTools.MsgGen/AssemblyInfo.cs b/src/internal/WixBuildTools.MsgGen/AssemblyInfo.cs
new file mode 100644
index 00000000..378adbf0
--- /dev/null
+++ b/src/internal/WixBuildTools.MsgGen/AssemblyInfo.cs
@@ -0,0 +1,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.
+using System.Reflection;
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyCulture("")]
diff --git a/src/internal/WixBuildTools.MsgGen/GenerateMessageFiles.cs b/src/internal/WixBuildTools.MsgGen/GenerateMessageFiles.cs
new file mode 100644
index 00000000..6f51dbf9
--- /dev/null
+++ b/src/internal/WixBuildTools.MsgGen/GenerateMessageFiles.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 WixBuildTools.MsgGen
+{
+    using System;
+    using System.CodeDom;
+    using System.Collections;
+    using System.Globalization;
+    using System.Reflection;
+    using System.Resources;
+    using System.Xml;
+    /// <summary>
+    /// Message files generation class.
+    /// </summary>
+    public class GenerateMessageFiles
+    {
+        /// <summary>
+        /// Generate the message files.
+        /// </summary>
+        /// <param name="messagesDoc">Input Xml document containing message definitions.</param>
+        /// <param name="codeCompileUnit">CodeDom container.</param>
+        /// <param name="resourceWriter">Writer for default resource file.</param>
+        public static void Generate(XmlDocument messagesDoc, CodeCompileUnit codeCompileUnit, ResourceWriter resourceWriter)
+        {
+            Hashtable usedNumbers = new Hashtable();
+            if (null == messagesDoc)
+            {
+                throw new ArgumentNullException("messagesDoc");
+            }
+            if (null == codeCompileUnit)
+            {
+                throw new ArgumentNullException("codeCompileUnit");
+            }
+            if (null == resourceWriter)
+            {
+                throw new ArgumentNullException("resourceWriter");
+            }
+            string namespaceAttr = messagesDoc.DocumentElement.GetAttribute("Namespace");
+            string resourcesAttr = messagesDoc.DocumentElement.GetAttribute("Resources");
+            // namespace
+            CodeNamespace messagesNamespace = new CodeNamespace(namespaceAttr);
+            codeCompileUnit.Namespaces.Add(messagesNamespace);
+            // imports
+            messagesNamespace.Imports.Add(new CodeNamespaceImport("System"));
+            messagesNamespace.Imports.Add(new CodeNamespaceImport("System.Reflection"));
+            messagesNamespace.Imports.Add(new CodeNamespaceImport("System.Resources"));
+            if (namespaceAttr != "WixToolset.Data")
+            {
+                messagesNamespace.Imports.Add(new CodeNamespaceImport("WixToolset.Data"));
+            }
+            foreach (XmlElement classElement in messagesDoc.DocumentElement.ChildNodes)
+            {
+                string className = classElement.GetAttribute("Name");
+                string baseContainerName = classElement.GetAttribute("BaseContainerName");
+                string containerName = classElement.GetAttribute("ContainerName");
+                string messageLevel = classElement.GetAttribute("Level");
+                // message container class
+                messagesNamespace.Types.Add(CreateContainer(namespaceAttr, baseContainerName, containerName, messageLevel, resourcesAttr));
+                // class
+                CodeTypeDeclaration messagesClass = new CodeTypeDeclaration(className);
+                messagesClass.TypeAttributes = TypeAttributes.Class | TypeAttributes.Public | TypeAttributes.Sealed;
+                messagesNamespace.Types.Add(messagesClass);
+                // private constructor (needed since all methods in this class are static)
+                CodeConstructor constructor = new CodeConstructor();
+                constructor.Attributes = MemberAttributes.Private;
+                constructor.ReturnType = null;
+                messagesClass.Members.Add(constructor);
+                // messages
+                foreach (XmlElement messageElement in classElement.ChildNodes)
+                {
+                    int number;
+                    string id = messageElement.GetAttribute("Id");
+                    string numberString = messageElement.GetAttribute("Number");
+                    bool sourceLineNumbers = true;
+                    // determine the message number (and ensure it was set properly)
+                    if (0 < numberString.Length)
+                    {
+                        number = Convert.ToInt32(numberString, CultureInfo.InvariantCulture);
+                    }
+                    else
+                    {
+                        throw new ApplicationException(String.Format("Message number must be assigned for {0} '{1}'.", containerName, id));
+                    }
+                    // check for message number collisions
+                    if (usedNumbers.Contains(number))
+                    {
+                        throw new ApplicationException(String.Format("Collision detected between two or more messages with number '{0}'.", number));
+                    }
+                    usedNumbers.Add(number, null);
+                    if ("no" == messageElement.GetAttribute("SourceLineNumbers"))
+                    {
+                        sourceLineNumbers = false;
+                    }
+                    int instanceCount = 0;
+                    foreach (XmlElement instanceElement in messageElement.ChildNodes)
+                    {
+                        string formatString = instanceElement.InnerText.Trim();
+                        string resourceName = String.Concat(className, "_", id, "_", (++instanceCount).ToString());
+                        // create a resource
+                        resourceWriter.AddResource(resourceName, formatString);
+                        // create method
+                        CodeMemberMethod method = new CodeMemberMethod();
+                        method.ReturnType = new CodeTypeReference(baseContainerName);
+                        method.Attributes = MemberAttributes.Public | MemberAttributes.Static;
+                        messagesClass.Members.Add(method);
+                        // method name
+                        method.Name = id;
+                        // return statement
+                        CodeMethodReturnStatement stmt = new CodeMethodReturnStatement();
+                        method.Statements.Add(stmt);
+                        // return statement expression
+                        CodeObjectCreateExpression expr = new CodeObjectCreateExpression();
+                        stmt.Expression = expr;
+                        // new struct
+                        expr.CreateType = new CodeTypeReference(containerName);
+                        // optionally have sourceLineNumbers as the first parameter
+                        if (sourceLineNumbers)
+                        {
+                            // sourceLineNumbers parameter
+                            expr.Parameters.Add(new CodeArgumentReferenceExpression("sourceLineNumbers"));
+                        }
+                        else
+                        {
+                            expr.Parameters.Add(new CodePrimitiveExpression(null));
+                        }
+                        // message number parameter
+                        expr.Parameters.Add(new CodePrimitiveExpression(number));
+                        // resource name parameter
+                        expr.Parameters.Add(new CodePrimitiveExpression(resourceName));
+                        // optionally have sourceLineNumbers as the first parameter
+                        if (sourceLineNumbers)
+                        {
+                            method.Parameters.Add(new CodeParameterDeclarationExpression("SourceLineNumber", "sourceLineNumbers"));
+                        }
+                        foreach (XmlNode parameterNode in instanceElement.ChildNodes)
+                        {
+                            XmlElement parameterElement;
+                            if (null != (parameterElement = parameterNode as XmlElement))
+                            {
+                                string type = parameterElement.GetAttribute("Type");
+                                string name = parameterElement.GetAttribute("Name");
+                                // method parameter
+                                method.Parameters.Add(new CodeParameterDeclarationExpression(type, name));
+                                // String.Format parameter
+                                expr.Parameters.Add(new CodeArgumentReferenceExpression(name));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// Create message container class.
+        /// </summary>
+        /// <param name="namespaceName">Namespace to use for resources stream.</param>
+        /// <param name="baseContainerName">Name of the base message container class.</param>
+        /// <param name="containerName">Name of the message container class.</param>
+        /// <param name="messageLevel">Message level of for the message.</param>
+        /// <param name="resourcesName">Name of the resources stream (will get namespace prepended).</param>
+        /// <returns>Message container class CodeDom object.</returns>
+        private static CodeTypeDeclaration CreateContainer(string namespaceName, string baseContainerName, string containerName, string messageLevel, string resourcesName)
+        {
+            CodeTypeDeclaration messageContainer = new CodeTypeDeclaration();
+            messageContainer.Name = containerName;
+            messageContainer.BaseTypes.Add(new CodeTypeReference(baseContainerName));
+            // constructor
+            CodeConstructor constructor = new CodeConstructor();
+            constructor.Attributes = MemberAttributes.Public;
+            constructor.ReturnType = null;
+            messageContainer.Members.Add(constructor);
+            CodeMemberField resourceManager = new CodeMemberField();
+            resourceManager.Attributes = MemberAttributes.Private | MemberAttributes.Static;
+            resourceManager.Name = "resourceManager";
+            resourceManager.Type = new CodeTypeReference("ResourceManager");
+            resourceManager.InitExpression = new CodeObjectCreateExpression("ResourceManager", new CodeSnippetExpression(String.Format("\"{0}.{1}\"", namespaceName, resourcesName)), new CodeSnippetExpression("Assembly.GetExecutingAssembly()"));
+            messageContainer.Members.Add(resourceManager);
+            // constructor parameters
+            constructor.Parameters.Add(new CodeParameterDeclarationExpression("SourceLineNumber", "sourceLineNumbers"));
+            constructor.Parameters.Add(new CodeParameterDeclarationExpression(typeof(int), "id"));
+            constructor.Parameters.Add(new CodeParameterDeclarationExpression(typeof(string), "resourceName"));
+            CodeParameterDeclarationExpression messageArgsParam = new CodeParameterDeclarationExpression("params object[]", "messageArgs");
+            constructor.Parameters.Add(messageArgsParam);
+            constructor.BaseConstructorArgs.Add(new CodeArgumentReferenceExpression("sourceLineNumbers"));
+            constructor.BaseConstructorArgs.Add(new CodeArgumentReferenceExpression("id"));
+            constructor.BaseConstructorArgs.Add(new CodeArgumentReferenceExpression("resourceName"));
+            constructor.BaseConstructorArgs.Add(new CodeArgumentReferenceExpression("messageArgs"));
+            // assign base.Level if messageLevel is specified
+            if (!String.IsNullOrEmpty(messageLevel))
+            {
+                CodePropertyReferenceExpression levelReference = new CodePropertyReferenceExpression(new CodeBaseReferenceExpression(), "Level");
+                CodeFieldReferenceExpression messageLevelField = new CodeFieldReferenceExpression(new CodeTypeReferenceExpression("MessageLevel"), messageLevel);
+                constructor.Statements.Add(new CodeAssignStatement(levelReference, messageLevelField));
+            }
+            // Assign base.ResourceManager property
+            CodePropertyReferenceExpression baseResourceManagerReference = new CodePropertyReferenceExpression(new CodeBaseReferenceExpression(), "ResourceManager");
+            CodeFieldReferenceExpression resourceManagerField = new CodeFieldReferenceExpression(null, "resourceManager");
+            constructor.Statements.Add(new CodeAssignStatement(baseResourceManagerReference, resourceManagerField));
+            //CodeMemberProperty resourceManagerProperty = new CodeMemberProperty();
+            //resourceManagerProperty.Attributes = MemberAttributes.Public | MemberAttributes.Override;
+            //resourceManagerProperty.Name = "ResourceManager";
+            //resourceManagerProperty.Type = new CodeTypeReference("ResourceManager");
+            //CodeFieldReferenceExpression resourceManagerReference = new CodeFieldReferenceExpression();
+            //resourceManagerReference.FieldName = "resourceManager";
+            //resourceManagerProperty.GetStatements.Add(new CodeMethodReturnStatement(resourceManagerReference));
+            //messageContainer.Members.Add(resourceManagerProperty);
+            return messageContainer;
+        }
+    }
+}
diff --git a/src/internal/WixBuildTools.MsgGen/MsgGen.cs b/src/internal/WixBuildTools.MsgGen/MsgGen.cs
new file mode 100644
index 00000000..ff4a4a90
--- /dev/null
+++ b/src/internal/WixBuildTools.MsgGen/MsgGen.cs
@@ -0,0 +1,261 @@
+// 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 WixBuildTools.MsgGen
+{
+    using Microsoft.CSharp;
+    using System;
+    using System.CodeDom;
+    using System.CodeDom.Compiler;
+    using System.Collections;
+    using System.IO;
+    using System.Reflection;
+    using System.Resources;
+    using System.Runtime.InteropServices;
+    using System.Xml;
+    using System.Xml.Schema;
+    /// <summary>
+    /// The main entry point for MsgGen.
+    /// </summary>
+    public class MsgGen
+    {
+        /// <summary>
+        /// The main entry point for MsgGen.
+        /// </summary>
+        /// <param name="args">Commandline arguments for the application.</param>
+        /// <returns>Returns the application error code.</returns>
+        [STAThread]
+        public static int Main(string[] args)
+        {
+            try
+            {
+                MsgGenMain msgGen = new MsgGenMain(args);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("MsgGen.exe : fatal error MSGG0000: {0}\r\n\r\nStack Trace:\r\n{1}", e.Message, e.StackTrace);
+                if (e is NullReferenceException || e is SEHException)
+                {
+                    throw;
+                }
+                return 2;
+            }
+            return 0;
+        }
+        /// <summary>
+        /// Main class for MsgGen.
+        /// </summary>
+        private class MsgGenMain
+        {
+            private bool showLogo;
+            private bool showHelp;
+            private string sourceFile;
+            private string destClassFile;
+            private string destResourcesFile;
+            /// <summary>
+            /// Main method for the MsgGen application within the MsgGenMain class.
+            /// </summary>
+            /// <param name="args">Commandline arguments to the application.</param>
+            public MsgGenMain(string[] args)
+            {
+                this.showLogo = true;
+                this.showHelp = false;
+                this.sourceFile = null;
+                this.destClassFile = null;
+                this.destResourcesFile = null;
+                // parse the command line
+                this.ParseCommandLine(args);
+                if (null == this.sourceFile || null == this.destClassFile)
+                {
+                    this.showHelp = true;
+                }
+                if (null == this.destResourcesFile)
+                {
+                    this.destResourcesFile = Path.ChangeExtension(this.destClassFile, ".resources");
+                }
+                // get the assemblies
+                Assembly msgGenAssembly = Assembly.GetExecutingAssembly();
+                if (this.showLogo)
+                {
+                    Console.WriteLine("Microsoft (R) Message Generation Tool version {0}", msgGenAssembly.GetName().Version.ToString());
+                    Console.WriteLine("Copyright (C) Microsoft Corporation 2004. All rights reserved.");
+                    Console.WriteLine();
+                }
+                if (this.showHelp)
+                {
+                    Console.WriteLine(" usage:  MsgGen.exe [-?] [-nologo] sourceFile destClassFile [destResourcesFile]");
+                    Console.WriteLine();
+                    Console.WriteLine("   -? this help information");
+                    Console.WriteLine();
+                    Console.WriteLine("For more information see: http://wix.sourceforge.net");
+                    return;   // exit
+                }
+                // load the schema
+                XmlReader reader = null;
+                XmlSchemaCollection schemaCollection = null;
+                try
+                {
+                    reader = new XmlTextReader(msgGenAssembly.GetManifestResourceStream("WixBuildTools.MsgGen.Xsd.messages.xsd"));
+                    schemaCollection = new XmlSchemaCollection();
+                    schemaCollection.Add("http://schemas.microsoft.com/genmsgs/2004/07/messages", reader);
+                }
+                finally
+                {
+                    reader.Close();
+                }
+                // load the source file and process it
+                using (StreamReader sr = new StreamReader(this.sourceFile))
+                {
+                    XmlParserContext context = new XmlParserContext(null, null, null, XmlSpace.None);
+                    XmlValidatingReader validatingReader = new XmlValidatingReader(sr.BaseStream, XmlNodeType.Document, context);
+                    validatingReader.Schemas.Add(schemaCollection);
+                    XmlDocument errorsDoc = new XmlDocument();
+                    errorsDoc.Load(validatingReader);
+                    CodeCompileUnit codeCompileUnit = new CodeCompileUnit();
+                    using (ResourceWriter resourceWriter = new ResourceWriter(this.destResourcesFile))
+                    {
+                        GenerateMessageFiles.Generate(errorsDoc, codeCompileUnit, resourceWriter);
+                        GenerateCSharpCode(codeCompileUnit, this.destClassFile);
+                    }
+                }
+            }
+            /// <summary>
+            /// Generate the actual C# code.
+            /// </summary>
+            /// <param name="codeCompileUnit">The code DOM.</param>
+            /// <param name="destClassFile">Destination C# source file.</param>
+            public static void GenerateCSharpCode(CodeCompileUnit codeCompileUnit, string destClassFile)
+            {
+                // generate the code with the C# code provider
+                CSharpCodeProvider provider = new CSharpCodeProvider();
+                // obtain an ICodeGenerator from the CodeDomProvider class
+                ICodeGenerator gen = provider.CreateGenerator();
+                // create a TextWriter to a StreamWriter to the output file
+                using (StreamWriter sw = new StreamWriter(destClassFile))
+                {
+                    using (IndentedTextWriter tw = new IndentedTextWriter(sw, "    "))
+                    {
+                        CodeGeneratorOptions options = new CodeGeneratorOptions();
+                        // code generation options
+                        options.BlankLinesBetweenMembers = true;
+                        options.BracingStyle = "C";
+                        // generate source code using the code generator
+                        gen.GenerateCodeFromCompileUnit(codeCompileUnit, tw, options);
+                    }
+                }
+            }
+            /// <summary>
+            /// Parse the commandline arguments.
+            /// </summary>
+            /// <param name="args">Commandline arguments.</param>
+            private void ParseCommandLine(string[] args)
+            {
+                for (int i = 0; i < args.Length; ++i)
+                {
+                    string arg = args[i];
+                    if (null == arg || "" == arg)   // skip blank arguments
+                    {
+                        continue;
+                    }
+                    if ('-' == arg[0] || '/' == arg[0])
+                    {
+                        string parameter = arg.Substring(1);
+                        if ("nologo" == parameter)
+                        {
+                            this.showLogo = false;
+                        }
+                        else if ("?" == parameter || "help" == parameter)
+                        {
+                            this.showHelp = true;
+                        }
+                    }
+                    else if ('@' == arg[0])
+                    {
+                        using (StreamReader reader = new StreamReader(arg.Substring(1)))
+                        {
+                            string line;
+                            ArrayList newArgs = new ArrayList();
+                            while (null != (line = reader.ReadLine()))
+                            {
+                                string newArg = "";
+                                bool betweenQuotes = false;
+                                for (int j = 0; j < line.Length; ++j)
+                                {
+                                    // skip whitespace
+                                    if (!betweenQuotes && (' ' == line[j] || '\t' == line[j]))
+                                    {
+                                        if ("" != newArg)
+                                        {
+                                            newArgs.Add(newArg);
+                                            newArg = null;
+                                        }
+                                        continue;
+                                    }
+                                    // if we're escaping a quote
+                                    if ('\\' == line[j] && '"' == line[j])
+                                    {
+                                        ++j;
+                                    }
+                                    else if ('"' == line[j])   // if we've hit a new quote
+                                    {
+                                        betweenQuotes = !betweenQuotes;
+                                        continue;
+                                    }
+                                    newArg = String.Concat(newArg, line[j]);
+                                }
+                                if ("" != newArg)
+                                {
+                                    newArgs.Add(newArg);
+                                }
+                            }
+                            string[] ar = (string[])newArgs.ToArray(typeof(string));
+                            this.ParseCommandLine(ar);
+                        }
+                    }
+                    else if (null == this.sourceFile)
+                    {
+                        this.sourceFile = arg;
+                    }
+                    else if (null == this.destClassFile)
+                    {
+                        this.destClassFile = arg;
+                    }
+                    else if (null == this.destResourcesFile)
+                    {
+                        this.destResourcesFile = arg;
+                    }
+                    else
+                    {
+                        throw new ArgumentException(String.Format("Unknown argument '{0}'.", arg));
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj b/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
new file mode 100644
index 00000000..954ffa59
--- /dev/null
+++ b/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net461</TargetFramework>
+    <IsTool>true</IsTool>
+    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
+    <DebugType>embedded</DebugType>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <NoWarn>CS0618</NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="build\WixBuildTools.MsgGen.targets" PackagePath="build\" />
+    <Content Include="buildCrossTargeting\WixBuildTools.MsgGen.targets" PackagePath="buildCrossTargeting\" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Xsd\messages.xsd" />
+  </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/internal/WixBuildTools.MsgGen/Xsd/messages.xsd b/src/internal/WixBuildTools.MsgGen/Xsd/messages.xsd
new file mode 100644
index 00000000..fd086502
--- /dev/null
+++ b/src/internal/WixBuildTools.MsgGen/Xsd/messages.xsd
@@ -0,0 +1,101 @@
+<?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. -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://schemas.microsoft.com/genmsgs/2004/07/messages"
+              xmlns="http://schemas.microsoft.com/genmsgs/2004/07/messages">
+    <xs:annotation>
+        <xs:documentation>
+            Schema for describing any kind of messages.
+        </xs:documentation>
+    </xs:annotation>
+    <xs:element name="Messages">
+        <xs:complexType>
+            <xs:sequence maxOccurs="unbounded">
+                <xs:element ref="Class"/>
+            </xs:sequence>
+            <xs:attribute name="Namespace" type="xs:string" use="required">
+                <xs:annotation><xs:documentation>Namespace of the generated class.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Resources" type="xs:string" use="required">
+                <xs:annotation><xs:documentation>Resources stream for messages. Will get namespace prepended to it.</xs:documentation></xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Class">
+        <xs:complexType>
+            <xs:sequence minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="Message"/>
+            </xs:sequence>
+            <xs:attribute name="Name" type="xs:string" use="required">
+                <xs:annotation><xs:documentation>Name of the generated class.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="ContainerName" type="xs:string" use="required">
+                <xs:annotation><xs:documentation>Name of the generated container class.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="BaseContainerName" type="xs:string" use="required">
+                <xs:annotation><xs:documentation>Name of the base container class.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Level" type="MessageLevelType">
+                <xs:annotation><xs:documentation>Optional message level for this container class and derivative classes.</xs:documentation></xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Message">
+        <xs:complexType>
+            <xs:sequence maxOccurs="unbounded">
+                <xs:element ref="Instance"/>
+            </xs:sequence>
+            <xs:attribute name="Id" type="xs:string" use="required">
+                <xs:annotation><xs:documentation>Name of the message type.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Number" type="xs:integer" use="required">
+                <xs:annotation><xs:documentation>Override the number for this message type.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="SourceLineNumbers" type="YesNoType">
+                <xs:annotation><xs:documentation>Associate SourceLineNumbers with this message.  The default value is "yes".</xs:documentation></xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Instance">
+        <xs:complexType mixed="true">
+            <xs:sequence minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="Parameter"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Parameter">
+        <xs:complexType>
+            <xs:attribute name="Type" type="xs:string" use="required">
+                <xs:annotation><xs:documentation>Type of the parameter.</xs:documentation></xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Name" type="xs:string" use="required">
+                <xs:annotation><xs:documentation>Name of the parameter.</xs:documentation></xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:simpleType name="YesNoType">
+        <xs:annotation><xs:documentation>Values of this type will either be "yes" or "no".</xs:documentation></xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="no"/>
+            <xs:enumeration value="yes"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="MessageLevelType">
+        <xs:annotation><xs:documentation>The message level for this message which corresponds to the WixToolset.MessageLevel enumeration.</xs:documentation></xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="Verbose"/>
+            <xs:enumeration value="Information"/>
+            <xs:enumeration value="Warning"/>
+            <xs:enumeration value="Error"/>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
diff --git a/src/internal/WixBuildTools.MsgGen/build/WixBuildTools.MsgGen.targets b/src/internal/WixBuildTools.MsgGen/build/WixBuildTools.MsgGen.targets
new file mode 100644
index 00000000..dfa7bcbe
--- /dev/null
+++ b/src/internal/WixBuildTools.MsgGen/build/WixBuildTools.MsgGen.targets
@@ -0,0 +1,102 @@
+<?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>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+  <ItemGroup>
+    <!--Provide support for setting type (BuildAction) from VS-->
+    <AvailableItemName Include="MsgGenSource" />
+  </ItemGroup>
+  <PropertyGroup>
+    <MsgGenPath Condition=" '$(MsgGenPath)'=='' ">$(MSBuildThisFileDirectory)..\tools\</MsgGenPath>
+  </PropertyGroup>
+  <!--
+  ================================================================================================
+  MsgGen
+    Generates a .cs class file and a .resx file from an XML file.
+    [IN]
+    @(MsgGenSource) - The items to run through the MsgGen tool.
+    [OUT]
+    $(IntermediateOutputPath)%(Filename).cs - The generated .cs files to include in the compilation.
+    $(IntermediateOutputPath)%(MsgGenSource.ResourcesLogicalName) - The generated .resources file to embed in the assembly.
+  ================================================================================================
+  -->
+  <PropertyGroup>
+    <MsgGenDependsOn>
+      PrepareMsgGen
+    </MsgGenDependsOn>
+    <PrepareResourcesDependsOn>
+      MsgGen;
+      $(PrepareResourcesDependsOn)
+    </PrepareResourcesDependsOn>
+  </PropertyGroup>
+  <Target
+    Name="MsgGen"
+    BeforeTargets="PrepareResources"
+    DependsOnTargets="$(MsgGenDependsOn)"
+    Condition=" '@(MsgGenSource)' != '' "
+    Inputs="@(MsgGenSource)"
+    Outputs="$(IntermediateOutputPath)%(MsgGenSource.Filename).cs;
+             $(IntermediateOutputPath)%(MsgGenSource.ResourcesLogicalName)">
+    <Exec Command="&quot;$(MsgGenPath)WixBuildTools.MsgGen.exe&quot; -nologo &quot;%(MsgGenSource.FullPath)&quot; &quot;$(MsgGenCsFile)&quot; &quot;$(MsgGenResourcesFile)&quot;"
+          Outputs="$(MsgGenCsFile);$(MsgGenResourcesFile)" />
+    <ItemGroup>
+      <!-- This will tell MSBuild to clean up the .cs and .resources file during a Clean build -->
+      <FileWrites Include="$(MsgGenCsFile);$(MsgGenResourcesFile)" />
+    </ItemGroup>
+  </Target>
+  <!--
+  ================================================================================================
+  PrepareMsgGen
+    Creates properties and Include items for MsgGen. This must be separate from the MsgGen target
+    to workaround an MSBuild bug: AdditionalMetadata is ignored when the target is up-to-date.
+  ================================================================================================
+  -->
+  <Target
+    Name="PrepareMsgGen"
+    Condition=" '@(MsgGenSource)' != '' ">
+    <CreateProperty Value="$(IntermediateOutputPath)%(MsgGenSource.Filename).cs">
+      <Output TaskParameter="Value" PropertyName="MsgGenCsFile" />
+    </CreateProperty>
+    <CreateProperty
+      Value="$(IntermediateOutputPath)%(MsgGenSource.ResourcesLogicalName)"
+      Condition=" '%(MsgGenSource.ResourcesLogicalName)' != '' ">
+      <Output TaskParameter="Value" PropertyName="MsgGenResourcesFile" />
+    </CreateProperty>
+    <!-- Add the generated .cs file to the list of source files to compile -->
+    <CreateItem
+      Include="$(MsgGenCsFile)"
+      AdditionalMetadata="Link=%(MsgGenCsFile.Filename)%(MsgGenCsFile.Extension)">
+      <Output TaskParameter="Include" ItemName="Compile" />
+    </CreateItem>
+    <!-- Add the generated .resources file to the list of resources to embed -->
+    <CreateItem
+      Include="$(MsgGenResourcesFile)"
+      AdditionalMetadata="Link=%(MsgGenResourcesFile.Filename)%(MsgGenResourcesFile.Extension);
+                          LogicalName=%(MsgGenSource.ResourcesLogicalName)"
+      Condition=" '$(MsgGenResourcesFile)' != '' ">
+      <Output TaskParameter="Include" ItemName="EmbeddedResource" />
+    </CreateItem>
+  </Target>
+</Project>
diff --git a/src/internal/WixBuildTools.MsgGen/buildCrossTargeting/WixBuildTools.MsgGen.targets b/src/internal/WixBuildTools.MsgGen/buildCrossTargeting/WixBuildTools.MsgGen.targets
new file mode 100644
index 00000000..a3985af5
--- /dev/null
+++ b/src/internal/WixBuildTools.MsgGen/buildCrossTargeting/WixBuildTools.MsgGen.targets
@@ -0,0 +1,6 @@
+<?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="..\build\WixBuildTools.MsgGen.targets" />
+</Project>
diff --git a/src/internal/WixBuildTools.TestSupport.Native/AssemblyInfo.cpp b/src/internal/WixBuildTools.TestSupport.Native/AssemblyInfo.cpp
new file mode 100644
index 00000000..23a48993
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport.Native/AssemblyInfo.cpp
@@ -0,0 +1,17 @@
+// 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.
+#include "precomp.h"
+using namespace System::Reflection;
+using namespace System::Runtime::CompilerServices;
+using namespace System::Runtime::InteropServices;
+//
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly: AssemblyTitleAttribute("WixBuildTools.TestSupport.Native")];
+[assembly: AssemblyDescriptionAttribute("")];
+[assembly: AssemblyCultureAttribute("")];
+[assembly: ComVisible(false)];
diff --git a/src/internal/WixBuildTools.TestSupport.Native/NativeAssert.h b/src/internal/WixBuildTools.TestSupport.Native/NativeAssert.h
new file mode 100644
index 00000000..34af4f34
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport.Native/NativeAssert.h
@@ -0,0 +1,85 @@
+#pragma once
+// 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 WixBuildTools {
+namespace TestSupport {
+    using namespace System;
+    using namespace System::Collections::Generic;
+    using namespace System::Linq;
+    using namespace Xunit;
+    public ref class NativeAssert : WixAssert
+    {
+    public:
+        static void NotNull(LPCWSTR wz)
+        {
+            if (!wz)
+            {
+                Assert::NotNull(nullptr);
+            }
+        }
+        // For some reason, naming these NotStringEqual methods "NotEqual" breaks Intellisense in files that call any overload of the NotEqual method.
+        static void NotStringEqual(LPCWSTR expected, LPCWSTR actual)
+        {
+            NativeAssert::NotStringEqual(expected, actual, FALSE);
+        }
+        static void NotStringEqual(LPCWSTR expected, LPCWSTR actual, BOOL ignoreCase)
+        {
+            IEqualityComparer<String^>^ comparer = ignoreCase ? StringComparer::InvariantCultureIgnoreCase : StringComparer::InvariantCulture;
+            Assert::NotEqual(NativeAssert::LPWSTRToString(expected), NativeAssert::LPWSTRToString(actual), comparer);
+        }
+        // For some reason, naming these StringEqual methods "Equal" breaks Intellisense in files that call any overload of the Equal method.
+        static void StringEqual(LPCWSTR expected, LPCWSTR actual)
+        {
+            NativeAssert::StringEqual(expected, actual, FALSE);
+        }
+        static void StringEqual(LPCWSTR expected, LPCWSTR actual, BOOL ignoreCase)
+        {
+            IEqualityComparer<String^>^ comparer = ignoreCase ? StringComparer::InvariantCultureIgnoreCase : StringComparer::InvariantCulture;
+            Assert::Equal(NativeAssert::LPWSTRToString(expected), NativeAssert::LPWSTRToString(actual), comparer);
+        }
+        static void Succeeded(HRESULT hr, LPCSTR zFormat, LPCSTR zArg, ... array<LPCSTR>^ zArgs)
+        {
+            array<Object^>^ formatArgs = gcnew array<Object^, 1>(zArgs->Length + 1);
+            formatArgs[0] = NativeAssert::LPSTRToString(zArg);
+            for (int i = 0; i < zArgs->Length; ++i)
+            {
+                formatArgs[i + 1] = NativeAssert::LPSTRToString(zArgs[i]);
+            }
+            WixAssert::Succeeded(hr, gcnew String(zFormat), formatArgs);
+        }
+        static void Succeeded(HRESULT hr, LPCSTR zFormat, ... array<LPCWSTR>^ wzArgs)
+        {
+            array<Object^>^ formatArgs = gcnew array<Object^, 1>(wzArgs->Length);
+            for (int i = 0; i < wzArgs->Length; ++i)
+            {
+                formatArgs[i] = NativeAssert::LPWSTRToString(wzArgs[i]);
+            }
+            WixAssert::Succeeded(hr, gcnew String(zFormat), formatArgs);
+        }
+        static void ValidReturnCode(HRESULT hr, ... array<HRESULT>^ validReturnCodes)
+        {
+            Assert::Contains(hr, (IEnumerable<HRESULT>^)validReturnCodes);
+        }
+    private:
+        static String^ LPSTRToString(LPCSTR z)
+        {
+            return z ? gcnew String(z) : nullptr;
+        }
+        static String^ LPWSTRToString(LPCWSTR wz)
+        {
+            return wz ? gcnew String(wz) : nullptr;
+        }
+    };
+}
+}
diff --git a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.nuspec b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.nuspec
new file mode 100644
index 00000000..2852826b
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.nuspec
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata minClientVersion="4.0">
+    <id>$id$</id>
+    <version>$version$</version>
+    <authors>$authors$</authors>
+    <owners>$authors$</owners>
+    <license type="expression">MS-RL</license>
+    <projectUrl>https://github.com/wixtoolset/WixBuildTools</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>$description$</description>
+    <copyright>$copyright$</copyright>
+    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
+    <dependencies>
+      <group targetFramework=".NETFramework4.7.2" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="build\$id$.props" target="build" />
+    <file src="build\$id$.targets" target="build" />
+    
+    <file src="$outputpath$$id$.dll" target="lib\net472" />
+    <file src="$outputpath$$id$.pdb" target="lib\net472" />
+  </files>
+</package>
diff --git a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj
new file mode 100644
index 00000000..aefdb4fb
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj
@@ -0,0 +1,85 @@
+<?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" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="build\WixBuildTools.TestSupport.Native.props" />
+  <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
+  <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
+  <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectTypes>{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes>
+    <ProjectGuid>{95BABD97-FBDB-453A-AF8A-FA031A07B599}</ProjectGuid>
+    <RootNamespace>WixBuildTools::TestSupport</RootNamespace>
+    <Keyword>ManagedCProj</Keyword>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <CLRSupport>true</CLRSupport>
+    <Description>WixBuildTools C++/CLI Test Support</Description>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="Shared">
+    <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" />
+    <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" />
+    <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" />
+    <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
+  </ImportGroup>
+  <PropertyGroup>
+    <ProjectAdditionalIncludeDirectories>
+    </ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalLinkLibraries>
+    </ProjectAdditionalLinkLibraries>
+  </PropertyGroup>
+  <ItemGroup>
+    <ClCompile Include="AssemblyInfo.cpp" />
+    <ClCompile Include="precomp.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+      <!-- Warnings from NativeAssert.h from referencing netstandard dlls -->
+      <DisableSpecificWarnings>4564;4691</DisableSpecificWarnings>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="precomp.h" />
+    <ClInclude Include="NativeAssert.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj">
+      <Project>{6C57EF2C-979A-4106-A9E5-FE342810619A}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="build\WixBuildTools.TestSupport.Native.targets" />
+  <Target Name="PackNativeNuget" DependsOnTargets="Build">
+    <Exec Command='nuget pack $(MSBuildThisFileName).nuspec -OutputDirectory "$(OutputPath).." -Properties Id=$(MSBuildThisFileName);Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);OutputPath=$(OutputPath)' />
+  </Target>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
+  </Target>
+</Project>
+\ No newline at end of file
diff --git a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj.filters b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj.filters
new file mode 100644
index 00000000..34c1380f
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj.filters
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="precomp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="NativeAssert.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="AssemblyInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="precomp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.props
new file mode 100644
index 00000000..4a7a0035
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.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. -->
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <RepoRootDir Condition=" '$(RepoRootDir)' == '' ">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), version.json))</RepoRootDir>
+  </PropertyGroup>
+  <Import Project="$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props')" />
+  <Import Project="$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" />
+  <PropertyGroup>
+    <PlatformToolset>v142</PlatformToolset>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="xunit.abstractions">
+      <HintPath>$(RepoRootDir)\packages\xunit.abstractions.2.0.3\lib\netstandard2.0\xunit.abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="xunit.assert">
+      <HintPath>$(RepoRootDir)\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
+    </Reference>
+    <Reference Include="xunit.core">
+      <HintPath>$(RepoRootDir)\packages\xunit.extensibility.core.2.4.1\lib\netstandard1.1\xunit.core.dll</HintPath>
+    </Reference>
+    <Reference Include="xunit.execution.desktop">
+      <HintPath>$(RepoRootDir)\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets
new file mode 100644
index 00000000..77e72e95
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets
@@ -0,0 +1,19 @@
+<?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" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.targets" Condition="Exists('$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.props'))" />
+    <Error Condition="!Exists('$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRootDir)\packages\xunit.core.2.4.1\build\xunit.core.targets'))" />
+    <Error Condition="!Exists('$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRootDir)\packages\xunit.runner.visualstudio.2.4.1\build\net20\xunit.runner.visualstudio.props'))" />
+  </Target>
+  <UsingTask AssemblyFile="$(RepoRootDir)\packages\xunit.runner.msbuild.2.4.1\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" />
+  <Target Name="Test" DependsOnTargets="Build">
+    <xunit Assemblies="$(TargetPath)" />
+  </Target>
+</Project>
+\ No newline at end of file
diff --git a/src/internal/WixBuildTools.TestSupport.Native/packages.config b/src/internal/WixBuildTools.TestSupport.Native/packages.config
new file mode 100644
index 00000000..917d7a63
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport.Native/packages.config
@@ -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. -->
+<packages>
+  <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" />
+  <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
+  <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
+  <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
+  <package id="xunit.abstractions" version="2.0.3" />
+  <package id="xunit.assert" version="2.4.1" />
+  <package id="xunit.core" version="2.4.1" />
+  <package id="xunit.extensibility.core" version="2.4.1" />
+  <package id="xunit.extensibility.execution" version="2.4.1" />
+  <package id="xunit.runner.msbuild" version="2.4.1" />
+  <package id="xunit.runner.visualstudio" version="2.4.1" />
+</packages>
+\ No newline at end of file
diff --git a/src/internal/WixBuildTools.TestSupport.Native/precomp.cpp b/src/internal/WixBuildTools.TestSupport.Native/precomp.cpp
new file mode 100644
index 00000000..37664a1c
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport.Native/precomp.cpp
@@ -0,0 +1,3 @@
+// 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.
+#include "precomp.h"
diff --git a/src/internal/WixBuildTools.TestSupport.Native/precomp.h b/src/internal/WixBuildTools.TestSupport.Native/precomp.h
new file mode 100644
index 00000000..f54b55be
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport.Native/precomp.h
@@ -0,0 +1,11 @@
+#pragma once
+// 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.
+#include <windows.h>
+#include <strsafe.h>
+#include "NativeAssert.h"
+#pragma managed
+#include <vcclr.h>
diff --git a/src/internal/WixBuildTools.TestSupport/Builder.cs b/src/internal/WixBuildTools.TestSupport/Builder.cs
new file mode 100644
index 00000000..ef0de8c9
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport/Builder.cs
@@ -0,0 +1,70 @@
+// 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 WixBuildTools.TestSupport
+{
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    public class Builder
+    {
+        public Builder(string sourceFolder, Type extensionType = null, string[] bindPaths = null, string outputFile = null)
+        {
+            this.SourceFolder = sourceFolder;
+            this.ExtensionType = extensionType;
+            this.BindPaths = bindPaths;
+            this.OutputFile = outputFile ?? "test.msi";
+        }
+        public string[] BindPaths { get; set; }
+        public Type ExtensionType { get; set; }
+        public string OutputFile { get; set; }
+        public string SourceFolder { get; }
+        public string[] BuildAndQuery(Action<string[]> buildFunc, params string[] tables)
+        {
+            var sourceFiles = Directory.GetFiles(this.SourceFolder, "*.wxs");
+            var wxlFiles = Directory.GetFiles(this.SourceFolder, "*.wxl");
+            using (var fs = new DisposableFileSystem())
+            {
+                var intermediateFolder = fs.GetFolder();
+                var outputPath = Path.Combine(intermediateFolder, "bin", this.OutputFile);
+                var args = new List<string>
+                {
+                    "build",
+                    "-o", outputPath,
+                    "-intermediateFolder", intermediateFolder,
+                };
+                if (this.ExtensionType != null)
+                {
+                    args.Add("-ext");
+                    args.Add(Path.GetFullPath(new Uri(this.ExtensionType.Assembly.CodeBase).LocalPath));
+                }
+                args.AddRange(sourceFiles);
+                foreach (var wxlFile in wxlFiles)
+                {
+                    args.Add("-loc");
+                    args.Add(wxlFile);
+                }
+                foreach (var bindPath in this.BindPaths)
+                {
+                    args.Add("-bindpath");
+                    args.Add(bindPath);
+                }
+                buildFunc(args.ToArray());
+                return Query.QueryDatabase(outputPath, tables);
+            }
+        }
+    }
+}
diff --git a/src/internal/WixBuildTools.TestSupport/DisposableFileSystem.cs b/src/internal/WixBuildTools.TestSupport/DisposableFileSystem.cs
new file mode 100644
index 00000000..f096db72
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport/DisposableFileSystem.cs
@@ -0,0 +1,93 @@
+// 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 WixBuildTools.TestSupport
+{
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    public class DisposableFileSystem : IDisposable
+    {
+        protected bool Disposed { get; private set; }
+        private List<string> CleanupPaths { get; } = new List<string>();
+        public bool Keep { get; }
+        public DisposableFileSystem(bool keep = false)
+        {
+            this.Keep = keep;
+        }
+        protected string GetFile(bool create = false)
+        {
+            var path = Path.GetTempFileName();
+            if (!create)
+            {
+                File.Delete(path);
+            }
+            this.CleanupPaths.Add(path);
+            return path;
+        }
+        public string GetFolder(bool create = false)
+        {
+            var path = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+            if (create)
+            {
+                Directory.CreateDirectory(path);
+            }
+            this.CleanupPaths.Add(path);
+            return path;
+        }
+        #region // IDisposable
+        public void Dispose()
+        {
+            this.Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+        protected virtual void Dispose(bool disposing)
+        {
+            if (this.Disposed)
+            {
+                return;
+            }
+            if (disposing && !this.Keep)
+            {
+                foreach (var path in this.CleanupPaths)
+                {
+                    try
+                    {
+                        if (File.Exists(path))
+                        {
+                            File.Delete(path);
+                        }
+                        else if (Directory.Exists(path))
+                        {
+                            Directory.Delete(path, true);
+                        }
+                    }
+                    catch
+                    {
+                        // Best effort delete, so ignore any failures.
+                    }
+                }
+            }
+            this.Disposed = true;
+        }
+        #endregion
+    }
+}
diff --git a/src/internal/WixBuildTools.TestSupport/DotnetRunner.cs b/src/internal/WixBuildTools.TestSupport/DotnetRunner.cs
new file mode 100644
index 00000000..82391178
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport/DotnetRunner.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 WixBuildTools.TestSupport
+{
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    public class DotnetRunner : ExternalExecutable
+    {
+        private static readonly object InitLock = new object();
+        private static bool Initialized;
+        private static DotnetRunner Instance;
+        public static ExternalExecutableResult Execute(string command, string[] arguments = null) =>
+            InitAndExecute(command, arguments);
+        private static ExternalExecutableResult InitAndExecute(string command, string[] arguments)
+        {
+            lock (InitLock)
+            {
+                if (!Initialized)
+                {
+                    Initialized = true;
+                    var dotnetPath = Environment.GetEnvironmentVariable("DOTNET_HOST_PATH");
+                    if (String.IsNullOrEmpty(dotnetPath) || !File.Exists(dotnetPath))
+                    {
+                        dotnetPath = "dotnet";
+                    }
+                    Instance = new DotnetRunner(dotnetPath);
+                }
+            }
+            return Instance.ExecuteCore(command, arguments);
+        }
+        private DotnetRunner(string exePath) : base(exePath) { }
+        private ExternalExecutableResult ExecuteCore(string command, string[] arguments)
+        {
+            var total = new List<string>
+            {
+                command,
+            };
+            if (arguments != null)
+            {
+                total.AddRange(arguments);
+            }
+            var args = CombineArguments(total);
+            var mergeErrorIntoOutput = true;
+            return this.Run(args, mergeErrorIntoOutput);
+        }
+    }
+}
diff --git a/src/internal/WixBuildTools.TestSupport/ExternalExecutable.cs b/src/internal/WixBuildTools.TestSupport/ExternalExecutable.cs
new file mode 100644
index 00000000..eb07aa13
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport/ExternalExecutable.cs
@@ -0,0 +1,88 @@
+// 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 WixBuildTools.TestSupport
+{
+    using System.Collections.Concurrent;
+    using System.Collections.Generic;
+    using System.Diagnostics;
+    using System.IO;
+    using System.Text;
+    public abstract class ExternalExecutable
+    {
+        private readonly string exePath;
+        protected ExternalExecutable(string exePath)
+        {
+            this.exePath = exePath;
+        }
+        protected ExternalExecutableResult Run(string args, bool mergeErrorIntoOutput = false, string workingDirectory = null)
+        {
+            var startInfo = new ProcessStartInfo(this.exePath, args)
+            {
+                CreateNoWindow = true,
+                RedirectStandardError = true,
+                RedirectStandardOutput = true,
+                UseShellExecute = false,
+                WorkingDirectory = workingDirectory ?? Path.GetDirectoryName(this.exePath),
+            };
+            using (var process = Process.Start(startInfo))
+            {
+                // This implementation of merging the streams does not guarantee that lines are retrieved in the same order that they were written.
+                // If the process is simultaneously writing to both streams, this is impossible to do anyway.
+                var standardOutput = new ConcurrentQueue<string>();
+                var standardError = mergeErrorIntoOutput ? standardOutput : new ConcurrentQueue<string>();
+                process.ErrorDataReceived += (s, e) => { if (e.Data != null) { standardError.Enqueue(e.Data); } };
+                process.OutputDataReceived += (s, e) => { if (e.Data != null) { standardOutput.Enqueue(e.Data); } };
+                process.BeginErrorReadLine();
+                process.BeginOutputReadLine();
+                process.WaitForExit();
+                return new ExternalExecutableResult
+                {
+                    ExitCode = process.ExitCode,
+                    StandardError = mergeErrorIntoOutput ? null : standardError.ToArray(),
+                    StandardOutput = standardOutput.ToArray(),
+                    StartInfo = startInfo,
+                };
+            }
+        }
+        // This is internal because it assumes backslashes aren't used as escape characters and there aren't any double quotes.
+        internal static string CombineArguments(IEnumerable<string> arguments)
+        {
+            if (arguments == null)
+            {
+                return null;
+            }
+            var sb = new StringBuilder();
+            foreach (var arg in arguments)
+            {
+                if (sb.Length > 0)
+                {
+                    sb.Append(' ');
+                }
+                if (arg.IndexOf(' ') > -1)
+                {
+                    sb.Append("\"");
+                    sb.Append(arg);
+                    sb.Append("\"");
+                }
+                else
+                {
+                    sb.Append(arg);
+                }
+            }
+            return sb.ToString();
+        }
+    }
+}
diff --git a/src/internal/WixBuildTools.TestSupport/ExternalExecutableResult.cs b/src/internal/WixBuildTools.TestSupport/ExternalExecutableResult.cs
new file mode 100644
index 00000000..19b5183b
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport/ExternalExecutableResult.cs
@@ -0,0 +1,17 @@
+// 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 WixBuildTools.TestSupport
+{
+    using System.Diagnostics;
+    public class ExternalExecutableResult
+    {
+        public int ExitCode { get; set; }
+        public string[] StandardError { get; set; }
+        public string[] StandardOutput { get; set; }
+        public ProcessStartInfo StartInfo { get; set; }
+    }
+}
diff --git a/src/internal/WixBuildTools.TestSupport/FakeBuildEngine.cs b/src/internal/WixBuildTools.TestSupport/FakeBuildEngine.cs
new file mode 100644
index 00000000..20545970
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport/FakeBuildEngine.cs
@@ -0,0 +1,33 @@
+// 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 WixBuildTools.TestSupport
+{
+    using System.Collections;
+    using System.Text;
+    using Microsoft.Build.Framework;
+    public class FakeBuildEngine : IBuildEngine
+    {
+        private readonly StringBuilder output = new StringBuilder();
+        public int ColumnNumberOfTaskNode => 0;
+        public bool ContinueOnError => false;
+        public int LineNumberOfTaskNode => 0;
+        public string ProjectFileOfTaskNode => "fake_wix.targets";
+        public string Output => this.output.ToString();
+        public bool BuildProjectFile(string projectFileName, string[] targetNames, IDictionary globalProperties, IDictionary targetOutputs) => throw new System.NotImplementedException();
+        public void LogCustomEvent(CustomBuildEventArgs e) => this.output.AppendLine(e.Message);
+        public void LogErrorEvent(BuildErrorEventArgs e) => this.output.AppendLine(e.Message);
+        public void LogMessageEvent(BuildMessageEventArgs e) => this.output.AppendLine(e.Message);
+        public void LogWarningEvent(BuildWarningEventArgs e) => this.output.AppendLine(e.Message);
+    }
+}
diff --git a/src/internal/WixBuildTools.TestSupport/MsbuildRunner.cs b/src/internal/WixBuildTools.TestSupport/MsbuildRunner.cs
new file mode 100644
index 00000000..35e53de6
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport/MsbuildRunner.cs
@@ -0,0 +1,168 @@
+// 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 WixBuildTools.TestSupport
+{
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    public class MsbuildRunner : ExternalExecutable
+    {
+        private static readonly string VswhereFindArguments = "-property installationPath";
+        private static readonly string Msbuild15RelativePath = @"MSBuild\15.0\Bin\MSBuild.exe";
+        private static readonly string Msbuild15RelativePath64 = @"MSBuild\15.0\Bin\amd64\MSBuild.exe";
+        private static readonly string MsbuildCurrentRelativePath = @"MSBuild\Current\Bin\MSBuild.exe";
+        private static readonly string MsbuildCurrentRelativePath64 = @"MSBuild\Current\Bin\amd64\MSBuild.exe";
+        private static readonly object InitLock = new object();
+        private static bool Initialized;
+        private static MsbuildRunner Msbuild15Runner;
+        private static MsbuildRunner Msbuild15Runner64;
+        private static MsbuildRunner MsbuildCurrentRunner;
+        private static MsbuildRunner MsbuildCurrentRunner64;
+        public static MsbuildRunnerResult Execute(string projectPath, string[] arguments = null, bool x64 = false) =>
+            InitAndExecute(String.Empty, projectPath, arguments, x64);
+        public static MsbuildRunnerResult ExecuteWithMsbuild15(string projectPath, string[] arguments = null, bool x64 = false) =>
+            InitAndExecute("15", projectPath, arguments, x64);
+        public static MsbuildRunnerResult ExecuteWithMsbuildCurrent(string projectPath, string[] arguments = null, bool x64 = false) =>
+            InitAndExecute("Current", projectPath, arguments, x64);
+        private static MsbuildRunnerResult InitAndExecute(string msbuildVersion, string projectPath, string[] arguments, bool x64)
+        {
+            lock (InitLock)
+            {
+                if (!Initialized)
+                {
+                    Initialized = true;
+                    var vswhereResult = VswhereRunner.Execute(VswhereFindArguments, true);
+                    if (vswhereResult.ExitCode != 0)
+                    {
+                        throw new InvalidOperationException($"Failed to execute vswhere.exe, exit code: {vswhereResult.ExitCode}. Output:\r\n{String.Join("\r\n", vswhereResult.StandardOutput)}");
+                    }
+                    string msbuild15Path = null;
+                    string msbuild15Path64 = null;
+                    string msbuildCurrentPath = null;
+                    string msbuildCurrentPath64 = null;
+                    foreach (var installPath in vswhereResult.StandardOutput)
+                    {
+                        if (msbuildCurrentPath == null)
+                        {
+                            var path = Path.Combine(installPath, MsbuildCurrentRelativePath);
+                            if (File.Exists(path))
+                            {
+                                msbuildCurrentPath = path;
+                            }
+                        }
+                        if (msbuildCurrentPath64 == null)
+                        {
+                            var path = Path.Combine(installPath, MsbuildCurrentRelativePath64);
+                            if (File.Exists(path))
+                            {
+                                msbuildCurrentPath64 = path;
+                            }
+                        }
+                        if (msbuild15Path == null)
+                        {
+                            var path = Path.Combine(installPath, Msbuild15RelativePath);
+                            if (File.Exists(path))
+                            {
+                                msbuild15Path = path;
+                            }
+                        }
+                        if (msbuild15Path64 == null)
+                        {
+                            var path = Path.Combine(installPath, Msbuild15RelativePath64);
+                            if (File.Exists(path))
+                            {
+                                msbuild15Path64 = path;
+                            }
+                        }
+                    }
+                    if (msbuildCurrentPath != null)
+                    {
+                        MsbuildCurrentRunner = new MsbuildRunner(msbuildCurrentPath);
+                    }
+                    if (msbuildCurrentPath64 != null)
+                    {
+                        MsbuildCurrentRunner64 = new MsbuildRunner(msbuildCurrentPath64);
+                    }
+                    if (msbuild15Path != null)
+                    {
+                        Msbuild15Runner = new MsbuildRunner(msbuild15Path);
+                    }
+                    if (msbuild15Path64 != null)
+                    {
+                        Msbuild15Runner64 = new MsbuildRunner(msbuild15Path64);
+                    }
+                }
+            }
+            MsbuildRunner runner;
+            switch (msbuildVersion)
+            {
+                case "15":
+                    {
+                        runner = x64 ? Msbuild15Runner64 : Msbuild15Runner;
+                        break;
+                    }
+                case "Current":
+                    {
+                        runner = x64 ? MsbuildCurrentRunner64 : MsbuildCurrentRunner;
+                        break;
+                    }
+                default:
+                    {
+                        runner = x64 ? MsbuildCurrentRunner64 ?? Msbuild15Runner64
+                                     : MsbuildCurrentRunner ?? Msbuild15Runner;
+                        break;
+                    }
+            }
+            if (runner == null)
+            {
+                throw new InvalidOperationException($"Failed to find an installed{(x64 ? " 64-bit" : String.Empty)} MSBuild{msbuildVersion}");
+            }
+            return runner.ExecuteCore(projectPath, arguments);
+        }
+        private MsbuildRunner(string exePath) : base(exePath) { }
+        private MsbuildRunnerResult ExecuteCore(string projectPath, string[] arguments)
+        {
+            var total = new List<string>
+            {
+                projectPath,
+            };
+            if (arguments != null)
+            {
+                total.AddRange(arguments);
+            }
+            var args = CombineArguments(total);
+            var mergeErrorIntoOutput = true;
+            var workingFolder = Path.GetDirectoryName(projectPath);
+            var result = this.Run(args, mergeErrorIntoOutput, workingFolder);
+            return new MsbuildRunnerResult
+            {
+                ExitCode = result.ExitCode,
+                Output = result.StandardOutput,
+            };
+        }
+    }
+}
diff --git a/src/internal/WixBuildTools.TestSupport/MsbuildRunnerResult.cs b/src/internal/WixBuildTools.TestSupport/MsbuildRunnerResult.cs
new file mode 100644
index 00000000..5610987e
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport/MsbuildRunnerResult.cs
@@ -0,0 +1,19 @@
+// 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 WixBuildTools.TestSupport
+{
+    using System;
+    using Xunit;
+    public class MsbuildRunnerResult
+    {
+        public int ExitCode { get; set; }
+        public string[] Output { get; set; }
+        public void AssertSuccess()
+        {
+            Assert.True(0 == this.ExitCode, $"MSBuild failed unexpectedly. Output:\r\n{String.Join("\r\n", this.Output)}");
+        }
+    }
+}
diff --git a/src/internal/WixBuildTools.TestSupport/Pushd.cs b/src/internal/WixBuildTools.TestSupport/Pushd.cs
new file mode 100644
index 00000000..d0545215
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport/Pushd.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 WixBuildTools.TestSupport
+{
+    using System;
+    using System.IO;
+    public class Pushd : IDisposable
+    {
+        protected bool Disposed { get; private set; }
+        public Pushd(string path)
+        {
+            this.PreviousDirectory = Directory.GetCurrentDirectory();
+            Directory.SetCurrentDirectory(path);
+        }
+        public string PreviousDirectory { get; }
+        #region // IDisposable
+        public void Dispose()
+        {
+            this.Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+        protected virtual void Dispose(bool disposing)
+        {
+            if (this.Disposed)
+            {
+                return;
+            }
+            if (disposing)
+            {
+                Directory.SetCurrentDirectory(this.PreviousDirectory);
+            }
+            this.Disposed = true;
+        }
+        #endregion
+    }
+}
diff --git a/src/internal/WixBuildTools.TestSupport/Query.cs b/src/internal/WixBuildTools.TestSupport/Query.cs
new file mode 100644
index 00000000..101a8890
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport/Query.cs
@@ -0,0 +1,172 @@
+// 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 WixBuildTools.TestSupport
+{
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Linq;
+    using System.Text;
+    using WixToolset.Dtf.Compression.Cab;
+    using WixToolset.Dtf.WindowsInstaller;
+    public class Query
+    {
+        public static string[] QueryDatabase(string path, string[] tables)
+        {
+            var results = new List<string>();
+            var resultsByTable = QueryDatabaseByTable(path, tables);
+            var sortedTables = tables.ToList();
+            sortedTables.Sort();
+            foreach (var tableName in sortedTables)
+            {
+                var rows = resultsByTable[tableName];
+                rows?.ForEach(r => results.Add($"{tableName}:{r}"));
+            }
+            return results.ToArray();
+        }
+        /// <summary>
+        /// Returns rows from requested tables formatted to facilitate testing.
+        /// If the table did not exist in the database, its list will be null.
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="tables"></param>
+        /// <returns></returns>
+        public static Dictionary<string, List<string>> QueryDatabaseByTable(string path, string[] tables)
+        {
+            var results = new Dictionary<string, List<string>>();
+            if (tables?.Length > 0)
+            {
+                var sb = new StringBuilder();
+                using (var db = new Database(path))
+                {
+                    foreach (var table in tables)
+                    {
+                        if (table == "_SummaryInformation")
+                        {
+                            var entries = new List<string>();
+                            results.Add(table, entries);
+                            entries.Add($"Title\t{db.SummaryInfo.Title}");
+                            entries.Add($"Subject\t{db.SummaryInfo.Subject}");
+                            entries.Add($"Author\t{db.SummaryInfo.Author}");
+                            entries.Add($"Keywords\t{db.SummaryInfo.Keywords}");
+                            entries.Add($"Comments\t{db.SummaryInfo.Comments}");
+                            entries.Add($"Template\t{db.SummaryInfo.Template}");
+                            entries.Add($"CodePage\t{db.SummaryInfo.CodePage}");
+                            entries.Add($"PageCount\t{db.SummaryInfo.PageCount}");
+                            entries.Add($"WordCount\t{db.SummaryInfo.WordCount}");
+                            entries.Add($"CharacterCount\t{db.SummaryInfo.CharacterCount}");
+                            entries.Add($"Security\t{db.SummaryInfo.Security}");
+                            continue;
+                        }
+                        if (!db.IsTablePersistent(table))
+                        {
+                            results.Add(table, null);
+                            continue;
+                        }
+                        var rows = new List<string>();
+                        results.Add(table, rows);
+                        using (var view = db.OpenView("SELECT * FROM `{0}`", table))
+                        {
+                            view.Execute();
+                            Record record;
+                            while ((record = view.Fetch()) != null)
+                            {
+                                sb.Clear();
+                                using (record)
+                                {
+                                    for (var i = 0; i < record.FieldCount; ++i)
+                                    {
+                                        if (i > 0)
+                                        {
+                                            sb.Append("\t");
+                                        }
+                                        sb.Append(record[i + 1]?.ToString());
+                                    }
+                                }
+                                rows.Add(sb.ToString());
+                            }
+                        }
+                        rows.Sort();
+                    }
+                }
+            }
+            return results;
+        }
+        public static CabFileInfo[] GetCabinetFiles(string path)
+        {
+            var cab = new CabInfo(path);
+            var result = cab.GetFiles();
+            return result.Select(c => c).ToArray();
+        }
+        public static void ExtractStream(string path, string streamName, string outputPath)
+        {
+            Directory.CreateDirectory(Path.GetDirectoryName(outputPath));
+            using (var db = new Database(path))
+            using (var view = db.OpenView("SELECT `Data` FROM `_Streams` WHERE `Name` = '{0}'", streamName))
+            {
+                view.Execute();
+                using (var record = view.Fetch())
+                {
+                    record.GetStream(1, outputPath);
+                }
+            }
+        }
+        public static void ExtractSubStorage(string path, string subStorageName, string outputPath)
+        {
+            Directory.CreateDirectory(Path.GetDirectoryName(outputPath));
+            using (var db = new Database(path))
+            using (var view = db.OpenView("SELECT `Name`, `Data` FROM `_Storages` WHERE `Name` = '{0}'", subStorageName))
+            {
+                view.Execute();
+                using (var record = view.Fetch())
+                {
+                    var name = record.GetString(1);
+                    record.GetStream(2, outputPath);
+                }
+            }
+        }
+        public static string[] GetSubStorageNames(string path)
+        {
+            var result = new List<string>();
+            using (var db = new Database(path))
+            using (var view = db.OpenView("SELECT `Name` FROM `_Storages`"))
+            {
+                view.Execute();
+                Record record;
+                while ((record = view.Fetch()) != null)
+                {
+                    var name = record.GetString(1);
+                    result.Add(name);
+                }
+            }
+            result.Sort();
+            return result.ToArray();
+        }
+    }
+}
diff --git a/src/internal/WixBuildTools.TestSupport/RobocopyRunner.cs b/src/internal/WixBuildTools.TestSupport/RobocopyRunner.cs
new file mode 100644
index 00000000..49d53351
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport/RobocopyRunner.cs
@@ -0,0 +1,16 @@
+// 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 WixBuildTools.TestSupport
+{
+    public class RobocopyRunner : ExternalExecutable
+    {
+        private static readonly RobocopyRunner Instance = new RobocopyRunner();
+        private RobocopyRunner() : base("robocopy") { }
+        public static ExternalExecutableResult Execute(string args)
+        {
+            return Instance.Run(args);
+        }
+    }
+}
diff --git a/src/internal/WixBuildTools.TestSupport/SucceededException.cs b/src/internal/WixBuildTools.TestSupport/SucceededException.cs
new file mode 100644
index 00000000..00b31d68
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport/SucceededException.cs
@@ -0,0 +1,18 @@
+// 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 WixBuildTools.TestSupport
+{
+    using System;
+    using Xunit.Sdk;
+    public class SucceededException : XunitException
+    {
+        public SucceededException(int hr, string userMessage)
+            : base(String.Format("WixAssert.Succeeded() Failure\r\n" +
+                                 "HRESULT:  0x{0:X8}\r\n" +
+                                 "Message:  {1}",
+                                 hr, userMessage))
+        {
+        }
+    }
+}
diff --git a/src/internal/WixBuildTools.TestSupport/TestData.cs b/src/internal/WixBuildTools.TestSupport/TestData.cs
new file mode 100644
index 00000000..8587330d
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport/TestData.cs
@@ -0,0 +1,16 @@
+// 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 WixBuildTools.TestSupport
+{
+    using System;
+    using System.IO;
+    public class TestData
+    {
+        public static string Get(params string[] paths)
+        {
+            var localPath = Path.GetDirectoryName(new Uri(System.Reflection.Assembly.GetCallingAssembly().CodeBase).LocalPath);
+            return Path.Combine(localPath, Path.Combine(paths));
+        }
+    }
+}
diff --git a/src/internal/WixBuildTools.TestSupport/TestDataFolderFileSystem.cs b/src/internal/WixBuildTools.TestSupport/TestDataFolderFileSystem.cs
new file mode 100644
index 00000000..8d670bf0
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport/TestDataFolderFileSystem.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.
+namespace WixBuildTools.TestSupport
+{
+    using System;
+    /// <summary>
+    /// This class builds on top of DisposableFileSystem
+    /// to make it easy to write a test that needs a whole folder of test data copied to a temp location
+    /// that will automatically be cleaned up at the end of the test.
+    /// </summary>
+    public class TestDataFolderFileSystem : IDisposable
+    {
+        private DisposableFileSystem fileSystem;
+        public string BaseFolder { get; private set; }
+        public void Dispose()
+        {
+            this.fileSystem?.Dispose();
+        }
+        public void Initialize(string sourceDirectoryPath)
+        {
+            if (this.fileSystem != null)
+            {
+                throw new InvalidOperationException();
+            }
+            this.fileSystem = new DisposableFileSystem();
+            this.BaseFolder = this.fileSystem.GetFolder();
+            RobocopyFolder(sourceDirectoryPath, this.BaseFolder);
+        }
+        private static ExternalExecutableResult RobocopyFolder(string sourceFolderPath, string destinationFolderPath)
+        {
+            var args = $"\"{sourceFolderPath}\" \"{destinationFolderPath}\" /E /R:1 /W:1";
+            return RobocopyRunner.Execute(args);
+        }
+    }
+}
diff --git a/src/internal/WixBuildTools.TestSupport/VswhereRunner.cs b/src/internal/WixBuildTools.TestSupport/VswhereRunner.cs
new file mode 100644
index 00000000..0197e125
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport/VswhereRunner.cs
@@ -0,0 +1,41 @@
+// 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 WixBuildTools.TestSupport
+{
+    using System;
+    using System.IO;
+    public class VswhereRunner : ExternalExecutable
+    {
+        private static readonly string VswhereRelativePath = @"Microsoft Visual Studio\Installer\vswhere.exe";
+        private static readonly object InitLock = new object();
+        private static bool Initialized;
+        private static VswhereRunner Instance;
+        public static ExternalExecutableResult Execute(string args, bool mergeErrorIntoOutput = false) =>
+            InitAndExecute(args, mergeErrorIntoOutput);
+        private static ExternalExecutableResult InitAndExecute(string args, bool mergeErrorIntoOutput)
+        {
+            lock (InitLock)
+            {
+                if (!Initialized)
+                {
+                    Initialized = true;
+                    var vswherePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86), VswhereRelativePath);
+                    if (!File.Exists(vswherePath))
+                    {
+                        throw new InvalidOperationException($"Failed to find vswhere at: {vswherePath}");
+                    }
+                    Instance = new VswhereRunner(vswherePath);
+                }
+            }
+            return Instance.Run(args, mergeErrorIntoOutput);
+        }
+        private VswhereRunner(string exePath) : base(exePath) { }
+    }
+}
diff --git a/src/internal/WixBuildTools.TestSupport/WixAssert.cs b/src/internal/WixBuildTools.TestSupport/WixAssert.cs
new file mode 100644
index 00000000..5638a787
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport/WixAssert.cs
@@ -0,0 +1,47 @@
+// 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 WixBuildTools.TestSupport
+{
+    using System;
+    using System.Linq;
+    using System.Xml.Linq;
+    using Xunit;
+    public class WixAssert : Assert
+    {
+        public static void CompareLineByLine(string[] expectedLines, string[] actualLines)
+        {
+            for (var i = 0; i < expectedLines.Length; ++i)
+            {
+                Assert.True(actualLines.Length > i, $"{i}: expectedLines longer than actualLines");
+                Assert.Equal($"{i}: {expectedLines[i]}", $"{i}: {actualLines[i]}");
+            }
+            Assert.True(expectedLines.Length == actualLines.Length, "actualLines longer than expectedLines");
+        }
+        public static void CompareXml(XContainer xExpected, XContainer xActual)
+        {
+            var expecteds = xExpected.Descendants().Select(x => $"{x.Name.LocalName}:{String.Join(",", x.Attributes().OrderBy(a => a.Name.LocalName).Select(a => $"{a.Name.LocalName}={a.Value}"))}");
+            var actuals = xActual.Descendants().Select(x => $"{x.Name.LocalName}:{String.Join(",", x.Attributes().OrderBy(a => a.Name.LocalName).Select(a => $"{a.Name.LocalName}={a.Value}"))}");
+            CompareLineByLine(expecteds.OrderBy(s => s).ToArray(), actuals.OrderBy(s => s).ToArray());
+        }
+        public static void CompareXml(string expectedPath, string actualPath)
+        {
+            var expectedDoc = XDocument.Load(expectedPath, LoadOptions.PreserveWhitespace | LoadOptions.SetBaseUri | LoadOptions.SetLineInfo);
+            var actualDoc = XDocument.Load(actualPath, LoadOptions.PreserveWhitespace | LoadOptions.SetBaseUri | LoadOptions.SetLineInfo);
+            CompareXml(expectedDoc, actualDoc);
+        }
+        public static void Succeeded(int hr, string format, params object[] formatArgs)
+        {
+            if (0 > hr)
+            {
+                throw new SucceededException(hr, String.Format(format, formatArgs));
+            }
+        }
+    }
+}
diff --git a/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj b/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
new file mode 100644
index 00000000..f59e5eca
--- /dev/null
+++ b/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.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 Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks>
+    <IsPackable>true</IsPackable>
+    <DebugType>embedded</DebugType>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <CreateDocumentationFile>true</CreateDocumentationFile>
+    <NoWarn>CS1591</NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" />
+    <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.*" />
+    <PackageReference Include="WixToolset.Dtf.Compression" Version="4.0.*" />
+    <PackageReference Include="WixToolset.Dtf.Compression.Cab" Version="4.0.*" />
+  </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>
+    <PackageReference Include="xunit.assert" Version="2.4.1" />
+  </ItemGroup>
+</Project>
diff --git a/src/internal/WixBuildTools.XsdGen/AssemblyInfo.cs b/src/internal/WixBuildTools.XsdGen/AssemblyInfo.cs
new file mode 100644
index 00000000..b3740b2a
--- /dev/null
+++ b/src/internal/WixBuildTools.XsdGen/AssemblyInfo.cs
@@ -0,0 +1,9 @@
+// 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.Reflection;
+using System.Runtime.InteropServices;
+[assembly: AssemblyCulture("")]
+[assembly: CLSCompliant(true)]
+[assembly: ComVisible(false)]
diff --git a/src/internal/WixBuildTools.XsdGen/CodeDomInterfaces.cs b/src/internal/WixBuildTools.XsdGen/CodeDomInterfaces.cs
new file mode 100644
index 00000000..850839d4
--- /dev/null
+++ b/src/internal/WixBuildTools.XsdGen/CodeDomInterfaces.cs
@@ -0,0 +1,96 @@
+// 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.Serialize
+{
+    using System;
+    using System.Collections;
+    using System.Xml;
+    /// <summary>
+    /// Interface for generated schema elements.
+    /// </summary>
+    public interface ISchemaElement
+    {
+        /// <summary>
+        /// Gets and sets the parent of this element. May be null.
+        /// </summary>
+        /// <value>An ISchemaElement that has this element as a child.</value>
+        ISchemaElement ParentElement
+        {
+            get;
+            set;
+        }
+    
+        /// <summary>
+        /// Outputs xml representing this element, including the associated attributes
+        /// and any nested elements.
+        /// </summary>
+        /// <param name="writer">XmlTextWriter to be used when outputting the element.</param>
+        void OutputXml(XmlWriter writer);
+    }
+    /// <summary>
+    /// Interface for generated schema elements. Implemented by elements that have child
+    /// elements.
+    /// </summary>
+    public interface IParentElement
+    {
+        /// <summary>
+        /// Gets an enumerable collection of the children of this element.
+        /// </summary>
+        /// <value>An enumerable collection of the children of this element.</value>
+        IEnumerable Children
+        {
+            get;
+        }
+        /// <summary>
+        /// Gets an enumerable collection of the children of this element, filtered
+        /// by the passed in type.
+        /// </summary>
+        /// <param name="childType">The type of children to retrieve.</param>
+        IEnumerable this[Type childType]
+        {
+            get;
+        }
+        /// <summary>
+        /// Adds a child to this element.
+        /// </summary>
+        /// <param name="child">Child to add.</param>
+        void AddChild(ISchemaElement child);
+        /// <summary>
+        /// Removes a child from this element.
+        /// </summary>
+        /// <param name="child">Child to remove.</param>
+        void RemoveChild(ISchemaElement child);
+    }
+    /// <summary>
+    /// Interface for generated schema elements. Implemented by classes with attributes.
+    /// </summary>
+    public interface ISetAttributes
+    {
+        /// <summary>
+        /// Sets the attribute with the given name to the given value. The value here is
+        /// a string, and is converted to the strongly-typed version inside this method.
+        /// </summary>
+        /// <param name="name">The name of the attribute to set.</param>
+        /// <param name="value">The value to assign to the attribute.</param>
+        void SetAttribute(string name, string value);
+    }
+    /// <summary>
+    /// Interface for generated schema elements. Implemented by classes with children.
+    /// </summary>
+    public interface ICreateChildren
+    {
+        /// <summary>
+        /// Creates an instance of the child with the passed in name.
+        /// </summary>
+        /// <param name="childName">String matching the element name of the child when represented in XML.</param>
+        /// <returns>An instance of that child.</returns>
+        ISchemaElement CreateChild(string childName);
+    }
+}
diff --git a/src/internal/WixBuildTools.XsdGen/CodeDomReader.cs b/src/internal/WixBuildTools.XsdGen/CodeDomReader.cs
new file mode 100644
index 00000000..5198f264
--- /dev/null
+++ b/src/internal/WixBuildTools.XsdGen/CodeDomReader.cs
@@ -0,0 +1,159 @@
+// 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.Serialize
+{
+    using System;
+    using System.Collections;
+    using System.Reflection;
+    using System.Xml;
+    /// <summary>
+    /// Class used for reading XML files in to the CodeDom.
+    /// </summary>
+    public class CodeDomReader
+    {
+        private Assembly[] assemblies;
+        /// <summary>
+        /// Creates a new CodeDomReader, using the current assembly.
+        /// </summary>
+        public CodeDomReader()
+        {
+            this.assemblies = new Assembly[] { Assembly.GetExecutingAssembly() };
+        }
+        /// <summary>
+        /// Creates a new CodeDomReader, and takes in a list of assemblies in which to
+        /// look for elements.
+        /// </summary>
+        /// <param name="assemblies">Assemblies in which to look for types that correspond 
+        /// to elements.</param>
+        public CodeDomReader(Assembly[] assemblies)
+        {
+            this.assemblies = assemblies;
+        }
+        /// <summary>
+        /// Loads an XML file into a strongly-typed code dom.
+        /// </summary>
+        /// <param name="filePath">File to load into the code dom.</param>
+        /// <returns>The strongly-typed object at the root of the tree.</returns>
+        public ISchemaElement Load(string filePath)
+        {
+            XmlDocument document = new XmlDocument();
+            document.Load(filePath);
+            ISchemaElement schemaElement = null;
+            foreach (XmlNode node in document.ChildNodes)
+            {
+                XmlElement element = node as XmlElement;
+                if (element != null)
+                {
+                    if (schemaElement != null)
+                    {
+                        throw new InvalidOperationException("Multiple root elements found in file.");
+                    }
+                    schemaElement = this.CreateObjectFromElement(element);
+                    this.ParseObjectFromElement(schemaElement, element);
+                }
+            }
+            return schemaElement;
+        }
+        /// <summary>
+        /// Parses an ISchemaElement from the XmlElement.
+        /// </summary>
+        /// <param name="schemaElement">ISchemaElement to fill in.</param>
+        /// <param name="element">XmlElement to parse from.</param>
+        private void ParseObjectFromElement(ISchemaElement schemaElement, XmlElement element)
+        {
+            foreach (XmlAttribute attribute in element.Attributes)
+            {
+                this.SetAttributeOnObject(schemaElement, attribute.LocalName, attribute.Value);
+            }
+            foreach (XmlNode node in element.ChildNodes)
+            {
+                XmlElement childElement = node as XmlElement;
+                if (childElement != null)
+                {
+                    ISchemaElement childSchemaElement = null;
+                    ICreateChildren createChildren = schemaElement as ICreateChildren;
+                    if (createChildren == null)
+                    {
+                        throw new InvalidOperationException("ISchemaElement with name " + element.LocalName + " does not implement ICreateChildren.");
+                    }
+                    else
+                    {
+                        childSchemaElement = createChildren.CreateChild(childElement.LocalName);
+                    }
+                    if (childSchemaElement == null)
+                    {
+                        childSchemaElement = this.CreateObjectFromElement(childElement);
+                        if (childSchemaElement == null)
+                        {
+                            throw new InvalidOperationException("XmlElement with name " + childElement.LocalName + " does not have a corresponding ISchemaElement.");
+                        }
+                    }
+                    this.ParseObjectFromElement(childSchemaElement, childElement);
+                    IParentElement parentElement = (IParentElement)schemaElement;
+                    parentElement.AddChild(childSchemaElement);
+                }
+                else
+                {
+                    XmlText childText = node as XmlText;
+                    if (childText != null)
+                    {
+                        this.SetAttributeOnObject(schemaElement, "Content", childText.Value);
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// Sets an attribute on an ISchemaElement.
+        /// </summary>
+        /// <param name="schemaElement">Schema element to set attribute on.</param>
+        /// <param name="name">Name of the attribute to set.</param>
+        /// <param name="value">Value to set on the attribute.</param>
+        private void SetAttributeOnObject(ISchemaElement schemaElement, string name, string value)
+        {
+            ISetAttributes setAttributes = schemaElement as ISetAttributes;
+            if (setAttributes == null)
+            {
+                throw new InvalidOperationException("ISchemaElement with name " 
+                    + schemaElement.GetType().FullName.ToString() 
+                    + " does not implement ISetAttributes.");
+            }
+            else
+            {
+                setAttributes.SetAttribute(name, value);
+            }
+        }
+        /// <summary>
+        /// Creates an object from an XML element by digging through the assembly list.
+        /// </summary>
+        /// <param name="element">XML Element to create an ISchemaElement from.</param>
+        /// <returns>A constructed ISchemaElement.</returns>
+        private ISchemaElement CreateObjectFromElement(XmlElement element)
+        {
+            ISchemaElement schemaElement = null;
+            foreach (Assembly assembly in this.assemblies)
+            {
+                foreach (Type type in assembly.GetTypes())
+                {
+                    if (type.FullName.EndsWith(element.LocalName) 
+                        && typeof(ISchemaElement).IsAssignableFrom(type))
+                    {
+                        schemaElement = (ISchemaElement)Activator.CreateInstance(type);
+                    }
+                }
+            }
+            return schemaElement;
+        }
+    }
+}
diff --git a/src/internal/WixBuildTools.XsdGen/ElementCollection.cs b/src/internal/WixBuildTools.XsdGen/ElementCollection.cs
new file mode 100644
index 00000000..3f0bff16
--- /dev/null
+++ b/src/internal/WixBuildTools.XsdGen/ElementCollection.cs
@@ -0,0 +1,642 @@
+// 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.Serialize
+{
+    using System;
+    using System.Collections;
+    using System.Globalization;
+    /// <summary>
+    /// Collection used in the CodeDOM for the children of a given element. Provides type-checking
+    /// on the allowed children to ensure that only allowed types are added.
+    /// </summary>
+    public class ElementCollection : ICollection, IEnumerable
+    {
+        private CollectionType collectionType;
+        private int minimum = 1;
+        private int maximum = 1;
+        private int totalContainedItems;
+        private int containersUsed;
+        private ArrayList items;
+        /// <summary>
+        /// Creates a new element collection.
+        /// </summary>
+        /// <param name="collectionType">Type of the collection to create.</param>
+        public ElementCollection(CollectionType collectionType)
+        {
+            this.collectionType = collectionType;
+            this.items = new ArrayList();
+        }
+        /// <summary>
+        /// Creates a new element collection.
+        /// </summary>
+        /// <param name="collectionType">Type of the collection to create.</param>
+        /// <param name="minimum">When used with a type 'Choice', specifies a minimum number of allowed children.</param>
+        /// <param name="maximum">When used with a type 'Choice', specifies a maximum number of allowed children.</param>
+        public ElementCollection(CollectionType collectionType, int minimum, int maximum) : this(collectionType)
+        {
+            this.minimum = minimum;
+            this.maximum = maximum;
+        }
+        /// <summary>
+        /// Enum representing types of XML collections.
+        /// </summary>
+        public enum CollectionType
+        {
+            /// <summary>
+            /// A choice type, corresponding to the XSD choice element.
+            /// </summary>
+            Choice,
+            /// <summary>
+            /// A sequence type, corresponding to the XSD sequence element.
+            /// </summary>
+            Sequence
+        }
+        /// <summary>
+        /// Gets the type of collection.
+        /// </summary>
+        /// <value>The type of collection.</value>
+        public CollectionType Type
+        {
+            get { return this.collectionType; }
+        }
+        /// <summary>
+        /// Gets the count of child elements in this collection (counts ISchemaElements, not nested collections).
+        /// </summary>
+        /// <value>The count of child elements in this collection (counts ISchemaElements, not nested collections).</value>
+        public int Count
+        {
+            get { return this.totalContainedItems; }
+        }
+        /// <summary>
+        /// Gets the flag specifying whether this collection is synchronized. Always returns false.
+        /// </summary>
+        /// <value>The flag specifying whether this collection is synchronized. Always returns false.</value>
+        public bool IsSynchronized
+        {
+            get { return false; }
+        }
+        /// <summary>
+        /// Gets an object external callers can synchronize on.
+        /// </summary>
+        /// <value>An object external callers can synchronize on.</value>
+        public object SyncRoot
+        {
+            get { return this; }
+        }
+        /// <summary>
+        /// Adds a child element to this collection.
+        /// </summary>
+        /// <param name="element">The element to add.</param>
+        /// <exception cref="ArgumentException">Thrown if the child is not of an allowed type.</exception>
+        public void AddElement(ISchemaElement element)
+        {
+            foreach (object obj in this.items)
+            {
+                bool containerUsed;
+                CollectionItem collectionItem = obj as CollectionItem;
+                if (collectionItem != null)
+                {
+                    containerUsed = collectionItem.Elements.Count != 0;
+                    if (collectionItem.ElementType.IsAssignableFrom(element.GetType()))
+                    {
+                        collectionItem.AddElement(element);
+                        if (!containerUsed)
+                        {
+                            this.containersUsed++;
+                        }
+                        this.totalContainedItems++;
+                        return;
+                    }
+                    continue;
+                }
+                ElementCollection collection = obj as ElementCollection;
+                if (collection != null)
+                {
+                    containerUsed = collection.Count != 0;
+                    try
+                    {
+                        collection.AddElement(element);
+                        if (!containerUsed)
+                        {
+                            this.containersUsed++;
+                        }
+                        this.totalContainedItems++;
+                        return;
+                    }
+                    catch (ArgumentException)
+                    {
+                        // Eat the exception and keep looking. We'll throw our own if we can't find its home.
+                    }
+                    continue;
+                }
+            }
+            throw new ArgumentException(String.Format(
+                CultureInfo.InvariantCulture,
+                "Element of type {0} is not valid for this collection.",
+                element.GetType().Name));
+        }
+        /// <summary>
+        /// Removes a child element from this collection.
+        /// </summary>
+        /// <param name="element">The element to remove.</param>
+        /// <exception cref="ArgumentException">Thrown if the element is not of an allowed type.</exception>
+        public void RemoveElement(ISchemaElement element)
+        {
+            foreach (object obj in this.items)
+            {
+                CollectionItem collectionItem = obj as CollectionItem;
+                if (collectionItem != null)
+                {
+                    if (collectionItem.ElementType.IsAssignableFrom(element.GetType()))
+                    {
+                        if (collectionItem.Elements.Count == 0)
+                        {
+                            return;
+                        }
+                        collectionItem.RemoveElement(element);
+                        if (collectionItem.Elements.Count == 0)
+                        {
+                            this.containersUsed--;
+                        }
+                        this.totalContainedItems--;
+                        return;
+                    }
+                    continue;
+                }
+                ElementCollection collection = obj as ElementCollection;
+                if (collection != null)
+                {
+                    if (collection.Count == 0)
+                    {
+                        continue;
+                    }
+                    try
+                    {
+                        collection.RemoveElement(element);
+                        if (collection.Count == 0)
+                        {
+                            this.containersUsed--;
+                        }
+                        this.totalContainedItems--;
+                        return;
+                    }
+                    catch (ArgumentException)
+                    {
+                        // Eat the exception and keep looking. We'll throw our own if we can't find its home.
+                    }
+                    continue;
+                }
+            }
+            throw new ArgumentException(String.Format(
+                CultureInfo.InvariantCulture,
+                "Element of type {0} is not valid for this collection.",
+                element.GetType().Name));
+        }
+        /// <summary>
+        /// Copies this collection to an array.
+        /// </summary>
+        /// <param name="array">Array to copy to.</param>
+        /// <param name="index">Offset into the array.</param>
+        public void CopyTo(Array array, int index)
+        {
+            int item = 0;
+            foreach (ISchemaElement element in this)
+            {
+                array.SetValue(element, (long)(item + index));
+                item++;
+            }
+        }
+        /// <summary>
+        /// Creates an enumerator for walking the elements in this collection.
+        /// </summary>
+        /// <returns>A newly created enumerator.</returns>
+        public IEnumerator GetEnumerator()
+        {
+            return new ElementCollectionEnumerator(this);
+        }
+        /// <summary>
+        /// Gets an enumerable collection of children of a given type.
+        /// </summary>
+        /// <param name="childType">Type of children to get.</param>
+        /// <returns>A collection of children.</returns>
+        /// <exception cref="ArgumentException">Thrown if the type isn't a valid child type.</exception>
+        public IEnumerable Filter(Type childType)
+        {
+            foreach (object container in this.items)
+            {
+                CollectionItem collectionItem = container as CollectionItem;
+                if (collectionItem != null)
+                {
+                    if (collectionItem.ElementType.IsAssignableFrom(childType))
+                    {
+                        return collectionItem.Elements;
+                    }
+                    continue;
+                }
+                ElementCollection elementCollection = container as ElementCollection;
+                if (elementCollection != null)
+                {
+                    IEnumerable nestedFilter = elementCollection.Filter(childType);
+                    if (nestedFilter != null)
+                    {
+                        return nestedFilter;
+                    }
+                    continue;
+                }
+            }
+            throw new ArgumentException(String.Format(
+                CultureInfo.InvariantCulture,
+                "Type {0} is not valid for this collection.",
+                childType.Name));
+        }
+        /// <summary>
+        /// Adds a type to this collection.
+        /// </summary>
+        /// <param name="collectionItem">CollectionItem representing the type to add.</param>
+        public void AddItem(CollectionItem collectionItem)
+        {
+            this.items.Add(collectionItem);
+        }
+        /// <summary>
+        /// Adds a nested collection to this collection.
+        /// </summary>
+        /// <param name="collection">ElementCollection to add.</param>
+        public void AddCollection(ElementCollection collection)
+        {
+            this.items.Add(collection);
+        }
+        /// <summary>
+        /// Class used to represent a given type in the child collection of an element. Abstract,
+        /// has subclasses for choice and sequence (which can do cardinality checks).
+        /// </summary>
+        public abstract class CollectionItem
+        {
+            private Type elementType;
+            private ArrayList elements;
+            /// <summary>
+            /// Creates a new CollectionItem for the given element type.
+            /// </summary>
+            /// <param name="elementType">Type of the element for this collection item.</param>
+            public CollectionItem(Type elementType)
+            {
+                this.elementType = elementType;
+                this.elements = new ArrayList();
+            }
+            /// <summary>
+            /// Gets the type of this collection's items.
+            /// </summary>
+            public Type ElementType
+            {
+                get { return this.elementType; }
+            }
+            /// <summary>
+            /// Gets the elements of this collection.
+            /// </summary>
+            public ArrayList Elements
+            {
+                get { return this.elements; }
+            }
+            /// <summary>
+            /// Adds an element to this collection. Must be of an assignable type to the collection's
+            /// type.
+            /// </summary>
+            /// <param name="element">The element to add.</param>
+            /// <exception cref="ArgumentException">Thrown if the type isn't assignable to the collection's type.</exception>
+            public void AddElement(ISchemaElement element)
+            {
+                if (!this.elementType.IsAssignableFrom(element.GetType()))
+                {
+                    throw new ArgumentException(
+                        String.Format(
+                            CultureInfo.InvariantCulture,
+                            "Element must be a subclass of {0}, but was of type {1}.",
+                            this.elementType.Name,
+                            element.GetType().Name),
+                        "element");
+                }
+                this.elements.Add(element);
+            }
+            /// <summary>
+            /// Removes an element from this collection.
+            /// </summary>
+            /// <param name="element">The element to remove.</param>
+            /// <exception cref="ArgumentException">Thrown if the element's type isn't assignable to the collection's type.</exception>
+            public void RemoveElement(ISchemaElement element)
+            {
+                if (!this.elementType.IsAssignableFrom(element.GetType()))
+                {
+                    throw new ArgumentException(
+                        String.Format(
+                            CultureInfo.InvariantCulture,
+                            "Element must be a subclass of {0}, but was of type {1}.",
+                            this.elementType.Name,
+                            element.GetType().Name),
+                        "element");
+                }
+                this.elements.Remove(element);
+            }
+        }
+        /// <summary>
+        /// Class representing a choice item. Doesn't do cardinality checks.
+        /// </summary>
+        public class ChoiceItem : CollectionItem
+        {
+            /// <summary>
+            /// Creates a new choice item.
+            /// </summary>
+            /// <param name="elementType">Type of the created item.</param>
+            public ChoiceItem(Type elementType) : base(elementType)
+            {
+            }
+        }
+        /// <summary>
+        /// Class representing a sequence item. Can do cardinality checks, if required.
+        /// </summary>
+        public class SequenceItem : CollectionItem
+        {
+            private int minimum = 1;
+            private int maximum = 1;
+            /// <summary>
+            /// Creates a new sequence item.
+            /// </summary>
+            /// <param name="elementType">Type of the created item.</param>
+            public SequenceItem(Type elementType) : base(elementType)
+            {
+            }
+            /// <summary>
+            /// Creates a new sequence item with the specified minimum and maximum.
+            /// </summary>
+            /// <param name="elementType">Type of the created item.</param>
+            /// <param name="minimum">Minimum number of elements.</param>
+            /// <param name="maximum">Maximum number of elements.</param>
+            public SequenceItem(Type elementType, int minimum, int maximum) : base(elementType)
+            {
+                this.minimum = minimum;
+                this.maximum = maximum;
+            }
+        }
+        /// <summary>
+        /// Enumerator for the ElementCollection.
+        /// </summary>
+        private class ElementCollectionEnumerator : IEnumerator
+        {
+            private ElementCollection collection;
+            private Stack collectionStack;
+            /// <summary>
+            /// Creates a new ElementCollectionEnumerator.
+            /// </summary>
+            /// <param name="collection">The collection to create an enumerator for.</param>
+            public ElementCollectionEnumerator(ElementCollection collection)
+            {
+                this.collection = collection;
+            }
+            /// <summary>
+            /// Gets the current object from the enumerator.
+            /// </summary>
+            public object Current
+            {
+                get
+                {
+                    if (this.collectionStack != null && this.collectionStack.Count > 0)
+                    {
+                        CollectionSymbol symbol = (CollectionSymbol)this.collectionStack.Peek();
+                        object container = symbol.Collection.items[symbol.ContainerIndex];
+                        CollectionItem collectionItem = container as CollectionItem;
+                        if (collectionItem != null)
+                        {
+                            return collectionItem.Elements[symbol.ItemIndex];
+                        }
+                        throw new InvalidOperationException(String.Format(
+                            CultureInfo.InvariantCulture,
+                            "Element of type {0} found in enumerator. Must be ChoiceItem or SequenceItem.",
+                            container.GetType().Name));
+                    }
+                    return null;
+                }
+            }
+            /// <summary>
+            /// Resets the enumerator to the beginning.
+            /// </summary>
+            public void Reset()
+            {
+                if (this.collectionStack != null)
+                {
+                    this.collectionStack.Clear();
+                    this.collectionStack = null;
+                }
+            }
+            /// <summary>
+            /// Moves the enumerator to the next item.
+            /// </summary>
+            /// <returns>True if there is a next item, false otherwise.</returns>
+            public bool MoveNext()
+            {
+                if (this.collectionStack == null)
+                {
+                    if (this.collection.Count == 0)
+                    {
+                        return false;
+                    }
+                    this.collectionStack = new Stack();
+                    this.collectionStack.Push(new CollectionSymbol(this.collection));
+                }
+                CollectionSymbol symbol = (CollectionSymbol)this.collectionStack.Peek();
+                if (this.FindNext(symbol))
+                {
+                    return true;
+                }
+                this.collectionStack.Pop();
+                if (this.collectionStack.Count == 0)
+                {
+                    return false;
+                }
+                return this.MoveNext();
+            }
+            /// <summary>
+            /// Pushes a collection onto the stack.
+            /// </summary>
+            /// <param name="collection">The collection to push.</param>
+            private void PushCollection(ElementCollection collection)
+            {
+                if (collection.Count <= 0)
+                {
+                    throw new ArgumentException(String.Format(
+                        CultureInfo.InvariantCulture,
+                        "Collection has {0} elements. Must have at least one.",
+                        collection.Count));
+                }
+                CollectionSymbol symbol = new CollectionSymbol(collection);
+                this.collectionStack.Push(symbol);
+                this.FindNext(symbol);
+            }
+            /// <summary>
+            /// Finds the next item from a given symbol.
+            /// </summary>
+            /// <param name="symbol">The symbol to start looking from.</param>
+            /// <returns>True if a next element is found, false otherwise.</returns>
+            private bool FindNext(CollectionSymbol symbol)
+            {
+                object container = symbol.Collection.items[symbol.ContainerIndex];
+                CollectionItem collectionItem = container as CollectionItem;
+                if (collectionItem != null)
+                {
+                    if (symbol.ItemIndex + 1 < collectionItem.Elements.Count)
+                    {
+                        symbol.ItemIndex++;
+                        return true;
+                    }
+                }
+                ElementCollection elementCollection = container as ElementCollection;
+                if (elementCollection != null && elementCollection.Count > 0 && symbol.ItemIndex == -1)
+                {
+                    symbol.ItemIndex++;
+                    this.PushCollection(elementCollection);
+                    return true;
+                }
+                symbol.ItemIndex = 0;
+                for (int i = symbol.ContainerIndex + 1; i < symbol.Collection.items.Count; ++i)
+                {
+                    object nestedContainer = symbol.Collection.items[i];
+                    CollectionItem nestedCollectionItem = nestedContainer as CollectionItem;
+                    if (nestedCollectionItem != null)
+                    {
+                        if (nestedCollectionItem.Elements.Count > 0)
+                        {
+                            symbol.ContainerIndex = i;
+                            return true;
+                        }
+                    }
+                    ElementCollection nestedElementCollection = nestedContainer as ElementCollection;
+                    if (nestedElementCollection != null && nestedElementCollection.Count > 0)
+                    {
+                        symbol.ContainerIndex = i;
+                        this.PushCollection(nestedElementCollection);
+                        return true;
+                    }
+                }
+                return false;
+            }
+            /// <summary>
+            /// Class representing a single point in the collection. Consists of an ElementCollection,
+            /// a container index, and an index into the container.
+            /// </summary>
+            private class CollectionSymbol
+            {
+                private ElementCollection collection;
+                private int containerIndex;
+                private int itemIndex = -1;
+                /// <summary>
+                /// Creates a new CollectionSymbol.
+                /// </summary>
+                /// <param name="collection">The collection for the symbol.</param>
+                public CollectionSymbol(ElementCollection collection)
+                {
+                    this.collection = collection;
+                }
+                /// <summary>
+                /// Gets the collection for the symbol.
+                /// </summary>
+                public ElementCollection Collection
+                {
+                    get { return this.collection; }
+                }
+                /// <summary>
+                /// Gets and sets the index of the container in the collection.
+                /// </summary>
+                public int ContainerIndex
+                {
+                    get { return this.containerIndex; }
+                    set { this.containerIndex = value; }
+                }
+                /// <summary>
+                /// Gets and sets the index of the item in the container.
+                /// </summary>
+                public int ItemIndex
+                {
+                    get { return this.itemIndex; }
+                    set { this.itemIndex = value; }
+                }
+            }
+        }
+    }
+}
diff --git a/src/internal/WixBuildTools.XsdGen/StronglyTypedClasses.cs b/src/internal/WixBuildTools.XsdGen/StronglyTypedClasses.cs
new file mode 100644
index 00000000..4a41f8a9
--- /dev/null
+++ b/src/internal/WixBuildTools.XsdGen/StronglyTypedClasses.cs
@@ -0,0 +1,1498 @@
+// 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.Tools
+{
+    using System;
+    using System.CodeDom;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Collections.Specialized;
+    using System.IO;
+    using System.Reflection;
+    using System.Text;
+    using System.Text.RegularExpressions;
+    using System.Xml;
+    using System.Xml.Schema;
+    /// <summary>
+    /// Type containing static Generate method, which fills in a compile unit from a 
+    /// given schema.
+    /// </summary>
+    internal class StronglyTypedClasses
+    {
+        private static string outputXmlComment = "Processes this element and all child elements into an XmlWriter.";
+        private static Hashtable simpleTypeNamesToClrTypeNames;
+        private static Dictionary<string, EnumDeclaration> typeNamesToEnumDeclarations;
+        private static Dictionary<EnumDeclaration, CodeTypeDeclaration> enumsToParseMethodClasses;
+        private static Regex multiUppercaseNameRegex = new Regex("[A-Z][A-Z][A-Z]", RegexOptions.Compiled);
+        private static Dictionary<string, XmlSchemaAttributeGroup> refToAttributeGroups;
+        private static CodeTypeDeclaration enumHelperClass;
+        /// <summary>
+        /// Private constructor for static class.
+        /// </summary>
+        private StronglyTypedClasses()
+        {
+        }
+        /// <summary>
+        /// Generates strongly typed serialization classes for the given schema document
+        /// under the given namespace and generates a code compile unit.
+        /// </summary>
+        /// <param name="xmlSchema">Schema document to generate classes for.</param>
+        /// <param name="generateNamespace">Namespace to be used for the generated code.</param>
+        /// <param name="commonNamespace">Namespace in which to find common classes and interfaces, 
+        /// like ISchemaElement.</param>
+        /// <returns>A fully populated CodeCompileUnit, which can be serialized in the language of choice.</returns>
+        public static CodeCompileUnit Generate(XmlSchema xmlSchema, string generateNamespace, string commonNamespace)
+        {
+            if (xmlSchema == null)
+            {
+                throw new ArgumentNullException("xmlSchema");
+            }
+            if (generateNamespace == null)
+            {
+                throw new ArgumentNullException("generateNamespace");
+            }
+            simpleTypeNamesToClrTypeNames = new Hashtable();
+            typeNamesToEnumDeclarations = new Dictionary<string, EnumDeclaration>();
+            refToAttributeGroups = new Dictionary<string, XmlSchemaAttributeGroup>();
+            enumsToParseMethodClasses = new Dictionary<EnumDeclaration, CodeTypeDeclaration>();
+            CodeCompileUnit codeCompileUnit = new CodeCompileUnit();
+            CodeNamespace codeNamespace = new CodeNamespace(generateNamespace);
+            codeCompileUnit.Namespaces.Add(codeNamespace);
+            codeNamespace.Imports.Add(new CodeNamespaceImport("System"));
+            codeNamespace.Imports.Add(new CodeNamespaceImport("System.CodeDom.Compiler")); // for GeneratedCodeAttribute
+            codeNamespace.Imports.Add(new CodeNamespaceImport("System.Collections"));
+            codeNamespace.Imports.Add(new CodeNamespaceImport("System.Diagnostics.CodeAnalysis"));
+            codeNamespace.Imports.Add(new CodeNamespaceImport("System.Globalization"));
+            codeNamespace.Imports.Add(new CodeNamespaceImport("System.Xml"));
+            if (commonNamespace != null)
+            {
+                codeNamespace.Imports.Add(new CodeNamespaceImport(commonNamespace));
+            }
+            // NOTE: This hash table serves double duty so be sure to have the XSD
+            //       type name mapped to the CLR type name *and* the CLR type name
+            //       mapped to the same CLR type name.  Look at long and bool for
+            //       examples below (and before you ask, no I don't know why DateTime
+            //       just works).
+            simpleTypeNamesToClrTypeNames.Add("dateTime", "DateTime");
+            simpleTypeNamesToClrTypeNames.Add("integer", "int");
+            simpleTypeNamesToClrTypeNames.Add("int", "int");
+            simpleTypeNamesToClrTypeNames.Add("NMTOKEN", "string");
+            simpleTypeNamesToClrTypeNames.Add("string", "string");
+            simpleTypeNamesToClrTypeNames.Add("nonNegativeInteger", "long");
+            simpleTypeNamesToClrTypeNames.Add("long", "long");
+            simpleTypeNamesToClrTypeNames.Add("boolean", "bool");
+            simpleTypeNamesToClrTypeNames.Add("bool", "bool");
+            xmlSchema.Compile(null);
+            foreach (XmlSchemaAttributeGroup schemaAttributeGroup in xmlSchema.AttributeGroups.Values)
+            {
+                refToAttributeGroups.Add(schemaAttributeGroup.Name, schemaAttributeGroup);
+            }
+            foreach (XmlSchemaObject schemaObject in xmlSchema.SchemaTypes.Values)
+            {
+                XmlSchemaSimpleType schemaSimpleType = schemaObject as XmlSchemaSimpleType;
+                if (schemaSimpleType != null)
+                {
+                    ProcessSimpleType(schemaSimpleType, codeNamespace);
+                }
+            }
+            foreach (XmlSchemaObject schemaObject in xmlSchema.SchemaTypes.Values)
+            {
+                XmlSchemaComplexType schemaComplexType = schemaObject as XmlSchemaComplexType;
+                if (schemaComplexType != null)
+                {
+                    ProcessComplexType(schemaComplexType, codeNamespace);
+                }
+            }
+            foreach (XmlSchemaObject schemaObject in xmlSchema.Elements.Values)
+            {
+                XmlSchemaElement schemaElement = schemaObject as XmlSchemaElement;
+                if (schemaElement != null)
+                {
+                    ProcessElement(schemaElement, codeNamespace);
+                }
+            }
+            return codeCompileUnit;
+        }
+        /// <summary>
+        /// Processes an XmlSchemaElement into corresponding types.
+        /// </summary>
+        /// <param name="schemaElement">XmlSchemaElement to be processed.</param>
+        /// <param name="codeNamespace">CodeNamespace to be used when outputting code.</param>
+        private static void ProcessElement(XmlSchemaElement schemaElement, CodeNamespace codeNamespace)
+        {
+            string elementType = schemaElement.SchemaTypeName.Name;
+            string elementNamespace = schemaElement.QualifiedName.Namespace;
+            string elementDocumentation = GetDocumentation(schemaElement.Annotation);
+            if ((elementType == null || elementType.Length == 0) && schemaElement.SchemaType != null)
+            {
+                ProcessComplexType(schemaElement.Name, elementNamespace, (XmlSchemaComplexType)schemaElement.SchemaType, elementDocumentation, codeNamespace);
+            }
+            else
+            {
+                if (elementType == null || elementType.Length == 0)
+                {
+                    elementType = "string";
+                }
+                CodeTypeDeclaration typeDeclaration = new CodeTypeDeclaration(schemaElement.Name);
+                typeDeclaration.CustomAttributes.Add(GetGeneratedCodeAttribute());
+                typeDeclaration.Attributes = MemberAttributes.Public;
+                typeDeclaration.IsClass = true;
+                if (elementDocumentation != null)
+                {
+                    GenerateSummaryComment(typeDeclaration.Comments, elementDocumentation);
+                }
+                CodeMemberMethod outputXmlMethod = new CodeMemberMethod();
+                outputXmlMethod.Attributes = MemberAttributes.Public;
+                outputXmlMethod.ImplementationTypes.Add("ISchemaElement");
+                outputXmlMethod.Name = "OutputXml";
+                outputXmlMethod.Parameters.Add(new CodeParameterDeclarationExpression("XmlWriter", "writer"));
+                outputXmlMethod.Statements.Add(GetArgumentNullCheckStatement("writer", false));
+                outputXmlMethod.Statements.Add(new CodeMethodInvokeExpression(new CodeVariableReferenceExpression("writer"), "WriteStartElement", new CodeSnippetExpression(String.Concat("\"", schemaElement.Name, "\"")), new CodeSnippetExpression(String.Concat("\"", elementNamespace, "\""))));
+                GenerateSummaryComment(outputXmlMethod.Comments, outputXmlComment);
+                if (simpleTypeNamesToClrTypeNames.ContainsKey(elementType))
+                {
+                    CodeMemberField parentField = new CodeMemberField("ISchemaElement", "parentElement");
+                    typeDeclaration.Members.Add(parentField);
+                    CodeMemberProperty parentProperty = new CodeMemberProperty();
+                    parentProperty.Attributes = MemberAttributes.Public;
+                    parentProperty.ImplementationTypes.Add("ISchemaElement");
+                    parentProperty.Name = "ParentElement";
+                    parentProperty.Type = new CodeTypeReference("ISchemaElement");
+                    parentProperty.GetStatements.Add(new CodeMethodReturnStatement(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), "parentElement")));
+                    parentProperty.SetStatements.Add(new CodeAssignStatement(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), "parentElement"), new CodeVariableReferenceExpression("value")));
+                    typeDeclaration.Members.Add(parentProperty);
+                    CodeMemberMethod setAttributeMethod = new CodeMemberMethod();
+                    setAttributeMethod.Attributes = MemberAttributes.Public;
+                    setAttributeMethod.ImplementationTypes.Add("ISetAttributes");
+                    setAttributeMethod.Name = "SetAttribute";
+                    setAttributeMethod.Parameters.Add(new CodeParameterDeclarationExpression(typeof(string), "name"));
+                    setAttributeMethod.Parameters.Add(new CodeParameterDeclarationExpression(typeof(string), "value"));
+                    setAttributeMethod.PrivateImplementationType = new CodeTypeReference("ISetAttributes");
+                    setAttributeMethod.CustomAttributes.Add(GetCodeAnalysisSuppressionAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes"));
+                    setAttributeMethod.Statements.Add(GetArgumentNullCheckStatement("name", true));
+                    GenerateFieldAndProperty("Content", (string)simpleTypeNamesToClrTypeNames[elementType], typeDeclaration, outputXmlMethod, setAttributeMethod, null, elementDocumentation, true, false);
+                    typeDeclaration.Members.Add(setAttributeMethod);
+                    typeDeclaration.BaseTypes.Add(new CodeTypeReference("ISetAttributes"));
+                }
+                else
+                {
+                    typeDeclaration.BaseTypes.Add(elementType);
+                    outputXmlMethod.Statements.Add(new CodeMethodInvokeExpression(new CodeBaseReferenceExpression(), "OutputXml", new CodeVariableReferenceExpression("writer")));
+                    outputXmlMethod.Attributes |= MemberAttributes.Override;
+                }
+                outputXmlMethod.Statements.Add(new CodeMethodInvokeExpression(new CodeVariableReferenceExpression("writer"), "WriteEndElement"));
+                typeDeclaration.BaseTypes.Add(new CodeTypeReference("ISchemaElement"));
+                typeDeclaration.Members.Add(outputXmlMethod);
+                codeNamespace.Types.Add(typeDeclaration);
+            }
+        }
+        /// <summary>
+        /// Processes an XmlSchemaComplexType into corresponding types.
+        /// </summary>
+        /// <param name="complexType">XmlSchemaComplexType to be processed.</param>
+        /// <param name="codeNamespace">CodeNamespace to be used when outputting code.</param>
+        private static void ProcessComplexType(XmlSchemaComplexType complexType, CodeNamespace codeNamespace)
+        {
+            CodeMemberMethod outputXmlMethod = new CodeMemberMethod();
+            outputXmlMethod.Attributes = MemberAttributes.Public;
+            outputXmlMethod.ImplementationTypes.Add("ISchemaElement");
+            outputXmlMethod.Name = "OutputXml";
+            outputXmlMethod.Parameters.Add(new CodeParameterDeclarationExpression("XmlWriter", "writer"));
+            outputXmlMethod.Statements.Add(GetArgumentNullCheckStatement("writer", false));
+            GenerateSummaryComment(outputXmlMethod.Comments, outputXmlComment);
+            CodeMemberMethod setAttributeMethod = new CodeMemberMethod();
+            setAttributeMethod.Attributes = MemberAttributes.Public;
+            setAttributeMethod.ImplementationTypes.Add("ISetAttributes");
+            setAttributeMethod.Name = "SetAttribute";
+            setAttributeMethod.Parameters.Add(new CodeParameterDeclarationExpression(typeof(string), "name"));
+            setAttributeMethod.Parameters.Add(new CodeParameterDeclarationExpression(typeof(string), "value"));
+            setAttributeMethod.PrivateImplementationType = new CodeTypeReference("ISetAttributes");
+            setAttributeMethod.CustomAttributes.Add(GetCodeAnalysisSuppressionAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes"));
+            setAttributeMethod.Statements.Add(GetArgumentNullCheckStatement("name", true));
+            string documentation = GetDocumentation(complexType.Annotation);
+            ProcessSimpleContent(complexType.Name, (XmlSchemaSimpleContentExtension)complexType.ContentModel.Content, documentation, codeNamespace, outputXmlMethod, setAttributeMethod, true);
+        }
+        /// <summary>
+        /// Processes an XmlSchemaComplexType into corresponding types.
+        /// </summary>
+        /// <param name="typeName">Name to use for the type being output.</param>
+        /// <param name="elementNamespace">Namespace of the xml element.</param>
+        /// <param name="complexType">XmlSchemaComplexType to be processed.</param>
+        /// <param name="documentation">Documentation for the element.</param>
+        /// <param name="codeNamespace">CodeNamespace to be used when outputting code.</param>
+        private static void ProcessComplexType(string typeName, string elementNamespace, XmlSchemaComplexType complexType, string documentation, CodeNamespace codeNamespace)
+        {
+            CodeMemberMethod outputXmlMethod = new CodeMemberMethod();
+            outputXmlMethod.Attributes = MemberAttributes.Public;
+            outputXmlMethod.ImplementationTypes.Add("ISchemaElement");
+            outputXmlMethod.Name = "OutputXml";
+            outputXmlMethod.Parameters.Add(new CodeParameterDeclarationExpression("XmlWriter", "writer"));
+            outputXmlMethod.Statements.Add(GetArgumentNullCheckStatement("writer", false));
+            outputXmlMethod.Statements.Add(new CodeMethodInvokeExpression(new CodeVariableReferenceExpression("writer"), "WriteStartElement", new CodeSnippetExpression(String.Concat("\"", typeName, "\"")), new CodeSnippetExpression(String.Concat("\"", elementNamespace, "\""))));
+            GenerateSummaryComment(outputXmlMethod.Comments, outputXmlComment);
+            CodeMemberMethod setAttributeMethod = new CodeMemberMethod();
+            setAttributeMethod.Attributes = MemberAttributes.Public;
+            setAttributeMethod.ImplementationTypes.Add("ISetAttributes");
+            setAttributeMethod.Name = "SetAttribute";
+            setAttributeMethod.Parameters.Add(new CodeParameterDeclarationExpression(typeof(string), "name"));
+            setAttributeMethod.Parameters.Add(new CodeParameterDeclarationExpression(typeof(string), "value"));
+            setAttributeMethod.PrivateImplementationType = new CodeTypeReference("ISetAttributes");
+            setAttributeMethod.CustomAttributes.Add(GetCodeAnalysisSuppressionAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes"));
+            setAttributeMethod.Statements.Add(GetArgumentNullCheckStatement("name", true));
+            if (complexType.ContentModel == null)
+            {
+                CodeTypeDeclaration typeDeclaration = new CodeTypeDeclaration(typeName);
+                typeDeclaration.CustomAttributes.Add(GetGeneratedCodeAttribute());
+                typeDeclaration.Attributes = MemberAttributes.Public;
+                typeDeclaration.IsClass = true;
+                CodeIterationStatement childEnumStatement = null;
+                if (documentation != null)
+                {
+                    GenerateSummaryComment(typeDeclaration.Comments, documentation);
+                }
+                if (complexType.Particle != null)
+                {
+                    CodeMemberField childrenField = new CodeMemberField("ElementCollection", "children");
+                    typeDeclaration.Members.Add(childrenField);
+                    CodeMemberProperty childrenProperty = new CodeMemberProperty();
+                    childrenProperty.Attributes = MemberAttributes.Public;
+                    childrenProperty.ImplementationTypes.Add("IParentElement");
+                    childrenProperty.Name = "Children";
+                    childrenProperty.Type = new CodeTypeReference("IEnumerable");
+                    childrenProperty.GetStatements.Add(new CodeMethodReturnStatement(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), "children")));
+                    typeDeclaration.Members.Add(childrenProperty);
+                    CodeMemberProperty filterChildrenProperty = new CodeMemberProperty();
+                    filterChildrenProperty.Attributes = MemberAttributes.Public;
+                    filterChildrenProperty.ImplementationTypes.Add("IParentElement");
+                    filterChildrenProperty.Name = "Item";
+                    filterChildrenProperty.Parameters.Add(new CodeParameterDeclarationExpression(typeof(Type), "childType"));
+                    filterChildrenProperty.Type = new CodeTypeReference("IEnumerable");
+                    filterChildrenProperty.GetStatements.Add(new CodeMethodReturnStatement(new CodeMethodInvokeExpression(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), "children"), "Filter", new CodeVariableReferenceExpression("childType"))));
+                    filterChildrenProperty.CustomAttributes.Add(GetCodeAnalysisSuppressionAttribute("Microsoft.Design", "CA1043:UseIntegralOrStringArgumentForIndexers"));
+                    typeDeclaration.Members.Add(filterChildrenProperty);
+                    CodeMemberMethod addChildMethod = new CodeMemberMethod();
+                    addChildMethod.Attributes = MemberAttributes.Public;
+                    addChildMethod.ImplementationTypes.Add("IParentElement");
+                    addChildMethod.Name = "AddChild";
+                    addChildMethod.Parameters.Add(new CodeParameterDeclarationExpression("ISchemaElement", "child"));
+                    addChildMethod.Statements.Add(GetArgumentNullCheckStatement("child", false));
+                    CodeExpressionStatement addChildStatement = new CodeExpressionStatement(new CodeMethodInvokeExpression(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), "children"), "AddElement", new CodeVariableReferenceExpression("child")));
+                    addChildMethod.Statements.Add(addChildStatement);
+                    CodeAssignStatement setParentStatement = new CodeAssignStatement(new CodePropertyReferenceExpression(new CodeVariableReferenceExpression("child"), "ParentElement"), new CodeThisReferenceExpression());
+                    addChildMethod.Statements.Add(setParentStatement);
+                    typeDeclaration.Members.Add(addChildMethod);
+                    CodeMemberMethod removeChildMethod = new CodeMemberMethod();
+                    removeChildMethod.Attributes = MemberAttributes.Public;
+                    removeChildMethod.ImplementationTypes.Add("IParentElement");
+                    removeChildMethod.Name = "RemoveChild";
+                    removeChildMethod.Parameters.Add(new CodeParameterDeclarationExpression("ISchemaElement", "child"));
+                    removeChildMethod.Statements.Add(GetArgumentNullCheckStatement("child", false));
+                    CodeExpressionStatement removeChildStatement = new CodeExpressionStatement(new CodeMethodInvokeExpression(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), "children"), "RemoveElement", new CodeVariableReferenceExpression("child")));
+                    removeChildMethod.Statements.Add(removeChildStatement);
+                    CodeAssignStatement nullParentStatement = new CodeAssignStatement(new CodePropertyReferenceExpression(new CodeVariableReferenceExpression("child"), "ParentElement"), new CodePrimitiveExpression(null));
+                    removeChildMethod.Statements.Add(nullParentStatement);
+                    typeDeclaration.Members.Add(removeChildMethod);
+                    CodeMemberMethod createChildMethod = new CodeMemberMethod();
+                    createChildMethod.Attributes = MemberAttributes.Public;
+                    createChildMethod.ImplementationTypes.Add("ICreateChildren");
+                    createChildMethod.Name = "CreateChild";
+                    createChildMethod.Parameters.Add(new CodeParameterDeclarationExpression(typeof(string), "childName"));
+                    createChildMethod.PrivateImplementationType = new CodeTypeReference("ICreateChildren");
+                    createChildMethod.CustomAttributes.Add(GetCodeAnalysisSuppressionAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes"));
+                    createChildMethod.ReturnType = new CodeTypeReference("ISchemaElement");
+                    createChildMethod.Statements.Add(GetArgumentNullCheckStatement("childName", true));
+                    createChildMethod.Statements.Add(new CodeVariableDeclarationStatement("ISchemaElement", "childValue", new CodePrimitiveExpression(null)));
+                    CodeConstructor typeConstructor = new CodeConstructor();
+                    typeConstructor.Attributes = MemberAttributes.Public;
+                    CodeVariableReferenceExpression collectionVariable = null;
+                    XmlSchemaChoice schemaChoice = complexType.Particle as XmlSchemaChoice;
+                    if (schemaChoice != null)
+                    {
+                        collectionVariable = ProcessSchemaGroup(schemaChoice, typeConstructor, createChildMethod);
+                    }
+                    else
+                    {
+                        XmlSchemaSequence schemaSequence = complexType.Particle as XmlSchemaSequence;
+                        if (schemaSequence != null)
+                        {
+                            collectionVariable = ProcessSchemaGroup(schemaSequence, typeConstructor, createChildMethod);
+                        }
+                    }
+                    typeConstructor.Statements.Add(new CodeAssignStatement(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), "children"), collectionVariable));
+                    typeDeclaration.Members.Add(typeConstructor);
+                    CodeConditionStatement childNameNotFound = new CodeConditionStatement();
+                    childNameNotFound.Condition = new CodeBinaryOperatorExpression(new CodePrimitiveExpression(null), CodeBinaryOperatorType.ValueEquality, new CodeVariableReferenceExpression("childValue"));
+                    childNameNotFound.TrueStatements.Add(new CodeThrowExceptionStatement(new CodeObjectCreateExpression("InvalidOperationException", new CodeMethodInvokeExpression(new CodeTypeReferenceExpression("String"), "Concat", new CodeVariableReferenceExpression("childName"), new CodeSnippetExpression("\" is not a valid child name.\"")))));
+                    createChildMethod.Statements.Add(childNameNotFound);
+                    if (createChildMethod.Statements.Count > 8)
+                    {
+                        createChildMethod.CustomAttributes.Add(GetCodeAnalysisSuppressionAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity"));
+                    }
+                    createChildMethod.Statements.Add(new CodeMethodReturnStatement(new CodeVariableReferenceExpression("childValue")));
+                    typeDeclaration.Members.Add(createChildMethod);
+                    childEnumStatement = new CodeIterationStatement();
+                    childEnumStatement.InitStatement = new CodeVariableDeclarationStatement("IEnumerator", "enumerator", new CodeMethodInvokeExpression(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), "children"), "GetEnumerator"));
+                    childEnumStatement.TestExpression = new CodeMethodInvokeExpression(new CodeVariableReferenceExpression("enumerator"), "MoveNext");
+                    childEnumStatement.Statements.Add(new CodeVariableDeclarationStatement("ISchemaElement", "childElement", new CodeCastExpression("ISchemaElement", new CodePropertyReferenceExpression(new CodeVariableReferenceExpression("enumerator"), "Current"))));
+                    childEnumStatement.Statements.Add(new CodeMethodInvokeExpression(new CodeVariableReferenceExpression("childElement"), "OutputXml", new CodeVariableReferenceExpression("writer")));
+                    childEnumStatement.IncrementStatement = new CodeExpressionStatement(new CodeSnippetExpression(""));
+                    typeDeclaration.BaseTypes.Add(new CodeTypeReference("IParentElement"));
+                    typeDeclaration.BaseTypes.Add(new CodeTypeReference("ICreateChildren"));
+                }
+                // TODO: Handle xs:anyAttribute.
+                ProcessAttributes(complexType.Attributes, typeDeclaration, outputXmlMethod, setAttributeMethod);
+                if (childEnumStatement != null)
+                {
+                    outputXmlMethod.Statements.Add(childEnumStatement);
+                }
+                typeDeclaration.BaseTypes.Add(new CodeTypeReference("ISchemaElement"));
+                typeDeclaration.BaseTypes.Add(new CodeTypeReference("ISetAttributes"));
+                CodeMemberField parentField = new CodeMemberField("ISchemaElement", "parentElement");
+                typeDeclaration.Members.Add(parentField);
+                CodeMemberProperty parentProperty = new CodeMemberProperty();
+                parentProperty.Attributes = MemberAttributes.Public;
+                parentProperty.ImplementationTypes.Add("ISchemaElement");
+                parentProperty.Name = "ParentElement";
+                parentProperty.Type = new CodeTypeReference("ISchemaElement");
+                parentProperty.GetStatements.Add(new CodeMethodReturnStatement(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), "parentElement")));
+                parentProperty.SetStatements.Add(new CodeAssignStatement(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), "parentElement"), new CodeVariableReferenceExpression("value")));
+                typeDeclaration.Members.Add(parentProperty);
+                if (outputXmlMethod.Statements.Count > 8)
+                {
+                    outputXmlMethod.CustomAttributes.Add(GetCodeAnalysisSuppressionAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity"));
+                }
+                if (setAttributeMethod.Statements.Count > 8)
+                {
+                    setAttributeMethod.CustomAttributes.Add(GetCodeAnalysisSuppressionAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity"));
+                }
+                typeDeclaration.Members.Add(outputXmlMethod);
+                typeDeclaration.Members.Add(setAttributeMethod);
+                codeNamespace.Types.Add(typeDeclaration);
+            }
+            else
+            {
+                ProcessSimpleContent(typeName, (XmlSchemaSimpleContentExtension)complexType.ContentModel.Content, documentation, codeNamespace, outputXmlMethod, setAttributeMethod, false);
+            }
+            outputXmlMethod.Statements.Add(new CodeMethodInvokeExpression(new CodeVariableReferenceExpression("writer"), "WriteEndElement"));
+        }
+        /// <summary>
+        /// Processes a collection of attributes, generating the required fields and properties.
+        /// </summary>
+        /// <param name="attributes">List of attribute or attributeGroupRef elements being processed.</param>
+        /// <param name="typeDeclaration">CodeTypeDeclaration to be used when outputting code.</param>
+        /// <param name="outputXmlMethod">Member method for the OutputXml method.</param>
+        /// <param name="setAttributeMethod">Member method for the SetAttribute method.</param>
+        private static void ProcessAttributes(XmlSchemaObjectCollection attributes, CodeTypeDeclaration typeDeclaration, CodeMemberMethod outputXmlMethod, CodeMemberMethod setAttributeMethod)
+        {
+            foreach (XmlSchemaObject schemaObject in attributes)
+            {
+                XmlSchemaAttribute schemaAttribute = schemaObject as XmlSchemaAttribute;
+                if (schemaAttribute != null)
+                {
+                    ProcessAttribute(schemaAttribute, typeDeclaration, outputXmlMethod, setAttributeMethod);
+                }
+                else
+                {
+                    XmlSchemaAttributeGroupRef schemaAttributeGroupRef = schemaObject as XmlSchemaAttributeGroupRef;
+                    if (schemaAttributeGroupRef != null)
+                    {
+                        XmlSchemaAttributeGroup schemaAttributeGroup = refToAttributeGroups[schemaAttributeGroupRef.RefName.Name];
+                        // recurse!
+                        ProcessAttributes(schemaAttributeGroup.Attributes, typeDeclaration, outputXmlMethod, setAttributeMethod);
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// Processes an XmlSchemaGroupBase element.
+        /// </summary>
+        /// <param name="schemaGroup">Element group to process.</param>
+        /// <param name="constructor">Constructor to which statements should be added.</param>
+        /// <param name="createChildMethod">Method used for creating children on read-in.</param>
+        /// <returns>A reference to the local variable containing the collection.</returns>
+        private static CodeVariableReferenceExpression ProcessSchemaGroup(XmlSchemaGroupBase schemaGroup, CodeConstructor constructor, CodeMemberMethod createChildMethod)
+        {
+            return ProcessSchemaGroup(schemaGroup, constructor, createChildMethod, 0);
+        }
+        /// <summary>
+        /// Processes an XmlSchemaGroupBase element.
+        /// </summary>
+        /// <param name="schemaGroup">Element group to process.</param>
+        /// <param name="constructor">Constructor to which statements should be added.</param>
+        /// <param name="createChildMethod">Method used for creating children on read-in.</param>
+        /// <param name="depth">Depth to which this collection is nested.</param>
+        /// <returns>A reference to the local variable containing the collection.</returns>
+        private static CodeVariableReferenceExpression ProcessSchemaGroup(XmlSchemaGroupBase schemaGroup, CodeConstructor constructor, CodeMemberMethod createChildMethod, int depth)
+        {
+            string collectionName = String.Format("childCollection{0}", depth);
+            CodeVariableReferenceExpression collectionVariableReference = new CodeVariableReferenceExpression(collectionName);
+            CodeVariableDeclarationStatement collectionStatement = new CodeVariableDeclarationStatement("ElementCollection", collectionName);
+            if (schemaGroup is XmlSchemaChoice)
+            {
+                collectionStatement.InitExpression = new CodeObjectCreateExpression("ElementCollection", new CodePropertyReferenceExpression(new CodeTypeReferenceExpression("ElementCollection.CollectionType"), "Choice"));
+            }
+            else
+            {
+                collectionStatement.InitExpression = new CodeObjectCreateExpression("ElementCollection", new CodePropertyReferenceExpression(new CodeTypeReferenceExpression("ElementCollection.CollectionType"), "Sequence"));
+            }
+            constructor.Statements.Add(collectionStatement);
+            foreach (XmlSchemaObject obj in schemaGroup.Items)
+            {
+                XmlSchemaElement schemaElement = obj as XmlSchemaElement;
+                if (schemaElement != null)
+                {
+                    if (schemaGroup is XmlSchemaChoice)
+                    {
+                        CodeMethodInvokeExpression addItemInvoke = new CodeMethodInvokeExpression(collectionVariableReference, "AddItem", new CodeObjectCreateExpression("ElementCollection.ChoiceItem", new CodeTypeOfExpression(schemaElement.RefName.Name)));
+                        constructor.Statements.Add(addItemInvoke);
+                    }
+                    else
+                    {
+                        CodeMethodInvokeExpression addItemInvoke = new CodeMethodInvokeExpression(collectionVariableReference, "AddItem", new CodeObjectCreateExpression("ElementCollection.SequenceItem", new CodeTypeOfExpression(schemaElement.RefName.Name)));
+                        constructor.Statements.Add(addItemInvoke);
+                    }
+                    CodeConditionStatement createChildIf = new CodeConditionStatement();
+                    createChildIf.Condition = new CodeBinaryOperatorExpression(new CodeSnippetExpression(String.Concat("\"", schemaElement.RefName.Name, "\"")), CodeBinaryOperatorType.ValueEquality, new CodeVariableReferenceExpression("childName"));
+                    createChildIf.TrueStatements.Add(new CodeAssignStatement(new CodeVariableReferenceExpression("childValue"), new CodeObjectCreateExpression(schemaElement.RefName.Name)));
+                    createChildMethod.Statements.Add(createChildIf);
+                    continue;
+                }
+                XmlSchemaAny schemaAny = obj as XmlSchemaAny;
+                if (schemaAny != null)
+                {
+                    if (schemaGroup is XmlSchemaChoice)
+                    {
+                        CodeMethodInvokeExpression addItemInvoke = new CodeMethodInvokeExpression(collectionVariableReference, "AddItem", new CodeObjectCreateExpression("ElementCollection.ChoiceItem", new CodeTypeOfExpression("ISchemaElement")));
+                        constructor.Statements.Add(addItemInvoke);
+                    }
+                    else
+                    {
+                        CodeMethodInvokeExpression addItemInvoke = new CodeMethodInvokeExpression(collectionVariableReference, "AddItem", new CodeObjectCreateExpression("ElementCollection.SequenceItem", new CodeTypeOfExpression("ISchemaElement"), new CodeSnippetExpression("0"), new CodeSnippetExpression("-1")));
+                        constructor.Statements.Add(addItemInvoke);
+                    }
+                    continue;
+                }
+                XmlSchemaGroupBase schemaGroupBase = obj as XmlSchemaGroupBase;
+                if (schemaGroupBase != null)
+                {
+                    CodeVariableReferenceExpression nestedCollectionReference = ProcessSchemaGroup(schemaGroupBase, constructor, createChildMethod, depth + 1);
+                    CodeMethodInvokeExpression addCollectionInvoke = new CodeMethodInvokeExpression(collectionVariableReference, "AddCollection", nestedCollectionReference);
+                    constructor.Statements.Add(addCollectionInvoke);
+                    continue;
+                }
+            }
+            return collectionVariableReference;
+        }
+        /// <summary>
+        /// Processes an XmlSchemaSimpleContentExtension into corresponding types.
+        /// </summary>
+        /// <param name="typeName">Name of the type being generated.</param>
+        /// <param name="simpleContent">XmlSchemaSimpleContentExtension being processed.</param>
+        /// <param name="documentation">Documentation for the simple content.</param>
+        /// <param name="codeNamespace">CodeNamespace to be used when outputting code.</param>
+        /// <param name="outputXmlMethod">Method to use when outputting Xml.</param>
+        /// <param name="setAttributeMethod">Method to use when setting an attribute.</param>
+        /// <param name="abstractClass">If true, generate an abstract class.</param>
+        private static void ProcessSimpleContent(string typeName, XmlSchemaSimpleContentExtension simpleContent, string documentation, CodeNamespace codeNamespace, CodeMemberMethod outputXmlMethod, CodeMemberMethod setAttributeMethod, bool abstractClass)
+        {
+            CodeTypeDeclaration typeDeclaration = new CodeTypeDeclaration(typeName);
+            typeDeclaration.CustomAttributes.Add(GetGeneratedCodeAttribute());
+            typeDeclaration.Attributes = MemberAttributes.Public;
+            typeDeclaration.IsClass = true;
+            if (documentation != null)
+            {
+                GenerateSummaryComment(typeDeclaration.Comments, documentation);
+            }
+            if (abstractClass)
+            {
+                typeDeclaration.TypeAttributes = System.Reflection.TypeAttributes.Abstract | System.Reflection.TypeAttributes.Public;
+            }
+            // TODO: Handle xs:anyAttribute here.
+            foreach (XmlSchemaAttribute schemaAttribute in simpleContent.Attributes)
+            {
+                ProcessAttribute(schemaAttribute, typeDeclaration, outputXmlMethod, setAttributeMethod);
+            }
+            // This needs to come last, so that the generation code generates the inner content after the attributes.
+            string contentDocumentation = GetDocumentation(simpleContent.Annotation);
+            GenerateFieldAndProperty("Content", (string)simpleTypeNamesToClrTypeNames[simpleContent.BaseTypeName.Name], typeDeclaration, outputXmlMethod, setAttributeMethod, null, contentDocumentation, true, false);
+            typeDeclaration.BaseTypes.Add(new CodeTypeReference("ISchemaElement"));
+            typeDeclaration.BaseTypes.Add(new CodeTypeReference("ISetAttributes"));
+            CodeMemberField parentField = new CodeMemberField("ISchemaElement", "parentElement");
+            typeDeclaration.Members.Add(parentField);
+            CodeMemberProperty parentProperty = new CodeMemberProperty();
+            parentProperty.Attributes = MemberAttributes.Public;
+            parentProperty.ImplementationTypes.Add("ISchemaElement");
+            parentProperty.Name = "ParentElement";
+            parentProperty.Type = new CodeTypeReference("ISchemaElement");
+            parentProperty.GetStatements.Add(new CodeMethodReturnStatement(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), "parentElement")));
+            parentProperty.SetStatements.Add(new CodeAssignStatement(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), "parentElement"), new CodeVariableReferenceExpression("value")));
+            typeDeclaration.Members.Add(parentProperty);
+            if (outputXmlMethod.Statements.Count > 8)
+            {
+                outputXmlMethod.CustomAttributes.Add(GetCodeAnalysisSuppressionAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity"));
+            }
+            if (setAttributeMethod.Statements.Count > 8)
+            {
+                setAttributeMethod.CustomAttributes.Add(GetCodeAnalysisSuppressionAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity"));
+            }
+            typeDeclaration.Members.Add(outputXmlMethod);
+            typeDeclaration.Members.Add(setAttributeMethod);
+            codeNamespace.Types.Add(typeDeclaration);
+        }
+        /// <summary>
+        /// Processes an attribute, generating the required field and property. Potentially generates
+        /// an enum for an attribute restriction.
+        /// </summary>
+        /// <param name="attribute">Attribute element being processed.</param>
+        /// <param name="typeDeclaration">CodeTypeDeclaration to be used when outputting code.</param>
+        /// <param name="outputXmlMethod">Member method for the OutputXml method.</param>
+        /// <param name="setAttributeMethod">Member method for the SetAttribute method.</param>
+        private static void ProcessAttribute(XmlSchemaAttribute attribute, CodeTypeDeclaration typeDeclaration, CodeMemberMethod outputXmlMethod, CodeMemberMethod setAttributeMethod)
+        {
+            string attributeName = attribute.QualifiedName.Name;
+            string rawAttributeType = attribute.AttributeSchemaType.QualifiedName.Name;
+            string attributeType = null;
+            EnumDeclaration enumDeclaration = null;
+            if (rawAttributeType == null || rawAttributeType.Length == 0)
+            {
+                ProcessSimpleType(attributeName, attribute.AttributeSchemaType, true, out enumDeclaration, out attributeType);
+                if (enumDeclaration != null)
+                {
+                    typeDeclaration.Members.Add(enumDeclaration.TypeDeclaration);
+                    AddEnumHelperMethods(enumDeclaration, typeDeclaration);
+                }
+            }
+            else
+            {
+                attributeType = (string)simpleTypeNamesToClrTypeNames[rawAttributeType];
+            }
+            string documentation = GetDocumentation(attribute.Annotation);
+            // TODO: Handle required fields.
+            GenerateFieldAndProperty(attributeName, attributeType, typeDeclaration, outputXmlMethod, setAttributeMethod, enumDeclaration, documentation, false, false);
+        }
+        /// <summary>
+        /// Gets the first sentence of a documentation element and returns it as a string.
+        /// </summary>
+        /// <param name="annotation">The annotation in which to look for a documentation element.</param>
+        /// <returns>The string representing the first sentence, or null if none found.</returns>
+        private static string GetDocumentation(XmlSchemaAnnotation annotation)
+        {
+            string documentation = null;
+            if (annotation != null && annotation.Items != null)
+            {
+                foreach (XmlSchemaObject obj in annotation.Items)
+                {
+                    XmlSchemaDocumentation schemaDocumentation = obj as XmlSchemaDocumentation;
+                    if (schemaDocumentation != null)
+                    {
+                        if (schemaDocumentation.Markup.Length > 0)
+                        {
+                            XmlText text = schemaDocumentation.Markup[0] as XmlText;
+                            if (text != null)
+                            {
+                                documentation = text.Value;
+                            }
+                        }
+                        break;
+                    }
+                }
+            }
+            if (documentation != null)
+            {
+                documentation = documentation.Trim();
+            }
+            return documentation;
+        }
+        /// <summary>
+        /// Makes a valid enum value out of the passed in value. May remove spaces, add 'Item' to the
+        /// start if it begins with an integer, or strip out punctuation.
+        /// </summary>
+        /// <param name="enumValue">Enum value to be processed.</param>
+        /// <returns>Enum value with invalid characters removed.</returns>
+        private static string MakeEnumValue(string enumValue)
+        {
+            if (Char.IsDigit(enumValue[0]))
+            {
+                enumValue = String.Concat("Item", enumValue);
+            }
+            StringBuilder newValue = new StringBuilder();
+            for (int i = 0; i < enumValue.Length; ++i)
+            {
+                if (!Char.IsPunctuation(enumValue[i]) && !Char.IsSymbol(enumValue[i]) && !Char.IsWhiteSpace(enumValue[i]))
+                {
+                    newValue.Append(enumValue[i]);
+                }
+            }
+            return newValue.ToString();
+        }
+        /// <summary>
+        /// Generates the private field and public property for a piece of data.
+        /// </summary>
+        /// <param name="propertyName">Name of the property being generated.</param>
+        /// <param name="typeName">Name of the type for the property.</param>
+        /// <param name="typeDeclaration">Type declaration into which the field and property should be placed.</param>
+        /// <param name="outputXmlMethod">Member method for the OutputXml method.</param>
+        /// <param name="setAttributeMethod">Member method for the SetAttribute method.</param>
+        /// <param name="enumDeclaration">EnumDeclaration, which is null unless called from a locally defined enum attribute.</param>
+        /// <param name="documentation">Comment string to be placed on the property.</param>
+        /// <param name="nestedContent">If true, the field will be placed in nested content when outputting to XML.</param>
+        /// <param name="requiredField">If true, the generated serialization code will throw if the field is not set.</param>
+        private static void GenerateFieldAndProperty(string propertyName, string typeName, CodeTypeDeclaration typeDeclaration, CodeMemberMethod outputXmlMethod, CodeMemberMethod setAttributeMethod, EnumDeclaration enumDeclaration, string documentation, bool nestedContent, bool requiredField)
+        {
+            string fieldName = String.Concat(propertyName.Substring(0, 1).ToLower(), propertyName.Substring(1), "Field");
+            string fieldNameSet = String.Concat(fieldName, "Set");
+            Type type = GetClrTypeByXmlName(typeName);
+            CodeMemberField fieldMember;
+            if (type == null)
+            {
+                fieldMember = new CodeMemberField(typeName, fieldName);
+            }
+            else
+            {
+                fieldMember = new CodeMemberField(type, fieldName);
+            }
+            fieldMember.Attributes = MemberAttributes.Private;
+            typeDeclaration.Members.Add(fieldMember);
+            typeDeclaration.Members.Add(new CodeMemberField(typeof(bool), fieldNameSet));
+            CodeMemberProperty propertyMember = new CodeMemberProperty();
+            propertyMember.Attributes = MemberAttributes.Public | MemberAttributes.Final;
+            if (documentation != null)
+            {
+                GenerateSummaryComment(propertyMember.Comments, documentation);
+            }
+            propertyMember.Name = propertyName;
+            if (type == null)
+            {
+                propertyMember.Type = new CodeTypeReference(typeName);
+            }
+            else
+            {
+                propertyMember.Type = new CodeTypeReference(type);
+            }
+            if (propertyMember.Name.StartsWith("src"))
+            {
+                propertyMember.CustomAttributes.Add(GetCodeAnalysisSuppressionAttribute("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly"));
+            }
+            else if (StronglyTypedClasses.multiUppercaseNameRegex.Match(propertyMember.Name).Success)
+            {
+                propertyMember.CustomAttributes.Add(GetCodeAnalysisSuppressionAttribute("Microsoft.Naming", "CA1705:LongAcronymsShouldBePascalCased"));
+            }
+            CodeMethodReturnStatement returnStatement = new CodeMethodReturnStatement();
+            returnStatement.Expression = new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldName);
+            propertyMember.GetStatements.Add(returnStatement);
+            CodeAssignStatement assignmentStatement = new CodeAssignStatement();
+            propertyMember.SetStatements.Add(new CodeAssignStatement(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldNameSet), new CodePrimitiveExpression(true)));
+            assignmentStatement.Left = new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldName);
+            assignmentStatement.Right = new CodePropertySetValueReferenceExpression();
+            propertyMember.SetStatements.Add(assignmentStatement);
+            CodeConditionStatement fieldSetStatement = new CodeConditionStatement();
+            fieldSetStatement.Condition = new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldNameSet);
+            CodeAssignStatement fieldSetAttrStatement = new CodeAssignStatement();
+            fieldSetAttrStatement.Left = new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldNameSet);
+            fieldSetAttrStatement.Right = new CodePrimitiveExpression(true);
+            CodeConditionStatement attributeNameMatchStatement = new CodeConditionStatement();
+            attributeNameMatchStatement.Condition = new CodeBinaryOperatorExpression(new CodeSnippetExpression(String.Concat("\"", propertyName, "\"")), CodeBinaryOperatorType.IdentityEquality, new CodeVariableReferenceExpression("name"));
+            string clrTypeName = (string)simpleTypeNamesToClrTypeNames[typeName];
+            switch (clrTypeName)
+            {
+                case "string":
+                    if (nestedContent)
+                    {
+                        fieldSetStatement.TrueStatements.Add(new CodeMethodInvokeExpression(new CodeVariableReferenceExpression("writer"), "WriteString", new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldName)));
+                        attributeNameMatchStatement.TrueStatements.Add(new CodeAssignStatement(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldName), new CodeVariableReferenceExpression("value")));
+                    }
+                    else
+                    {
+                        fieldSetStatement.TrueStatements.Add(new CodeMethodInvokeExpression(new CodeVariableReferenceExpression("writer"), "WriteAttributeString", new CodeSnippetExpression(String.Concat("\"", propertyName, "\"")), new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldName)));
+                        attributeNameMatchStatement.TrueStatements.Add(new CodeAssignStatement(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldName), new CodeVariableReferenceExpression("value")));
+                    }
+                    break;
+                case "bool":
+                    if (nestedContent)
+                    {
+                        fieldSetStatement.TrueStatements.Add(new CodeMethodInvokeExpression(new CodeVariableReferenceExpression("writer"), "WriteString", new CodeMethodInvokeExpression(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldName), "ToString", new CodePropertyReferenceExpression(new CodeTypeReferenceExpression("CultureInfo"), "InvariantCulture"))));
+                    }
+                    else
+                    {
+                        fieldSetStatement.TrueStatements.Add(new CodeMethodInvokeExpression(new CodeVariableReferenceExpression("writer"), "WriteAttributeString", new CodeSnippetExpression(String.Concat("\"", propertyName, "\"")), new CodeMethodInvokeExpression(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldName), "ToString", new CodePropertyReferenceExpression(new CodeTypeReferenceExpression("CultureInfo"), "InvariantCulture"))));
+                    }
+                    attributeNameMatchStatement.TrueStatements.Add(new CodeAssignStatement(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldName), new CodeMethodInvokeExpression(new CodeTypeReferenceExpression("Convert"), "ToBoolean", new CodeVariableReferenceExpression("value"), new CodePropertyReferenceExpression(new CodeTypeReferenceExpression("CultureInfo"), "InvariantCulture"))));
+                    break;
+                case "int":
+                case "long":
+                    if (nestedContent)
+                    {
+                        fieldSetStatement.TrueStatements.Add(new CodeMethodInvokeExpression(new CodeVariableReferenceExpression("writer"), "WriteString", new CodeMethodInvokeExpression(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldName), "ToString", new CodePropertyReferenceExpression(new CodeTypeReferenceExpression("CultureInfo"), "InvariantCulture"))));
+                    }
+                    else
+                    {
+                        fieldSetStatement.TrueStatements.Add(new CodeMethodInvokeExpression(new CodeVariableReferenceExpression("writer"), "WriteAttributeString", new CodeSnippetExpression(String.Concat("\"", propertyName, "\"")), new CodeMethodInvokeExpression(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldName), "ToString", new CodePropertyReferenceExpression(new CodeTypeReferenceExpression("CultureInfo"), "InvariantCulture"))));
+                    }
+                    attributeNameMatchStatement.TrueStatements.Add(new CodeAssignStatement(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldName), new CodeMethodInvokeExpression(new CodeTypeReferenceExpression("Convert"), "ToInt32", new CodeVariableReferenceExpression("value"), new CodePropertyReferenceExpression(new CodeTypeReferenceExpression("CultureInfo"), "InvariantCulture"))));
+                    break;
+                default:
+                    if (typeName == "DateTime")
+                    {
+                        if (nestedContent)
+                        {
+                            fieldSetStatement.TrueStatements.Add(new CodeMethodInvokeExpression(new CodeVariableReferenceExpression("writer"), "WriteString", new CodeMethodInvokeExpression(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldName), "ToString", new CodePropertyReferenceExpression(new CodeTypeReferenceExpression("CultureInfo"), "InvariantCulture"))));
+                        }
+                        else
+                        {
+                            fieldSetStatement.TrueStatements.Add(new CodeMethodInvokeExpression(new CodeVariableReferenceExpression("writer"), "WriteAttributeString", new CodeSnippetExpression(String.Concat("\"", propertyName, "\"")), new CodeMethodInvokeExpression(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldName), "ToString", new CodePrimitiveExpression("yyyy-MM-ddTHH:mm:ss"), new CodePropertyReferenceExpression(new CodePropertyReferenceExpression(new CodeTypeReferenceExpression("CultureInfo"), "InvariantCulture"), "DateTimeFormat"))));
+                        }
+                        attributeNameMatchStatement.TrueStatements.Add(new CodeAssignStatement(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldName), new CodeMethodInvokeExpression(new CodeTypeReferenceExpression("Convert"), "ToDateTime", new CodeVariableReferenceExpression("value"), new CodePropertyReferenceExpression(new CodeTypeReferenceExpression("CultureInfo"), "InvariantCulture"))));
+                        break;
+                    }
+                    if (enumDeclaration == null)
+                    {
+                        GenerateOutputForEnum(fieldSetStatement, attributeNameMatchStatement, typeNamesToEnumDeclarations[typeName], fieldName, propertyName);
+                    }
+                    else
+                    {
+                        GenerateOutputForEnum(fieldSetStatement, attributeNameMatchStatement, enumDeclaration, fieldName, propertyName);
+                    }
+                    break;
+            }
+            attributeNameMatchStatement.TrueStatements.Add(fieldSetAttrStatement);
+            // TODO: Add throw to falseStatements if required field not set.
+            outputXmlMethod.Statements.Add(fieldSetStatement);
+            setAttributeMethod.Statements.Add(attributeNameMatchStatement);
+            typeDeclaration.Members.Add(propertyMember);
+        }
+        /// <summary>
+        /// Generates output for an enum type. Will generate a switch statement for normal enums, and if statements
+        /// for a flags enum.
+        /// </summary>
+        /// <param name="fieldSetStatement">If statement to add statements to.</param>
+        /// <param name="attributeNameMatchStatement">If statement to add statements to.</param>
+        /// <param name="enumDeclaration">Enum declaration for this field. Could be locally defined enum or global.</param>
+        /// <param name="fieldName">Name of the private field.</param>
+        /// <param name="propertyName">Name of the property (and XML attribute).</param>
+        private static void GenerateOutputForEnum(CodeConditionStatement fieldSetStatement, CodeConditionStatement attributeNameMatchStatement, EnumDeclaration enumDeclaration, string fieldName, string propertyName)
+        {
+            CodeTypeDeclaration enumParent = enumsToParseMethodClasses[enumDeclaration];
+            if (enumDeclaration.Flags)
+            {
+                CodeVariableDeclarationStatement outputValueVariable = new CodeVariableDeclarationStatement(typeof(string), "outputValue", new CodeSnippetExpression("\"\""));
+                fieldSetStatement.TrueStatements.Add(outputValueVariable);
+                foreach (string key in enumDeclaration.Values)
+                {
+                    CodeConditionStatement enumIfStatement = new CodeConditionStatement();
+                    enumIfStatement.Condition = new CodeBinaryOperatorExpression(new CodeBinaryOperatorExpression(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldName), CodeBinaryOperatorType.BitwiseAnd, new CodePropertyReferenceExpression(new CodeSnippetExpression(enumDeclaration.Name), MakeEnumValue(key))), CodeBinaryOperatorType.IdentityInequality, new CodeSnippetExpression("0"));
+                    CodeConditionStatement lengthIfStatement = new CodeConditionStatement();
+                    lengthIfStatement.Condition = new CodeBinaryOperatorExpression(new CodePropertyReferenceExpression(new CodeVariableReferenceExpression("outputValue"), "Length"), CodeBinaryOperatorType.IdentityInequality, new CodeSnippetExpression("0"));
+                    lengthIfStatement.TrueStatements.Add(new CodeAssignStatement(new CodeVariableReferenceExpression("outputValue"), new CodeBinaryOperatorExpression(new CodeVariableReferenceExpression("outputValue"), CodeBinaryOperatorType.Add, new CodeSnippetExpression("\" \""))));
+                    enumIfStatement.TrueStatements.Add(lengthIfStatement);
+                    enumIfStatement.TrueStatements.Add(new CodeAssignStatement(new CodeVariableReferenceExpression("outputValue"), new CodeBinaryOperatorExpression(new CodeVariableReferenceExpression("outputValue"), CodeBinaryOperatorType.Add, new CodeSnippetExpression(String.Concat("\"", key, "\"")))));
+                    fieldSetStatement.TrueStatements.Add(enumIfStatement);
+                }
+                attributeNameMatchStatement.TrueStatements.Add(new CodeMethodInvokeExpression(
+                    new CodeTypeReferenceExpression(enumParent.Name),
+                    String.Concat("TryParse", enumDeclaration.Name),
+                    new CodeVariableReferenceExpression("value"),
+                    new CodeDirectionExpression(FieldDirection.Out, new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldName))));
+                fieldSetStatement.TrueStatements.Add(new CodeMethodInvokeExpression(new CodeVariableReferenceExpression("writer"), "WriteAttributeString", new CodeSnippetExpression(String.Concat("\"", propertyName, "\"")), new CodeSnippetExpression(String.Concat("outputValue"))));
+            }
+            else
+            {
+                foreach (string key in enumDeclaration.Values)
+                {
+                    CodeConditionStatement enumOutStatement = new CodeConditionStatement();
+                    enumOutStatement.Condition = new CodeBinaryOperatorExpression(new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldName), CodeBinaryOperatorType.ValueEquality, new CodePropertyReferenceExpression(new CodeSnippetExpression(enumDeclaration.Name), MakeEnumValue(key)));
+                    enumOutStatement.TrueStatements.Add(new CodeMethodInvokeExpression(new CodeVariableReferenceExpression("writer"), "WriteAttributeString", new CodeSnippetExpression(String.Concat("\"", propertyName, "\"")), new CodeSnippetExpression(String.Concat("\"", key, "\""))));
+                    fieldSetStatement.TrueStatements.Add(enumOutStatement);
+                }
+                attributeNameMatchStatement.TrueStatements.Add(new CodeAssignStatement(
+                    new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), fieldName),
+                    new CodeMethodInvokeExpression(new CodeTypeReferenceExpression(enumParent.Name),
+                        String.Concat("Parse", enumDeclaration.Name),
+                        new CodeVariableReferenceExpression("value"))));
+            }
+        }
+        /// <summary>
+        /// Generates a summary comment.
+        /// </summary>
+        /// <param name="comments">Comments collection to add the comments to.</param>
+        /// <param name="content">Content of the comment.</param>
+        private static void GenerateSummaryComment(CodeCommentStatementCollection comments, string content)
+        {
+            using (StringWriter sw = new StringWriter())
+            {
+                XmlTextWriter writer = null;
+                // create the comment as xml to ensure proper escaping of special xml characters
+                try
+                {
+                    writer = new XmlTextWriter(sw);
+                    writer.Indentation = 0;
+                    writer.WriteStartElement("summary");
+                    writer.WriteString(Environment.NewLine);
+                    string nextComment;
+                    int newlineIndex = content.IndexOf(Environment.NewLine);
+                    int offset = 0;
+                    while (newlineIndex != -1)
+                    {
+                        nextComment = content.Substring(offset, newlineIndex - offset).Trim();
+                        writer.WriteString(nextComment);
+                        writer.WriteString(Environment.NewLine);
+                        offset = newlineIndex + Environment.NewLine.Length;
+                        newlineIndex = content.IndexOf(Environment.NewLine, offset);
+                    }
+                    nextComment = content.Substring(offset).Trim();
+                    writer.WriteString(nextComment);
+                    writer.WriteString(Environment.NewLine);
+                    writer.WriteEndElement();
+                }
+                finally
+                {
+                    if (null != writer)
+                    {
+                        writer.Close();
+                    }
+                }
+                // create the comment statements (one per line of xml)
+                using (StringReader sr = new StringReader(sw.ToString()))
+                {
+                    string line;
+                    while (null != (line = sr.ReadLine()))
+                    {
+                        comments.Add(new CodeCommentStatement(line, true));
+                    }
+                }
+            }
+        }
+        /// <summary>
+        /// Gets the CLR type for simple XML type.
+        /// </summary>
+        /// <param name="typeName">Plain text name of type.</param>
+        /// <returns>Type corresponding to parameter.</returns>
+        private static Type GetClrTypeByXmlName(string typeName)
+        {
+            switch (typeName)
+            {
+                case "bool":
+                    return typeof(bool);
+                case "int":
+                    return typeof(int);
+                case "long":
+                    return typeof(long);
+                case "string":
+                    return typeof(string);
+                default:
+                    return null;
+            }
+        }
+        /// <summary>
+        /// Processes an XmlSchemaSimpleType into corresponding types.
+        /// </summary>
+        /// <param name="simpleType">XmlSchemaSimpleType to be processed.</param>
+        /// <param name="codeNamespace">CodeNamespace to be used when outputting code.</param>
+        private static void ProcessSimpleType(XmlSchemaSimpleType simpleType, CodeNamespace codeNamespace)
+        {
+            EnumDeclaration enumDeclaration;
+            string simpleTypeName = simpleType.Name;
+            string baseTypeName;
+            ProcessSimpleType(simpleTypeName, simpleType, false, out enumDeclaration, out baseTypeName);
+            simpleTypeNamesToClrTypeNames.Add(simpleTypeName, baseTypeName);
+            if (enumDeclaration != null)
+            {
+                codeNamespace.Types.Add(enumDeclaration.TypeDeclaration);
+                typeNamesToEnumDeclarations.Add(simpleTypeName, enumDeclaration);
+                AddEnumHelperMethods(enumDeclaration, codeNamespace);
+            }
+        }
+        /// <summary>
+        /// Processes an XmlSchemaSimpleType into corresponding code.
+        /// </summary>
+        /// <param name="simpleTypeName">Name for the type.</param>
+        /// <param name="simpleType">XmlSchemaSimpleType to be processed.</param>
+        /// <param name="codeNamespace">CodeNamespace to be used when outputting code for global types.</param>
+        /// <param name="parentTypeDeclaration">CodeTypeDeclaration to be used when outputting code for nested types.</param>
+        /// <param name="outputXmlMethod">Member method for the OutputXml method for nested types.</param>
+        /// <param name="setAttributeMethod">Member method for the SetAttribute method for nested types.</param>
+        private static void ProcessSimpleType(string simpleTypeName, XmlSchemaSimpleType simpleType, bool nestedType, out EnumDeclaration enumDeclaration, out string baseTypeName)
+        {
+            enumDeclaration = null;
+            baseTypeName = null;
+            // XSD supports simpleTypes derived by union, list, or restriction; restrictions can have any
+            // combination of pattern, enumeration, length, and more; lists can contain any other simpleType.
+            // XsdGen, in contrast, only supports a limited set of values...
+            // Unions are weakly supported by just using the first member type
+            // restrictions must either be all enumeration or a single pattern, a list must be of a
+            // single simpleType which itself is only a restriction of enumeration.
+            if (simpleType.Content is XmlSchemaSimpleTypeUnion)
+            {
+                XmlSchemaSimpleTypeUnion union = simpleType.Content as XmlSchemaSimpleTypeUnion;
+                if (union.MemberTypes.Length > 0)
+                {
+                    baseTypeName = union.MemberTypes[0].Name;
+                    return;
+                }
+                else
+                {
+                    baseTypeName = "string";
+                    return;
+                }
+            }
+            bool listType = false; // XSD lists become [Flag]enums in C#...
+            XmlSchemaSimpleTypeList simpleTypeList = simpleType.Content as XmlSchemaSimpleTypeList;
+            XmlSchemaSimpleTypeRestriction simpleTypeRestriction = simpleType.Content as XmlSchemaSimpleTypeRestriction;
+            if (simpleTypeList != null)
+            {
+                baseTypeName = simpleTypeList.ItemTypeName.Name;
+                if (String.IsNullOrEmpty(baseTypeName))
+                {
+                    simpleTypeRestriction = simpleTypeList.ItemType.Content as XmlSchemaSimpleTypeRestriction;
+                    if (simpleTypeRestriction == null)
+                    {
+                        string appName = typeof(XsdGen).Assembly.GetName().Name;
+                        throw new NotImplementedException(string.Format("{0} does not support a <list> that does not contain a <simpleType>/<restriction>.", appName));
+                    }
+                    listType = true;
+                }
+                else
+                {
+                    // We expect to find an existing enum already declared!
+                    EnumDeclaration existingEnumDeclaration = typeNamesToEnumDeclarations[baseTypeName];
+                    // TODO: do we need to further alter the Flags setter code because of the helper stuff?
+                    // As far as I can tell, this code is never exercised by our existing XSDs!
+                    existingEnumDeclaration.SetFlags();
+                }
+            }
+            if (simpleTypeRestriction == null)
+            {
+                string appName = typeof(XsdGen).Assembly.GetName().Name;
+                throw new NotImplementedException(string.Format("{0} does not understand this simpleType!", appName));
+            }
+            bool foundPattern = false;
+            foreach (XmlSchemaFacet facet in simpleTypeRestriction.Facets)
+            {
+                XmlSchemaEnumerationFacet enumFacet = facet as XmlSchemaEnumerationFacet;
+                XmlSchemaPatternFacet patternFacet = facet as XmlSchemaPatternFacet;
+                if (enumFacet != null)
+                {
+                    if (foundPattern)
+                    {
+                        string appName = typeof(XsdGen).Assembly.GetName().Name;
+                        throw new NotImplementedException(string.Format("{0} does not support restrictions containing both <pattern> and <enumeration>.", appName));
+                    }
+                    if (enumDeclaration == null)
+                    {
+                        // For nested types, the simple name comes from the attribute name, with "Type" appended
+                        // to prevent name collision with the attribute member itself.
+                        if (nestedType)
+                        {
+                            simpleTypeName = String.Concat(simpleTypeName, "Type");
+                        }
+                        baseTypeName = simpleTypeName;
+                        string typeDocumentation = GetDocumentation(simpleType.Annotation);
+                        enumDeclaration = new EnumDeclaration(simpleTypeName, typeDocumentation);
+                    }
+                    string documentation = GetDocumentation(enumFacet.Annotation);
+                    enumDeclaration.AddValue(enumFacet.Value, documentation);
+                }
+                if (patternFacet != null)
+                {
+                    if (enumDeclaration != null)
+                    {
+                        string appName = typeof(XsdGen).Assembly.GetName().Name;
+                        throw new NotImplementedException(string.Format("{0} does not support restrictions containing both <pattern> and <enumeration>.", appName));
+                    }
+                    if (foundPattern)
+                    {
+                        string appName = typeof(XsdGen).Assembly.GetName().Name;
+                        throw new NotImplementedException(string.Format("{0} does not support restrictions multiple <pattern> elements.", appName));
+                    }
+                    foundPattern = true;
+                }
+            }
+            if (enumDeclaration != null && listType)
+            {
+                enumDeclaration.SetFlags();
+            }
+            if (String.IsNullOrEmpty(baseTypeName))
+            {
+                baseTypeName = (string)simpleTypeNamesToClrTypeNames[simpleTypeRestriction.BaseTypeName.Name];
+            }
+        }
+        /// <summary>
+        /// Creates an attribute declaration indicating generated code including the tool name and version.
+        /// </summary>
+        /// <returns>GeneratedCodeAttribute declearation.</returns>
+        private static CodeAttributeDeclaration GetGeneratedCodeAttribute()
+        {
+            AssemblyName generatorAssemblyName = typeof(XsdGen).Assembly.GetName();
+            return new CodeAttributeDeclaration("GeneratedCode",
+                new CodeAttributeArgument(new CodePrimitiveExpression(generatorAssemblyName.Name)),
+                new CodeAttributeArgument(new CodePrimitiveExpression(generatorAssemblyName.Version.ToString())));
+        }
+        /// <summary>
+        /// Creates a code statement to throw an exception if an argument is null.
+        /// </summary>
+        /// <param name="argumentName">Name of the argument to check.</param>
+        /// <param name="nullOrEmpty">True to check for null-or-empty instead of just null</param>
+        /// <returns>Code condition statement.</returns>
+        private static CodeConditionStatement GetArgumentNullCheckStatement(string argumentName, bool nullOrEmpty)
+        {
+            CodeConditionStatement conditionStatement = new CodeConditionStatement();
+            if (nullOrEmpty)
+            {
+                conditionStatement.Condition = new CodeMethodInvokeExpression(new CodeMethodReferenceExpression(new CodeTypeReferenceExpression("String"), "IsNullOrEmpty"), new CodeVariableReferenceExpression(argumentName));
+            }
+            else
+            {
+                conditionStatement.Condition = new CodeBinaryOperatorExpression(new CodePrimitiveExpression(null), CodeBinaryOperatorType.ValueEquality, new CodeVariableReferenceExpression(argumentName));
+            }
+            conditionStatement.TrueStatements.Add(new CodeThrowExceptionStatement(new CodeObjectCreateExpression("ArgumentNullException", new CodeSnippetExpression(String.Concat("\"", argumentName, "\"")))));
+            return conditionStatement;
+        }
+        /// <summary>
+        /// Creates an attribute declaration to suppress a particular code-analysis message.
+        /// </summary>
+        /// <param name="category">Code analysis category, such as "Microsoft.Design"</param>
+        /// <param name="checkId">Code analysis ID number.</param>
+        /// <returns>SuppressMessageAttribute declaration.</returns>
+        private static CodeAttributeDeclaration GetCodeAnalysisSuppressionAttribute(string category, string checkId)
+        {
+            return new CodeAttributeDeclaration("SuppressMessage",
+                new CodeAttributeArgument(new CodePrimitiveExpression(category)),
+                new CodeAttributeArgument(new CodePrimitiveExpression(checkId)));
+        }
+        /// <summary>
+        /// Class representing an enum declaration.
+        /// </summary>
+        internal class EnumDeclaration
+        {
+            private string enumTypeName;
+            private CodeTypeDeclaration declaration;
+            private bool flags;
+            private StringCollection enumValues;
+            /// <summary>
+            /// Creates a new enum declaration with the given name.
+            /// </summary>
+            /// <param name="enumTypeName">Name of the type for the enum.</param>
+            /// <param name="documentation">Documentation for the enum type.</param>
+            public EnumDeclaration(string enumTypeName, string documentation)
+            {
+                this.enumTypeName = enumTypeName;
+                this.declaration = new CodeTypeDeclaration(enumTypeName);
+                this.declaration.CustomAttributes.Add(GetGeneratedCodeAttribute());
+                this.declaration.Attributes = MemberAttributes.Public;
+                this.declaration.IsEnum = true;
+                if (documentation != null)
+                {
+                    GenerateSummaryComment(this.declaration.Comments, documentation);
+                }
+                this.enumValues = new StringCollection();
+            }
+            public CodeTypeDeclaration TypeDeclaration
+            {
+                get { return this.declaration; }
+            }
+            /// <summary>
+            /// Gets the enumeration values.
+            /// </summary>
+            /// <value>The enumeration values.</value>
+            public ICollection Values
+            {
+                get { return this.enumValues; }
+            }
+            /// <summary>
+            /// Gets the enumeration name.
+            /// </summary>
+            /// <value>The enumeration name.</value>
+            public string Name
+            {
+                get { return this.enumTypeName; }
+            }
+            /// <summary>
+            /// Gets the enumeration flags property.
+            /// </summary>
+            /// <value>Whether the enumeration is a [Flags] type.</value>
+            public bool Flags
+            {
+                get { return this.flags; }
+            }
+            /// <summary>
+            /// Sets the [Flags] property on the enumeration. Once set, this cannot be undone.
+            /// </summary>
+            public void SetFlags()
+            {
+                if (this.flags)
+                {
+                    return;
+                }
+                this.flags = true;
+                this.declaration.CustomAttributes.Add(new CodeAttributeDeclaration("Flags"));
+                SwitchToNoneValue();
+                int enumValue = 0;
+                foreach (CodeMemberField enumField in this.declaration.Members)
+                {
+                    enumField.InitExpression = new CodeSnippetExpression(enumValue.ToString());
+                    if (enumValue == 0)
+                    {
+                        enumValue = 1;
+                    }
+                    else
+                    {
+                        enumValue *= 2;
+                    }
+                }
+            }
+            private void InjectIllegalAndNotSetValues()
+            {
+                CodeMemberField memberIllegal = new CodeMemberField(typeof(int), "IllegalValue");
+                CodeMemberField memberNotSet = new CodeMemberField(typeof(int), "NotSet");
+                memberIllegal.InitExpression = new CodeFieldReferenceExpression(new CodeTypeReferenceExpression(typeof(int)), "MaxValue");
+                // Using "-1" for "NotSet" ensure that the next value is zero, which is consistent
+                // with older (3.0) behavior.
+                memberNotSet.InitExpression = new CodePrimitiveExpression(-1);
+                this.declaration.Members.Insert(0, memberIllegal);
+                this.declaration.Members.Insert(1, memberNotSet);
+            }
+            private void SwitchToNoneValue()
+            {
+                if (this.enumValues.Count > 0)
+                {
+                    // Remove the "IllegalValue" and "NotSet" values first.
+                    this.declaration.Members.RemoveAt(0);
+                    this.declaration.Members.RemoveAt(0);
+                    CodeMemberField memberNone = new CodeMemberField(typeof(int), "None");
+                    memberNone.InitExpression = new CodePrimitiveExpression(0);
+                    this.declaration.Members.Insert(0, memberNone);
+                }
+            }
+            /// <summary>
+            /// Add a value to the enumeration.
+            /// </summary>
+            /// <param name="enumValue">The value to add.</param>
+            public void AddValue(string enumValue, string documentation)
+            {
+                if (this.enumValues.Count == 0)
+                {
+                    InjectIllegalAndNotSetValues();
+                }
+                this.enumValues.Add(enumValue);
+                CodeMemberField memberField = new CodeMemberField(typeof(int), MakeEnumValue(enumValue));
+                //memberField.Attributes
+                this.declaration.Members.Add(memberField);
+                if (documentation != null)
+                {
+                    GenerateSummaryComment(memberField.Comments, documentation);
+                }
+            }
+        }
+        private static void AddEnumHelperMethods(EnumDeclaration enumDeclaration, CodeNamespace codeNamespace)
+        {
+            if (enumHelperClass == null)
+            {
+                enumHelperClass = new CodeTypeDeclaration("Enums");
+                enumHelperClass.CustomAttributes.Add(GetGeneratedCodeAttribute());
+                // The static and final attributes don't seem to get applied, but we'd prefer if they were.
+                enumHelperClass.Attributes = MemberAttributes.Public | MemberAttributes.Static | MemberAttributes.Final;
+                codeNamespace.Types.Add(enumHelperClass);
+            }
+            AddEnumHelperMethods(enumDeclaration, enumHelperClass);
+        }
+        private static void AddEnumHelperMethods(EnumDeclaration enumDeclaration, CodeTypeDeclaration parentType)
+        {
+            CodeTypeReference stringType = new CodeTypeReference(typeof(string));
+            CodeTypeReference boolType = new CodeTypeReference(typeof(bool));
+            CodeTypeReference enumType = new CodeTypeReference(typeof(Enum));
+            CodeTypeReference newEnumType = new CodeTypeReference(enumDeclaration.Name);
+            CodePrimitiveExpression falseValue = new CodePrimitiveExpression(false);
+            CodePrimitiveExpression trueValue = new CodePrimitiveExpression(true);
+            CodeMethodReturnStatement returnFalse = new CodeMethodReturnStatement(falseValue);
+            CodeMethodReturnStatement returnTrue = new CodeMethodReturnStatement(trueValue);
+            string parseMethodName = String.Concat("Parse", enumDeclaration.Name);
+            string tryParseMethodName = String.Concat("TryParse", enumDeclaration.Name);
+            CodeFieldReferenceExpression defaultEnumValue = null;
+            CodeFieldReferenceExpression illegalEnumValue = null;
+            bool addParse = true;
+            if (enumDeclaration.Flags)
+            {
+                defaultEnumValue = new CodeFieldReferenceExpression(new CodeTypeReferenceExpression(newEnumType), "None");
+                illegalEnumValue = defaultEnumValue;
+                // Because there's no "IllegalValue" for [Flags] enums, we can't create the Parse()
+                // method.  We can still create the TryParse() method, though!
+                addParse = false;
+            }
+            else
+            {
+                defaultEnumValue = new CodeFieldReferenceExpression(new CodeTypeReferenceExpression(newEnumType), "NotSet");
+                illegalEnumValue = new CodeFieldReferenceExpression(new CodeTypeReferenceExpression(newEnumType), "IllegalValue");
+            }
+            if (addParse)
+            {
+                CodeMemberMethod parseNewEnum = new CodeMemberMethod();
+                GenerateSummaryComment(parseNewEnum.Comments, String.Format("Parses a {0} from a string.", enumDeclaration.Name));
+                parseNewEnum.Attributes = MemberAttributes.Public | MemberAttributes.Static;
+                parseNewEnum.Name = parseMethodName;
+                parseNewEnum.ReturnType = newEnumType;
+                parseNewEnum.Parameters.Add(new CodeParameterDeclarationExpression(stringType, "value"));
+                parseNewEnum.Statements.Add(new CodeVariableDeclarationStatement(newEnumType, "parsedValue"));
+                // Just delegate to the TryParse version...
+                parseNewEnum.Statements.Add(new CodeMethodInvokeExpression(
+                    new CodeMethodReferenceExpression(new CodeTypeReferenceExpression(parentType.Name), tryParseMethodName),
+                    new CodeArgumentReferenceExpression("value"),
+                    new CodeDirectionExpression(FieldDirection.Out, new CodeVariableReferenceExpression("parsedValue"))));
+                parseNewEnum.Statements.Add(new CodeMethodReturnStatement(new CodeVariableReferenceExpression("parsedValue")));
+                parentType.Members.Add(parseNewEnum);
+            }
+            CodeMemberMethod tryParseNewEnum = new CodeMemberMethod();
+            GenerateSummaryComment(tryParseNewEnum.Comments, String.Format("Tries to parse a {0} from a string.", enumDeclaration.Name));
+            tryParseNewEnum.Attributes = MemberAttributes.Public | MemberAttributes.Static;
+            tryParseNewEnum.Name = tryParseMethodName;
+            tryParseNewEnum.ReturnType = boolType;
+            CodeParameterDeclarationExpression valueDeclaration = new CodeParameterDeclarationExpression(stringType, "value");
+            CodeParameterDeclarationExpression parsedValueDeclaration = new CodeParameterDeclarationExpression(newEnumType, "parsedValue");
+            parsedValueDeclaration.Direction = FieldDirection.Out;
+            tryParseNewEnum.Parameters.Add(valueDeclaration);
+            tryParseNewEnum.Parameters.Add(parsedValueDeclaration);
+            CodeArgumentReferenceExpression value = new CodeArgumentReferenceExpression(valueDeclaration.Name);
+            CodeArgumentReferenceExpression parsedValue = new CodeArgumentReferenceExpression(parsedValueDeclaration.Name);
+            tryParseNewEnum.Statements.Add(new CodeAssignStatement(parsedValue, defaultEnumValue));
+            tryParseNewEnum.Statements.Add(new CodeConditionStatement(
+                new CodeMethodInvokeExpression(new CodeMethodReferenceExpression(new CodeTypeReferenceExpression(stringType), "IsNullOrEmpty"), value),
+                returnFalse));
+            // The structure is similar, but distinct, for regular and flag-style enums. In particular,
+            // for a flags-style enum we have to be able to parse multiple values, separated by
+            // spaces, and each value is bitwise-OR'd together.
+            CodeStatementCollection nestedIfParent = tryParseNewEnum.Statements;
+            CodeExpression valueToTest = value;
+            // For Flags-style enums, we need to loop over the space-separated values...
+            if (enumDeclaration.Flags)
+            {
+                CodeVariableDeclarationStatement split = new CodeVariableDeclarationStatement(typeof(string[]), "splitValue",
+                    new CodeMethodInvokeExpression(value, "Split",
+                        new CodeMethodInvokeExpression(new CodePrimitiveExpression(" \t\r\n"), "ToCharArray"),
+                        new CodeFieldReferenceExpression(new CodeTypeReferenceExpression(typeof(StringSplitOptions)), "RemoveEmptyEntries")));
+                tryParseNewEnum.Statements.Add(split);
+                CodeIterationStatement flagLoop = new CodeIterationStatement(
+                    new CodeVariableDeclarationStatement(typeof(IEnumerator), "enumerator",
+                        new CodeMethodInvokeExpression(new CodeVariableReferenceExpression(split.Name), "GetEnumerator")),
+                    new CodeMethodInvokeExpression(new CodeVariableReferenceExpression("enumerator"), "MoveNext"),
+                    new CodeSnippetStatement(""));
+                tryParseNewEnum.Statements.Add(flagLoop);
+                CodeVariableDeclarationStatement currentValue = new CodeVariableDeclarationStatement(typeof(string), "currentValue",
+                    new CodeCastExpression(stringType,
+                        new CodePropertyReferenceExpression(new CodeVariableReferenceExpression("enumerator"), "Current")));
+                flagLoop.Statements.Add(currentValue);
+                valueToTest = new CodeVariableReferenceExpression(currentValue.Name);
+                nestedIfParent = flagLoop.Statements;
+            }
+            // We can't just Enum.Parse, because some values are also keywords (like 'string', 'int', 'default'),
+            // and these get generated as '@'-prefixed values.  Instead, we 'switch' on the value and do it manually.
+            // Actually, we if/else, because CodeDom doesn't support 'switch'!  Also, we nest the successive 'if's
+            // in order to short-circuit the parsing as soon as there's a match.
+            foreach (string enumValue in enumDeclaration.Values)
+            {
+                CodeFieldReferenceExpression enumValueReference = new CodeFieldReferenceExpression(new CodeTypeReferenceExpression(newEnumType), MakeEnumValue(enumValue));
+                CodeConditionStatement ifStatement = new CodeConditionStatement(
+                    new CodeBinaryOperatorExpression(new CodePrimitiveExpression(enumValue), CodeBinaryOperatorType.ValueEquality, valueToTest));
+                if (enumDeclaration.Flags)
+                {
+                    ifStatement.TrueStatements.Add(new CodeAssignStatement(parsedValue,
+                        new CodeBinaryOperatorExpression(parsedValue, CodeBinaryOperatorType.BitwiseOr, enumValueReference)));
+                }
+                else
+                {
+                    ifStatement.TrueStatements.Add(new CodeAssignStatement(parsedValue, enumValueReference));
+                }
+                nestedIfParent.Add(ifStatement);
+                nestedIfParent = ifStatement.FalseStatements;
+            }
+            // Finally, if we didn't find a match, it's illegal (or none, for flags)!
+            nestedIfParent.Add(new CodeAssignStatement(parsedValue, illegalEnumValue));
+            nestedIfParent.Add(returnFalse);
+            tryParseNewEnum.Statements.Add(returnTrue);
+            parentType.Members.Add(tryParseNewEnum);
+            enumsToParseMethodClasses.Add(enumDeclaration, parentType);
+        }
+    }
+}
diff --git a/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj b/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
new file mode 100644
index 00000000..2e3a0382
--- /dev/null
+++ b/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <!-- <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks> -->
+    <TargetFrameworks>net461</TargetFrameworks>
+    <IsTool>true</IsTool>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
+    <DebugType>embedded</DebugType>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <NoWarn>CS0618</NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="build\WixBuildTools.XsdGen.targets" PackagePath="build\" />
+    <Content Include="buildCrossTargeting\WixBuildTools.XsdGen.targets" PackagePath="buildCrossTargeting\" />
+    <Content Include="$(OutputPath)net461\$(TargetFileName)" PackagePath="tools\full" />
+    <!-- <Content Include="$(OutputPath)netcoreapp2.0\$(TargetFileName)" PackagePath="tools\core" /> -->
+  </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/internal/WixBuildTools.XsdGen/XsdGen.cs b/src/internal/WixBuildTools.XsdGen/XsdGen.cs
new file mode 100644
index 00000000..a1374df3
--- /dev/null
+++ b/src/internal/WixBuildTools.XsdGen/XsdGen.cs
@@ -0,0 +1,124 @@
+// 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.Tools
+{
+    using System;
+    using System.CodeDom;
+    using System.CodeDom.Compiler;
+    using System.Collections;
+    using System.IO;
+    using System.Xml;
+    using System.Xml.Schema;
+    using Microsoft.CSharp;
+    using WixToolset;
+    /// <summary>
+    /// Generates a strongly-typed C# class from an XML schema (XSD).
+    /// </summary>
+    public class XsdGen
+    {
+        private string xsdFile;
+        private string outFile;
+        private string outputNamespace;
+        private string commonNamespace;
+        private bool showHelp;
+        /// <summary>
+        /// Constructor for the XsdGen class.
+        /// </summary>
+        /// <param name="args">Command-line arguments passed to the program.</param>
+        private XsdGen(string[] args)
+        {
+            this.ParseCommandlineArgs(args);
+            // show usage information
+            if (this.showHelp)
+            {
+                Console.WriteLine("usage: XsdGen.exe <schema>.xsd <outputFile> <namespace> [<commonNamespace>]");
+                return;
+            }
+            // ensure that the schema file exists
+            if (!File.Exists(this.xsdFile))
+            {
+                throw new ApplicationException(String.Format("Schema file does not exist: '{0}'.", this.xsdFile));
+            }
+            XmlSchema document = null;
+            using (StreamReader xsdFileReader = new StreamReader(this.xsdFile))
+            {
+                document = XmlSchema.Read(xsdFileReader, new ValidationEventHandler(this.ValidationHandler));
+            }
+            CodeCompileUnit codeCompileUnit = StronglyTypedClasses.Generate(document, this.outputNamespace, this.commonNamespace);
+            using (CSharpCodeProvider codeProvider = new CSharpCodeProvider())
+            {
+                ICodeGenerator generator = codeProvider.CreateGenerator();
+                CodeGeneratorOptions options = new CodeGeneratorOptions();
+                options.BlankLinesBetweenMembers = true;
+                options.BracingStyle = "C";
+                options.IndentString = "    ";
+                using (StreamWriter csharpFileWriter = new StreamWriter(this.outFile))
+                {
+                    generator.GenerateCodeFromCompileUnit(codeCompileUnit, csharpFileWriter, options);
+                }
+            }
+        }
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        /// <param name="args">The command line arguments.</param>
+        /// <returns>The error code.</returns>
+        [STAThread]
+        public static int Main(string[] args)
+        {
+            try
+            {
+                XsdGen xsdGen = new XsdGen(args);
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("XsdGen.exe : fatal error MSF0000: {0}\r\n\r\nStack Trace:\r\n{1}", e.Message, e.StackTrace);
+                return 1;
+            }
+            return 0;
+        }
+        /// <summary>
+        /// Validation event handler.
+        /// </summary>
+        /// <param name="sender">Sender for the event.</param>
+        /// <param name="e">Event args.</param>
+        public void ValidationHandler(object sender, ValidationEventArgs e)
+        {
+        }
+        /// <summary>
+        /// Parse the command line arguments.
+        /// </summary>
+        /// <param name="args">Command-line arguments.</param>
+        private void ParseCommandlineArgs(string[] args)
+        {
+            if (3 > args.Length)
+            {
+                this.showHelp = true;
+            }
+            else
+            {
+                this.xsdFile = args[0];
+                this.outFile = args[1];
+                this.outputNamespace = args[2];
+                if (args.Length >= 4)
+                {
+                    this.commonNamespace = args[3];
+                }
+            }
+        }
+    }
+}
diff --git a/src/internal/WixBuildTools.XsdGen/build/WixBuildTools.XsdGen.targets b/src/internal/WixBuildTools.XsdGen/build/WixBuildTools.XsdGen.targets
new file mode 100644
index 00000000..ca1b89f6
--- /dev/null
+++ b/src/internal/WixBuildTools.XsdGen/build/WixBuildTools.XsdGen.targets
@@ -0,0 +1,67 @@
+<?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>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+  <ItemGroup>
+    <!--Provide support for setting type (BuildAction) from VS-->
+    <AvailableItemName Include="XsdGenSource" />
+  </ItemGroup>
+  <PropertyGroup>
+    <!-- <XsdGenPath Condition=" '$(XsdGenPath)'=='' and '$(MSBuildRuntimeType)'=='Core' ">$(MSBuildThisFileDirectory)..\tools\core\</XsdGenPath> -->
+    <XsdGenPath Condition=" '$(XsdGenPath)'=='' ">$(MSBuildThisFileDirectory)..\tools\full\</XsdGenPath>
+  </PropertyGroup>
+  <!--
+  ================================================================================================
+  XsdGen
+    Generates a .cs class file from an .xsd file.
+    [IN]
+    @(XsdGenSource) - The items to run through the XsdGen tool.
+    [OUT]
+    $(IntermediateOutputPath)%(Filename).cs - The generated .cs files to include in the compilation.
+  ================================================================================================
+  -->
+  <PropertyGroup>
+    <XsdGenDependsOn>
+    </XsdGenDependsOn>
+    <PrepareResourcesDependsOn>
+      XsdGen;
+      $(PrepareResourcesDependsOn)
+    </PrepareResourcesDependsOn>
+  </PropertyGroup>
+  <Target
+    Name="XsdGen"
+    BeforeTargets="PrepareResources"
+    DependsOnTargets="$(XsdGenDependsOn)"
+    Condition=" '@(XsdGenSource)' != '' "
+    Inputs="$(MSBuildAllProjects);@(XsdGenSource)"
+    Outputs="$(IntermediateOutputPath)%(XsdGenSource.Filename).cs">
+    <PropertyGroup>
+      <XsdGenCsFile>$(IntermediateOutputPath)%(XsdGenSource.Filename).cs</XsdGenCsFile>
+      <XsdGenCommonNamespace>%(XsdGenSource.CommonNamespace)</XsdGenCommonNamespace>
+    </PropertyGroup>
+    <Exec Command="&quot;$(XsdGenPath)WixBuildTools.XsdGen.exe&quot; &quot;%(XsdGenSource.FullPath)&quot; &quot;$(XsdGenCsFile)&quot; %(XsdGenSource.Namespace) $(XsdGenCommonNamespace)"
+          Outputs="$(XsdGenCsFile)" />
+    <ItemGroup>
+      <!-- This will tell MSBuild to clean up the .cs file during a Clean build -->
+      <FileWrites Include="$(XsdGenCsFile)" />
+      <!-- Add the generated .cs file to the list of source files to compile -->
+      <Compile Include="$(XsdGenCsFile)">
+        <Link>%(XsdGenCsFile.Filename)%(XsdGenCsFile.Extension)</Link>
+      </Compile>
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/src/internal/WixBuildTools.XsdGen/buildCrossTargeting/WixBuildTools.XsdGen.targets b/src/internal/WixBuildTools.XsdGen/buildCrossTargeting/WixBuildTools.XsdGen.targets
new file mode 100644
index 00000000..58692095
--- /dev/null
+++ b/src/internal/WixBuildTools.XsdGen/buildCrossTargeting/WixBuildTools.XsdGen.targets
@@ -0,0 +1,6 @@
+<?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="..\build\WixBuildTools.XsdGen.targets" />
+</Project>
diff --git a/src/internal/WixBuildTools.sln b/src/internal/WixBuildTools.sln
new file mode 100644
index 00000000..689832fb
--- /dev/null
+++ b/src/internal/WixBuildTools.sln
@@ -0,0 +1,81 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2003
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixBuildTools.XsdGen", "src\WixBuildTools.XsdGen\WixBuildTools.XsdGen.csproj", "{E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixBuildTools.MsgGen", "src\WixBuildTools.MsgGen\WixBuildTools.MsgGen.csproj", "{DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixBuildTools.TestSupport", "src\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj", "{6C57EF2C-979A-4106-A9E5-FE342810619A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WixBuildTools.TestSupport.Native", "src\WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj", "{95BABD97-FBDB-453A-AF8A-FA031A07B599}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F6660B22-092F-4BC5-A303-E6F696C31E1B}"
+        ProjectSection(SolutionItems) = preProject
+                .editorconfig = .editorconfig
+        EndProjectSection
+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
+                {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|x64.Build.0 = Debug|Any CPU
+                {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Debug|x86.Build.0 = Debug|Any CPU
+                {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|Any CPU.Build.0 = Release|Any CPU
+                {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|x64.ActiveCfg = Release|Any CPU
+                {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|x64.Build.0 = Release|Any CPU
+                {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|x86.ActiveCfg = Release|Any CPU
+                {E89E52C9-A4A1-4174-A1B1-3B72975E6ED6}.Release|x86.Build.0 = Release|Any CPU
+                {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|x64.Build.0 = Debug|Any CPU
+                {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Debug|x86.Build.0 = Debug|Any CPU
+                {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|Any CPU.Build.0 = Release|Any CPU
+                {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|x64.ActiveCfg = Release|Any CPU
+                {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|x64.Build.0 = Release|Any CPU
+                {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|x86.ActiveCfg = Release|Any CPU
+                {DB6EF6F3-51B1-4214-9A14-D501C23F6FA4}.Release|x86.Build.0 = Release|Any CPU
+                {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|x64.Build.0 = Debug|Any CPU
+                {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {6C57EF2C-979A-4106-A9E5-FE342810619A}.Debug|x86.Build.0 = Debug|Any CPU
+                {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|Any CPU.Build.0 = Release|Any CPU
+                {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|x64.ActiveCfg = Release|Any CPU
+                {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|x64.Build.0 = Release|Any CPU
+                {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|x86.ActiveCfg = Release|Any CPU
+                {6C57EF2C-979A-4106-A9E5-FE342810619A}.Release|x86.Build.0 = Release|Any CPU
+                {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|Any CPU.ActiveCfg = Debug|Win32
+                {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|Any CPU.Build.0 = Debug|Win32
+                {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x64.ActiveCfg = Debug|Win32
+                {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.ActiveCfg = Debug|Win32
+                {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Debug|x86.Build.0 = Debug|Win32
+                {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|Any CPU.ActiveCfg = Release|Win32
+                {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|Any CPU.Build.0 = Release|Win32
+                {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x64.ActiveCfg = Release|Win32
+                {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x86.ActiveCfg = Release|Win32
+                {95BABD97-FBDB-453A-AF8A-FA031A07B599}.Release|x86.Build.0 = Release|Win32
+        EndGlobalSection
+        GlobalSection(SolutionProperties) = preSolution
+                HideSolutionNode = FALSE
+        EndGlobalSection
+        GlobalSection(ExtensibilityGlobals) = postSolution
+                SolutionGuid = {83E9E075-B440-471A-9C37-9D84BA0AE3E0}
+        EndGlobalSection
+EndGlobal
diff --git a/src/internal/WixBuildTools.v3.ncrunchsolution b/src/internal/WixBuildTools.v3.ncrunchsolution
new file mode 100644
index 00000000..10420ac9
--- /dev/null
+++ b/src/internal/WixBuildTools.v3.ncrunchsolution
@@ -0,0 +1,6 @@
+<SolutionConfiguration>
+  <Settings>
+    <AllowParallelTestExecution>True</AllowParallelTestExecution>
+    <SolutionConfigured>True</SolutionConfigured>
+  </Settings>
+</SolutionConfiguration>
+\ No newline at end of file
diff --git a/src/internal/appveyor.cmd b/src/internal/appveyor.cmd
new file mode 100644
index 00000000..9fa5e330
--- /dev/null
+++ b/src/internal/appveyor.cmd
@@ -0,0 +1,13 @@
+@setlocal
+@pushd %~dp0
+nuget restore || exit /b
+dotnet pack -c Release src\WixBuildTools.MsgGen\WixBuildTools.MsgGen.csproj || exit /b
+dotnet pack -c Release src\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj || exit /b
+dotnet pack -c Release src\WixBuildTools.XsdGen\WixBuildTools.XsdGen.csproj || exit /b
+msbuild -p:Configuration=Release -t:PackNativeNuget src\WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj || exit /b
+@popd
+@endlocal
+\ No newline at end of file
diff --git a/src/internal/appveyor.yml b/src/internal/appveyor.yml
new file mode 100644
index 00000000..522e5af3
--- /dev/null
+++ b/src/internal/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/internal/nuget.config b/src/internal/nuget.config
new file mode 100644
index 00000000..fcbac27a
--- /dev/null
+++ b/src/internal/nuget.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" />
+    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
+</configuration>
+\ No newline at end of file
diff --git a/src/libs/dutil/CustomizedNativeRecommendedRules.ruleset b/src/libs/dutil/CustomizedNativeRecommendedRules.ruleset
new file mode 100644
index 00000000..142b141c
--- /dev/null
+++ b/src/libs/dutil/CustomizedNativeRecommendedRules.ruleset
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="Customized Microsoft Native Recommended Rules" Description="Microsoft Native Recommended Rules, -C26812" ToolsVersion="16.0">
+  <Include Path="nativerecommendedrules.ruleset" Action="Default" />
+  <Rules AnalyzerId="Microsoft.Analyzers.NativeCodeAnalysis" RuleNamespace="Microsoft.Rules.Native">
+    <!-- We need C style enums since we support BAs written in C -->
+    <Rule Id="C26812" Action="None" />
+  </Rules>
+</RuleSet>
+\ No newline at end of file
diff --git a/src/libs/dutil/Directory.Build.props b/src/libs/dutil/Directory.Build.props
new file mode 100644
index 00000000..fb34d54e
--- /dev/null
+++ b/src/libs/dutil/Directory.Build.props
@@ -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. -->
+<!--
+  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>
+    <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="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " />
+  <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
+</Project>
diff --git a/src/libs/dutil/Directory.Build.targets b/src/libs/dutil/Directory.Build.targets
new file mode 100644
index 00000000..44701fb6
--- /dev/null
+++ b/src/libs/dutil/Directory.Build.targets
@@ -0,0 +1,73 @@
+<?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.
+-->
+<Project>
+  <PropertyGroup>
+    <SigningToolFolder>$(BaseOutputPath)obj\.tools</SigningToolFolder>
+    <SigningToolExe>$(SigningToolFolder)\SignClient.exe</SigningToolExe>
+    <SigningFilelist>$(SigningToolFolder)\empty-filelist.txt</SigningFilelist>
+    <SigningConfiguration>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), signing.json))\signing.json</SigningConfiguration>
+  </PropertyGroup>
+  <PropertyGroup>
+    <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
+    <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
+  </PropertyGroup>
+  <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion"
+          Condition=" Exists('$(MSBuildProjectName).nuspec') ">
+    <PropertyGroup>
+      <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl>
+      <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
+      <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(MSBuildProjectDirectory)</NuspecBasePath>
+      <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors="$(Authors)";Configuration=$(Configuration);Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"</NuspecProperties>
+      <NuspecProperties>$(NuspecProperties);Version=$(NPMPackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties>
+      <PublishRepositoryUrl>true</PublishRepositoryUrl>
+      <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    </PropertyGroup>
+  </Target>
+  <Target Name="PackNative" DependsOnTargets="GetBuildVersion;SetNuspecProperties"
+          Condition=" Exists('$(MSBuildProjectName).nuspec') ">
+    <Exec Command='nuget pack $(NuspecFile) -OutputDirectory "$(BaseOutputPath)$(Configuration)" -BasePath "$(NuspecBasePath)" -Properties $(NuspecProperties)' 
+          WorkingDirectory="$(MSBuildProjectDirectory)" />
+    <ItemGroup>
+      <NuGetPackOutput Include="$(BaseOutputPath)$(Configuration)\**\$(PackageId)*.nupkg" />
+    </ItemGroup>
+  </Target>
+  <Target Name="_GetSignClient"
+          Condition=" !Exists('$(SigningToolExe)') ">
+    <WriteLinesToFile File='$(SigningFilelist)' Lines='do-not-sign-files-in-nupkg' Overwrite='true' />
+    <Exec Command='dotnet.exe tool install --tool-path "$(SigningToolFolder)" SignClient' />
+  </Target>
+  <Target Name="SignOutput" DependsOnTargets="_GetSignClient" AfterTargets="AfterBuild"
+          Condition=" '$(SigningUser)'!='' and '$(SignOutput)'!='false' and 
+                      ('$(MSBuildProjectExtension)'=='.csproj' or ('$(MSBuildProjectExtension)'=='.vcxproj' and '$(ConfigurationType)'!='StaticLibrary'))">
+    <Exec Command='"$(SigningToolExe)" sign -i $(TargetPath) -c "$(SigningConfiguration)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"'
+          WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" />
+  </Target>
+  <Target Name="SignNupkg" DependsOnTargets="_GetSignClient" AfterTargets="Pack;PackNative"
+          Condition=" '$(SigningUser)'!='' and '@(NuGetPackOutput)'!='' and '$(SignNupkg)'!='false' ">
+    <ItemGroup>
+      <SigningNupkgs Include="@(NuGetPackOutput)" Condition=" '%(Extension)'=='.nupkg' " />
+    </ItemGroup>
+    <Exec Command='"$(SigningToolExe)" sign -i "@(SigningNupkgs->&apos;%(Identity)&apos;)" -c "$(SigningConfiguration)" -f "$(SigningFilelist)" -n "WiX Toolset" -d "WiX Toolset" -u https://wixtoolset.org/ -r "$(SigningUser)" -s "$(SigningSecret)"'
+          WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" />
+  </Target>
+  <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " />
+  <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
+</Project>
diff --git a/src/libs/dutil/Directory.csproj.props b/src/libs/dutil/Directory.csproj.props
new file mode 100644
index 00000000..81d24ad1
--- /dev/null
+++ b/src/libs/dutil/Directory.csproj.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/libs/dutil/Directory.vcxproj.props b/src/libs/dutil/Directory.vcxproj.props
new file mode 100644
index 00000000..9ea7071b
--- /dev/null
+++ b/src/libs/dutil/Directory.vcxproj.props
@@ -0,0 +1,115 @@
+<?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>
+    <!-- NBGV properties -->
+    <AssemblyCompany>$(Company)</AssemblyCompany>
+    <AssemblyCopyright>$(Copyright)</AssemblyCopyright>
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+    <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
+    <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <CodeAnalysisRuleSet Condition=" Exists('$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset') ">$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </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/libs/dutil/NativeMultiTargeting.Build.props b/src/libs/dutil/NativeMultiTargeting.Build.props
new file mode 100644
index 00000000..1ff46559
--- /dev/null
+++ b/src/libs/dutil/NativeMultiTargeting.Build.props
@@ -0,0 +1,10 @@
+<?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>
+  <!-- Overrides the standard Cpp.Build.props to include the PlatformToolset in the output path. -->
+  <PropertyGroup>
+    <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(PlatformToolset)\$(PlatformTarget)\</IntDir>
+    <OutDir>$(OutputPath)$(PlatformToolset)\$(PlatformTarget)\</OutDir>
+  </PropertyGroup>
+</Project>
diff --git a/src/libs/dutil/README.md b/src/libs/dutil/README.md
new file mode 100644
index 00000000..2d6605fe
--- /dev/null
+++ b/src/libs/dutil/README.md
@@ -0,0 +1,2 @@
+# dutil
+dutil.lib - foundation library for all native code in WiX Toolset
diff --git a/src/libs/dutil/WixToolset.DUtil/acl2util.cpp b/src/libs/dutil/WixToolset.DUtil/acl2util.cpp
new file mode 100644
index 00000000..598f12e7
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/acl2util.cpp
@@ -0,0 +1,135 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define AclExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_ACLUTIL, x, s, __VA_ARGS__)
+#define AclExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_ACLUTIL, x, s, __VA_ARGS__)
+#define AclExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_ACLUTIL, x, s, __VA_ARGS__)
+#define AclExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_ACLUTIL, x, s, __VA_ARGS__)
+#define AclExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_ACLUTIL, x, s, __VA_ARGS__)
+#define AclExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_ACLUTIL, x, s, __VA_ARGS__)
+#define AclExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_ACLUTIL, p, x, e, s, __VA_ARGS__)
+#define AclExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_ACLUTIL, p, x, s, __VA_ARGS__)
+#define AclExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_ACLUTIL, p, x, e, s, __VA_ARGS__)
+#define AclExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_ACLUTIL, p, x, s, __VA_ARGS__)
+#define AclExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_ACLUTIL, e, x, s, __VA_ARGS__)
+#define AclExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_ACLUTIL, g, x, s, __VA_ARGS__)
+/********************************************************************
+AclCalculateServiceSidString - gets the SID string for the given service name
+NOTE: psczSid should be freed with StrFree()
+********************************************************************/
+extern "C" HRESULT DAPI AclCalculateServiceSidString(
+    __in LPCWSTR wzServiceName,
+    __in SIZE_T cchServiceName,
+    __deref_out_z LPWSTR* psczSid
+    )
+{
+    // TODO: use undocumented RtlCreateServiceSid function?
+    // http://blogs.technet.com/b/voy/archive/2007/03/22/per-service-sid.aspx
+    // Assume little endian.
+    HRESULT hr = S_OK;
+    LPWSTR sczUpperServiceName = NULL;
+    DWORD cbHash = SHA1_HASH_LEN;
+    BYTE* pbHash = NULL;
+    Assert(psczSid);
+    if (0 == cchServiceName)
+    {
+        hr = ::StringCchLengthW(wzServiceName, STRSAFE_MAX_CCH, reinterpret_cast<size_t*>(&cchServiceName));
+        AclExitOnFailure(hr, "Failed to get the length of the service name.");
+    }
+    hr = StrAllocStringToUpperInvariant(&sczUpperServiceName, wzServiceName, cchServiceName);
+    AclExitOnFailure(hr, "Failed to upper case the service name.");
+    pbHash = reinterpret_cast<BYTE*>(MemAlloc(cbHash, TRUE));
+    AclExitOnNull(pbHash, hr, E_OUTOFMEMORY, "Failed to allocate hash byte array.");
+    hr = CrypHashBuffer(reinterpret_cast<BYTE*>(sczUpperServiceName), cchServiceName * sizeof(WCHAR), PROV_RSA_FULL, CALG_SHA1, pbHash, cbHash);
+    AclExitOnNull(pbHash, hr, E_OUTOFMEMORY, "Failed to hash the service name.");
+    hr = StrAllocFormatted(psczSid, L"S-1-5-80-%u-%u-%u-%u-%u",
+                           MAKEDWORD(MAKEWORD(pbHash[0], pbHash[1]), MAKEWORD(pbHash[2], pbHash[3])),
+                           MAKEDWORD(MAKEWORD(pbHash[4], pbHash[5]), MAKEWORD(pbHash[6], pbHash[7])),
+                           MAKEDWORD(MAKEWORD(pbHash[8], pbHash[9]), MAKEWORD(pbHash[10], pbHash[11])),
+                           MAKEDWORD(MAKEWORD(pbHash[12], pbHash[13]), MAKEWORD(pbHash[14], pbHash[15])),
+                           MAKEDWORD(MAKEWORD(pbHash[16], pbHash[17]), MAKEWORD(pbHash[18], pbHash[19])));
+LExit:
+    ReleaseMem(pbHash);
+    ReleaseStr(sczUpperServiceName);
+    return hr;
+}
+/********************************************************************
+AclGetAccountSidStringEx - gets a string version of the account's SID
+                           calculates a service's SID if lookup fails
+NOTE: psczSid should be freed with StrFree()
+********************************************************************/
+extern "C" HRESULT DAPI AclGetAccountSidStringEx(
+    __in_z LPCWSTR wzSystem,
+    __in_z LPCWSTR wzAccount,
+    __deref_out_z LPWSTR* psczSid
+    )
+{
+    HRESULT hr = S_OK;
+    SIZE_T cchAccount = 0;
+    PSID psid = NULL;
+    LPWSTR pwz = NULL;
+    LPWSTR sczSid = NULL;
+    Assert(psczSid);
+    hr = AclGetAccountSid(wzSystem, wzAccount, &psid);
+    if (SUCCEEDED(hr))
+    {
+        Assert(::IsValidSid(psid));
+        if (!::ConvertSidToStringSidW(psid, &pwz))
+        {
+            AclExitWithLastError(hr, "Failed to convert SID to string for Account: %ls", wzAccount);
+        }
+        hr = StrAllocString(psczSid, pwz, 0);
+    }
+    else
+    {
+        if (HRESULT_FROM_WIN32(ERROR_NONE_MAPPED) == hr)
+        {
+            HRESULT hrLength = ::StringCchLengthW(wzAccount, STRSAFE_MAX_CCH, reinterpret_cast<size_t*>(&cchAccount));
+            AclExitOnFailure(hrLength, "Failed to get the length of the account name.");
+            if (11 < cchAccount && CSTR_EQUAL == CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, L"NT SERVICE\\", 11, wzAccount, 11))
+            {
+                // If the service is not installed then LookupAccountName doesn't resolve the SID, but we can calculate it.
+                LPCWSTR wzServiceName = &wzAccount[11];
+                hr = AclCalculateServiceSidString(wzServiceName, cchAccount - 11, &sczSid);
+                AclExitOnFailure(hr, "Failed to calculate the service SID for %ls", wzServiceName);
+                *psczSid = sczSid;
+                sczSid = NULL;
+            }
+        }
+        AclExitOnFailure(hr, "Failed to get SID for account: %ls", wzAccount);
+    }
+LExit:
+    ReleaseStr(sczSid);
+    if (pwz)
+    {
+        ::LocalFree(pwz);
+    }
+    if (psid)
+    {
+        AclFreeSid(psid);
+    }
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/aclutil.cpp b/src/libs/dutil/WixToolset.DUtil/aclutil.cpp
new file mode 100644
index 00000000..c9733033
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/aclutil.cpp
@@ -0,0 +1,1044 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define AclExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_ACLUTIL, x, s, __VA_ARGS__)
+#define AclExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_ACLUTIL, x, s, __VA_ARGS__)
+#define AclExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_ACLUTIL, x, s, __VA_ARGS__)
+#define AclExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_ACLUTIL, x, s, __VA_ARGS__)
+#define AclExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_ACLUTIL, x, s, __VA_ARGS__)
+#define AclExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_ACLUTIL, x, s, __VA_ARGS__)
+#define AclExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_ACLUTIL, p, x, e, s, __VA_ARGS__)
+#define AclExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_ACLUTIL, p, x, s, __VA_ARGS__)
+#define AclExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_ACLUTIL, p, x, e, s, __VA_ARGS__)
+#define AclExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_ACLUTIL, p, x, s, __VA_ARGS__)
+#define AclExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_ACLUTIL, e, x, s, __VA_ARGS__)
+#define AclExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_ACLUTIL, g, x, s, __VA_ARGS__)
+/********************************************************************
+AclCheckAccess - determines if token has appropriate privileges
+NOTE: paa->fDenyAccess and paa->dwAccessMask are ignored and must be zero
+if hToken is NULL, the thread will be checked
+if hToken is not NULL the token must be an impersonation token
+********************************************************************/
+extern "C" HRESULT DAPI AclCheckAccess(
+    __in HANDLE hToken, 
+    __in ACL_ACCESS* paa
+    )
+{
+    HRESULT hr = S_OK;
+    PSID psid = NULL; 
+    BOOL fIsMember = FALSE;
+    AclExitOnNull(paa, hr, E_INVALIDARG, "Failed to check ACL access, because no acl access provided to check");
+    Assert(0 == paa->fDenyAccess && 0 == paa->dwAccessMask);
+    if (paa->pwzAccountName)
+    {
+        hr = AclGetAccountSid(NULL, paa->pwzAccountName, &psid);
+        AclExitOnFailure(hr, "failed to get SID for account: %ls", paa->pwzAccountName);
+    }
+    else
+    {
+        if (!::AllocateAndInitializeSid(&paa->sia, paa->nSubAuthorityCount, paa->nSubAuthority[0], paa->nSubAuthority[1], paa->nSubAuthority[2], paa->nSubAuthority[3], paa->nSubAuthority[4], paa->nSubAuthority[5], paa->nSubAuthority[6], paa->nSubAuthority[7], &psid))
+        {
+            AclExitWithLastError(hr, "failed to initialize SID");
+        }
+    }
+    if (!::CheckTokenMembership(hToken, psid, &fIsMember)) 
+    {
+        AclExitWithLastError(hr, "failed to check membership");
+    }
+    fIsMember ? hr = S_OK : hr = S_FALSE;
+LExit:
+    if (psid)
+    {
+        ::FreeSid(psid);  // TODO: does this have bad behavior if SID was allocated by Heap from AclGetAccountSid?
+    }
+    return hr;
+}
+/********************************************************************
+AclCheckAdministratorAccess - determines if token has Administrator privileges
+NOTE: if hToken is NULL, the thread will be checked
+if hToken is not NULL the token must be an impersonation token
+********************************************************************/
+extern "C" HRESULT DAPI AclCheckAdministratorAccess(
+    __in HANDLE hToken
+    )
+{
+    ACL_ACCESS aa;
+    SID_IDENTIFIER_AUTHORITY siaNt = SECURITY_NT_AUTHORITY;
+    memset(&aa, 0, sizeof(aa));
+    aa.sia = siaNt;
+    aa.nSubAuthorityCount = 2;
+    aa.nSubAuthority[0] = SECURITY_BUILTIN_DOMAIN_RID;
+    aa.nSubAuthority[1] = DOMAIN_ALIAS_RID_ADMINS;
+    return AclCheckAccess(hToken, &aa);
+}
+/********************************************************************
+AclCheckLocalSystemAccess - determines if token has LocalSystem privileges
+NOTE: if hToken is NULL, the thread will be checked
+if hToken is not NULL the token must be an impersonation token
+********************************************************************/
+extern "C" HRESULT DAPI AclCheckLocalSystemAccess(
+    __in HANDLE hToken
+    )
+{
+    ACL_ACCESS aa;
+    SID_IDENTIFIER_AUTHORITY siaNt = SECURITY_NT_AUTHORITY;
+    memset(&aa, 0, sizeof(aa));
+    aa.sia = siaNt;
+    aa.nSubAuthorityCount = 1;
+    aa.nSubAuthority[0] = SECURITY_LOCAL_SYSTEM_RID;
+    return AclCheckAccess(hToken, &aa);
+}
+/********************************************************************
+AclGetWellKnownSid - returns a SID for the specified account
+********************************************************************/
+extern "C" HRESULT DAPI AclGetWellKnownSid(
+    __in WELL_KNOWN_SID_TYPE wkst,
+    __deref_out PSID* ppsid
+    )
+{
+    Assert(ppsid);
+    HRESULT hr = S_OK;;
+    PSID psid = NULL;
+    DWORD cbSid = SECURITY_MAX_SID_SIZE;
+    PSID psidTemp = NULL;
+#if(_WIN32_WINNT < 0x0501)
+    SID_IDENTIFIER_AUTHORITY siaNT = SECURITY_NT_AUTHORITY;
+    SID_IDENTIFIER_AUTHORITY siaWorld = SECURITY_WORLD_SID_AUTHORITY;
+    SID_IDENTIFIER_AUTHORITY siaCreator = SECURITY_CREATOR_SID_AUTHORITY;
+    BOOL fSuccess = FALSE;
+#endif
+    //
+    // allocate memory for the SID and get it
+    //
+    psid = static_cast<PSID>(MemAlloc(cbSid, TRUE));
+    AclExitOnNull(psid, hr, E_OUTOFMEMORY, "failed allocate memory for well known SID");
+#if(_WIN32_WINNT < 0x0501)
+    switch (wkst)
+    {
+    case WinWorldSid:                 // Everyone
+        fSuccess = ::AllocateAndInitializeSid(&siaWorld, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0, &psidTemp);
+        break;
+    case WinAuthenticatedUserSid:     // Authenticated Users
+        fSuccess = ::AllocateAndInitializeSid(&siaNT, 1, SECURITY_AUTHENTICATED_USER_RID, 0, 0, 0, 0, 0, 0, 0, &psidTemp);
+        break;
+    case WinLocalSystemSid:           // LocalSystem
+        fSuccess = ::AllocateAndInitializeSid(&siaNT, 1, SECURITY_LOCAL_SYSTEM_RID, 0, 0, 0, 0, 0, 0, 0, &psidTemp);
+        break;
+    case WinLocalServiceSid:          // LocalService
+        fSuccess = ::AllocateAndInitializeSid(&siaNT, 1, SECURITY_LOCAL_SERVICE_RID, 0, 0, 0, 0, 0, 0, 0, &psidTemp);
+        break;
+    case WinNetworkServiceSid:        // NetworkService
+        fSuccess = ::AllocateAndInitializeSid(&siaNT, 1, SECURITY_NETWORK_SERVICE_RID, 0, 0, 0, 0, 0, 0, 0, &psidTemp);
+        break;
+    case WinBuiltinGuestsSid: // Guests
+        fSuccess = ::AllocateAndInitializeSid(&siaNT, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_GUESTS, 0, 0, 0, 0, 0, 0, &psidTemp);
+        break;
+    case WinBuiltinAdministratorsSid: // Administrators
+        fSuccess = ::AllocateAndInitializeSid(&siaNT, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &psidTemp);
+        break;
+    case WinBuiltinUsersSid:          // Users
+        fSuccess = ::AllocateAndInitializeSid(&siaNT, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS, 0, 0, 0, 0, 0, 0, &psidTemp);
+        break;
+    case WinCreatorOwnerSid:  //CREATOR OWNER
+        fSuccess = ::AllocateAndInitializeSid(&siaCreator, 1, SECURITY_CREATOR_OWNER_RID, 0, 0, 0, 0, 0, 0, 0, &psidTemp);
+        break;
+    case WinInteractiveSid:  // INTERACTIVE
+        fSuccess = ::AllocateAndInitializeSid(&siaNT, 1, SECURITY_INTERACTIVE_RID, 0, 0, 0, 0, 0, 0, 0, &psidTemp);
+        break;
+    default:
+        hr = E_INVALIDARG;
+        AclExitOnFailure(hr, "unknown well known SID: %d", wkst);
+    }
+    if (!fSuccess)
+        AclExitOnLastError(hr, "failed to allocate well known SID: %d", wkst);
+    if (!::CopySid(cbSid, psid, psidTemp))
+        AclExitOnLastError(hr, "failed to create well known SID: %d", wkst);
+#else
+    Assert(NULL == psidTemp);
+    if (!::CreateWellKnownSid(wkst, NULL, psid, &cbSid))
+    {
+        AclExitWithLastError(hr, "failed to create well known SID: %d", wkst);
+    }
+#endif 
+    *ppsid = psid;
+    psid = NULL;   // null it here so it won't be released below
+    Assert(S_OK == hr && ::IsValidSid(*ppsid));
+LExit:
+    if (psidTemp)
+    {
+        ::FreeSid(psidTemp);
+    }
+    ReleaseMem(psid);
+    return hr;
+}
+/********************************************************************
+AclGetAccountSid - returns a SID for the specified account
+********************************************************************/
+extern "C" HRESULT DAPI AclGetAccountSid(
+    __in_opt LPCWSTR wzSystem,
+    __in_z LPCWSTR wzAccount,
+    __deref_out PSID* ppsid
+    )
+{
+    Assert(wzAccount && *wzAccount && ppsid);
+    HRESULT hr = S_OK;
+    UINT er = ERROR_SUCCESS;
+    PSID psid = NULL;
+    DWORD cbSid = SECURITY_MAX_SID_SIZE;
+    LPWSTR pwzDomainName = NULL;
+    DWORD cbDomainName = 255;
+    SID_NAME_USE peUse;
+    //
+    // allocate memory for the SID and domain name
+    //
+    psid = static_cast<PSID>(MemAlloc(cbSid, TRUE));
+    AclExitOnNull(psid, hr, E_OUTOFMEMORY, "failed to allocate memory for SID");
+    hr = StrAlloc(&pwzDomainName, cbDomainName);
+    AclExitOnFailure(hr, "failed to allocate string for domain name");
+    //
+    // try to lookup the account now
+    //
+    if (!::LookupAccountNameW(wzSystem, wzAccount, psid, &cbSid, pwzDomainName, &cbDomainName, &peUse))
+    {
+        // if one of the buffers wasn't large enough
+        er = ::GetLastError();
+        if (ERROR_INSUFFICIENT_BUFFER == er)
+        {
+            if (SECURITY_MAX_SID_SIZE < cbSid)
+            {
+                PSID psidNew = static_cast<PSID>(MemReAlloc(psid, cbSid, TRUE));
+                AclExitOnNullWithLastError(psidNew, hr, "failed to allocate memory for account: %ls", wzAccount);
+                psid = psidNew;
+            }
+            if (255 < cbDomainName)
+            {
+                hr = StrAlloc(&pwzDomainName, cbDomainName);
+                AclExitOnFailure(hr, "failed to allocate string for domain name");
+            }
+            if (!::LookupAccountNameW(wzSystem, wzAccount, psid, &cbSid, pwzDomainName, &cbDomainName, &peUse))
+            {
+                AclExitWithLastError(hr, "failed to lookup account: %ls", wzAccount);
+            }
+        }
+        else
+        {
+            AclExitOnWin32Error(er, hr, "failed to lookup account: %ls", wzAccount);
+        }
+    }
+    *ppsid = psid;
+    psid = NULL;
+    hr = S_OK;
+LExit:
+    ReleaseStr(pwzDomainName);
+    ReleaseMem(psid);
+    return hr;
+}
+/********************************************************************
+AclGetAccountSidString - gets a string version of the user's SID
+NOTE: ppwzSid should be freed with StrFree()
+********************************************************************/
+extern "C" HRESULT DAPI AclGetAccountSidString(
+    __in_z LPCWSTR wzSystem,
+    __in_z LPCWSTR wzAccount,
+    __deref_out_z LPWSTR* ppwzSid
+    )
+{
+    Assert(ppwzSid);
+    HRESULT hr = S_OK;
+    PSID psid = NULL;
+    LPWSTR pwz = NULL;
+    *ppwzSid = NULL;
+    hr = AclGetAccountSid(wzSystem, wzAccount, &psid);
+    AclExitOnFailure(hr, "failed to get SID for account: %ls", wzAccount);
+    Assert(::IsValidSid(psid));
+    if (!::ConvertSidToStringSidW(psid, &pwz))
+    {
+        AclExitWithLastError(hr, "failed to convert SID to string for Account: %ls", wzAccount);
+    }
+    hr = StrAllocString(ppwzSid, pwz, 0);
+LExit:
+    if (FAILED(hr))
+    {
+        ReleaseNullStr(*ppwzSid);
+    }
+    if (pwz)
+    {
+        ::LocalFree(pwz);
+    }
+    if (psid)
+    {
+        AclFreeSid(psid);
+    }
+    return hr;
+}
+/********************************************************************
+AclCreateDacl - creates a DACL from ACL_ACE structures
+********************************************************************/
+extern "C" HRESULT DAPI AclCreateDacl(
+    __in_ecount(cDeny) ACL_ACE rgaaDeny[],
+    __in DWORD cDeny,
+    __in_ecount(cAllow) ACL_ACE rgaaAllow[],
+    __in DWORD cAllow,
+    __deref_out ACL** ppAcl
+    )
+{
+    Assert(ppAcl);
+    HRESULT hr = S_OK;
+    ACL* pAcl = NULL;
+    DWORD cbAcl = 0;
+    DWORD i;
+    *ppAcl = NULL;
+    // initialize the ACL
+    cbAcl = sizeof(ACL);
+    for (i = 0; i < cDeny; ++i)
+    {
+        cbAcl += sizeof(ACCESS_DENIED_ACE) + ::GetLengthSid(rgaaDeny[i].psid) - sizeof(DWORD);
+    }
+    for (i = 0; i < cAllow; ++i)
+    {
+        cbAcl += sizeof(ACCESS_ALLOWED_ACE) + ::GetLengthSid(rgaaAllow[i].psid) - sizeof(DWORD);
+    }
+    pAcl = static_cast<ACL*>(MemAlloc(cbAcl, TRUE));
+    AclExitOnNull(pAcl, hr, E_OUTOFMEMORY, "failed to allocate ACL");
+#pragma prefast(push)
+#pragma prefast(disable:25029)
+    if (!::InitializeAcl(pAcl, cbAcl, ACL_REVISION))
+#pragma prefast(pop)
+    {
+        AclExitWithLastError(hr, "failed to initialize ACL");
+    }
+    // add in the ACEs (denied first)
+    for (i = 0; i < cDeny; ++i)
+    {
+#pragma prefast(push)
+#pragma prefast(disable:25029)
+        if (!::AddAccessDeniedAceEx(pAcl, ACL_REVISION, rgaaDeny[i].dwFlags, rgaaDeny[i].dwMask, rgaaDeny[i].psid))
+#pragma prefast(pop)
+        {
+            AclExitWithLastError(hr, "failed to add access denied ACE #%d to ACL", i);
+        }
+    }
+    for (i = 0; i < cAllow; ++i)
+    {
+#pragma prefast(push)
+#pragma prefast(disable:25029)
+        if (!::AddAccessAllowedAceEx(pAcl, ACL_REVISION, rgaaAllow[i].dwFlags, rgaaAllow[i].dwMask, rgaaAllow[i].psid))
+#pragma prefast(pop)
+        {
+            AclExitWithLastError(hr, "failed to add access allowed ACE #%d to ACL", i);
+        }
+    }
+    *ppAcl = pAcl;
+    pAcl = NULL;
+    AssertSz(::IsValidAcl(*ppAcl), "AclCreateDacl() - created invalid ACL");
+    Assert(S_OK == hr);
+LExit:
+    if (pAcl)
+    {
+        AclFreeDacl(pAcl);
+    }
+    return hr;
+}
+/********************************************************************
+AclAddToDacl - creates a new DACL from an ACL plus new ACL_ACE structure
+********************************************************************/
+extern "C" HRESULT DAPI AclAddToDacl(
+    __in ACL* pAcl,
+    __in_ecount_opt(cDeny) const ACL_ACE rgaaDeny[],
+    __in DWORD cDeny,
+    __in_ecount_opt(cAllow) const ACL_ACE rgaaAllow[],
+    __in DWORD cAllow,
+    __deref_out ACL** ppAclNew
+    )
+{
+    Assert(pAcl && ::IsValidAcl(pAcl) && ppAclNew);
+    HRESULT hr = S_OK;
+    ACL_SIZE_INFORMATION asi;
+    ACL_ACE* paaNewDeny = NULL;
+    DWORD cNewDeny = 0;
+    ACL_ACE* paaNewAllow = NULL;
+    DWORD cNewAllow = 0;
+    ACCESS_ALLOWED_ACE* paaa;
+    ACCESS_DENIED_ACE* pada;
+    DWORD i;
+    // allocate memory for all the new ACEs (NOTE: this over calculates the memory necessary, but that's okay)
+    if (!::GetAclInformation(pAcl, &asi, sizeof(asi), AclSizeInformation))
+    {
+        AclExitWithLastError(hr, "failed to get information about original ACL");
+    }
+    if ((asi.AceCount + cDeny) < asi.AceCount || // check for overflow
+        (asi.AceCount + cDeny) < cDeny || // check for overflow
+        (asi.AceCount + cDeny) >= MAXSIZE_T / sizeof(ACL_ACE))
+    {
+        hr = E_OUTOFMEMORY;
+        AclExitOnFailure(hr, "Not enough memory to allocate %d ACEs", (asi.AceCount + cDeny));
+    }
+    paaNewDeny = static_cast<ACL_ACE*>(MemAlloc(sizeof(ACL_ACE) * (asi.AceCount + cDeny), TRUE));
+    AclExitOnNull(paaNewDeny, hr, E_OUTOFMEMORY, "failed to allocate memory for new deny ACEs");
+    if ((asi.AceCount + cAllow) < asi.AceCount || // check for overflow
+        (asi.AceCount + cAllow) < cAllow || // check for overflow
+        (asi.AceCount + cAllow) >= MAXSIZE_T / sizeof(ACL_ACE))
+    {
+        hr = E_OUTOFMEMORY;
+        AclExitOnFailure(hr, "Not enough memory to allocate %d ACEs", (asi.AceCount + cAllow));
+    }
+    paaNewAllow = static_cast<ACL_ACE*>(MemAlloc(sizeof(ACL_ACE) * (asi.AceCount + cAllow), TRUE));
+    AclExitOnNull(paaNewAllow, hr, E_OUTOFMEMORY, "failed to allocate memory for new allow ACEs");
+    // fill in the new structures with old data then new data (denied first)
+    for (i = 0; i < asi.AceCount; ++i)
+    {
+        if (!::GetAce(pAcl, i, reinterpret_cast<LPVOID*>(&pada)))
+        {
+            AclExitWithLastError(hr, "failed to get ACE #%d from ACL", i);
+        }
+        if (ACCESS_DENIED_ACE_TYPE != pada->Header.AceType)
+        {
+            continue;  // skip non-denied aces
+        }
+        paaNewDeny[i].dwFlags = pada->Header.AceFlags;
+        paaNewDeny[i].dwMask = pada->Mask;
+        paaNewDeny[i].psid = reinterpret_cast<PSID>(&(pada->SidStart));
+        ++cNewDeny;
+    }
+    memcpy(paaNewDeny + cNewDeny, rgaaDeny, sizeof(ACL_ACE) * cDeny);
+    cNewDeny += cDeny;
+    for (i = 0; i < asi.AceCount; ++i)
+    {
+        if (!::GetAce(pAcl, i, reinterpret_cast<LPVOID*>(&paaa)))
+        {
+            AclExitWithLastError(hr, "failed to get ACE #%d from ACL", i);
+        }
+        if (ACCESS_ALLOWED_ACE_TYPE != paaa->Header.AceType)
+        {
+            continue;  // skip non-allowed aces
+        }
+        paaNewAllow[i].dwFlags = paaa->Header.AceFlags;
+        paaNewAllow[i].dwMask = paaa->Mask;
+        paaNewAllow[i].psid = reinterpret_cast<PSID>(&(paaa->SidStart));
+        ++cNewAllow;
+    }
+    memcpy(paaNewAllow + cNewAllow, rgaaAllow, sizeof(ACL_ACE) * cAllow);
+    cNewAllow += cAllow;
+    // create the dacl with the new 
+    hr = AclCreateDacl(paaNewDeny, cNewDeny, paaNewAllow, cNewAllow, ppAclNew);
+    AclExitOnFailure(hr, "failed to create new ACL from existing ACL");
+    AssertSz(::IsValidAcl(*ppAclNew), "AclAddToDacl() - created invalid ACL");
+    Assert(S_OK == hr);
+LExit:
+    ReleaseMem(paaNewAllow);
+    ReleaseMem(paaNewDeny);
+    return hr;
+}
+/********************************************************************
+AclMergeDacls - creates a new DACL from two existing ACLs
+********************************************************************/
+extern "C" HRESULT DAPI AclMergeDacls(
+    __in const ACL* pAcl1,
+    __in const ACL* pAcl2,
+    __deref_out ACL** ppAclNew
+    )
+{
+    HRESULT hr = E_NOTIMPL;
+    Assert(pAcl1 && pAcl2 && ppAclNew);
+    UNREFERENCED_PARAMETER(pAcl1);
+    UNREFERENCED_PARAMETER(pAcl2);
+    UNREFERENCED_PARAMETER(ppAclNew);
+//LExit:
+    return hr;
+}
+/********************************************************************
+AclCreateDaclOld - creates a DACL from an ACL_ACCESS structure
+********************************************************************/
+extern "C" HRESULT DAPI AclCreateDaclOld(
+    __in_ecount(cAclAccesses) ACL_ACCESS* paa,
+    __in DWORD cAclAccesses,
+    __deref_out ACL** ppACL
+    )
+{
+    Assert(ppACL);
+    HRESULT hr = S_OK;
+    DWORD* pdwAccessMask = NULL;
+    PSID* ppsid = NULL;
+    DWORD i;
+    int cbAcl;
+    *ppACL = NULL;
+    //
+    // create the SIDs and calculate the space for the ACL
+    //
+    pdwAccessMask = static_cast<DWORD*>(MemAlloc(sizeof(DWORD) * cAclAccesses, TRUE));
+    AclExitOnNull(pdwAccessMask, hr, E_OUTOFMEMORY, "failed allocate memory for access mask");
+    ppsid = static_cast<PSID*>(MemAlloc(sizeof(PSID) * cAclAccesses, TRUE));
+    AclExitOnNull(ppsid, hr, E_OUTOFMEMORY, "failed allocate memory for sid");
+    cbAcl = sizeof (ACL);  // start with the size of the header
+    for (i = 0; i < cAclAccesses; ++i)
+    {
+        if (paa[i].pwzAccountName)
+        {
+            hr = AclGetAccountSid(NULL, paa[i].pwzAccountName, ppsid + i);
+            AclExitOnFailure(hr, "failed to get SID for account: %ls", paa[i].pwzAccountName);
+        }
+        else
+        {
+            if ((!::AllocateAndInitializeSid(&paa[i].sia, paa[i].nSubAuthorityCount, 
+                paa[i].nSubAuthority[0], paa[i].nSubAuthority[1], 
+                paa[i].nSubAuthority[2], paa[i].nSubAuthority[3], 
+                paa[i].nSubAuthority[4], paa[i].nSubAuthority[5], 
+                paa[i].nSubAuthority[6], paa[i].nSubAuthority[7], 
+                (void**)(ppsid + i))))
+            {
+                AclExitWithLastError(hr, "failed to initialize SIDs #%u", i);
+            }
+        }
+        // add the newly allocated SID size to the count of bytes for this ACL
+        cbAcl +=::GetLengthSid(*(ppsid + i)) - sizeof(DWORD);
+        if (paa[i].fDenyAccess)
+        {
+            cbAcl += sizeof(ACCESS_DENIED_ACE);
+        }
+        else
+        {
+            cbAcl += sizeof(ACCESS_ALLOWED_ACE);
+        }
+        pdwAccessMask[i] = paa[i].dwAccessMask;
+    }
+    //
+    // allocate the ACL and set the appropriate ACEs
+    //
+    *ppACL = static_cast<ACL*>(MemAlloc(cbAcl, FALSE));
+    AclExitOnNull(*ppACL, hr, E_OUTOFMEMORY, "failed allocate memory for ACL");
+#pragma prefast(push)
+#pragma prefast(disable:25029)
+    if (!::InitializeAcl(*ppACL, cbAcl, ACL_REVISION))
+#pragma prefast(pop)
+    {
+        AclExitWithLastError(hr, "failed to initialize ACLs");
+    }
+    // add an access-allowed ACE for each of the SIDs
+    for (i = 0; i < cAclAccesses; ++i)
+    {
+        if (paa[i].fDenyAccess)
+        {
+#pragma prefast(push)
+#pragma prefast(disable:25029)
+            if (!::AddAccessDeniedAceEx(*ppACL, ACL_REVISION, CONTAINER_INHERIT_ACE | OBJECT_INHERIT_ACE, pdwAccessMask[i], *(ppsid + i)))
+#pragma prefast(pop)
+            {
+                AclExitWithLastError(hr, "failed to add access denied for ACE");
+            }
+        }
+        else
+        {
+#pragma prefast(push)
+#pragma prefast(disable:25029)
+            if (!::AddAccessAllowedAceEx(*ppACL, ACL_REVISION, CONTAINER_INHERIT_ACE | OBJECT_INHERIT_ACE, pdwAccessMask[i], *(ppsid + i)))
+#pragma prefast(pop)
+            {
+                AclExitWithLastError(hr, "failed to add access allowed for ACE");
+            }
+        }
+    }
+LExit:
+    if (FAILED(hr))
+    {
+        ReleaseNullMem(*ppACL);
+    }
+    if (ppsid)
+    {
+        for (i = 0; i < cAclAccesses; ++i)
+        {
+            if (ppsid[i])
+            {
+                ::FreeSid(ppsid[i]);
+            }
+        }
+        MemFree(ppsid);
+    }
+    ReleaseMem(pdwAccessMask);
+    return hr;
+}
+/********************************************************************
+AclCreateSecurityDescriptorFromDacl - creates a self-relative security 
+descriptor from an existing DACL
+********************************************************************/
+extern "C" HRESULT DAPI AclCreateSecurityDescriptorFromDacl(
+    __in ACL* pACL,
+    __deref_out SECURITY_DESCRIPTOR** ppsd
+    )
+{
+    HRESULT hr = S_OK;
+    SECURITY_DESCRIPTOR sd;
+    DWORD cbSD;
+    AclExitOnNull(pACL, hr, E_INVALIDARG, "Failed to create security descriptor from DACL, because no DACL was provided");
+    AclExitOnNull(ppsd, hr, E_INVALIDARG, "Failed to create security descriptor from DACL, because no output object was provided");
+    *ppsd = NULL;
+    //
+    // create the absolute security descriptor
+    //
+    // initialize our security descriptor, throw the ACL into it, and set the owner
+#pragma prefast(push)
+#pragma prefast(disable:25028) // We only call this when pACL isn't NULL, so this call is safe according to the docs
+#pragma prefast(disable:25029)
+    if (!::InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION) ||
+        (!::SetSecurityDescriptorDacl(&sd, TRUE, pACL, FALSE)) ||
+        (!::SetSecurityDescriptorOwner(&sd, NULL, FALSE)))
+#pragma prefast(pop)
+    {
+        AclExitWithLastError(hr, "failed to initialize security descriptor");
+    }
+    //
+    // create the self-relative security descriptor
+    //
+    cbSD = ::GetSecurityDescriptorLength(&sd);
+    *ppsd = static_cast<SECURITY_DESCRIPTOR*>(MemAlloc(cbSD, FALSE));
+    AclExitOnNull(*ppsd, hr, E_OUTOFMEMORY, "failed allocate memory for security descriptor");
+    ::MakeSelfRelativeSD(&sd, (BYTE*)*ppsd, &cbSD);
+    Assert(::IsValidSecurityDescriptor(*ppsd));
+LExit:
+    if (FAILED(hr) && NULL != ppsd && NULL != *ppsd)
+    {
+        MemFree(*ppsd);
+        *ppsd = NULL;
+    }
+    return hr;
+}
+/********************************************************************
+AclCreateSecurityDescriptor - creates a self-relative security descriptor from an 
+ACL_ACCESS structure
+NOTE: ppsd should be freed with AclFreeSecurityDescriptor()
+********************************************************************/
+extern "C" HRESULT DAPI AclCreateSecurityDescriptor(
+    __in_ecount(cAclAccesses) ACL_ACCESS* paa,
+    __in DWORD cAclAccesses,
+    __deref_out SECURITY_DESCRIPTOR** ppsd
+    )
+{
+    Assert(ppsd);
+    HRESULT hr = S_OK;
+    ACL* pACL;
+    *ppsd = NULL;
+    //
+    // create the DACL
+    //
+    hr = AclCreateDaclOld(paa, cAclAccesses, &pACL);
+    AclExitOnFailure(hr, "failed to create DACL for security descriptor");
+    //
+    // create self-relative security descriptor
+    //
+    hr = AclCreateSecurityDescriptorFromDacl(pACL, ppsd);
+LExit:
+    return hr;
+}
+/********************************************************************
+AclCreateSecurityDescriptorFromString - creates a self-relative security
+descriptor from an SDDL string
+NOTE: ppsd should be freed with AclFreeSecurityDescriptor()
+********************************************************************/
+extern "C" HRESULT DAPI AclCreateSecurityDescriptorFromString(
+    __deref_out SECURITY_DESCRIPTOR** ppsd,
+    __in_z __format_string LPCWSTR wzSddlFormat,
+    ...
+    )
+{
+    Assert(ppsd);
+    HRESULT hr = S_OK;
+    LPWSTR pwzSddl = NULL;
+    va_list args;
+    PSECURITY_DESCRIPTOR psd = NULL;
+    DWORD cbSD = 0;
+    *ppsd = NULL;
+    va_start(args, wzSddlFormat);
+    hr = StrAllocFormattedArgs(&pwzSddl, wzSddlFormat, args);
+    va_end(args);
+    AclExitOnFailure(hr, "failed to create SDDL string for format: %ls", wzSddlFormat);
+    if (!::ConvertStringSecurityDescriptorToSecurityDescriptorW(pwzSddl, SDDL_REVISION_1, &psd, &cbSD))
+    {
+        AclExitWithLastError(hr, "failed to create security descriptor from SDDL: %ls", pwzSddl);
+    }
+    *ppsd = static_cast<SECURITY_DESCRIPTOR*>(MemAlloc(cbSD, FALSE));
+    AclExitOnNull(*ppsd, hr, E_OUTOFMEMORY, "failed to allocate memory for security descriptor");
+    memcpy(*ppsd, psd, cbSD);
+    Assert(::IsValidSecurityDescriptor(*ppsd));
+    Assert(S_OK == hr);
+LExit:
+    if (FAILED(hr) && NULL != ppsd && NULL != *ppsd)
+    {
+        MemFree(*ppsd);
+        *ppsd = NULL;
+    }
+    if (psd)
+    {
+        ::LocalFree(psd);
+    }
+    ReleaseStr(pwzSddl);
+    return hr;
+}
+/********************************************************************
+AclDuplicateSecurityDescriptor - creates a copy of a self-relative security descriptor 
+NOTE: passed in security descriptor must be in self-relative format
+********************************************************************/
+extern "C" HRESULT DAPI AclDuplicateSecurityDescriptor(
+    __in SECURITY_DESCRIPTOR* psd,
+    __deref_out SECURITY_DESCRIPTOR** ppsd
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD cbSD;
+    AclExitOnNull(ppsd, hr, E_INVALIDARG, "Failed to get duplicate ACL security descriptor because no place to output was provided");
+    *ppsd = NULL;
+    //
+    // create the self-relative security descriptor
+    //
+    cbSD = ::GetSecurityDescriptorLength(psd);
+    *ppsd = static_cast<SECURITY_DESCRIPTOR*>(MemAlloc(cbSD, 0));
+    AclExitOnNull(*ppsd, hr, E_OUTOFMEMORY, "failed allocate memory for security descriptor");
+    memcpy(*ppsd, psd, cbSD);
+    Assert(::IsValidSecurityDescriptor(*ppsd));
+LExit:
+    if (FAILED(hr) && NULL != ppsd && NULL != *ppsd)
+    {
+        MemFree(*ppsd);
+        *ppsd = NULL;
+    }
+    return hr;
+}
+/********************************************************************
+AclGetSecurityDescriptor - returns self-relative security descriptor for named object
+NOTE: free ppsd with AclFreeSecurityDescriptor()
+********************************************************************/
+extern "C" HRESULT DAPI AclGetSecurityDescriptor(
+    __in_z LPCWSTR wzObject,
+    __in SE_OBJECT_TYPE sot,
+    __in SECURITY_INFORMATION securityInformation,
+    __deref_out SECURITY_DESCRIPTOR** ppsd
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er;
+    PSECURITY_DESCRIPTOR psd = NULL;
+    DWORD cbSD;
+    AclExitOnNull(ppsd, hr, E_INVALIDARG, "Failed to get ACL Security Descriptor because no place to output was provided");
+    *ppsd = NULL;
+    // get the security descriptor for the object
+    er = ::GetNamedSecurityInfoW(const_cast<LPWSTR>(wzObject), sot, securityInformation, NULL, NULL, NULL, NULL, &psd);
+    AclExitOnWin32Error(er, hr, "failed to get security info from object: %ls", wzObject);
+    Assert(::IsValidSecurityDescriptor(psd));
+    // copy the self-relative security descriptor
+    cbSD = ::GetSecurityDescriptorLength(psd);
+    *ppsd = static_cast<SECURITY_DESCRIPTOR*>(MemAlloc(cbSD, 0));
+    AclExitOnNull(*ppsd, hr, E_OUTOFMEMORY, "failed allocate memory for security descriptor");
+    memcpy(*ppsd, psd, cbSD);
+    Assert(::IsValidSecurityDescriptor(*ppsd));
+LExit:
+    if (FAILED(hr) && NULL != ppsd && NULL != *ppsd)
+    {
+        MemFree(*ppsd);
+        *ppsd = NULL;
+    }
+    if (psd)
+    {
+        ::LocalFree(psd);
+    }
+    return hr;
+}
+extern "C" HRESULT DAPI AclSetSecurityWithRetry(
+    __in_z LPCWSTR wzObject,
+    __in SE_OBJECT_TYPE sot,
+    __in SECURITY_INFORMATION securityInformation,
+    __in_opt PSID psidOwner,
+    __in_opt PSID psidGroup,
+    __in_opt PACL pDacl,
+    __in_opt PACL pSacl,
+    __in DWORD cRetry,
+    __in DWORD dwWaitMilliseconds
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczObject = NULL;
+    DWORD i = 0;
+    hr = StrAllocString(&sczObject, wzObject, 0);
+    AclExitOnFailure(hr, "Failed to copy object to secure.");
+    hr = E_FAIL;
+    for (i = 0; FAILED(hr) && i <= cRetry; ++i)
+    {
+        if (0 < i)
+        {
+            ::Sleep(dwWaitMilliseconds);
+        }
+        DWORD er = ::SetNamedSecurityInfoW(sczObject, sot, securityInformation, psidOwner, psidGroup, pDacl, pSacl);
+        hr = HRESULT_FROM_WIN32(er);
+    }
+    AclExitOnRootFailure(hr, "Failed to set security on object '%ls' after %u retries.", wzObject, i);
+LExit:
+    ReleaseStr(sczObject);
+    return hr;
+}
+/********************************************************************
+AclFreeSid - frees a SID created by any Acl* functions
+********************************************************************/
+extern "C" HRESULT DAPI AclFreeSid(
+    __in PSID psid
+    )
+{
+    Assert(psid && ::IsValidSid(psid));
+    HRESULT hr = S_OK;
+    hr = MemFree(psid);
+    return hr;
+}
+/********************************************************************
+AclFreeDacl - frees a DACL created by any Acl* functions
+********************************************************************/
+extern "C" HRESULT DAPI AclFreeDacl(
+    __in ACL* pACL
+    )
+{
+    Assert(pACL);
+    HRESULT hr = S_OK;
+    hr = MemFree(pACL);
+    return hr;
+}
+/********************************************************************
+AclFreeSecurityDescriptor - frees a security descriptor created by any Acl* functions
+********************************************************************/
+extern "C" HRESULT DAPI AclFreeSecurityDescriptor(
+    __in SECURITY_DESCRIPTOR* psd
+    )
+{
+    Assert(psd && ::IsValidSecurityDescriptor(psd));
+    HRESULT hr = S_OK;
+    hr = MemFree(psd);
+    return hr;
+}
+/********************************************************************
+AclAddAdminToSecurityDescriptor - Adds the Administrators group to a security descriptor
+********************************************************************/
+extern "C" HRESULT DAPI AclAddAdminToSecurityDescriptor(
+    __in SECURITY_DESCRIPTOR* pSecurity,
+    __deref_out SECURITY_DESCRIPTOR** ppSecurityNew
+    )
+{
+    HRESULT hr = S_OK;
+    PACL pAcl = NULL;
+    PACL pAclNew = NULL;
+    BOOL fValid, fDaclDefaulted;
+    ACL_ACE ace[1];
+    SECURITY_DESCRIPTOR* pSecurityNew;
+    
+    if (!::GetSecurityDescriptorDacl(pSecurity, &fValid, &pAcl, &fDaclDefaulted) || !fValid)
+    {
+        AclExitOnLastError(hr, "Failed to get acl from security descriptor");
+    }
+    
+    hr = AclGetWellKnownSid(WinBuiltinAdministratorsSid, &ace[0].psid);
+    AclExitOnFailure(hr, "failed to get sid for Administrators group");
+    ace[0].dwFlags = NO_PROPAGATE_INHERIT_ACE;
+    ace[0].dwMask = GENERIC_ALL;
+    hr = AclAddToDacl(pAcl, NULL, 0, ace, 1, &pAclNew);
+    AclExitOnFailure(hr, "failed to add Administrators ACE to ACL");
+    hr = AclCreateSecurityDescriptorFromDacl(pAclNew, &pSecurityNew);
+    AclExitOnLastError(hr, "Failed to create new security descriptor");
+    // The DACL is referenced by, not copied into, the security descriptor.  Make sure not to free it.
+    pAclNew = NULL;
+    *ppSecurityNew = pSecurityNew;
+LExit:
+    if (pAclNew)
+    {
+        AclFreeDacl(pAclNew);
+    }
+    if (ace[0].psid)
+    {
+        AclFreeSid(ace[0].psid);
+    }
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/apputil.cpp b/src/libs/dutil/WixToolset.DUtil/apputil.cpp
new file mode 100644
index 00000000..589a09dd
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/apputil.cpp
@@ -0,0 +1,124 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define AppExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_APPUTIL, x, s, __VA_ARGS__)
+#define AppExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_APPUTIL, x, s, __VA_ARGS__)
+#define AppExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_APPUTIL, x, s, __VA_ARGS__)
+#define AppExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_APPUTIL, x, s, __VA_ARGS__)
+#define AppExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_APPUTIL, x, s, __VA_ARGS__)
+#define AppExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_APPUTIL, x, s, __VA_ARGS__)
+#define AppExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_APPUTIL, p, x, e, s, __VA_ARGS__)
+#define AppExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_APPUTIL, p, x, s, __VA_ARGS__)
+#define AppExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_APPUTIL, p, x, e, s, __VA_ARGS__)
+#define AppExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_APPUTIL, p, x, s, __VA_ARGS__)
+#define AppExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_APPUTIL, e, x, s, __VA_ARGS__)
+#define AppExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_APPUTIL, g, x, s, __VA_ARGS__)
+const DWORD PRIVATE_LOAD_LIBRARY_SEARCH_SYSTEM32 = 0x00000800;
+typedef BOOL(WINAPI *LPFN_SETDEFAULTDLLDIRECTORIES)(DWORD);
+typedef BOOL(WINAPI *LPFN_SETDLLDIRECTORYW)(LPCWSTR);
+extern "C" void DAPI AppFreeCommandLineArgs(
+    __in LPWSTR* argv
+    )
+{
+    // The "ignored" hack in AppParseCommandLine requires an adjustment.
+    LPWSTR* argvOriginal = argv - 1;
+    ::LocalFree(argvOriginal);
+}
+/********************************************************************
+AppInitialize - initializes the standard safety precautions for an
+                installation application.
+********************************************************************/
+extern "C" void DAPI AppInitialize(
+    __in_ecount(cSafelyLoadSystemDlls) LPCWSTR rgsczSafelyLoadSystemDlls[],
+    __in DWORD cSafelyLoadSystemDlls
+    )
+{
+    HRESULT hr = S_OK;
+    HMODULE hIgnored = NULL;
+    BOOL fSetDefaultDllDirectories = FALSE;
+    ::HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0);
+    // Best effort call to initialize default DLL directories to system only.
+    HMODULE hKernel32 = ::GetModuleHandleW(L"kernel32");
+    Assert(hKernel32);
+    LPFN_SETDEFAULTDLLDIRECTORIES pfnSetDefaultDllDirectories = (LPFN_SETDEFAULTDLLDIRECTORIES)::GetProcAddress(hKernel32, "SetDefaultDllDirectories");
+    if (pfnSetDefaultDllDirectories)
+    {
+        if (pfnSetDefaultDllDirectories(PRIVATE_LOAD_LIBRARY_SEARCH_SYSTEM32))
+        {
+            fSetDefaultDllDirectories = TRUE;
+        }
+        else
+        {
+            hr = HRESULT_FROM_WIN32(::GetLastError());
+            TraceError(hr, "Failed to call SetDefaultDllDirectories.");
+        }
+    }
+    // Only need to safely load if the default DLL directories was not
+    // able to be set.
+    if (!fSetDefaultDllDirectories)
+    {
+        // Remove current working directory from search order.
+        LPFN_SETDLLDIRECTORYW pfnSetDllDirectory = (LPFN_SETDLLDIRECTORYW)::GetProcAddress(hKernel32, "SetDllDirectoryW");
+        if (!pfnSetDllDirectory || !pfnSetDllDirectory(L""))
+        {
+            hr = HRESULT_FROM_WIN32(::GetLastError());
+            TraceError(hr, "Failed to call SetDllDirectory.");
+        }
+        for (DWORD i = 0; i < cSafelyLoadSystemDlls; ++i)
+        {
+            hr = LoadSystemLibrary(rgsczSafelyLoadSystemDlls[i], &hIgnored);
+            if (FAILED(hr))
+            {
+                TraceError(hr, "Failed to safety load: %ls", rgsczSafelyLoadSystemDlls[i]);
+            }
+        }
+    }
+}
+extern "C" void DAPI AppInitializeUnsafe()
+{
+    ::HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0);
+}
+extern "C" DAPI_(HRESULT) AppParseCommandLine(
+    __in LPCWSTR wzCommandLine,
+    __in int* pArgc,
+    __in LPWSTR** pArgv
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczCommandLine = NULL;
+    LPWSTR* argv = NULL;
+    int argc = 0;
+    // CommandLineToArgvW tries to treat the first argument as the path to the process,
+    // which fails pretty miserably if your first argument is something like
+    // FOO="C:\Program Files\My Company". So give it something harmless to play with.
+    hr = StrAllocConcat(&sczCommandLine, L"ignored ", 0);
+    AppExitOnFailure(hr, "Failed to initialize command line.");
+    hr = StrAllocConcat(&sczCommandLine, wzCommandLine, 0);
+    AppExitOnFailure(hr, "Failed to copy command line.");
+    argv = ::CommandLineToArgvW(sczCommandLine, &argc);
+    AppExitOnNullWithLastError(argv, hr, "Failed to parse command line.");
+    // Skip "ignored" argument/hack.
+    *pArgv = argv + 1;
+    *pArgc = argc - 1;
+LExit:
+    ReleaseStr(sczCommandLine);
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/apuputil.cpp b/src/libs/dutil/WixToolset.DUtil/apuputil.cpp
new file mode 100644
index 00000000..eb96d515
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/apuputil.cpp
@@ -0,0 +1,700 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define ApupExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_APUPUTIL, x, s, __VA_ARGS__)
+#define ApupExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_APUPUTIL, x, s, __VA_ARGS__)
+#define ApupExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_APUPUTIL, x, s, __VA_ARGS__)
+#define ApupExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_APUPUTIL, x, s, __VA_ARGS__)
+#define ApupExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_APUPUTIL, x, s, __VA_ARGS__)
+#define ApupExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_APUPUTIL, x, s, __VA_ARGS__)
+#define ApupExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_APUPUTIL, p, x, e, s, __VA_ARGS__)
+#define ApupExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_APUPUTIL, p, x, s, __VA_ARGS__)
+#define ApupExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_APUPUTIL, p, x, e, s, __VA_ARGS__)
+#define ApupExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_APUPUTIL, p, x, s, __VA_ARGS__)
+#define ApupExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_APUPUTIL, e, x, s, __VA_ARGS__)
+#define ApupExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_APUPUTIL, g, x, s, __VA_ARGS__)
+// prototypes
+static HRESULT ProcessEntry(
+    __in ATOM_ENTRY* pAtomEntry,
+    __in LPCWSTR wzDefaultAppId,
+    __inout APPLICATION_UPDATE_ENTRY* pApupEntry
+    );
+static HRESULT ParseEnclosure(
+    __in ATOM_LINK* pLink,
+    __in APPLICATION_UPDATE_ENCLOSURE* pEnclosure
+    );
+static __callback int __cdecl CompareEntries(
+    void* pvContext,
+    const void* pvLeft,
+    const void* pvRight
+    );
+static HRESULT FilterEntries(
+    __in APPLICATION_UPDATE_ENTRY* rgEntries,
+    __in DWORD cEntries,
+    __in VERUTIL_VERSION* pCurrentVersion,
+    __inout APPLICATION_UPDATE_ENTRY** prgFilteredEntries,
+    __inout DWORD* pcFilteredEntries
+    );
+static HRESULT CopyEntry(
+    __in const APPLICATION_UPDATE_ENTRY* pSrc,
+    __in APPLICATION_UPDATE_ENTRY* pDest
+    );
+static HRESULT CopyEnclosure(
+    __in const APPLICATION_UPDATE_ENCLOSURE* pSrc,
+    __in APPLICATION_UPDATE_ENCLOSURE* pDest
+    );
+static void FreeEntry(
+    __in APPLICATION_UPDATE_ENTRY* pApupEntry
+    );
+static void FreeEnclosure(
+    __in APPLICATION_UPDATE_ENCLOSURE* pEnclosure
+    );
+//
+// ApupCalculateChainFromAtom - returns the chain of application updates found in an ATOM feed.
+//
+extern "C" HRESULT DAPI ApupAllocChainFromAtom(
+    __in ATOM_FEED* pFeed,
+    __out APPLICATION_UPDATE_CHAIN** ppChain
+    )
+{
+    HRESULT hr = S_OK;
+    APPLICATION_UPDATE_CHAIN* pChain = NULL;
+    pChain = static_cast<APPLICATION_UPDATE_CHAIN*>(MemAlloc(sizeof(APPLICATION_UPDATE_CHAIN), TRUE));
+    // First search the ATOM feed's custom elements to try and find the default application identity.
+    for (ATOM_UNKNOWN_ELEMENT* pElement = pFeed->pUnknownElements; pElement; pElement = pElement->pNext)
+    {
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pElement->wzNamespace, -1, APPLICATION_SYNDICATION_NAMESPACE, -1))
+        {
+            if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pElement->wzElement, -1, L"application", -1))
+            {
+                hr = StrAllocString(&pChain->wzDefaultApplicationId, pElement->wzValue, 0);
+                ApupExitOnFailure(hr, "Failed to allocate default application id.");
+                for (ATOM_UNKNOWN_ATTRIBUTE* pAttribute = pElement->pAttributes; pAttribute; pAttribute = pAttribute->pNext)
+                {
+                    if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pAttribute->wzAttribute, -1, L"type", -1))
+                    {
+                        hr = StrAllocString(&pChain->wzDefaultApplicationType, pAttribute->wzValue, 0);
+                        ApupExitOnFailure(hr, "Failed to allocate default application type.");
+                    }
+                }
+            }
+        }
+    }
+    // Assume there will be as many application updates entries as their are feed entries.
+    if (pFeed->cEntries)
+    {
+        pChain->rgEntries = static_cast<APPLICATION_UPDATE_ENTRY*>(MemAlloc(sizeof(APPLICATION_UPDATE_ENTRY) * pFeed->cEntries, TRUE));
+        ApupExitOnNull(pChain->rgEntries, hr, E_OUTOFMEMORY, "Failed to allocate memory for update entries.");
+        // Process each entry, building up the chain.
+        for (DWORD i = 0; i < pFeed->cEntries; ++i)
+        {
+            hr = ProcessEntry(pFeed->rgEntries + i, pChain->wzDefaultApplicationId, pChain->rgEntries + pChain->cEntries);
+            ApupExitOnFailure(hr, "Failed to process ATOM entry.");
+            if (S_FALSE != hr)
+            {
+                ++pChain->cEntries;
+            }
+        }
+        // Sort the chain by descending version and ascending total size.
+        qsort_s(pChain->rgEntries, pChain->cEntries, sizeof(APPLICATION_UPDATE_ENTRY), CompareEntries, NULL);
+    }
+    // Trim the unused entries from the end, if any of the entries failed to parse or validate
+    if (pChain->cEntries != pFeed->cEntries) 
+    {
+        if (pChain->cEntries > 0)
+        {
+            pChain->rgEntries = static_cast<APPLICATION_UPDATE_ENTRY*>(MemReAlloc(pChain->rgEntries, sizeof(APPLICATION_UPDATE_ENTRY) * pChain->cEntries, FALSE));
+            ApupExitOnNull(pChain->rgEntries, hr, E_OUTOFMEMORY, "Failed to reallocate memory for update entries.");
+        }
+        else
+        {
+            ReleaseNullMem(pChain->rgEntries);
+        }
+    }
+    *ppChain = pChain;
+    pChain = NULL;
+LExit:
+    ReleaseApupChain(pChain);
+    return hr;
+}
+//
+// ApupFilterChain - remove the unneeded update elements from the chain.
+//
+HRESULT DAPI ApupFilterChain(
+    __in APPLICATION_UPDATE_CHAIN* pChain,
+    __in VERUTIL_VERSION* pVersion,
+    __out APPLICATION_UPDATE_CHAIN** ppFilteredChain
+    )
+{
+    HRESULT hr = S_OK;
+    APPLICATION_UPDATE_CHAIN* pNewChain = NULL;
+    APPLICATION_UPDATE_ENTRY* prgEntries = NULL;
+    DWORD cEntries = NULL;
+    pNewChain = static_cast<APPLICATION_UPDATE_CHAIN*>(MemAlloc(sizeof(APPLICATION_UPDATE_CHAIN), TRUE));
+    ApupExitOnNull(pNewChain, hr, E_OUTOFMEMORY, "Failed to allocate filtered chain.");
+    hr = FilterEntries(pChain->rgEntries, pChain->cEntries, pVersion, &prgEntries, &cEntries);
+    ApupExitOnFailure(hr, "Failed to filter entries by version.");
+    if (pChain->wzDefaultApplicationId)
+    {
+        hr = StrAllocString(&pNewChain->wzDefaultApplicationId, pChain->wzDefaultApplicationId, 0);
+        ApupExitOnFailure(hr, "Failed to copy default application id.");
+    }
+    if (pChain->wzDefaultApplicationType)
+    {
+        hr = StrAllocString(&pNewChain->wzDefaultApplicationType, pChain->wzDefaultApplicationType, 0);
+        ApupExitOnFailure(hr, "Failed to copy default application type.");
+    }
+    pNewChain->rgEntries = prgEntries;
+    pNewChain->cEntries = cEntries;
+    *ppFilteredChain = pNewChain;
+    pNewChain = NULL;
+LExit:
+    ReleaseApupChain(pNewChain);
+    return hr;
+}
+//
+// ApupFreeChain - frees a previously allocated application update chain.
+//
+extern "C" void DAPI ApupFreeChain(
+    __in APPLICATION_UPDATE_CHAIN* pChain
+    )
+{
+    if (pChain)
+    {
+        for (DWORD i = 0; i < pChain->cEntries; ++i)
+        {
+            FreeEntry(pChain->rgEntries + i);
+        }
+        ReleaseMem(pChain->rgEntries);
+        ReleaseStr(pChain->wzDefaultApplicationType);
+        ReleaseStr(pChain->wzDefaultApplicationId);
+        ReleaseMem(pChain);
+    }
+}
+static HRESULT ProcessEntry(
+    __in ATOM_ENTRY* pAtomEntry,
+    __in LPCWSTR wzDefaultAppId,
+    __inout APPLICATION_UPDATE_ENTRY* pApupEntry
+    )
+{
+    HRESULT hr = S_OK;
+    int nCompareResult = 0;
+    // First search the ATOM entry's custom elements to try and find the application update information.
+    for (ATOM_UNKNOWN_ELEMENT* pElement = pAtomEntry->pUnknownElements; pElement; pElement = pElement->pNext)
+    {
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pElement->wzNamespace, -1, APPLICATION_SYNDICATION_NAMESPACE, -1))
+        {
+            if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pElement->wzElement, -1, L"application", -1))
+            {
+                hr = StrAllocString(&pApupEntry->wzApplicationId, pElement->wzValue, 0);
+                ApupExitOnFailure(hr, "Failed to allocate application identity.");
+                for (ATOM_UNKNOWN_ATTRIBUTE* pAttribute = pElement->pAttributes; pAttribute; pAttribute = pAttribute->pNext)
+                {
+                    if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pAttribute->wzAttribute, -1, L"type", -1))
+                    {
+                        hr = StrAllocString(&pApupEntry->wzApplicationType, pAttribute->wzValue, 0);
+                        ApupExitOnFailure(hr, "Failed to allocate application type.");
+                    }
+                }
+            }
+            else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pElement->wzElement, -1, L"upgrade", -1))
+            {
+                hr = StrAllocString(&pApupEntry->wzUpgradeId, pElement->wzValue, 0);
+                ApupExitOnFailure(hr, "Failed to allocate upgrade id.");
+                for (ATOM_UNKNOWN_ATTRIBUTE* pAttribute = pElement->pAttributes; pAttribute; pAttribute = pAttribute->pNext)
+                {
+                    if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pAttribute->wzAttribute, -1, L"version", -1))
+                    {
+                        hr = VerParseVersion(pAttribute->wzValue, 0, FALSE, &pApupEntry->pUpgradeVersion);
+                        ApupExitOnFailure(hr, "Failed to parse upgrade version string '%ls' from ATOM entry.", pAttribute->wzValue);
+                    }
+                    else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pAttribute->wzAttribute, -1, L"exclusive", -1))
+                    {
+                        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pAttribute->wzValue, -1, L"true", -1))
+                        {
+                            pApupEntry->fUpgradeExclusive = TRUE;
+                        }
+                    }
+                }
+            }
+            else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pElement->wzElement, -1, L"version", -1))
+            {
+                hr = VerParseVersion(pElement->wzValue, 0, FALSE, &pApupEntry->pVersion);
+                ApupExitOnFailure(hr, "Failed to parse version string '%ls' from ATOM entry.", pElement->wzValue);
+            }
+        }
+    }
+    // If there is no application identity or no version, skip the whole thing.
+    if ((!pApupEntry->wzApplicationId && !wzDefaultAppId) || !pApupEntry->pVersion)
+    {
+        ExitFunction1(hr = S_FALSE); // skip this update since it has no application id or version.
+    }
+    if (pApupEntry->pUpgradeVersion)
+    {
+        hr = VerCompareParsedVersions(pApupEntry->pUpgradeVersion, pApupEntry->pVersion, &nCompareResult);
+        ApupExitOnFailure(hr, "Failed to compare version to upgrade version.");
+        if (nCompareResult >= 0)
+        {
+            hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+            ApupExitOnRootFailure(hr, "Upgrade version is greater than or equal to application version.");
+        }
+    }
+    if (pAtomEntry->wzTitle)
+    {
+        hr = StrAllocString(&pApupEntry->wzTitle, pAtomEntry->wzTitle, 0);
+        ApupExitOnFailure(hr, "Failed to allocate application title.");
+    }
+    if (pAtomEntry->wzSummary)
+    {
+        hr = StrAllocString(&pApupEntry->wzSummary, pAtomEntry->wzSummary, 0);
+        ApupExitOnFailure(hr, "Failed to allocate application summary.");
+    }
+    if (pAtomEntry->pContent)
+    {
+        if (pAtomEntry->pContent->wzType)
+        {
+            hr = StrAllocString(&pApupEntry->wzContentType, pAtomEntry->pContent->wzType, 0);
+            ApupExitOnFailure(hr, "Failed to allocate content type.");
+        }
+        if (pAtomEntry->pContent->wzValue)
+        {
+            hr = StrAllocString(&pApupEntry->wzContent, pAtomEntry->pContent->wzValue, 0);
+            ApupExitOnFailure(hr, "Failed to allocate content.");
+        }
+    }
+    // Now process the enclosures.  Assume every link in the ATOM entry is an enclosure.
+    pApupEntry->rgEnclosures = static_cast<APPLICATION_UPDATE_ENCLOSURE*>(MemAlloc(sizeof(APPLICATION_UPDATE_ENCLOSURE) * pAtomEntry->cLinks, TRUE));
+    ApupExitOnNull(pApupEntry->rgEnclosures, hr, E_OUTOFMEMORY, "Failed to allocate enclosures for application update entry.");
+    for (DWORD i = 0; i < pAtomEntry->cLinks; ++i)
+    {
+        ATOM_LINK* pLink = pAtomEntry->rgLinks + i;
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pLink->wzRel, -1, L"enclosure", -1))
+        {
+            hr = ParseEnclosure(pLink, pApupEntry->rgEnclosures + pApupEntry->cEnclosures);
+            ApupExitOnFailure(hr, "Failed to parse enclosure.");
+            pApupEntry->dw64TotalSize += pApupEntry->rgEnclosures[pApupEntry->cEnclosures].dw64Size; // total up the size of the enclosures
+            ++pApupEntry->cEnclosures;
+        }
+    }
+LExit:
+    if (S_OK != hr) // if anything went wrong, free the entry.
+    {
+        FreeEntry(pApupEntry);
+        memset(pApupEntry, 0, sizeof(APPLICATION_UPDATE_ENTRY));
+    }
+    return hr;
+}
+static HRESULT ParseEnclosure(
+    __in ATOM_LINK* pLink,
+    __in APPLICATION_UPDATE_ENCLOSURE* pEnclosure
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD dwDigestLength = 0;
+    DWORD dwDigestStringLength = 0;
+    size_t cchDigestString = 0;
+    // First search the ATOM link's custom elements to try and find the application update enclosure information.
+    for (ATOM_UNKNOWN_ELEMENT* pElement = pLink->pUnknownElements; pElement; pElement = pElement->pNext)
+    {
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pElement->wzNamespace, -1, APPLICATION_SYNDICATION_NAMESPACE, -1))
+        {
+            if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, L"digest", -1, pElement->wzElement, -1))
+            {
+                // Find the digest[@algorithm] which is required. Everything else is ignored.
+                for (ATOM_UNKNOWN_ATTRIBUTE* pAttribute = pElement->pAttributes; pAttribute; pAttribute = pAttribute->pNext)
+                {
+                    dwDigestLength = 0;
+                    if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, L"algorithm", -1, pAttribute->wzAttribute, -1))
+                    {
+                        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, L"md5", -1, pAttribute->wzValue, -1))
+                        {
+                            pEnclosure->digestAlgorithm = APUP_HASH_ALGORITHM_MD5;
+                            dwDigestLength = MD5_HASH_LEN;
+                        }
+                        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, L"sha1", -1, pAttribute->wzValue, -1))
+                        {
+                            pEnclosure->digestAlgorithm = APUP_HASH_ALGORITHM_SHA1;
+                            dwDigestLength = SHA1_HASH_LEN;
+                        }
+                        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, L"sha256", -1, pAttribute->wzValue, -1))
+                        {
+                            pEnclosure->digestAlgorithm = APUP_HASH_ALGORITHM_SHA256;
+                            dwDigestLength = SHA256_HASH_LEN;
+                        }
+                        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, L"sha512", -1, pAttribute->wzValue, -1))
+                        {
+                            pEnclosure->digestAlgorithm = APUP_HASH_ALGORITHM_SHA512;
+                            dwDigestLength = SHA512_HASH_LEN;
+                        }
+                        break;
+                    }
+                }
+                if (dwDigestLength)
+                {
+                    dwDigestStringLength = 2 * dwDigestLength;
+                    hr = ::StringCchLengthW(pElement->wzValue, STRSAFE_MAX_CCH, &cchDigestString);
+                    ApupExitOnFailure(hr, "Failed to get string length of digest value.");
+                    if (dwDigestStringLength != cchDigestString)
+                    {
+                        hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+                        ApupExitOnRootFailure(hr, "Invalid digest length (%Iu) for digest algorithm (%u).", cchDigestString, dwDigestStringLength);
+                    }
+                    pEnclosure->cbDigest = sizeof(BYTE) * dwDigestLength;
+                    pEnclosure->rgbDigest = static_cast<BYTE*>(MemAlloc(pEnclosure->cbDigest, TRUE));
+                    ApupExitOnNull(pEnclosure->rgbDigest, hr, E_OUTOFMEMORY, "Failed to allocate memory for digest.");
+                    hr = StrHexDecode(pElement->wzValue, pEnclosure->rgbDigest, pEnclosure->cbDigest);
+                    ApupExitOnFailure(hr, "Failed to decode digest value.");
+                }
+                else
+                {
+                    hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+                    ApupExitOnRootFailure(hr, "Unknown algorithm type for digest.");
+                }
+                break;
+            }
+            else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, L"name", -1, pElement->wzElement, -1))
+            {
+                hr = StrAllocString(&pEnclosure->wzLocalName, pElement->wzValue, 0);
+                ApupExitOnFailure(hr, "Failed to copy local name.");
+            }
+        }
+    }
+    pEnclosure->dw64Size = pLink->dw64Length;
+    hr = StrAllocString(&pEnclosure->wzUrl, pLink->wzUrl, 0);
+    ApupExitOnFailure(hr, "Failed to allocate enclosure URL.");
+    pEnclosure->fInstaller = FALSE;
+    pEnclosure->wzLocalName = NULL;
+LExit:
+    return hr;
+}
+static __callback int __cdecl CompareEntries(
+    void* /*pvContext*/,
+    const void* pvLeft,
+    const void* pvRight
+    )
+{
+    int ret = 0;
+    const APPLICATION_UPDATE_ENTRY* pEntryLeft = static_cast<const APPLICATION_UPDATE_ENTRY*>(pvLeft);
+    const APPLICATION_UPDATE_ENTRY* pEntryRight = static_cast<const APPLICATION_UPDATE_ENTRY*>(pvRight);
+    VerCompareParsedVersions(pEntryLeft->pVersion, pEntryRight->pVersion, &ret);
+    if (0 == ret)
+    {
+        VerCompareParsedVersions(pEntryLeft->pUpgradeVersion, pEntryRight->pUpgradeVersion, &ret);
+        if (0 == ret)
+        {
+            ret = (pEntryLeft->dw64TotalSize < pEntryRight->dw64TotalSize) ? -1 :
+                  (pEntryLeft->dw64TotalSize > pEntryRight->dw64TotalSize) ?  1 : 0;
+        }
+    }
+    // Sort descending.
+    ret = -ret;
+    return ret;
+}
+static HRESULT FilterEntries(
+    __in APPLICATION_UPDATE_ENTRY* rgEntries,
+    __in DWORD cEntries,
+    __in VERUTIL_VERSION* pCurrentVersion,
+    __inout APPLICATION_UPDATE_ENTRY** prgFilteredEntries,
+    __inout DWORD* pcFilteredEntries
+    )
+{
+    HRESULT hr = S_OK;
+    int nCompareResult = 0;
+    size_t cbAllocSize = 0;
+    const APPLICATION_UPDATE_ENTRY* pRequired = NULL;;
+    LPVOID pv = NULL;
+    if (cEntries)
+    {
+        for (DWORD i = 0; i < cEntries; ++i)
+        {
+            const APPLICATION_UPDATE_ENTRY* pEntry = rgEntries + i;
+            hr = VerCompareParsedVersions(pCurrentVersion, pEntry->pVersion, &nCompareResult);
+            ApupExitOnFailure(hr, "Failed to compare versions.");
+            if (nCompareResult >= 0)
+            {
+                continue;
+            }
+            hr = VerCompareParsedVersions(pCurrentVersion, pEntry->pUpgradeVersion, &nCompareResult);
+            ApupExitOnFailure(hr, "Failed to compare upgrade versions.");
+            if (nCompareResult > 0 || (!pEntry->fUpgradeExclusive && nCompareResult == 0))
+            {
+                pRequired = pEntry;
+                break;
+            }
+        }
+        if (pRequired)
+        {
+            DWORD cNewFilteredEntries = *pcFilteredEntries + 1;
+            hr = ::SizeTMult(sizeof(APPLICATION_UPDATE_ENTRY), cNewFilteredEntries, &cbAllocSize);
+            ApupExitOnFailure(hr, "Overflow while calculating alloc size for more entries - number of entries: %u", cNewFilteredEntries);
+            if (*prgFilteredEntries)
+            {
+                pv = MemReAlloc(*prgFilteredEntries, cbAllocSize, FALSE);
+                ApupExitOnNull(pv, hr, E_OUTOFMEMORY, "Failed to reallocate memory for more entries.");
+            }
+            else
+            {
+                pv = MemAlloc(cbAllocSize, TRUE);
+                ApupExitOnNull(pv, hr, E_OUTOFMEMORY, "Failed to allocate memory for entries.");
+            }
+            *pcFilteredEntries = cNewFilteredEntries;
+            *prgFilteredEntries = static_cast<APPLICATION_UPDATE_ENTRY*>(pv);
+            pv = NULL;
+            hr = CopyEntry(pRequired, *prgFilteredEntries + *pcFilteredEntries - 1);
+            ApupExitOnFailure(hr, "Failed to deep copy entry.");
+            hr = VerCompareParsedVersions(pRequired->pVersion, rgEntries[0].pVersion, &nCompareResult);
+            ApupExitOnFailure(hr, "Failed to compare required version.");
+            if (nCompareResult < 0)
+            {
+                FilterEntries(rgEntries, cEntries, pRequired->pVersion, prgFilteredEntries, pcFilteredEntries);
+            }
+        }
+    }
+LExit:
+    ReleaseMem(pv);
+    return hr;
+}
+static HRESULT CopyEntry(
+    __in const APPLICATION_UPDATE_ENTRY* pSrc,
+    __in APPLICATION_UPDATE_ENTRY* pDest
+    )
+{
+    HRESULT hr = S_OK;
+    size_t cbAllocSize = 0;
+    memset(pDest, 0, sizeof(APPLICATION_UPDATE_ENTRY));
+    if (pSrc->wzApplicationId)
+    {
+        hr = StrAllocString(&pDest->wzApplicationId, pSrc->wzApplicationId, 0);
+        ApupExitOnFailure(hr, "Failed to copy application id.");
+    }
+    if (pSrc->wzApplicationType)
+    {
+        hr = StrAllocString(&pDest->wzApplicationType, pSrc->wzApplicationType, 0);
+        ApupExitOnFailure(hr, "Failed to copy application type.");
+    }
+    if (pSrc->wzUpgradeId)
+    {
+        hr = StrAllocString(&pDest->wzUpgradeId, pSrc->wzUpgradeId, 0);
+        ApupExitOnFailure(hr, "Failed to copy upgrade id.");
+    }
+    if (pSrc->wzTitle)
+    {
+        hr = StrAllocString(&pDest->wzTitle, pSrc->wzTitle, 0);
+        ApupExitOnFailure(hr, "Failed to copy title.");
+    }
+    if (pSrc->wzSummary)
+    {
+        hr = StrAllocString(&pDest->wzSummary, pSrc->wzSummary, 0);
+        ApupExitOnFailure(hr, "Failed to copy summary.");
+    }
+    if (pSrc->wzContentType)
+    {
+        hr = StrAllocString(&pDest->wzContentType, pSrc->wzContentType, 0);
+        ApupExitOnFailure(hr, "Failed to copy content type.");
+    }
+    if (pSrc->wzContent)
+    {
+        hr = StrAllocString(&pDest->wzContent, pSrc->wzContent, 0);
+        ApupExitOnFailure(hr, "Failed to copy content.");
+    }
+    pDest->dw64TotalSize = pSrc->dw64TotalSize;
+    hr = VerCopyVersion(pSrc->pUpgradeVersion, &pDest->pUpgradeVersion);
+    ApupExitOnFailure(hr, "Failed to copy upgrade version.");
+    hr = VerCopyVersion(pSrc->pVersion, &pDest->pVersion);
+    ApupExitOnFailure(hr, "Failed to copy version.");
+    pDest->fUpgradeExclusive = pSrc->fUpgradeExclusive;
+    hr = ::SizeTMult(sizeof(APPLICATION_UPDATE_ENCLOSURE), pSrc->cEnclosures, &cbAllocSize);
+    ApupExitOnRootFailure(hr, "Overflow while calculating memory allocation size");
+    pDest->rgEnclosures = static_cast<APPLICATION_UPDATE_ENCLOSURE*>(MemAlloc(cbAllocSize, TRUE));
+    ApupExitOnNull(pDest->rgEnclosures, hr, E_OUTOFMEMORY, "Failed to allocate copy of enclosures.");
+    pDest->cEnclosures = pSrc->cEnclosures;
+    for (DWORD i = 0; i < pDest->cEnclosures; ++i)
+    {
+        hr = CopyEnclosure(pSrc->rgEnclosures + i, pDest->rgEnclosures + i);
+        ApupExitOnFailure(hr, "Failed to copy enclosure.");
+    }
+LExit:
+    if (FAILED(hr))
+    {
+        FreeEntry(pDest);
+    }
+    return hr;
+}
+static HRESULT CopyEnclosure(
+    __in const APPLICATION_UPDATE_ENCLOSURE* pSrc,
+    __in APPLICATION_UPDATE_ENCLOSURE* pDest
+    )
+{
+    HRESULT hr = S_OK;
+    memset(pDest, 0, sizeof(APPLICATION_UPDATE_ENCLOSURE));
+    if (pSrc->wzUrl)
+    {
+        hr = StrAllocString(&pDest->wzUrl, pSrc->wzUrl, 0);
+        ApupExitOnFailure(hr, "Failed copy url.");
+    }
+    if (pSrc->wzLocalName)
+    {
+        hr = StrAllocString(&pDest->wzLocalName, pSrc->wzLocalName, 0);
+        ApupExitOnFailure(hr, "Failed copy url.");
+    }
+    pDest->rgbDigest = static_cast<BYTE*>(MemAlloc(sizeof(BYTE) * pSrc->cbDigest, FALSE));
+    ApupExitOnNull(pDest->rgbDigest, hr, E_OUTOFMEMORY, "Failed to allocate memory for copy of digest.");
+    pDest->cbDigest = pSrc->cbDigest;
+    memcpy_s(pDest->rgbDigest, sizeof(BYTE) * pDest->cbDigest, pSrc->rgbDigest, sizeof(BYTE) * pSrc->cbDigest);
+    pDest->digestAlgorithm = pSrc->digestAlgorithm;
+    pDest->dw64Size = pSrc->dw64Size;
+    pDest->fInstaller = pSrc->fInstaller;
+LExit:
+    if (FAILED(hr))
+    {
+        FreeEnclosure(pDest);
+    }
+    return hr;
+}
+static void FreeEntry(
+    __in APPLICATION_UPDATE_ENTRY* pEntry
+    )
+{
+    if (pEntry)
+    {
+        for (DWORD i = 0; i < pEntry->cEnclosures; ++i)
+        {
+            FreeEnclosure(pEntry->rgEnclosures + i);
+        }
+        ReleaseStr(pEntry->wzUpgradeId);
+        ReleaseStr(pEntry->wzApplicationType);
+        ReleaseStr(pEntry->wzApplicationId);
+        ReleaseStr(pEntry->wzTitle);
+        ReleaseStr(pEntry->wzSummary);
+        ReleaseStr(pEntry->wzContentType);
+        ReleaseStr(pEntry->wzContent);
+        ReleaseVerutilVersion(pEntry->pVersion);
+        ReleaseVerutilVersion(pEntry->pUpgradeVersion);
+    }
+}
+static void FreeEnclosure(
+    __in APPLICATION_UPDATE_ENCLOSURE* pEnclosure
+    )
+{
+    if (pEnclosure)
+    {
+        ReleaseMem(pEnclosure->rgbDigest);
+        ReleaseStr(pEnclosure->wzLocalName);
+        ReleaseStr(pEnclosure->wzUrl);
+    }
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/atomutil.cpp b/src/libs/dutil/WixToolset.DUtil/atomutil.cpp
new file mode 100644
index 00000000..c7c7975a
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/atomutil.cpp
@@ -0,0 +1,1297 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define AtomExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_ATOMUTIL, x, s, __VA_ARGS__)
+#define AtomExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_ATOMUTIL, x, s, __VA_ARGS__)
+#define AtomExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_ATOMUTIL, x, s, __VA_ARGS__)
+#define AtomExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_ATOMUTIL, x, s, __VA_ARGS__)
+#define AtomExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_ATOMUTIL, x, s, __VA_ARGS__)
+#define AtomExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_ATOMUTIL, x, s, __VA_ARGS__)
+#define AtomExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_ATOMUTIL, p, x, e, s, __VA_ARGS__)
+#define AtomExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_ATOMUTIL, p, x, s, __VA_ARGS__)
+#define AtomExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_ATOMUTIL, p, x, e, s, __VA_ARGS__)
+#define AtomExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_ATOMUTIL, p, x, s, __VA_ARGS__)
+#define AtomExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_ATOMUTIL, e, x, s, __VA_ARGS__)
+#define AtomExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_ATOMUTIL, g, x, s, __VA_ARGS__)
+static HRESULT ParseAtomDocument(
+    __in IXMLDOMDocument *pixd,
+    __out ATOM_FEED **ppFeed
+    );
+static HRESULT ParseAtomFeed(
+    __in IXMLDOMNode *pixnFeed,
+    __out ATOM_FEED **ppFeed
+    );
+static HRESULT ParseAtomAuthor(
+    __in IXMLDOMNode* pixnAuthor,
+    __in ATOM_AUTHOR* pAuthor
+    );
+static HRESULT ParseAtomCategory(
+    __in IXMLDOMNode* pixnCategory,
+    __in ATOM_CATEGORY* pCategory
+    );
+static HRESULT ParseAtomEntry(
+    __in IXMLDOMNode* pixnEntry,
+    __in ATOM_ENTRY* pEntry
+    );
+static HRESULT ParseAtomLink(
+    __in IXMLDOMNode* pixnLink,
+    __in ATOM_LINK* pLink
+    );
+static HRESULT ParseAtomUnknownElement(
+    __in IXMLDOMNode *pNode,
+    __inout ATOM_UNKNOWN_ELEMENT** ppUnknownElement
+    );
+static HRESULT ParseAtomUnknownAttribute(
+    __in IXMLDOMNode *pNode,
+    __inout ATOM_UNKNOWN_ATTRIBUTE** ppUnknownAttribute
+    );
+static HRESULT AssignDateTime(
+    __in FILETIME* pft,
+    __in IXMLDOMNode* pNode
+    );
+static HRESULT AssignString(
+    __out_z LPWSTR* pwzValue,
+    __in IXMLDOMNode* pNode
+    );
+static void FreeAtomAuthor(
+    __in_opt ATOM_AUTHOR* pAuthor
+    );
+static void FreeAtomContent(
+    __in_opt ATOM_CONTENT* pContent
+    );
+static void FreeAtomCategory(
+    __in_opt ATOM_CATEGORY* pCategory
+    );
+static void FreeAtomEntry(
+    __in_opt ATOM_ENTRY* pEntry
+    );
+static void FreeAtomLink(
+    __in_opt ATOM_LINK* pLink
+    );
+static void FreeAtomUnknownElementList(
+    __in_opt ATOM_UNKNOWN_ELEMENT* pUnknownElement
+    );
+static void FreeAtomUnknownAttributeList(
+    __in_opt ATOM_UNKNOWN_ATTRIBUTE* pUnknownAttribute
+    );
+template<class T> static HRESULT AllocateAtomType(
+    __in IXMLDOMNode* pixnParent,
+    __in LPCWSTR wzT,
+    __out T** pprgT,
+    __out DWORD* pcT
+    );
+/********************************************************************
+ AtomInitialize - Initialize ATOM utilities.
+*********************************************************************/
+extern "C" HRESULT DAPI AtomInitialize()
+{
+    return XmlInitialize();
+}
+/********************************************************************
+ AtomUninitialize - Uninitialize ATOM utilities.
+*********************************************************************/
+extern "C" void DAPI AtomUninitialize()
+{
+    XmlUninitialize();
+}
+/********************************************************************
+ AtomParseFromString - parses out an ATOM feed from a string.
+*********************************************************************/
+extern "C" HRESULT DAPI AtomParseFromString(
+    __in_z LPCWSTR wzAtomString,
+    __out ATOM_FEED **ppFeed
+    )
+{
+    Assert(wzAtomString);
+    Assert(ppFeed);
+    HRESULT hr = S_OK;
+    ATOM_FEED *pNewFeed = NULL;
+    IXMLDOMDocument *pixdAtom = NULL;
+    hr = XmlLoadDocument(wzAtomString, &pixdAtom);
+    AtomExitOnFailure(hr, "Failed to load ATOM string as XML document.");
+    hr = ParseAtomDocument(pixdAtom, &pNewFeed);
+    AtomExitOnFailure(hr, "Failed to parse ATOM document.");
+    *ppFeed = pNewFeed;
+    pNewFeed = NULL;
+LExit:
+    ReleaseAtomFeed(pNewFeed);
+    ReleaseObject(pixdAtom);
+    return hr;
+}
+/********************************************************************
+ AtomParseFromFile - parses out an ATOM feed from a file path.
+*********************************************************************/
+extern "C" HRESULT DAPI AtomParseFromFile(
+    __in_z LPCWSTR wzAtomFile,
+    __out ATOM_FEED **ppFeed
+    )
+{
+    Assert(wzAtomFile);
+    Assert(ppFeed);
+    HRESULT hr = S_OK;
+    ATOM_FEED *pNewFeed = NULL;
+    IXMLDOMDocument *pixdAtom = NULL;
+    hr = XmlLoadDocumentFromFile(wzAtomFile, &pixdAtom);
+    AtomExitOnFailure(hr, "Failed to load ATOM string as XML document.");
+    hr = ParseAtomDocument(pixdAtom, &pNewFeed);
+    AtomExitOnFailure(hr, "Failed to parse ATOM document.");
+    *ppFeed = pNewFeed;
+    pNewFeed = NULL;
+LExit:
+    ReleaseAtomFeed(pNewFeed);
+    ReleaseObject(pixdAtom);
+    return hr;
+}
+/********************************************************************
+ AtomParseFromDocument - parses out an ATOM feed from an XML document.
+*********************************************************************/
+extern "C" HRESULT DAPI AtomParseFromDocument(
+    __in IXMLDOMDocument* pixdDocument,
+    __out ATOM_FEED **ppFeed
+    )
+{
+    Assert(pixdDocument);
+    Assert(ppFeed);
+    HRESULT hr = S_OK;
+    ATOM_FEED *pNewFeed = NULL;
+    hr = ParseAtomDocument(pixdDocument, &pNewFeed);
+    AtomExitOnFailure(hr, "Failed to parse ATOM document.");
+    *ppFeed = pNewFeed;
+    pNewFeed = NULL;
+LExit:
+    ReleaseAtomFeed(pNewFeed);
+    return hr;
+}
+/********************************************************************
+ AtomFreeFeed - parses out an ATOM feed from a string.
+*********************************************************************/
+extern "C" void DAPI AtomFreeFeed(
+    __in_xcount(pFeed->cItems) ATOM_FEED* pFeed
+    )
+{
+    if (pFeed)
+    {
+        FreeAtomUnknownElementList(pFeed->pUnknownElements);
+        ReleaseObject(pFeed->pixn);
+        for (DWORD i = 0; i < pFeed->cLinks; ++i)
+        {
+            FreeAtomLink(pFeed->rgLinks + i);
+        }
+        ReleaseMem(pFeed->rgLinks);
+        for (DWORD i = 0; i < pFeed->cEntries; ++i)
+        {
+            FreeAtomEntry(pFeed->rgEntries + i);
+        }
+        ReleaseMem(pFeed->rgEntries);
+        for (DWORD i = 0; i < pFeed->cCategories; ++i)
+        {
+            FreeAtomCategory(pFeed->rgCategories + i);
+        }
+        ReleaseMem(pFeed->rgCategories);
+        for (DWORD i = 0; i < pFeed->cAuthors; ++i)
+        {
+            FreeAtomAuthor(pFeed->rgAuthors + i);
+        }
+        ReleaseMem(pFeed->rgAuthors);
+        ReleaseStr(pFeed->wzGenerator);
+        ReleaseStr(pFeed->wzIcon);
+        ReleaseStr(pFeed->wzId);
+        ReleaseStr(pFeed->wzLogo);
+        ReleaseStr(pFeed->wzSubtitle);
+        ReleaseStr(pFeed->wzTitle);
+        MemFree(pFeed);
+    }
+}
+/********************************************************************
+ ParseAtomDocument - parses out an ATOM feed from a loaded XML DOM document.
+*********************************************************************/
+static HRESULT ParseAtomDocument(
+    __in IXMLDOMDocument *pixd,
+    __out ATOM_FEED **ppFeed
+    )
+{
+    Assert(pixd);
+    Assert(ppFeed);
+    HRESULT hr = S_OK;
+    IXMLDOMElement *pFeedElement = NULL;
+    ATOM_FEED *pNewFeed = NULL;
+    //
+    // Get the document element and start processing feeds.
+    //
+    hr = pixd->get_documentElement(&pFeedElement);
+    AtomExitOnFailure(hr, "failed get_documentElement in ParseAtomDocument");
+    hr = ParseAtomFeed(pFeedElement, &pNewFeed);
+    AtomExitOnFailure(hr, "Failed to parse ATOM feed.");
+    if (S_FALSE == hr)
+    {
+        hr = S_OK;
+    }
+    *ppFeed = pNewFeed;
+    pNewFeed = NULL;
+LExit:
+    ReleaseObject(pFeedElement);
+    ReleaseAtomFeed(pNewFeed);
+    return hr;
+}
+/********************************************************************
+ ParseAtomFeed - parses out an ATOM feed from a loaded XML DOM element.
+*********************************************************************/
+static HRESULT ParseAtomFeed(
+    __in IXMLDOMNode *pixnFeed,
+    __out ATOM_FEED **ppFeed
+    )
+{
+    Assert(pixnFeed);
+    Assert(ppFeed);
+    HRESULT hr = S_OK;
+    IXMLDOMNodeList *pNodeList = NULL;
+    ATOM_FEED *pNewFeed = NULL;
+    DWORD cAuthors = 0;
+    DWORD cCategories = 0;
+    DWORD cEntries = 0;
+    DWORD cLinks = 0;
+    IXMLDOMNode *pNode = NULL;
+    BSTR bstrNodeName = NULL;
+    // First, allocate the new feed and all the possible sub elements.
+    pNewFeed = (ATOM_FEED*)MemAlloc(sizeof(ATOM_FEED), TRUE);
+    AtomExitOnNull(pNewFeed, hr, E_OUTOFMEMORY, "Failed to allocate ATOM feed structure.");
+    pNewFeed->pixn = pixnFeed;
+    pNewFeed->pixn->AddRef();
+    hr = AllocateAtomType<ATOM_AUTHOR>(pixnFeed, L"author", &pNewFeed->rgAuthors, &pNewFeed->cAuthors);
+    AtomExitOnFailure(hr, "Failed to allocate ATOM feed authors.");
+    hr = AllocateAtomType<ATOM_CATEGORY>(pixnFeed, L"category", &pNewFeed->rgCategories, &pNewFeed->cCategories);
+    AtomExitOnFailure(hr, "Failed to allocate ATOM feed categories.");
+    hr = AllocateAtomType<ATOM_ENTRY>(pixnFeed, L"entry", &pNewFeed->rgEntries, &pNewFeed->cEntries);
+    AtomExitOnFailure(hr, "Failed to allocate ATOM feed entries.");
+    hr = AllocateAtomType<ATOM_LINK>(pixnFeed, L"link", &pNewFeed->rgLinks, &pNewFeed->cLinks);
+    AtomExitOnFailure(hr, "Failed to allocate ATOM feed links.");
+    // Second, process the elements under a feed.
+    hr = pixnFeed->get_childNodes(&pNodeList);
+    AtomExitOnFailure(hr, "Failed to get child nodes of ATOM feed element.");
+    while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, &bstrNodeName)))
+    {
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"generator", -1))
+        {
+            hr = AssignString(&pNewFeed->wzGenerator, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM feed generator.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"icon", -1))
+        {
+            hr = AssignString(&pNewFeed->wzIcon, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM feed icon.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"id", -1))
+        {
+            hr = AssignString(&pNewFeed->wzId, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM feed id.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"logo", -1))
+        {
+            hr = AssignString(&pNewFeed->wzLogo, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM feed logo.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"subtitle", -1))
+        {
+            hr = AssignString(&pNewFeed->wzSubtitle, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM feed subtitle.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"title", -1))
+        {
+            hr = AssignString(&pNewFeed->wzTitle, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM feed title.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"updated", -1))
+        {
+            hr = AssignDateTime(&pNewFeed->ftUpdated, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM feed updated.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"author", -1))
+        {
+            hr = ParseAtomAuthor(pNode, &pNewFeed->rgAuthors[cAuthors]);
+            AtomExitOnFailure(hr, "Failed to parse ATOM author.");
+            ++cAuthors;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"category", -1))
+        {
+            hr = ParseAtomCategory(pNode, &pNewFeed->rgCategories[cCategories]);
+            AtomExitOnFailure(hr, "Failed to parse ATOM category.");
+            ++cCategories;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"entry", -1))
+        {
+            hr = ParseAtomEntry(pNode, &pNewFeed->rgEntries[cEntries]);
+            AtomExitOnFailure(hr, "Failed to parse ATOM entry.");
+            ++cEntries;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"link", -1))
+        {
+            hr = ParseAtomLink(pNode, &pNewFeed->rgLinks[cLinks]);
+            AtomExitOnFailure(hr, "Failed to parse ATOM link.");
+            ++cLinks;
+        }
+        else
+        {
+            hr = ParseAtomUnknownElement(pNode, &pNewFeed->pUnknownElements);
+            AtomExitOnFailure(hr, "Failed to parse unknown ATOM feed element: %ls", bstrNodeName);
+        }
+        ReleaseNullBSTR(bstrNodeName);
+        ReleaseNullObject(pNode);
+    }
+    if (!pNewFeed->wzId || !*pNewFeed->wzId)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+        AtomExitOnRootFailure(hr, "Failed to find required feed/id element.");
+    }
+    else if (!pNewFeed->wzTitle || !*pNewFeed->wzTitle)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+        AtomExitOnRootFailure(hr, "Failed to find required feed/title element.");
+    }
+    else if (0 == pNewFeed->ftUpdated.dwHighDateTime && 0 == pNewFeed->ftUpdated.dwLowDateTime)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+        AtomExitOnRootFailure(hr, "Failed to find required feed/updated element.");
+    }
+    *ppFeed = pNewFeed;
+    pNewFeed = NULL;
+LExit:
+    ReleaseBSTR(bstrNodeName);
+    ReleaseObject(pNode);
+    ReleaseObject(pNodeList);
+    ReleaseAtomFeed(pNewFeed);
+    return hr;
+}
+/********************************************************************
+ AllocateAtomType - allocates enough space for all of the ATOM elements
+                    of a particular type under a particular node.
+*********************************************************************/
+template<class T> static HRESULT AllocateAtomType(
+    __in IXMLDOMNode* pixnParent,
+    __in LPCWSTR wzT,
+    __out T** pprgT,
+    __out DWORD* pcT
+    )
+{
+    HRESULT hr = S_OK;
+    IXMLDOMNodeList *pNodeList = NULL;
+    long cT = 0;
+    T* prgT = NULL;
+    hr = XmlSelectNodes(pixnParent, wzT, &pNodeList);
+    AtomExitOnFailure(hr, "Failed to select all ATOM %ls.", wzT);
+    if (S_OK == hr)
+    {
+        hr = pNodeList->get_length(&cT);
+        AtomExitOnFailure(hr, "Failed to count the number of ATOM %ls.", wzT);
+        if (cT == 0)
+        {
+            ExitFunction();
+        }
+        prgT = static_cast<T*>(MemAlloc(sizeof(T) * cT, TRUE));
+        AtomExitOnNull(prgT, hr, E_OUTOFMEMORY, "Failed to allocate ATOM.");
+        *pcT = cT;
+        *pprgT = prgT;
+        prgT = NULL;
+    }
+    else
+    {
+        *pprgT = NULL;
+        *pcT = 0;
+    }
+LExit:
+    ReleaseMem(prgT);
+    ReleaseObject(pNodeList);
+    return hr;
+}
+/********************************************************************
+ ParseAtomAuthor - parses out an ATOM author from a loaded XML DOM node.
+*********************************************************************/
+static HRESULT ParseAtomAuthor(
+    __in IXMLDOMNode* pixnAuthor,
+    __in ATOM_AUTHOR* pAuthor
+    )
+{
+    HRESULT hr = S_OK;
+    IXMLDOMNodeList *pNodeList = NULL;
+    IXMLDOMNode *pNode = NULL;
+    BSTR bstrNodeName = NULL;
+    hr = pixnAuthor->get_childNodes(&pNodeList);
+    AtomExitOnFailure(hr, "Failed to get child nodes of ATOM author element.");
+    while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, &bstrNodeName)))
+    {
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"name", -1))
+        {
+            hr = AssignString(&pAuthor->wzName, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM author name.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"email", -1))
+        {
+            hr = AssignString(&pAuthor->wzEmail, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM author email.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"uri", -1))
+        {
+            hr = AssignString(&pAuthor->wzUrl, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM author uri.");
+        }
+        ReleaseNullBSTR(bstrNodeName);
+        ReleaseNullObject(pNode);
+    }
+    AtomExitOnFailure(hr, "Failed to process all ATOM author elements.");
+    hr = S_OK;
+LExit:
+    ReleaseBSTR(bstrNodeName);
+    ReleaseObject(pNode);
+    ReleaseObject(pNodeList);
+    return hr;
+}
+/********************************************************************
+ ParseAtomCategory - parses out an ATOM category from a loaded XML DOM node.
+*********************************************************************/
+static HRESULT ParseAtomCategory(
+    __in IXMLDOMNode* pixnCategory,
+    __in ATOM_CATEGORY* pCategory
+    )
+{
+    HRESULT hr = S_OK;
+    IXMLDOMNamedNodeMap* pixnnmAttributes = NULL;
+    IXMLDOMNodeList *pNodeList = NULL;
+    IXMLDOMNode *pNode = NULL;
+    BSTR bstrNodeName = NULL;
+    // Process attributes first.
+    hr = pixnCategory->get_attributes(&pixnnmAttributes);
+    AtomExitOnFailure(hr, "Failed get attributes on ATOM unknown element.");
+    while (S_OK == (hr = XmlNextAttribute(pixnnmAttributes, &pNode, &bstrNodeName)))
+    {
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"label", -1))
+        {
+            hr = AssignString(&pCategory->wzLabel, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM category label.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"scheme", -1))
+        {
+            hr = AssignString(&pCategory->wzScheme, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM category scheme.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"term", -1))
+        {
+            hr = AssignString(&pCategory->wzTerm, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM category term.");
+        }
+        ReleaseNullBSTR(bstrNodeName);
+        ReleaseNullObject(pNode);
+    }
+    AtomExitOnFailure(hr, "Failed to process all ATOM category attributes.");
+    // Process elements second.
+    hr = pixnCategory->get_childNodes(&pNodeList);
+    AtomExitOnFailure(hr, "Failed to get child nodes of ATOM category element.");
+    while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, &bstrNodeName)))
+    {
+        hr = ParseAtomUnknownElement(pNode, &pCategory->pUnknownElements);
+        AtomExitOnFailure(hr, "Failed to parse unknown ATOM category element: %ls", bstrNodeName);
+        ReleaseNullBSTR(bstrNodeName);
+        ReleaseNullObject(pNode);
+    }
+    AtomExitOnFailure(hr, "Failed to process all ATOM category elements.");
+    hr = S_OK;
+LExit:
+    ReleaseBSTR(bstrNodeName);
+    ReleaseObject(pNode);
+    ReleaseObject(pNodeList);
+    ReleaseObject(pixnnmAttributes);
+    return hr;
+}
+/********************************************************************
+ ParseAtomContent - parses out an ATOM content from a loaded XML DOM node.
+*********************************************************************/
+static HRESULT ParseAtomContent(
+    __in IXMLDOMNode* pixnContent,
+    __in ATOM_CONTENT* pContent
+    )
+{
+    HRESULT hr = S_OK;
+    IXMLDOMNamedNodeMap* pixnnmAttributes = NULL;
+    IXMLDOMNodeList *pNodeList = NULL;
+    IXMLDOMNode *pNode = NULL;
+    BSTR bstrNodeName = NULL;
+    // Process attributes first.
+    hr = pixnContent->get_attributes(&pixnnmAttributes);
+    AtomExitOnFailure(hr, "Failed get attributes on ATOM unknown element.");
+    while (S_OK == (hr = XmlNextAttribute(pixnnmAttributes, &pNode, &bstrNodeName)))
+    {
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"type", -1))
+        {
+            hr = AssignString(&pContent->wzType, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM content type.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"url", -1))
+        {
+            hr = AssignString(&pContent->wzUrl, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM content scheme.");
+        }
+        ReleaseNullBSTR(bstrNodeName);
+        ReleaseNullObject(pNode);
+    }
+    AtomExitOnFailure(hr, "Failed to process all ATOM content attributes.");
+    // Process elements second.
+    hr = pixnContent->get_childNodes(&pNodeList);
+    AtomExitOnFailure(hr, "Failed to get child nodes of ATOM content element.");
+    while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, &bstrNodeName)))
+    {
+        hr = ParseAtomUnknownElement(pNode, &pContent->pUnknownElements);
+        AtomExitOnFailure(hr, "Failed to parse unknown ATOM content element: %ls", bstrNodeName);
+        ReleaseNullBSTR(bstrNodeName);
+        ReleaseNullObject(pNode);
+    }
+    AtomExitOnFailure(hr, "Failed to process all ATOM content elements.");
+    hr = AssignString(&pContent->wzValue, pixnContent);
+    AtomExitOnFailure(hr, "Failed to allocate ATOM content value.");
+LExit:
+    ReleaseBSTR(bstrNodeName);
+    ReleaseObject(pNode);
+    ReleaseObject(pNodeList);
+    ReleaseObject(pixnnmAttributes);
+    return hr;
+}
+/********************************************************************
+ ParseAtomEntry - parses out an ATOM entry from a loaded XML DOM node.
+*********************************************************************/
+static HRESULT ParseAtomEntry(
+    __in IXMLDOMNode* pixnEntry,
+    __in ATOM_ENTRY* pEntry
+    )
+{
+    HRESULT hr = S_OK;
+    IXMLDOMNamedNodeMap* pixnnmAttributes = NULL;
+    IXMLDOMNodeList *pNodeList = NULL;
+    IXMLDOMNode *pNode = NULL;
+    BSTR bstrNodeName = NULL;
+    DWORD cAuthors = 0;
+    DWORD cCategories = 0;
+    DWORD cLinks = 0;
+    pEntry->pixn = pixnEntry;
+    pEntry->pixn->AddRef();
+    // First, allocate all the possible sub elements.
+    hr = AllocateAtomType<ATOM_AUTHOR>(pixnEntry, L"author", &pEntry->rgAuthors, &pEntry->cAuthors);
+    AtomExitOnFailure(hr, "Failed to allocate ATOM entry authors.");
+    hr = AllocateAtomType<ATOM_CATEGORY>(pixnEntry, L"category", &pEntry->rgCategories, &pEntry->cCategories);
+    AtomExitOnFailure(hr, "Failed to allocate ATOM entry categories.");
+    hr = AllocateAtomType<ATOM_LINK>(pixnEntry, L"link", &pEntry->rgLinks, &pEntry->cLinks);
+    AtomExitOnFailure(hr, "Failed to allocate ATOM entry links.");
+    // Second, process elements.
+    hr = pixnEntry->get_childNodes(&pNodeList);
+    AtomExitOnFailure(hr, "Failed to get child nodes of ATOM entry element.");
+    while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, &bstrNodeName)))
+    {
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"id", -1))
+        {
+            hr = AssignString(&pEntry->wzId, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM entry id.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"summary", -1))
+        {
+            hr = AssignString(&pEntry->wzSummary, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM entry summary.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"title", -1))
+        {
+            hr = AssignString(&pEntry->wzTitle, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM entry title.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"published", -1))
+        {
+            hr = AssignDateTime(&pEntry->ftPublished, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM entry published.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"updated", -1))
+        {
+            hr = AssignDateTime(&pEntry->ftUpdated, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM entry updated.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"author", -1))
+        {
+            hr = ParseAtomAuthor(pNode, &pEntry->rgAuthors[cAuthors]);
+            AtomExitOnFailure(hr, "Failed to parse ATOM entry author.");
+            ++cAuthors;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"category", -1))
+        {
+            hr = ParseAtomCategory(pNode, &pEntry->rgCategories[cCategories]);
+            AtomExitOnFailure(hr, "Failed to parse ATOM entry category.");
+            ++cCategories;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"content", -1))
+        {
+            if (NULL != pEntry->pContent)
+            {
+                hr = E_UNEXPECTED;
+                AtomExitOnFailure(hr, "Cannot have two content elements in ATOM entry.");
+            }
+            pEntry->pContent = static_cast<ATOM_CONTENT*>(MemAlloc(sizeof(ATOM_CONTENT), TRUE));
+            AtomExitOnNull(pEntry->pContent, hr, E_OUTOFMEMORY, "Failed to allocate ATOM entry content.");
+            hr = ParseAtomContent(pNode, pEntry->pContent);
+            AtomExitOnFailure(hr, "Failed to parse ATOM entry content.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"link", -1))
+        {
+            hr = ParseAtomLink(pNode, &pEntry->rgLinks[cLinks]);
+            AtomExitOnFailure(hr, "Failed to parse ATOM entry link.");
+            ++cLinks;
+        }
+        else
+        {
+            hr = ParseAtomUnknownElement(pNode, &pEntry->pUnknownElements);
+            AtomExitOnFailure(hr, "Failed to parse unknown ATOM entry element: %ls", bstrNodeName);
+        }
+        ReleaseNullBSTR(bstrNodeName);
+        ReleaseNullObject(pNode);
+    }
+    AtomExitOnFailure(hr, "Failed to process all ATOM entry elements.");
+    if (!pEntry->wzId || !*pEntry->wzId)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+        AtomExitOnRootFailure(hr, "Failed to find required feed/entry/id element.");
+    }
+    else if (!pEntry->wzTitle || !*pEntry->wzTitle)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+        AtomExitOnRootFailure(hr, "Failed to find required feed/entry/title element.");
+    }
+    else if (0 == pEntry->ftUpdated.dwHighDateTime && 0 == pEntry->ftUpdated.dwLowDateTime)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+        AtomExitOnRootFailure(hr, "Failed to find required feed/entry/updated element.");
+    }
+    hr = S_OK;
+LExit:
+    ReleaseBSTR(bstrNodeName);
+    ReleaseObject(pNode);
+    ReleaseObject(pNodeList);
+    ReleaseObject(pixnnmAttributes);
+    return hr;
+}
+/********************************************************************
+ ParseAtomLink - parses out an ATOM link from a loaded XML DOM node.
+*********************************************************************/
+static HRESULT ParseAtomLink(
+    __in IXMLDOMNode* pixnLink,
+    __in ATOM_LINK* pLink
+    )
+{
+    HRESULT hr = S_OK;
+    IXMLDOMNamedNodeMap* pixnnmAttributes = NULL;
+    IXMLDOMNodeList *pNodeList = NULL;
+    IXMLDOMNode *pNode = NULL;
+    BSTR bstrNodeName = NULL;
+    // Process attributes first.
+    hr = pixnLink->get_attributes(&pixnnmAttributes);
+    AtomExitOnFailure(hr, "Failed get attributes for ATOM link.");
+    while (S_OK == (hr = XmlNextAttribute(pixnnmAttributes, &pNode, &bstrNodeName)))
+    {
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"rel", -1))
+        {
+            hr = AssignString(&pLink->wzRel, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM link rel.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"href", -1))
+        {
+            hr = AssignString(&pLink->wzUrl, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM link href.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"length", -1))
+        {
+            hr = XmlGetAttributeLargeNumber(pixnLink, bstrNodeName, &pLink->dw64Length);
+            if (E_INVALIDARG == hr)
+            {
+                hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+            }
+            AtomExitOnFailure(hr, "Failed to parse ATOM link length.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"title", -1))
+        {
+            hr = AssignString(&pLink->wzTitle, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM link title.");
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrNodeName, -1, L"type", -1))
+        {
+            hr = AssignString(&pLink->wzType, pNode);
+            AtomExitOnFailure(hr, "Failed to allocate ATOM link type.");
+        }
+        else
+        {
+            hr = ParseAtomUnknownAttribute(pNode, &pLink->pUnknownAttributes);
+            AtomExitOnFailure(hr, "Failed to parse unknown ATOM link attribute: %ls", bstrNodeName);
+        }
+        ReleaseNullBSTR(bstrNodeName);
+        ReleaseNullObject(pNode);
+    }
+    AtomExitOnFailure(hr, "Failed to process all ATOM link attributes.");
+    // Process elements second.
+    hr = pixnLink->get_childNodes(&pNodeList);
+    AtomExitOnFailure(hr, "Failed to get child nodes of ATOM link element.");
+    while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, &bstrNodeName)))
+    {
+        hr = ParseAtomUnknownElement(pNode, &pLink->pUnknownElements);
+        AtomExitOnFailure(hr, "Failed to parse unknown ATOM link element: %ls", bstrNodeName);
+        ReleaseNullBSTR(bstrNodeName);
+        ReleaseNullObject(pNode);
+    }
+    AtomExitOnFailure(hr, "Failed to process all ATOM link elements.");
+    hr = AssignString(&pLink->wzValue, pixnLink);
+    AtomExitOnFailure(hr, "Failed to allocate ATOM link value.");
+LExit:
+    ReleaseBSTR(bstrNodeName);
+    ReleaseObject(pNode);
+    ReleaseObject(pNodeList);
+    ReleaseObject(pixnnmAttributes);
+    return hr;
+}
+/********************************************************************
+ ParseAtomUnknownElement - parses out an unknown item from the ATOM feed from a loaded XML DOM node.
+*********************************************************************/
+static HRESULT ParseAtomUnknownElement(
+    __in IXMLDOMNode *pNode,
+    __inout ATOM_UNKNOWN_ELEMENT** ppUnknownElement
+    )
+{
+    Assert(ppUnknownElement);
+    HRESULT hr = S_OK;
+    BSTR bstrNodeNamespace = NULL;
+    BSTR bstrNodeName = NULL;
+    BSTR bstrNodeValue = NULL;
+    IXMLDOMNamedNodeMap* pixnnmAttributes = NULL;
+    IXMLDOMNode* pixnAttribute = NULL;
+    ATOM_UNKNOWN_ELEMENT* pNewUnknownElement;
+    pNewUnknownElement = (ATOM_UNKNOWN_ELEMENT*)MemAlloc(sizeof(ATOM_UNKNOWN_ELEMENT), TRUE);
+    AtomExitOnNull(pNewUnknownElement, hr, E_OUTOFMEMORY, "Failed to allocate unknown element.");
+    hr = pNode->get_namespaceURI(&bstrNodeNamespace);
+    if (S_OK == hr)
+    {
+        hr = StrAllocString(&pNewUnknownElement->wzNamespace, bstrNodeNamespace, 0);
+        AtomExitOnFailure(hr, "Failed to allocate ATOM unknown element namespace.");
+    }
+    else if (S_FALSE == hr)
+    {
+        hr = S_OK;
+    }
+    AtomExitOnFailure(hr, "Failed to get unknown element namespace.");
+    hr = pNode->get_baseName(&bstrNodeName);
+    AtomExitOnFailure(hr, "Failed to get unknown element name.");
+    hr = StrAllocString(&pNewUnknownElement->wzElement, bstrNodeName, 0);
+    AtomExitOnFailure(hr, "Failed to allocate ATOM unknown element name.");
+    hr = XmlGetText(pNode, &bstrNodeValue);
+    AtomExitOnFailure(hr, "Failed to get unknown element value.");
+    hr = StrAllocString(&pNewUnknownElement->wzValue, bstrNodeValue, 0);
+    AtomExitOnFailure(hr, "Failed to allocate ATOM unknown element value.");
+    hr = pNode->get_attributes(&pixnnmAttributes);
+    AtomExitOnFailure(hr, "Failed get attributes on ATOM unknown element.");
+    while (S_OK == (hr = pixnnmAttributes->nextNode(&pixnAttribute)))
+    {
+        hr = ParseAtomUnknownAttribute(pixnAttribute, &pNewUnknownElement->pAttributes);
+        AtomExitOnFailure(hr, "Failed to parse attribute on ATOM unknown element.");
+        ReleaseNullObject(pixnAttribute);
+    }
+    if (S_FALSE == hr)
+    {
+        hr = S_OK;
+    }
+    AtomExitOnFailure(hr, "Failed to enumerate all attributes on ATOM unknown element.");
+    ATOM_UNKNOWN_ELEMENT** ppTail = ppUnknownElement;
+    while (*ppTail)
+    {
+        ppTail = &(*ppTail)->pNext;
+    }
+    *ppTail = pNewUnknownElement;
+    pNewUnknownElement = NULL;
+LExit:
+    FreeAtomUnknownElementList(pNewUnknownElement);
+    ReleaseBSTR(bstrNodeNamespace);
+    ReleaseBSTR(bstrNodeName);
+    ReleaseBSTR(bstrNodeValue);
+    ReleaseObject(pixnnmAttributes);
+    ReleaseObject(pixnAttribute);
+    return hr;
+}
+/********************************************************************
+ ParseAtomUnknownAttribute - parses out attribute from an unknown element
+*********************************************************************/
+static HRESULT ParseAtomUnknownAttribute(
+    __in IXMLDOMNode *pNode,
+    __inout ATOM_UNKNOWN_ATTRIBUTE** ppUnknownAttribute
+    )
+{
+    Assert(ppUnknownAttribute);
+    HRESULT hr = S_OK;
+    BSTR bstrNodeNamespace = NULL;
+    BSTR bstrNodeName = NULL;
+    BSTR bstrNodeValue = NULL;
+    ATOM_UNKNOWN_ATTRIBUTE* pNewUnknownAttribute;
+    pNewUnknownAttribute = (ATOM_UNKNOWN_ATTRIBUTE*)MemAlloc(sizeof(ATOM_UNKNOWN_ATTRIBUTE), TRUE);
+    AtomExitOnNull(pNewUnknownAttribute, hr, E_OUTOFMEMORY, "Failed to allocate unknown attribute.");
+    hr = pNode->get_namespaceURI(&bstrNodeNamespace);
+    if (S_OK == hr)
+    {
+        hr = StrAllocString(&pNewUnknownAttribute->wzNamespace, bstrNodeNamespace, 0);
+        AtomExitOnFailure(hr, "Failed to allocate ATOM unknown attribute namespace.");
+    }
+    else if (S_FALSE == hr)
+    {
+        hr = S_OK;
+    }
+    AtomExitOnFailure(hr, "Failed to get unknown attribute namespace.");
+    hr = pNode->get_baseName(&bstrNodeName);
+    AtomExitOnFailure(hr, "Failed to get unknown attribute name.");
+    hr = StrAllocString(&pNewUnknownAttribute->wzAttribute, bstrNodeName, 0);
+    AtomExitOnFailure(hr, "Failed to allocate ATOM unknown attribute name.");
+    hr = XmlGetText(pNode, &bstrNodeValue);
+    AtomExitOnFailure(hr, "Failed to get unknown attribute value.");
+    hr = StrAllocString(&pNewUnknownAttribute->wzValue, bstrNodeValue, 0);
+    AtomExitOnFailure(hr, "Failed to allocate ATOM unknown attribute value.");
+    ATOM_UNKNOWN_ATTRIBUTE** ppTail = ppUnknownAttribute;
+    while (*ppTail)
+    {
+        ppTail = &(*ppTail)->pNext;
+    }
+    *ppTail = pNewUnknownAttribute;
+    pNewUnknownAttribute = NULL;
+LExit:
+    FreeAtomUnknownAttributeList(pNewUnknownAttribute);
+    ReleaseBSTR(bstrNodeNamespace);
+    ReleaseBSTR(bstrNodeName);
+    ReleaseBSTR(bstrNodeValue);
+    return hr;
+}
+/********************************************************************
+ AssignDateTime - assigns the value of a node to a FILETIME struct.
+*********************************************************************/
+static HRESULT AssignDateTime(
+    __in FILETIME* pft,
+    __in IXMLDOMNode* pNode
+    )
+{
+    HRESULT hr = S_OK;
+    BSTR bstrValue = NULL;
+    if (0 != pft->dwHighDateTime || 0 != pft->dwLowDateTime)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+        AtomExitOnRootFailure(hr, "Already process this datetime value.");
+    }
+    hr = XmlGetText(pNode, &bstrValue);
+    AtomExitOnFailure(hr, "Failed to get value.");
+    if (S_OK == hr)
+    {
+        hr = TimeFromString3339(bstrValue, pft);
+        AtomExitOnFailure(hr, "Failed to convert value to time.");
+    }
+    else
+    {
+        ZeroMemory(pft, sizeof(FILETIME));
+        hr = S_OK;
+    }
+LExit:
+    ReleaseBSTR(bstrValue);
+    return hr;
+}
+/********************************************************************
+ AssignString - assigns the value of a node to a dynamic string.
+*********************************************************************/
+static HRESULT AssignString(
+    __out_z LPWSTR* pwzValue,
+    __in IXMLDOMNode* pNode
+    )
+{
+    HRESULT hr = S_OK;
+    BSTR bstrValue = NULL;
+    if (pwzValue && *pwzValue)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+        AtomExitOnRootFailure(hr, "Already processed this value.");
+    }
+    hr = XmlGetText(pNode, &bstrValue);
+    AtomExitOnFailure(hr, "Failed to get value.");
+    if (S_OK == hr)
+    {
+        hr = StrAllocString(pwzValue, bstrValue, 0);
+        AtomExitOnFailure(hr, "Failed to allocate value.");
+    }
+    else
+    {
+        ReleaseNullStr(pwzValue);
+        hr = S_OK;
+    }
+LExit:
+    ReleaseBSTR(bstrValue);
+    return hr;
+}
+/********************************************************************
+ FreeAtomAuthor - releases all of the memory used by an ATOM author.
+*********************************************************************/
+static void FreeAtomAuthor(
+    __in_opt ATOM_AUTHOR* pAuthor
+    )
+{
+    if (pAuthor)
+    {
+        ReleaseStr(pAuthor->wzUrl);
+        ReleaseStr(pAuthor->wzEmail);
+        ReleaseStr(pAuthor->wzName);
+    }
+}
+/********************************************************************
+ FreeAtomCategory - releases all of the memory used by an ATOM category.
+*********************************************************************/
+static void FreeAtomCategory(
+    __in_opt ATOM_CATEGORY* pCategory
+    )
+{
+    if (pCategory)
+    {
+        FreeAtomUnknownElementList(pCategory->pUnknownElements);
+        ReleaseStr(pCategory->wzTerm);
+        ReleaseStr(pCategory->wzScheme);
+        ReleaseStr(pCategory->wzLabel);
+    }
+}
+/********************************************************************
+ FreeAtomContent - releases all of the memory used by an ATOM content.
+*********************************************************************/
+static void FreeAtomContent(
+    __in_opt ATOM_CONTENT* pContent
+    )
+{
+    if (pContent)
+    {
+        FreeAtomUnknownElementList(pContent->pUnknownElements);
+        ReleaseStr(pContent->wzValue);
+        ReleaseStr(pContent->wzUrl);
+        ReleaseStr(pContent->wzType);
+    }
+}
+/********************************************************************
+ FreeAtomEntry - releases all of the memory used by an ATOM entry.
+*********************************************************************/
+static void FreeAtomEntry(
+    __in_opt ATOM_ENTRY* pEntry
+    )
+{
+    if (pEntry)
+    {
+        FreeAtomUnknownElementList(pEntry->pUnknownElements);
+        ReleaseObject(pEntry->pixn);
+        for (DWORD i = 0; i < pEntry->cLinks; ++i)
+        {
+            FreeAtomLink(pEntry->rgLinks + i);
+        }
+        ReleaseMem(pEntry->rgLinks);
+        for (DWORD i = 0; i < pEntry->cCategories; ++i)
+        {
+            FreeAtomCategory(pEntry->rgCategories + i);
+        }
+        ReleaseMem(pEntry->rgCategories);
+        for (DWORD i = 0; i < pEntry->cAuthors; ++i)
+        {
+            FreeAtomAuthor(pEntry->rgAuthors + i);
+        }
+        ReleaseMem(pEntry->rgAuthors);
+        FreeAtomContent(pEntry->pContent);
+        ReleaseMem(pEntry->pContent);
+        ReleaseStr(pEntry->wzTitle);
+        ReleaseStr(pEntry->wzSummary);
+        ReleaseStr(pEntry->wzId);
+    }
+}
+/********************************************************************
+ FreeAtomLink - releases all of the memory used by an ATOM link.
+*********************************************************************/
+static void FreeAtomLink(
+    __in_opt ATOM_LINK* pLink
+    )
+{
+    if (pLink)
+    {
+        FreeAtomUnknownElementList(pLink->pUnknownElements);
+        FreeAtomUnknownAttributeList(pLink->pUnknownAttributes);
+        ReleaseStr(pLink->wzValue);
+        ReleaseStr(pLink->wzUrl);
+        ReleaseStr(pLink->wzType);
+        ReleaseStr(pLink->wzTitle);
+        ReleaseStr(pLink->wzRel);
+    }
+}
+/********************************************************************
+ FreeAtomUnknownElement - releases all of the memory used by a list of unknown elements
+*********************************************************************/
+static void FreeAtomUnknownElementList(
+    __in_opt ATOM_UNKNOWN_ELEMENT* pUnknownElement
+    )
+{
+    while (pUnknownElement)
+    {
+        ATOM_UNKNOWN_ELEMENT* pFree = pUnknownElement;
+        pUnknownElement = pUnknownElement->pNext;
+        FreeAtomUnknownAttributeList(pFree->pAttributes);
+        ReleaseStr(pFree->wzNamespace);
+        ReleaseStr(pFree->wzElement);
+        ReleaseStr(pFree->wzValue);
+        MemFree(pFree);
+    }
+}
+/********************************************************************
+ FreeAtomUnknownAttribute - releases all of the memory used by a list of unknown attributes
+*********************************************************************/
+static void FreeAtomUnknownAttributeList(
+    __in_opt ATOM_UNKNOWN_ATTRIBUTE* pUnknownAttribute
+    )
+{
+    while (pUnknownAttribute)
+    {
+        ATOM_UNKNOWN_ATTRIBUTE* pFree = pUnknownAttribute;
+        pUnknownAttribute = pUnknownAttribute->pNext;
+        ReleaseStr(pFree->wzNamespace);
+        ReleaseStr(pFree->wzAttribute);
+        ReleaseStr(pFree->wzValue);
+        MemFree(pFree);
+    }
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/buffutil.cpp b/src/libs/dutil/WixToolset.DUtil/buffutil.cpp
new file mode 100644
index 00000000..b6d58cc0
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/buffutil.cpp
@@ -0,0 +1,529 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define BuffExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_BUFFUTIL, x, s, __VA_ARGS__)
+#define BuffExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_BUFFUTIL, x, s, __VA_ARGS__)
+#define BuffExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_BUFFUTIL, x, s, __VA_ARGS__)
+#define BuffExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_BUFFUTIL, x, s, __VA_ARGS__)
+#define BuffExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_BUFFUTIL, x, s, __VA_ARGS__)
+#define BuffExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_BUFFUTIL, x, s, __VA_ARGS__)
+#define BuffExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_BUFFUTIL, p, x, e, s, __VA_ARGS__)
+#define BuffExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_BUFFUTIL, p, x, s, __VA_ARGS__)
+#define BuffExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_BUFFUTIL, p, x, e, s, __VA_ARGS__)
+#define BuffExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_BUFFUTIL, p, x, s, __VA_ARGS__)
+#define BuffExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_BUFFUTIL, e, x, s, __VA_ARGS__)
+#define BuffExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_BUFFUTIL, g, x, s, __VA_ARGS__)
+// constants
+#define BUFFER_INCREMENT 128
+// helper function declarations
+static HRESULT EnsureBufferSize(
+    __deref_inout_bcount(cbSize) BYTE** ppbBuffer,
+    __in SIZE_T cbSize
+    );
+// functions
+extern "C" HRESULT BuffReadNumber(
+    __in_bcount(cbBuffer) const BYTE* pbBuffer,
+    __in SIZE_T cbBuffer,
+    __inout SIZE_T* piBuffer,
+    __out DWORD* pdw
+    )
+{
+    Assert(pbBuffer);
+    Assert(piBuffer);
+    Assert(pdw);
+    HRESULT hr = S_OK;
+    SIZE_T cbAvailable = 0;
+    // get availiable data size
+    hr = ::SIZETSub(cbBuffer, *piBuffer, &cbAvailable);
+    BuffExitOnRootFailure(hr, "Failed to calculate available data size.");
+    // verify buffer size
+    if (sizeof(DWORD) > cbAvailable)
+    {
+        hr = E_INVALIDARG;
+        BuffExitOnRootFailure(hr, "Buffer too small.");
+    }
+    *pdw = *(const DWORD*)(pbBuffer + *piBuffer);
+    *piBuffer += sizeof(DWORD);
+LExit:
+    return hr;
+}
+extern "C" HRESULT BuffReadNumber64(
+    __in_bcount(cbBuffer) const BYTE * pbBuffer,
+    __in SIZE_T cbBuffer,
+    __inout SIZE_T* piBuffer,
+    __out DWORD64* pdw64
+    )
+{
+    Assert(pbBuffer);
+    Assert(piBuffer);
+    Assert(pdw64);
+    HRESULT hr = S_OK;
+    SIZE_T cbAvailable = 0;
+    // get availiable data size
+    hr = ::SIZETSub(cbBuffer, *piBuffer, &cbAvailable);
+    BuffExitOnRootFailure(hr, "Failed to calculate available data size.");
+    // verify buffer size
+    if (sizeof(DWORD64) > cbAvailable)
+    {
+        hr = E_INVALIDARG;
+        BuffExitOnRootFailure(hr, "Buffer too small.");
+    }
+    *pdw64 = *(const DWORD64*)(pbBuffer + *piBuffer);
+    *piBuffer += sizeof(DWORD64);
+LExit:
+    return hr;
+}
+extern "C" HRESULT BuffReadPointer(
+    __in_bcount(cbBuffer) const BYTE* pbBuffer,
+    __in SIZE_T cbBuffer,
+    __inout SIZE_T* piBuffer,
+    __out DWORD_PTR* pdw64
+    )
+{
+    Assert(pbBuffer);
+    Assert(piBuffer);
+    Assert(pdw64);
+    HRESULT hr = S_OK;
+    SIZE_T cbAvailable = 0;
+    // get availiable data size
+    hr = ::SIZETSub(cbBuffer, *piBuffer, &cbAvailable);
+    BuffExitOnRootFailure(hr, "Failed to calculate available data size.");
+    // verify buffer size
+    if (sizeof(DWORD_PTR) > cbAvailable)
+    {
+        hr = E_INVALIDARG;
+        BuffExitOnRootFailure(hr, "Buffer too small.");
+    }
+    *pdw64 = *(const DWORD_PTR*)(pbBuffer + *piBuffer);
+    *piBuffer += sizeof(DWORD_PTR);
+LExit:
+    return hr;
+}
+extern "C" HRESULT BuffReadString(
+    __in_bcount(cbBuffer) const BYTE* pbBuffer,
+    __in SIZE_T cbBuffer,
+    __inout SIZE_T* piBuffer,
+    __deref_out_z LPWSTR* pscz
+    )
+{
+    Assert(pbBuffer);
+    Assert(piBuffer);
+    Assert(pscz);
+    HRESULT hr = S_OK;
+    SIZE_T cch = 0;
+    SIZE_T cb = 0;
+    SIZE_T cbAvailable = 0;
+    // get availiable data size
+    hr = ::SIZETSub(cbBuffer, *piBuffer, &cbAvailable);
+    BuffExitOnRootFailure(hr, "Failed to calculate available data size for character count.");
+    // verify buffer size
+    if (sizeof(SIZE_T) > cbAvailable)
+    {
+        hr = E_INVALIDARG;
+        BuffExitOnRootFailure(hr, "Buffer too small.");
+    }
+    // read character count
+    cch = *(const SIZE_T*)(pbBuffer + *piBuffer);
+    hr = ::SIZETMult(cch, sizeof(WCHAR), &cb);
+    BuffExitOnRootFailure(hr, "Overflow while multiplying to calculate buffer size");
+    hr = ::SIZETAdd(*piBuffer, sizeof(SIZE_T), piBuffer);
+    BuffExitOnRootFailure(hr, "Overflow while adding to calculate buffer size");
+    // get availiable data size
+    hr = ::SIZETSub(cbBuffer, *piBuffer, &cbAvailable);
+    BuffExitOnRootFailure(hr, "Failed to calculate available data size for character buffer.");
+    // verify buffer size
+    if (cb > cbAvailable)
+    {
+        hr = E_INVALIDARG;
+        BuffExitOnRootFailure(hr, "Buffer too small to hold character data.");
+    }
+    // copy character data
+    hr = StrAllocString(pscz, cch ? (LPCWSTR)(pbBuffer + *piBuffer) : L"", cch);
+    BuffExitOnFailure(hr, "Failed to copy character data.");
+    *piBuffer += cb;
+LExit:
+    return hr;
+}
+extern "C" HRESULT BuffReadStringAnsi(
+    __in_bcount(cbBuffer) const BYTE* pbBuffer,
+    __in SIZE_T cbBuffer,
+    __inout SIZE_T* piBuffer,
+    __deref_out_z LPSTR* pscz
+    )
+{
+    Assert(pbBuffer);
+    Assert(piBuffer);
+    Assert(pscz);
+    HRESULT hr = S_OK;
+    SIZE_T cch = 0;
+    SIZE_T cb = 0;
+    SIZE_T cbAvailable = 0;
+    // get availiable data size
+    hr = ::SIZETSub(cbBuffer, *piBuffer, &cbAvailable);
+    BuffExitOnRootFailure(hr, "Failed to calculate available data size for character count.");
+    // verify buffer size
+    if (sizeof(SIZE_T) > cbAvailable)
+    {
+        hr = E_INVALIDARG;
+        BuffExitOnRootFailure(hr, "Buffer too small.");
+    }
+    // read character count
+    cch = *(const SIZE_T*)(pbBuffer + *piBuffer);
+    hr = ::SIZETMult(cch, sizeof(CHAR), &cb);
+    BuffExitOnRootFailure(hr, "Overflow while multiplying to calculate buffer size");
+    hr = ::SIZETAdd(*piBuffer, sizeof(SIZE_T), piBuffer);
+    BuffExitOnRootFailure(hr, "Overflow while adding to calculate buffer size");
+    // get availiable data size
+    hr = ::SIZETSub(cbBuffer, *piBuffer, &cbAvailable);
+    BuffExitOnRootFailure(hr, "Failed to calculate available data size for character buffer.");
+    // verify buffer size
+    if (cb > cbAvailable)
+    {
+        hr = E_INVALIDARG;
+        BuffExitOnRootFailure(hr, "Buffer too small to hold character count.");
+    }
+    // copy character data
+    hr = StrAnsiAllocStringAnsi(pscz, cch ? (LPCSTR)(pbBuffer + *piBuffer) : "", cch);
+    BuffExitOnFailure(hr, "Failed to copy character data.");
+    *piBuffer += cb;
+LExit:
+    return hr;
+}
+extern "C" HRESULT BuffReadStream(
+    __in_bcount(cbBuffer) const BYTE* pbBuffer,
+    __in SIZE_T cbBuffer,
+    __inout SIZE_T* piBuffer,
+    __deref_inout_bcount(*pcbStream) BYTE** ppbStream,
+    __out SIZE_T* pcbStream
+    )
+{
+    Assert(pbBuffer);
+    Assert(piBuffer);
+    Assert(ppbStream);
+    Assert(pcbStream);
+    HRESULT hr = S_OK;
+    SIZE_T cb = 0;
+    SIZE_T cbAvailable = 0;
+    errno_t err = 0;
+    // get availiable data size
+    hr = ::SIZETSub(cbBuffer, *piBuffer, &cbAvailable);
+    BuffExitOnRootFailure(hr, "Failed to calculate available data size for stream size.");
+    // verify buffer size
+    if (sizeof(SIZE_T) > cbAvailable)
+    {
+        hr = E_INVALIDARG;
+        BuffExitOnRootFailure(hr, "Buffer too small.");
+    }
+    // read stream size
+    cb = *(const SIZE_T*)(pbBuffer + *piBuffer);
+    *piBuffer += sizeof(SIZE_T);
+    // get availiable data size
+    hr = ::SIZETSub(cbBuffer, *piBuffer, &cbAvailable);
+    BuffExitOnRootFailure(hr, "Failed to calculate available data size for stream buffer.");
+    // verify buffer size
+    if (cb > cbAvailable)
+    {
+        hr = E_INVALIDARG;
+        BuffExitOnRootFailure(hr, "Buffer too small to hold byte count.");
+    }
+    // allocate buffer
+    *ppbStream = (BYTE*)MemAlloc(cb, TRUE);
+    BuffExitOnNull(*ppbStream, hr, E_OUTOFMEMORY, "Failed to allocate stream.");
+    // read stream data
+    err = memcpy_s(*ppbStream, cbBuffer - *piBuffer, pbBuffer + *piBuffer, cb);
+    if (err)
+    {
+        BuffExitOnRootFailure(hr = E_INVALIDARG, "Failed to read stream from buffer, error: %d", err);
+    }
+    *piBuffer += cb;
+    // return stream size
+    *pcbStream = cb;
+LExit:
+    return hr;
+}
+extern "C" HRESULT BuffWriteNumber(
+    __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
+    __inout SIZE_T* piBuffer,
+    __in DWORD dw
+    )
+{
+    Assert(ppbBuffer);
+    Assert(piBuffer);
+    HRESULT hr = S_OK;
+    // make sure we have a buffer with sufficient space
+    hr = EnsureBufferSize(ppbBuffer, *piBuffer + sizeof(DWORD));
+    BuffExitOnFailure(hr, "Failed to ensure buffer size.");
+    // copy data to buffer
+    *(DWORD*)(*ppbBuffer + *piBuffer) = dw;
+    *piBuffer += sizeof(DWORD);
+LExit:
+    return hr;
+}
+extern "C" HRESULT BuffWriteNumber64(
+    __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
+    __inout SIZE_T* piBuffer,
+    __in DWORD64 dw64
+    )
+{
+    Assert(ppbBuffer);
+    Assert(piBuffer);
+    HRESULT hr = S_OK;
+    // make sure we have a buffer with sufficient space
+    hr = EnsureBufferSize(ppbBuffer, *piBuffer + sizeof(DWORD64));
+    BuffExitOnFailure(hr, "Failed to ensure buffer size.");
+    // copy data to buffer
+    *(DWORD64*)(*ppbBuffer + *piBuffer) = dw64;
+    *piBuffer += sizeof(DWORD64);
+LExit:
+    return hr;
+}
+extern "C" HRESULT BuffWritePointer(
+    __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
+    __inout SIZE_T* piBuffer,
+    __in DWORD_PTR dw
+    )
+{
+    Assert(ppbBuffer);
+    Assert(piBuffer);
+    HRESULT hr = S_OK;
+    // make sure we have a buffer with sufficient space
+    hr = EnsureBufferSize(ppbBuffer, *piBuffer + sizeof(DWORD_PTR));
+    BuffExitOnFailure(hr, "Failed to ensure buffer size.");
+    // copy data to buffer
+    *(DWORD_PTR*)(*ppbBuffer + *piBuffer) = dw;
+    *piBuffer += sizeof(DWORD_PTR);
+LExit:
+    return hr;
+}
+extern "C" HRESULT BuffWriteString(
+    __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
+    __inout SIZE_T* piBuffer,
+    __in_z_opt LPCWSTR scz
+    )
+{
+    Assert(ppbBuffer);
+    Assert(piBuffer);
+    HRESULT hr = S_OK;
+    SIZE_T cch = 0;
+    SIZE_T cb = 0;
+    errno_t err = 0;
+    if (scz)
+    {
+        hr = ::StringCchLengthW(scz, STRSAFE_MAX_CCH, reinterpret_cast<size_t*>(&cch));
+        BuffExitOnRootFailure(hr, "Failed to get string size.")
+    }
+    cb = cch * sizeof(WCHAR);
+    // make sure we have a buffer with sufficient space
+    hr = EnsureBufferSize(ppbBuffer, *piBuffer + (sizeof(SIZE_T) + cb));
+    BuffExitOnFailure(hr, "Failed to ensure buffer size.");
+    // copy character count to buffer
+    *(SIZE_T*)(*ppbBuffer + *piBuffer) = cch;
+    *piBuffer += sizeof(SIZE_T);
+    // copy data to buffer
+    err = memcpy_s(*ppbBuffer + *piBuffer, cb, scz, cb);
+    if (err)
+    {
+        BuffExitOnRootFailure(hr = E_INVALIDARG, "Failed to write string to buffer: '%ls', error: %d", scz, err);
+    }
+    *piBuffer += cb;
+LExit:
+    return hr;
+}
+extern "C" HRESULT BuffWriteStringAnsi(
+    __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
+    __inout SIZE_T* piBuffer,
+    __in_z_opt LPCSTR scz
+    )
+{
+    Assert(ppbBuffer);
+    Assert(piBuffer);
+    HRESULT hr = S_OK;
+    SIZE_T cch = 0;
+    SIZE_T cb = 0;
+    errno_t err = 0;
+    if (scz)
+    {
+        hr = ::StringCchLengthA(scz, STRSAFE_MAX_CCH, reinterpret_cast<size_t*>(&cch));
+        BuffExitOnRootFailure(hr, "Failed to get string size.")
+    }
+    cb = cch * sizeof(CHAR);
+    // make sure we have a buffer with sufficient space
+    hr = EnsureBufferSize(ppbBuffer, *piBuffer + (sizeof(SIZE_T) + cb));
+    BuffExitOnFailure(hr, "Failed to ensure buffer size.");
+    // copy character count to buffer
+    *(SIZE_T*)(*ppbBuffer + *piBuffer) = cch;
+    *piBuffer += sizeof(SIZE_T);
+    // copy data to buffer
+    err = memcpy_s(*ppbBuffer + *piBuffer, cb, scz, cb);
+    if (err)
+    {
+        BuffExitOnRootFailure(hr = E_INVALIDARG, "Failed to write string to buffer: '%hs', error: %d", scz, err);
+    }
+    *piBuffer += cb;
+LExit:
+    return hr;
+}
+extern "C" HRESULT BuffWriteStream(
+    __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
+    __inout SIZE_T* piBuffer,
+    __in_bcount(cbStream) const BYTE* pbStream,
+    __in SIZE_T cbStream
+    )
+{
+    Assert(ppbBuffer);
+    Assert(piBuffer);
+    Assert(pbStream);
+    HRESULT hr = S_OK;
+    SIZE_T cb = cbStream;
+    errno_t err = 0;
+    // make sure we have a buffer with sufficient space
+    hr = EnsureBufferSize(ppbBuffer, *piBuffer + cbStream + sizeof(SIZE_T));
+    BuffExitOnFailure(hr, "Failed to ensure buffer size.");
+    // copy byte count to buffer
+    *(SIZE_T*)(*ppbBuffer + *piBuffer) = cb;
+    *piBuffer += sizeof(SIZE_T);
+    // copy data to buffer
+    err = memcpy_s(*ppbBuffer + *piBuffer, cbStream, pbStream, cbStream);
+    if (err)
+    {
+        BuffExitOnRootFailure(hr = E_INVALIDARG, "Failed to write stream to buffer, error: %d", err);
+    }
+    *piBuffer += cbStream;
+LExit:
+    return hr;
+}
+// helper functions
+static HRESULT EnsureBufferSize(
+    __deref_inout_bcount(cbSize) BYTE** ppbBuffer,
+    __in SIZE_T cbSize
+    )
+{
+    HRESULT hr = S_OK;
+    SIZE_T cbTarget = ((cbSize / BUFFER_INCREMENT) + 1) * BUFFER_INCREMENT;
+    if (*ppbBuffer)
+    {
+        if (MemSize(*ppbBuffer) < cbTarget)
+        {
+            LPVOID pv = MemReAlloc(*ppbBuffer, cbTarget, TRUE);
+            BuffExitOnNull(pv, hr, E_OUTOFMEMORY, "Failed to reallocate buffer.");
+            *ppbBuffer = (BYTE*)pv;
+        }
+    }
+    else
+    {
+        *ppbBuffer = (BYTE*)MemAlloc(cbTarget, TRUE);
+        BuffExitOnNull(*ppbBuffer, hr, E_OUTOFMEMORY, "Failed to allocate buffer.");
+    }
+LExit:
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/build/WixToolset.DUtil.props b/src/libs/dutil/WixToolset.DUtil/build/WixToolset.DUtil.props
new file mode 100644
index 00000000..35749be8
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/build/WixToolset.DUtil.props
@@ -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 ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v140')) ">
+    <Link>
+      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v140\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v141')) ">
+    <Link>
+      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v142')) ">
+    <Link>
+      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\dutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/src/libs/dutil/WixToolset.DUtil/butil.cpp b/src/libs/dutil/WixToolset.DUtil/butil.cpp
new file mode 100644
index 00000000..e04b52e9
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/butil.cpp
@@ -0,0 +1,257 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define ButilExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_BUTIL, x, s, __VA_ARGS__)
+#define ButilExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_BUTIL, x, s, __VA_ARGS__)
+#define ButilExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_BUTIL, x, s, __VA_ARGS__)
+#define ButilExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_BUTIL, x, s, __VA_ARGS__)
+#define ButilExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_BUTIL, x, s, __VA_ARGS__)
+#define ButilExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_BUTIL, x, s, __VA_ARGS__)
+#define ButilExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_BUTIL, p, x, e, s, __VA_ARGS__)
+#define ButilExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_BUTIL, p, x, s, __VA_ARGS__)
+#define ButilExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_BUTIL, p, x, e, s, __VA_ARGS__)
+#define ButilExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_BUTIL, p, x, s, __VA_ARGS__)
+#define ButilExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_BUTIL, e, x, s, __VA_ARGS__)
+// constants
+// From engine/registration.h
+const LPCWSTR BUNDLE_REGISTRATION_REGISTRY_UNINSTALL_KEY = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall";
+const LPCWSTR BUNDLE_REGISTRATION_REGISTRY_BUNDLE_UPGRADE_CODE = L"BundleUpgradeCode";
+const LPCWSTR BUNDLE_REGISTRATION_REGISTRY_BUNDLE_PROVIDER_KEY = L"BundleProviderKey";
+// Forward declarations.
+/********************************************************************
+OpenBundleKey - Opens the bundle uninstallation key for a given bundle
+NOTE: caller is responsible for closing key
+********************************************************************/
+static HRESULT OpenBundleKey(
+    __in_z LPCWSTR wzBundleId,
+    __in BUNDLE_INSTALL_CONTEXT context, 
+    __inout HKEY *key);
+extern "C" HRESULT DAPI BundleGetBundleInfo(
+  __in_z LPCWSTR wzBundleId,
+  __in_z LPCWSTR wzAttribute,
+  __out_ecount_opt(*pcchValueBuf) LPWSTR lpValueBuf,
+  __inout_opt LPDWORD pcchValueBuf
+  )
+{
+    Assert(wzBundleId && wzAttribute);
+    HRESULT hr = S_OK;
+    BUNDLE_INSTALL_CONTEXT context = BUNDLE_INSTALL_CONTEXT_MACHINE;
+    LPWSTR sczValue = NULL;
+    HKEY hkBundle = NULL;
+    DWORD cchSource = 0;
+    DWORD dwType = 0;
+    DWORD dwValue = 0;
+    if ((lpValueBuf && !pcchValueBuf) || !wzBundleId || !wzAttribute)
+    {
+        ButilExitOnFailure(hr = E_INVALIDARG, "An invalid parameter was passed to the function.");
+    }
+    if (FAILED(hr = OpenBundleKey(wzBundleId, context = BUNDLE_INSTALL_CONTEXT_MACHINE, &hkBundle)) &&
+        FAILED(hr = OpenBundleKey(wzBundleId, context = BUNDLE_INSTALL_CONTEXT_USER, &hkBundle)))
+    {
+        ButilExitOnFailure(E_FILENOTFOUND == hr ? HRESULT_FROM_WIN32(ERROR_UNKNOWN_PRODUCT) : hr, "Failed to locate bundle uninstall key path.");
+    }
+    // If the bundle doesn't have the property defined, return ERROR_UNKNOWN_PROPERTY
+    hr = RegGetType(hkBundle, wzAttribute, &dwType);
+    ButilExitOnFailure(E_FILENOTFOUND == hr ? HRESULT_FROM_WIN32(ERROR_UNKNOWN_PROPERTY) : hr, "Failed to locate bundle property.");
+    switch (dwType)
+    {
+        case REG_SZ:
+            hr = RegReadString(hkBundle, wzAttribute, &sczValue);
+            ButilExitOnFailure(hr, "Failed to read string property.");
+            break;
+        case REG_DWORD:
+            hr = RegReadNumber(hkBundle, wzAttribute, &dwValue);
+            ButilExitOnFailure(hr, "Failed to read dword property.");
+            hr = StrAllocFormatted(&sczValue, L"%d", dwValue);
+            ButilExitOnFailure(hr, "Failed to format dword property as string.");
+            break;
+        default:
+            ButilExitOnFailure(hr = E_NOTIMPL, "Reading bundle info of type 0x%x not implemented.", dwType);
+    }
+    hr = ::StringCchLengthW(sczValue, STRSAFE_MAX_CCH, reinterpret_cast<UINT_PTR*>(&cchSource));
+    ButilExitOnFailure(hr, "Failed to calculate length of string");
+    if (lpValueBuf)
+    {
+        // cchSource is the length of the string not including the terminating null character
+        if (*pcchValueBuf <= cchSource)
+        {
+            *pcchValueBuf = ++cchSource;
+            ButilExitOnFailure(hr = HRESULT_FROM_WIN32(ERROR_MORE_DATA), "A buffer is too small to hold the requested data.");
+        }
+        hr = ::StringCchCatNExW(lpValueBuf, *pcchValueBuf, sczValue, cchSource, NULL, NULL, STRSAFE_FILL_BEHIND_NULL);
+        ButilExitOnFailure(hr, "Failed to copy the property value to the output buffer.");
+        
+        *pcchValueBuf = cchSource++;        
+    }
+LExit:
+    ReleaseRegKey(hkBundle);
+    ReleaseStr(sczValue);
+    return hr;
+}
+HRESULT DAPI BundleEnumRelatedBundle(
+  __in_z LPCWSTR wzUpgradeCode,
+  __in BUNDLE_INSTALL_CONTEXT context,
+  __inout PDWORD pdwStartIndex,
+  __out_ecount(MAX_GUID_CHARS+1) LPWSTR lpBundleIdBuf
+    )
+{
+    HRESULT hr = S_OK;
+    HKEY hkRoot = BUNDLE_INSTALL_CONTEXT_USER == context ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
+    HKEY hkUninstall = NULL;
+    HKEY hkBundle = NULL;
+    LPWSTR sczUninstallSubKey = NULL;
+    DWORD cchUninstallSubKey = 0;
+    LPWSTR sczUninstallSubKeyPath = NULL;
+    LPWSTR sczValue = NULL;
+    DWORD dwType = 0;
+    LPWSTR* rgsczBundleUpgradeCodes = NULL;
+    DWORD cBundleUpgradeCodes = 0;
+    BOOL fUpgradeCodeFound = FALSE;
+    if (!wzUpgradeCode || !lpBundleIdBuf || !pdwStartIndex)
+    {
+        ButilExitOnFailure(hr = E_INVALIDARG, "An invalid parameter was passed to the function.");
+    }
+    hr = RegOpen(hkRoot, BUNDLE_REGISTRATION_REGISTRY_UNINSTALL_KEY, KEY_READ, &hkUninstall);
+    ButilExitOnFailure(hr, "Failed to open bundle uninstall key path.");
+    for (DWORD dwIndex = *pdwStartIndex; !fUpgradeCodeFound; dwIndex++)
+    {
+        hr = RegKeyEnum(hkUninstall, dwIndex, &sczUninstallSubKey);
+        ButilExitOnFailure(hr, "Failed to enumerate bundle uninstall key path.");
+        hr = StrAllocFormatted(&sczUninstallSubKeyPath, L"%ls\\%ls", BUNDLE_REGISTRATION_REGISTRY_UNINSTALL_KEY, sczUninstallSubKey);
+        ButilExitOnFailure(hr, "Failed to allocate bundle uninstall key path.");
+        
+        hr = RegOpen(hkRoot, sczUninstallSubKeyPath, KEY_READ, &hkBundle);
+        ButilExitOnFailure(hr, "Failed to open uninstall key path.");
+        // If it's a bundle, it should have a BundleUpgradeCode value of type REG_SZ (old) or REG_MULTI_SZ
+        hr = RegGetType(hkBundle, BUNDLE_REGISTRATION_REGISTRY_BUNDLE_UPGRADE_CODE, &dwType);
+        if (FAILED(hr))
+        {
+            ReleaseRegKey(hkBundle);
+            ReleaseNullStr(sczUninstallSubKey);
+            ReleaseNullStr(sczUninstallSubKeyPath);
+            // Not a bundle
+            continue;
+        }
+        switch (dwType)
+        {
+            case REG_SZ:
+                hr = RegReadString(hkBundle, BUNDLE_REGISTRATION_REGISTRY_BUNDLE_UPGRADE_CODE, &sczValue);
+                ButilExitOnFailure(hr, "Failed to read BundleUpgradeCode string property.");
+                if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, sczValue, -1, wzUpgradeCode, -1))
+                {
+                    *pdwStartIndex = dwIndex;
+                    fUpgradeCodeFound = TRUE;
+                    break;
+                }
+                ReleaseNullStr(sczValue);
+                break;
+            case REG_MULTI_SZ:
+                hr = RegReadStringArray(hkBundle, BUNDLE_REGISTRATION_REGISTRY_BUNDLE_UPGRADE_CODE, &rgsczBundleUpgradeCodes, &cBundleUpgradeCodes);
+                ButilExitOnFailure(hr, "Failed to read BundleUpgradeCode  multi-string property.");
+                for (DWORD i = 0; i < cBundleUpgradeCodes; i++)
+                {
+                    LPWSTR wzBundleUpgradeCode = rgsczBundleUpgradeCodes[i];
+                    if (wzBundleUpgradeCode && *wzBundleUpgradeCode)
+                    {
+                        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, wzBundleUpgradeCode, -1, wzUpgradeCode, -1))
+                        {
+                            *pdwStartIndex = dwIndex;
+                            fUpgradeCodeFound = TRUE;
+                            break;
+                        }
+                    }
+                }
+                ReleaseNullStrArray(rgsczBundleUpgradeCodes, cBundleUpgradeCodes);
+                break;
+            default:
+                ButilExitOnFailure(hr = E_NOTIMPL, "BundleUpgradeCode of type 0x%x not implemented.", dwType);
+        }
+        if (fUpgradeCodeFound)
+        {
+            if (lpBundleIdBuf)
+            {
+                hr = ::StringCchLengthW(sczUninstallSubKey, STRSAFE_MAX_CCH, reinterpret_cast<UINT_PTR*>(&cchUninstallSubKey));
+                ButilExitOnFailure(hr, "Failed to calculate length of string");
+                hr = ::StringCchCopyNExW(lpBundleIdBuf, MAX_GUID_CHARS + 1, sczUninstallSubKey, cchUninstallSubKey, NULL, NULL, STRSAFE_FILL_BEHIND_NULL);
+                ButilExitOnFailure(hr, "Failed to copy the property value to the output buffer.");
+            }
+            break;
+        }
+        // Cleanup before next iteration
+        ReleaseRegKey(hkBundle);
+        ReleaseNullStr(sczUninstallSubKey);
+        ReleaseNullStr(sczUninstallSubKeyPath);
+    }
+LExit:
+    ReleaseStr(sczValue);
+    ReleaseStr(sczUninstallSubKey);
+    ReleaseStr(sczUninstallSubKeyPath);
+    ReleaseRegKey(hkBundle);
+    ReleaseRegKey(hkUninstall);
+    ReleaseStrArray(rgsczBundleUpgradeCodes, cBundleUpgradeCodes);
+    return hr;
+}
+HRESULT OpenBundleKey(
+    __in_z LPCWSTR wzBundleId,
+    __in BUNDLE_INSTALL_CONTEXT context, 
+    __inout HKEY *key)
+{
+    Assert(key && wzBundleId);
+    AssertSz(NULL == *key, "*key should be null");
+    HRESULT hr = S_OK;
+    HKEY hkRoot = BUNDLE_INSTALL_CONTEXT_USER == context ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
+    LPWSTR sczKeypath = NULL;
+    hr = StrAllocFormatted(&sczKeypath, L"%ls\\%ls", BUNDLE_REGISTRATION_REGISTRY_UNINSTALL_KEY, wzBundleId);
+    ButilExitOnFailure(hr, "Failed to allocate bundle uninstall key path.");
+    
+    hr = RegOpen(hkRoot, sczKeypath, KEY_READ, key);
+    ButilExitOnFailure(hr, "Failed to open bundle uninstall key path.");
+LExit:
+    ReleaseStr(sczKeypath);
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/cabcutil.cpp b/src/libs/dutil/WixToolset.DUtil/cabcutil.cpp
new file mode 100644
index 00000000..93a9b7e1
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/cabcutil.cpp
@@ -0,0 +1,1539 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define CabcExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_CABCUTIL, x, s, __VA_ARGS__)
+#define CabcExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_CABCUTIL, x, s, __VA_ARGS__)
+#define CabcExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_CABCUTIL, x, s, __VA_ARGS__)
+#define CabcExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_CABCUTIL, x, s, __VA_ARGS__)
+#define CabcExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_CABCUTIL, x, s, __VA_ARGS__)
+#define CabcExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_CABCUTIL, x, s, __VA_ARGS__)
+#define CabcExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_CABCUTIL, p, x, e, s, __VA_ARGS__)
+#define CabcExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_CABCUTIL, p, x, s, __VA_ARGS__)
+#define CabcExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_CABCUTIL, p, x, e, s, __VA_ARGS__)
+#define CabcExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_CABCUTIL, p, x, s, __VA_ARGS__)
+#define CabcExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_CABCUTIL, e, x, s, __VA_ARGS__)
+#define CabcExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_CABCUTIL, g, x, s, __VA_ARGS__)
+static const WCHAR CABC_MAGIC_UNICODE_STRING_MARKER = '?';
+static const DWORD MAX_CABINET_HEADER_SIZE = 16 * 1024 * 1024;
+// The minimum number of uncompressed bytes between FciFlushFolder() calls - if we call FciFlushFolder()
+// too often (because of duplicates too close together) we theoretically ruin our compression ratio -
+// left at zero to maximize install-time performance, because even a small minimum threshhold seems to
+// have a high install-time performance cost for little or no size benefit. The value is left here for
+// tweaking though - possible suggested values are 524288 for 512K, or 2097152 for 2MB.
+static const DWORD MINFLUSHTHRESHHOLD = 0;
+// structs
+struct MS_CABINET_HEADER
+{
+    DWORD sig;
+    DWORD csumHeader;
+    DWORD cbCabinet;
+    DWORD csumFolders;
+    DWORD coffFiles;
+    DWORD csumFiles;
+    WORD version;
+    WORD cFolders;
+    WORD cFiles;
+    WORD flags;
+    WORD setID;
+    WORD iCabinet;
+};
+struct MS_CABINET_ITEM
+{
+    DWORD cbFile;
+    DWORD uoffFolderStart;
+    WORD iFolder;
+    WORD date;
+    WORD time;
+    WORD attribs;
+};
+struct CABC_INTERNAL_ADDFILEINFO
+{
+    LPCWSTR wzSourcePath;
+    LPCWSTR wzEmptyPath;
+};
+struct CABC_DUPLICATEFILE
+{
+    DWORD dwFileArrayIndex;
+    DWORD dwDuplicateCabFileIndex;
+    LPWSTR pwzSourcePath;
+    LPWSTR pwzToken;
+};
+struct CABC_FILE
+{
+    DWORD dwCabFileIndex;
+    LPWSTR pwzSourcePath;
+    LPWSTR pwzToken;
+    PMSIFILEHASHINFO pmfHash;
+    LONGLONG llFileSize;
+    BOOL fHasDuplicates;
+};
+struct CABC_DATA
+{
+    LONGLONG llBytesSinceLastFlush;
+    LONGLONG llFlushThreshhold;
+    STRINGDICT_HANDLE shDictHandle;
+    WCHAR wzCabinetPath[MAX_PATH];
+    WCHAR wzEmptyFile[MAX_PATH];
+    HANDLE hEmptyFile;
+    DWORD dwLastFileIndex;
+    DWORD cFilePaths;
+    DWORD cMaxFilePaths;
+    CABC_FILE *prgFiles;
+    DWORD cDuplicates;
+    DWORD cMaxDuplicates;
+    CABC_DUPLICATEFILE *prgDuplicates;
+    HRESULT hrLastError;
+    BOOL fGoodCab;
+    HFCI hfci;
+    ERF erf;
+    CCAB ccab;
+    TCOMP tc;
+    // Below Field are used for Cabinet Splitting
+    BOOL fCabinetSplittingEnabled;
+    FileSplitCabNamesCallback fileSplitCabNamesCallback;
+    WCHAR wzFirstCabinetName[MAX_PATH]; // Stores Name of First Cabinet excluding ".cab" extention to help generate other names by Splitting
+};
+const int CABC_HANDLE_BYTES = sizeof(CABC_DATA);
+//
+// prototypes
+//
+static void FreeCabCData(
+    __in CABC_DATA* pcd
+    );
+static HRESULT CheckForDuplicateFile(
+    __in CABC_DATA *pcd,
+    __out CABC_FILE **ppcf,
+    __in LPCWSTR wzFileName,
+    __in PMSIFILEHASHINFO *ppmfHash,
+    __in LONGLONG llFileSize
+    );
+static HRESULT AddDuplicateFile(
+    __in CABC_DATA *pcd,
+    __in DWORD dwFileArrayIndex,
+    __in_z LPCWSTR wzSourcePath,
+    __in_opt LPCWSTR wzToken,
+    __in DWORD dwDuplicateCabFileIndex
+    );
+static HRESULT AddNonDuplicateFile(
+    __in CABC_DATA *pcd,
+    __in LPCWSTR wzFile,
+    __in_opt LPCWSTR wzToken,
+    __in_opt const MSIFILEHASHINFO* pmfHash,
+    __in LONGLONG llFileSize,
+    __in DWORD dwCabFileIndex
+    );
+static HRESULT UpdateDuplicateFiles(
+    __in const CABC_DATA *pcd
+    );
+static HRESULT DuplicateFile(
+    __in MS_CABINET_HEADER *pHeader,
+    __in const CABC_DATA *pcd,
+    __in const CABC_DUPLICATEFILE *pDuplicate
+    );
+static HRESULT UtcFileTimeToLocalDosDateTime(
+    __in const FILETIME* pFileTime,
+    __out USHORT* pDate,
+    __out USHORT* pTime
+    );
+static __callback int DIAMONDAPI CabCFilePlaced(__in PCCAB pccab, __in_z PSTR szFile, __in long cbFile, __in BOOL fContinuation, __inout_bcount(CABC_HANDLE_BYTES) void *pv);
+static __callback void * DIAMONDAPI CabCAlloc(__in ULONG cb);
+static __callback void DIAMONDAPI CabCFree(__out_bcount(CABC_HANDLE_BYTES) void *pv);
+static __callback INT_PTR DIAMONDAPI CabCOpen(__in_z PSTR pszFile, __in int oflag, __in int pmode, __out int *err, __inout_bcount(CABC_HANDLE_BYTES) void *pv);
+static __callback UINT FAR DIAMONDAPI CabCRead(__in INT_PTR hf, __out_bcount(cb) void FAR *memory, __in UINT cb, __out int *err, __inout_bcount(CABC_HANDLE_BYTES) void *pv);
+static __callback UINT FAR DIAMONDAPI CabCWrite(__in INT_PTR hf, __in_bcount(cb) void FAR *memory, __in UINT cb, __out int *err, __inout_bcount(CABC_HANDLE_BYTES) void *pv);
+static __callback long FAR DIAMONDAPI CabCSeek(__in INT_PTR hf, __in long dist, __in int seektype, __out int *err, __inout_bcount(CABC_HANDLE_BYTES) void *pv);
+static __callback int FAR DIAMONDAPI CabCClose(__in INT_PTR hf, __out int *err, __inout_bcount(CABC_HANDLE_BYTES) void *pv);
+static __callback int DIAMONDAPI CabCDelete(__in_z PSTR szFile, __out int *err, __inout_bcount(CABC_HANDLE_BYTES) void *pv);
+__success(return != FALSE) static __callback BOOL DIAMONDAPI CabCGetTempFile(__out_bcount_z(cbFile) char *szFile, __in int cbFile, __inout_bcount(CABC_HANDLE_BYTES) void *pv);
+__success(return != FALSE) static __callback BOOL DIAMONDAPI CabCGetNextCabinet(__in PCCAB pccab, __in ULONG ul, __out_bcount(CABC_HANDLE_BYTES) void *pv);
+static __callback INT_PTR DIAMONDAPI CabCGetOpenInfo(__in_z PSTR pszName, __out USHORT *pdate, __out USHORT *ptime, __out USHORT *pattribs, __out int *err, __out_bcount(CABC_HANDLE_BYTES) void *pv);
+static __callback long DIAMONDAPI CabCStatus(__in UINT uiTypeStatus, __in ULONG cb1, __in ULONG cb2, __inout_bcount(CABC_HANDLE_BYTES) void *pv);
+/********************************************************************
+CabcBegin - begins creating a cabinet
+NOTE: phContext must be the same handle used in AddFile and Finish.
+      wzCabDir can be L"", but not NULL.
+      dwMaxSize and dwMaxThresh can be 0.  A large default value will be used in that case.
+********************************************************************/
+extern "C" HRESULT DAPI CabCBegin(
+    __in_z LPCWSTR wzCab,
+    __in_z LPCWSTR wzCabDir,
+    __in DWORD dwMaxFiles,
+    __in DWORD dwMaxSize,
+    __in DWORD dwMaxThresh,
+    __in COMPRESSION_TYPE ct,
+    __out_bcount(CABC_HANDLE_BYTES) HANDLE *phContext
+    )
+{
+    Assert(wzCab && *wzCab && phContext);
+    HRESULT hr = S_OK;
+    CABC_DATA *pcd = NULL;
+    WCHAR wzTempPath[MAX_PATH] = { };
+    C_ASSERT(sizeof(MSIFILEHASHINFO) == 20);
+    WCHAR wzPathBuffer [MAX_PATH] = L"";
+    size_t cchPathBuffer;
+    if (wzCabDir)
+    {
+        hr = ::StringCchLengthW(wzCabDir, MAX_PATH, &cchPathBuffer);
+        CabcExitOnFailure(hr, "Failed to get length of cab directory");
+        // Need room to terminate with L'\\' and L'\0'
+        if((MAX_PATH - 1) <= cchPathBuffer || 0 == cchPathBuffer)
+        {
+            hr = E_INVALIDARG;
+            CabcExitOnFailure(hr, "Cab directory had invalid length: %u", cchPathBuffer);
+        }
+        hr = ::StringCchCopyW(wzPathBuffer, countof(wzPathBuffer), wzCabDir);
+        CabcExitOnFailure(hr, "Failed to copy cab directory to buffer");
+        if (L'\\' != wzPathBuffer[cchPathBuffer - 1])
+        {
+            hr = ::StringCchCatW(wzPathBuffer, countof(wzPathBuffer), L"\\");
+            CabcExitOnFailure(hr, "Failed to cat \\ to end of buffer");
+            ++cchPathBuffer;
+        }
+    }
+    pcd = static_cast<CABC_DATA*>(MemAlloc(sizeof(CABC_DATA), TRUE));
+    CabcExitOnNull(pcd, hr, E_OUTOFMEMORY, "failed to allocate cab creation data structure");
+    pcd->hrLastError = S_OK;
+    pcd->fGoodCab = TRUE;
+    pcd->llFlushThreshhold = MINFLUSHTHRESHHOLD;
+    pcd->hEmptyFile = INVALID_HANDLE_VALUE;
+    pcd->fileSplitCabNamesCallback = NULL;
+    if (NULL == dwMaxSize)
+    {
+        pcd->ccab.cb = CAB_MAX_SIZE;
+        pcd->fCabinetSplittingEnabled = FALSE; // If no max cab size is supplied, cabinet splitting is not desired
+    }
+    else
+    {
+        pcd->ccab.cb = dwMaxSize * 1024 * 1024;
+        pcd->fCabinetSplittingEnabled = TRUE;
+    }
+    if (0 == dwMaxThresh)
+    {
+        // Subtract 16 to magically make cabbing of uncompressed data larger than 2GB work.
+        pcd->ccab.cbFolderThresh = CAB_MAX_SIZE - 16; 
+    }
+    else
+    {
+        pcd->ccab.cbFolderThresh = dwMaxThresh;
+    }
+    // Translate the compression type
+    if (COMPRESSION_TYPE_NONE == ct)
+    {
+        pcd->tc = tcompTYPE_NONE;
+    }
+    else if (COMPRESSION_TYPE_LOW == ct)
+    {
+        pcd->tc = tcompTYPE_LZX | tcompLZX_WINDOW_LO;
+    }
+    else if (COMPRESSION_TYPE_MEDIUM == ct)
+    {
+        pcd->tc = TCOMPfromLZXWindow(18);
+    }
+    else if (COMPRESSION_TYPE_HIGH == ct)
+    {
+        pcd->tc = tcompTYPE_LZX | tcompLZX_WINDOW_HI;
+    }
+    else if (COMPRESSION_TYPE_MSZIP == ct)
+    {
+        pcd->tc = tcompTYPE_MSZIP;
+    }
+    else
+    {
+        hr = E_INVALIDARG;
+        CabcExitOnFailure(hr, "Invalid compression type specified.");
+    }
+    if (0 == ::WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, wzCab, -1, pcd->ccab.szCab, sizeof(pcd->ccab.szCab), NULL, NULL))
+    {
+        CabcExitWithLastError(hr, "failed to convert cab name to multi-byte");
+    }
+    if (0 ==  ::WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, wzPathBuffer, -1, pcd->ccab.szCabPath, sizeof(pcd->ccab.szCab), NULL, NULL))
+    {
+        CabcExitWithLastError(hr, "failed to convert cab dir to multi-byte");
+    }
+    // Remember the path to the cabinet.
+    hr= ::StringCchCopyW(pcd->wzCabinetPath, countof(pcd->wzCabinetPath), wzPathBuffer);
+    CabcExitOnFailure(hr, "Failed to copy cabinet path from path: %ls", wzPathBuffer);
+    hr = ::StringCchCatW(pcd->wzCabinetPath, countof(pcd->wzCabinetPath), wzCab);
+    CabcExitOnFailure(hr, "Failed to concat to cabinet path cabinet name: %ls", wzCab);
+    // Get the empty file to use as the blank marker for duplicates.
+    if (!::GetTempPathW(countof(wzTempPath), wzTempPath))
+    {
+        CabcExitWithLastError(hr, "Failed to get temp path.");
+    }
+    if (!::GetTempFileNameW(wzTempPath, L"WSC", 0, pcd->wzEmptyFile))
+    {
+        CabcExitWithLastError(hr, "Failed to create a temp file name.");
+    }
+    // Try to open the newly created empty file (remember, GetTempFileName() is kind enough to create a file for us)
+    // with a handle to automatically delete the file on close. Ignore any failure that might happen, since the worst
+    // case is we'll leave a zero byte file behind in the temp folder.
+    pcd->hEmptyFile = ::CreateFileW(pcd->wzEmptyFile, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_TEMPORARY | FILE_FLAG_DELETE_ON_CLOSE, NULL);
+    hr = DictCreateWithEmbeddedKey(&pcd->shDictHandle, dwMaxFiles, reinterpret_cast<void **>(&pcd->prgFiles), offsetof(CABC_FILE, pwzSourcePath), DICT_FLAG_CASEINSENSITIVE);
+    CabcExitOnFailure(hr, "Failed to create dictionary to keep track of duplicate files");
+    // Make sure to allocate at least some space, or we won't be able to realloc later if they "lied" about having zero files
+    if (1 > dwMaxFiles)
+    {
+        dwMaxFiles = 1;
+    }
+    pcd->cMaxFilePaths = dwMaxFiles;
+    size_t cbFileAllocSize = 0;
+    hr = ::SizeTMult(pcd->cMaxFilePaths, sizeof(CABC_FILE), &(cbFileAllocSize));
+    CabcExitOnFailure(hr, "Maximum allocation exceeded on initialization.");
+    pcd->prgFiles = static_cast<CABC_FILE*>(MemAlloc(cbFileAllocSize, TRUE));
+    CabcExitOnNull(pcd->prgFiles, hr, E_OUTOFMEMORY, "Failed to allocate memory for files.");
+    // Tell cabinet API about our configuration.
+    pcd->hfci = ::FCICreate(&(pcd->erf), CabCFilePlaced, CabCAlloc, CabCFree, CabCOpen, CabCRead, CabCWrite, CabCClose, CabCSeek, CabCDelete, CabCGetTempFile, &(pcd->ccab), pcd);
+    if (NULL == pcd->hfci || pcd->erf.fError)
+    {
+        // Prefer our recorded last error, then ::GetLastError(), finally fallback to the useless "E_FAIL" error
+        if (FAILED(pcd->hrLastError))
+        {
+            hr = pcd->hrLastError;
+        }
+        else
+        {
+            CabcExitWithLastError(hr, "failed to create FCI object Oper: 0x%x Type: 0x%x", pcd->erf.erfOper, pcd->erf.erfType);
+        }
+        pcd->fGoodCab = FALSE;
+        CabcExitOnFailure(hr, "failed to create FCI object Oper: 0x%x Type: 0x%x", pcd->erf.erfOper, pcd->erf.erfType);  // TODO: can these be converted to HRESULTS?
+    }
+    *phContext = pcd;
+LExit:
+    if (FAILED(hr) && pcd && pcd->hfci)
+    {
+        ::FCIDestroy(pcd->hfci);
+    }
+    return hr;
+}
+/********************************************************************
+CabCNextCab - This will be useful when creating multiple cabs.
+Haven't needed it yet.
+********************************************************************/
+extern "C" HRESULT DAPI CabCNextCab(
+    __in_bcount(CABC_HANDLE_BYTES) HANDLE hContext
+    )
+{
+    UNREFERENCED_PARAMETER(hContext);
+    // TODO: Make the appropriate FCIFlushCabinet and FCIFlushFolder calls
+    return E_NOTIMPL;
+}
+/********************************************************************
+CabcAddFile - adds a file to a cabinet
+NOTE: hContext must be the same used in Begin and Finish
+if wzToken is null, the file's original name is used within the cab
+********************************************************************/
+extern "C" HRESULT DAPI CabCAddFile(
+    __in_z LPCWSTR wzFile,
+    __in_z_opt LPCWSTR wzToken,
+    __in_opt PMSIFILEHASHINFO pmfHash,
+    __in_bcount(CABC_HANDLE_BYTES) HANDLE hContext
+    )
+{
+    Assert(wzFile && *wzFile && hContext);
+    HRESULT hr = S_OK;
+    CABC_DATA *pcd = reinterpret_cast<CABC_DATA*>(hContext);
+    CABC_FILE *pcfDuplicate = NULL;
+    LONGLONG llFileSize = 0;
+    PMSIFILEHASHINFO pmfLocalHash = pmfHash;
+    // Use Smart Cabbing if there are duplicates and if Cabinet Splitting is not desired
+    // For Cabinet Spliting avoid hashing as Smart Cabbing is disabled
+    if(!pcd->fCabinetSplittingEnabled)
+    {
+        // Store file size, primarily used to determine which files to hash for duplicates
+        hr = FileSize(wzFile, &llFileSize);
+        CabcExitOnFailure(hr, "Failed to check size of file %ls", wzFile);
+        hr = CheckForDuplicateFile(pcd, &pcfDuplicate, wzFile, &pmfLocalHash, llFileSize);
+        CabcExitOnFailure(hr, "Failed while checking for duplicate of file: %ls", wzFile);
+    }
+    if (pcfDuplicate) // This will be null for smart cabbing case
+    {
+        DWORD index;
+        hr = ::PtrdiffTToDWord(pcfDuplicate - pcd->prgFiles, &index);
+        CabcExitOnFailure(hr, "Failed to calculate index of file name: %ls", pcfDuplicate->pwzSourcePath);
+        hr = AddDuplicateFile(pcd, index, wzFile, wzToken, pcd->dwLastFileIndex);
+        CabcExitOnFailure(hr, "Failed to add duplicate of file name: %ls", pcfDuplicate->pwzSourcePath);
+    }
+    else
+    {
+        hr = AddNonDuplicateFile(pcd, wzFile, wzToken, pmfLocalHash, llFileSize, pcd->dwLastFileIndex);
+        CabcExitOnFailure(hr, "Failed to add non-duplicated file: %ls", wzFile);
+    }
+    ++pcd->dwLastFileIndex;
+LExit:
+    // If we allocated a hash struct ourselves, free it
+    if (pmfHash != pmfLocalHash)
+    {
+        ReleaseMem(pmfLocalHash);
+    }
+    return hr;
+}
+/********************************************************************
+CabcFinish - finishes making a cabinet
+NOTE: hContext must be the same used in Begin and AddFile
+*********************************************************************/
+extern "C" HRESULT DAPI CabCFinish(
+    __in_bcount(CABC_HANDLE_BYTES) HANDLE hContext,
+    __in_opt FileSplitCabNamesCallback fileSplitCabNamesCallback
+    )
+{
+    Assert(hContext);
+    HRESULT hr = S_OK;
+    CABC_DATA *pcd = reinterpret_cast<CABC_DATA*>(hContext);
+    CABC_INTERNAL_ADDFILEINFO fileInfo = { };
+    DWORD dwCabFileIndex; // Total file index, counts up to pcd->dwLastFileIndex
+    DWORD dwArrayFileIndex = 0; // Index into pcd->prgFiles[] array
+    DWORD dwDupeArrayFileIndex = 0; // Index into pcd->prgDuplicates[] array
+    LPSTR pszFileToken = NULL;
+    LONGLONG llFileSize = 0;
+    pcd->fileSplitCabNamesCallback = fileSplitCabNamesCallback;
+    // These are used to determine whether to call FciFlushFolder() before or after the next call to FciAddFile()
+    // doing so at appropriate times results in install-time performance benefits in the case of duplicate files.
+    // Basically, when MSI has to extract files out of order (as it does due to our smart cabbing), it can't just jump
+    // exactly to the out of order file, it must begin extracting all over again, starting from that file's CAB folder
+    // (this is not the same as a regular folder, and is a concept unique to CABs).
+    
+    // This means MSI spends a lot of time extracting the same files twice, especially if the duplicate file has many files
+    // before it in the CAB folder. To avoid this, we want to make sure whenever MSI jumps to another file in the CAB, that
+    // file is at the beginning of its own folder, so no extra files need to be extracted. FciFlushFolder() causes the CAB
+    // to close the current folder, and create a new folder for the next file to be added.
+    
+    // So to maximize our performance benefit, we must call FciFlushFolder() at every place MSI will jump "to" in the CAB sequence.
+    // So, we call FciFlushFolder() before adding the original version of a duplicated file (as this will be jumped "to")
+    // And we call FciFlushFolder() after adding the duplicate versions of files (as this will be jumped back "to" to get back in the regular sequence)
+    BOOL fFlushBefore = FALSE;
+    BOOL fFlushAfter = FALSE;
+    ReleaseDict(pcd->shDictHandle);
+    // We need to go through all the files, duplicates and non-duplicates, sequentially in the order they were added
+    for (dwCabFileIndex = 0; dwCabFileIndex < pcd->dwLastFileIndex; ++dwCabFileIndex)
+    {
+        if (dwArrayFileIndex < pcd->cMaxFilePaths && pcd->prgFiles[dwArrayFileIndex].dwCabFileIndex == dwCabFileIndex) // If it's a non-duplicate file
+        {
+            // Just a normal, non-duplicated file.  We'll add it to the list for later checking of
+            // duplicates.
+            fileInfo.wzSourcePath = pcd->prgFiles[dwArrayFileIndex].pwzSourcePath;
+            fileInfo.wzEmptyPath = NULL;
+            // Use the provided token, otherwise default to the source file name.
+            if (pcd->prgFiles[dwArrayFileIndex].pwzToken)
+            {
+                LPCWSTR pwzTemp = pcd->prgFiles[dwArrayFileIndex].pwzToken;
+                hr = StrAnsiAllocString(&pszFileToken, pwzTemp, 0, CP_ACP);
+                CabcExitOnFailure(hr, "failed to convert file token to ANSI: %ls", pwzTemp);
+            }
+            else
+            {
+                LPCWSTR pwzTemp = FileFromPath(fileInfo.wzSourcePath);
+                hr = StrAnsiAllocString(&pszFileToken, pwzTemp, 0, CP_ACP);
+                CabcExitOnFailure(hr, "failed to convert file name to ANSI: %ls", pwzTemp);
+            }
+            if (pcd->prgFiles[dwArrayFileIndex].fHasDuplicates)
+            {
+                fFlushBefore = TRUE;
+            }
+            llFileSize = pcd->prgFiles[dwArrayFileIndex].llFileSize;
+            ++dwArrayFileIndex; // Increment into the non-duplicate array
+        }
+        else if (dwDupeArrayFileIndex < pcd->cMaxDuplicates && pcd->prgDuplicates[dwDupeArrayFileIndex].dwDuplicateCabFileIndex == dwCabFileIndex) // If it's a duplicate file
+        {
+            // For duplicate files, we point them at our empty (zero-byte) file so it takes up no space
+            // in the resultant cabinet.  Later on (CabCFinish) we'll go through and change all the zero
+            // byte files to point at their duplicated file index.
+            //
+            // Notice that duplicate files are not added to the list of file paths because all duplicate
+            // files point at the same path (the empty file) so there is no point in tracking them with
+            // their path.
+            fileInfo.wzSourcePath = pcd->prgDuplicates[dwDupeArrayFileIndex].pwzSourcePath;
+            fileInfo.wzEmptyPath = pcd->wzEmptyFile;
+            // Use the provided token, otherwise default to the source file name.
+            if (pcd->prgDuplicates[dwDupeArrayFileIndex].pwzToken)
+            {
+                LPCWSTR pwzTemp = pcd->prgDuplicates[dwDupeArrayFileIndex].pwzToken;
+                hr = StrAnsiAllocString(&pszFileToken, pwzTemp, 0, CP_ACP);
+                CabcExitOnFailure(hr, "failed to convert duplicate file token to ANSI: %ls", pwzTemp);
+            }
+            else
+            {
+                LPCWSTR pwzTemp = FileFromPath(fileInfo.wzSourcePath);
+                hr = StrAnsiAllocString(&pszFileToken, pwzTemp, 0, CP_ACP);
+                CabcExitOnFailure(hr, "failed to convert duplicate file name to ANSI: %ls", pwzTemp);
+            }
+            // Flush afterward only if this isn't a duplicate of the previous file, and at least one non-duplicate file remains to be added to the cab
+            if (!(dwCabFileIndex - 1 == pcd->prgFiles[pcd->prgDuplicates[dwDupeArrayFileIndex].dwFileArrayIndex].dwCabFileIndex) &&
+                !(dwDupeArrayFileIndex > 0 && dwCabFileIndex - 1 == pcd->prgDuplicates[dwDupeArrayFileIndex - 1].dwDuplicateCabFileIndex) &&
+                dwArrayFileIndex < pcd->cFilePaths)
+            {
+                fFlushAfter = TRUE;
+            }
+            // We're just adding a 0-byte file, so set it appropriately
+            llFileSize = 0;
+            ++dwDupeArrayFileIndex; // Increment into the duplicate array
+        }
+        else // If it's neither duplicate nor non-duplicate, throw an error
+        {
+            hr = HRESULT_FROM_WIN32(ERROR_EA_LIST_INCONSISTENT);
+            CabcExitOnRootFailure(hr, "Internal inconsistency in data structures while creating CAB file - a non-standard, non-duplicate file was encountered");
+        }
+        if (fFlushBefore && pcd->llBytesSinceLastFlush > pcd->llFlushThreshhold)
+        {
+            if (!::FCIFlushFolder(pcd->hfci, CabCGetNextCabinet, CabCStatus))
+            {
+                CabcExitWithLastError(hr, "failed to flush FCI folder before adding file, Oper: 0x%x Type: 0x%x", pcd->erf.erfOper, pcd->erf.erfType);
+            }
+            pcd->llBytesSinceLastFlush = 0;
+        }
+        pcd->llBytesSinceLastFlush += llFileSize;
+        // Add the file to the cab. Notice that we are passing our CABC_INTERNAL_ADDFILEINFO struct
+        // through the pointer to an ANSI string. This is neccessary so we can smuggle through the
+        // path to the empty file (should this be a duplicate file).
+#pragma prefast(push)
+#pragma prefast(disable:6387) // OACR is silly, pszFileToken can't be false here
+        if (!::FCIAddFile(pcd->hfci, reinterpret_cast<LPSTR>(&fileInfo), pszFileToken, FALSE, CabCGetNextCabinet, CabCStatus, CabCGetOpenInfo, pcd->tc))
+#pragma prefast(pop)
+        {
+            pcd->fGoodCab = FALSE;
+            // Prefer our recorded last error, then ::GetLastError(), finally fallback to the useless "E_FAIL" error
+            if (FAILED(pcd->hrLastError))
+            {
+                hr = pcd->hrLastError;
+            }
+            else
+            {
+                CabcExitWithLastError(hr, "failed to add file to FCI object Oper: 0x%x Type: 0x%x File: %ls", pcd->erf.erfOper, pcd->erf.erfType, fileInfo.wzSourcePath);
+            }
+            CabcExitOnFailure(hr, "failed to add file to FCI object Oper: 0x%x Type: 0x%x File: %ls", pcd->erf.erfOper, pcd->erf.erfType, fileInfo.wzSourcePath);  // TODO: can these be converted to HRESULTS?
+        }
+        // For Cabinet Splitting case, check for pcd->hrLastError that may be set as result of Error in CabCGetNextCabinet
+        // This is required as returning False in CabCGetNextCabinet is not aborting cabinet creation and is reporting success instead
+        if (pcd->fCabinetSplittingEnabled && FAILED(pcd->hrLastError))
+        {
+            hr = pcd->hrLastError;
+            CabcExitOnFailure(hr, "Failed to create next cabinet name while splitting cabinet.");
+        }
+        if (fFlushAfter && pcd->llBytesSinceLastFlush > pcd->llFlushThreshhold)
+        {
+            if (!::FCIFlushFolder(pcd->hfci, CabCGetNextCabinet, CabCStatus))
+            {
+                CabcExitWithLastError(hr, "failed to flush FCI folder after adding file, Oper: 0x%x Type: 0x%x", pcd->erf.erfOper, pcd->erf.erfType);
+            }
+            pcd->llBytesSinceLastFlush = 0;
+        }
+        fFlushAfter = FALSE;
+        fFlushBefore = FALSE;
+    }
+    if (!pcd->fGoodCab)
+    {
+        // Prefer our recorded last error, then ::GetLastError(), finally fallback to the useless "E_FAIL" error
+        if (FAILED(pcd->hrLastError))
+        {
+            hr = pcd->hrLastError;
+        }
+        else
+        {
+            CabcExitWithLastError(hr, "failed while creating CAB FCI object Oper: 0x%x Type: 0x%x File: %ls", pcd->erf.erfOper, pcd->erf.erfType, fileInfo.wzSourcePath);
+        }
+        CabcExitOnFailure(hr, "failed while creating CAB FCI object Oper: 0x%x Type: 0x%x File: %ls", pcd->erf.erfOper, pcd->erf.erfType, fileInfo.wzSourcePath);  // TODO: can these be converted to HRESULTS?
+    }
+    // Only flush the cabinet if we actually succeeded in previous calls - otherwise we just waste time (a lot on big cabs)
+    if (!::FCIFlushCabinet(pcd->hfci, FALSE, CabCGetNextCabinet, CabCStatus))
+    {
+        // If we have a last error, use that, otherwise return the useless error
+        hr = FAILED(pcd->hrLastError) ? pcd->hrLastError : E_FAIL;
+        CabcExitOnFailure(hr, "failed to flush FCI object Oper: 0x%x Type: 0x%x", pcd->erf.erfOper, pcd->erf.erfType);  // TODO: can these be converted to HRESULTS?
+    }
+    if (pcd->fGoodCab && pcd->cDuplicates)
+    {
+        hr = UpdateDuplicateFiles(pcd);
+        CabcExitOnFailure(hr, "Failed to update duplicates in cabinet: %ls", pcd->wzCabinetPath);
+    }
+LExit:
+    ::FCIDestroy(pcd->hfci);
+    FreeCabCData(pcd);
+    ReleaseNullStr(pszFileToken);
+    return hr;
+}
+/********************************************************************
+CabCCancel - cancels making a cabinet
+NOTE: hContext must be the same used in Begin and AddFile
+*********************************************************************/
+extern "C" void DAPI CabCCancel(
+    __in_bcount(CABC_HANDLE_BYTES) HANDLE hContext
+    )
+{
+    Assert(hContext);
+    CABC_DATA* pcd = reinterpret_cast<CABC_DATA*>(hContext);
+    ::FCIDestroy(pcd->hfci);
+    FreeCabCData(pcd);
+}
+//
+// private
+//
+static void FreeCabCData(
+    __in CABC_DATA* pcd
+    )
+{
+    if (pcd)
+    {
+        ReleaseFileHandle(pcd->hEmptyFile);
+        for (DWORD i = 0; i < pcd->cFilePaths; ++i)
+        {
+            ReleaseStr(pcd->prgFiles[i].pwzSourcePath);
+            ReleaseMem(pcd->prgFiles[i].pmfHash);
+        }
+        ReleaseMem(pcd->prgFiles);
+        ReleaseMem(pcd->prgDuplicates);
+        ReleaseMem(pcd);
+    }
+}
+/********************************************************************
+ SmartCab functions
+********************************************************************/
+static HRESULT CheckForDuplicateFile(
+    __in CABC_DATA *pcd,
+    __out CABC_FILE **ppcf,
+    __in LPCWSTR wzFileName,
+    __in PMSIFILEHASHINFO *ppmfHash,
+    __in LONGLONG llFileSize
+    )
+{
+    DWORD i;
+    HRESULT hr = S_OK;
+    UINT er = ERROR_SUCCESS;
+    CabcExitOnNull(ppcf, hr, E_INVALIDARG, "No file structure sent while checking for duplicate file");
+    CabcExitOnNull(ppmfHash, hr, E_INVALIDARG, "No file hash structure pointer sent while checking for duplicate file");
+    *ppcf = NULL; // By default, we'll set our output to NULL
+    hr = DictGetValue(pcd->shDictHandle, wzFileName, reinterpret_cast<void **>(ppcf));
+    // If we found it in the hash of previously added source paths, return our match immediately
+    if (SUCCEEDED(hr))
+    {
+        ExitFunction1(hr = S_OK);
+    }
+    else if (E_NOTFOUND == hr)
+    {
+        hr = S_OK;
+    }
+    CabcExitOnFailure(hr, "Failed while searching for file in dictionary of previously added files");
+    for (i = 0; i < pcd->cFilePaths; ++i)
+    {
+        // If two files have the same size, use hashing to check if they're a match
+        if (llFileSize == pcd->prgFiles[i].llFileSize)
+        {
+            // If pcd->prgFiles[i], our potential match, hasn't been hashed yet, hash it
+            if (pcd->prgFiles[i].pmfHash == NULL)
+            {
+                pcd->prgFiles[i].pmfHash = (PMSIFILEHASHINFO)MemAlloc(sizeof(MSIFILEHASHINFO), FALSE);
+                CabcExitOnNull(pcd->prgFiles[i].pmfHash, hr, E_OUTOFMEMORY, "Failed to allocate memory for candidate duplicate file's MSI file hash");
+                pcd->prgFiles[i].pmfHash->dwFileHashInfoSize = sizeof(MSIFILEHASHINFO);
+                er = ::MsiGetFileHashW(pcd->prgFiles[i].pwzSourcePath, 0, pcd->prgFiles[i].pmfHash);
+                CabcExitOnWin32Error(er, hr, "Failed while getting MSI file hash of candidate duplicate file: %ls", pcd->prgFiles[i].pwzSourcePath);
+            }
+            // If our own file hasn't yet been hashed, hash it
+            if (NULL == *ppmfHash)
+            {
+                *ppmfHash = (PMSIFILEHASHINFO)MemAlloc(sizeof(MSIFILEHASHINFO), FALSE);
+                CabcExitOnNull(*ppmfHash, hr, E_OUTOFMEMORY, "Failed to allocate memory for file's MSI file hash");
+                (*ppmfHash)->dwFileHashInfoSize = sizeof(MSIFILEHASHINFO);
+                er = ::MsiGetFileHashW(wzFileName, 0, *ppmfHash);
+                CabcExitOnWin32Error(er, hr, "Failed while getting MSI file hash of file: %ls", pcd->prgFiles[i].pwzSourcePath);
+            }
+            // If the two file hashes are both of the expected size, and they match, we've got a match, so return it!
+            if (pcd->prgFiles[i].pmfHash->dwFileHashInfoSize == (*ppmfHash)->dwFileHashInfoSize &&
+                sizeof(MSIFILEHASHINFO) == (*ppmfHash)->dwFileHashInfoSize &&
+                pcd->prgFiles[i].pmfHash->dwData[0] == (*ppmfHash)->dwData[0] &&
+                pcd->prgFiles[i].pmfHash->dwData[1] == (*ppmfHash)->dwData[1] &&
+                pcd->prgFiles[i].pmfHash->dwData[2] == (*ppmfHash)->dwData[2] && 
+                pcd->prgFiles[i].pmfHash->dwData[3] == (*ppmfHash)->dwData[3])
+             {
+                 *ppcf = pcd->prgFiles + i;
+                 ExitFunction1(hr = S_OK);
+             }
+        }
+    }
+LExit:
+    return hr;
+}
+static HRESULT AddDuplicateFile(
+    __in CABC_DATA *pcd,
+    __in DWORD dwFileArrayIndex,
+    __in_z LPCWSTR wzSourcePath,
+    __in_opt LPCWSTR wzToken,
+    __in DWORD dwDuplicateCabFileIndex
+    )
+{
+    HRESULT hr = S_OK;
+    LPVOID pv = NULL;
+    // Ensure there is enough memory to store this duplicate file index.
+    if (pcd->cDuplicates == pcd->cMaxDuplicates)
+    {
+        pcd->cMaxDuplicates += 20; // grow by a reasonable number (20 is reasonable, right?)
+        size_t cbDuplicates = 0;
+        hr = ::SizeTMult(pcd->cMaxDuplicates, sizeof(CABC_DUPLICATEFILE), &cbDuplicates);
+        CabcExitOnFailure(hr, "Maximum allocation exceeded.");
+        if (pcd->cDuplicates)
+        {
+            pv = MemReAlloc(pcd->prgDuplicates, cbDuplicates, FALSE);
+            CabcExitOnNull(pv, hr, E_OUTOFMEMORY, "Failed to reallocate memory for duplicate file.");
+        }
+        else
+        {
+            pv = MemAlloc(cbDuplicates, FALSE);
+            CabcExitOnNull(pv, hr, E_OUTOFMEMORY, "Failed to allocate memory for duplicate file.");
+        }
+        ZeroMemory(reinterpret_cast<BYTE*>(pv) + (pcd->cDuplicates * sizeof(CABC_DUPLICATEFILE)), (pcd->cMaxDuplicates - pcd->cDuplicates) * sizeof(CABC_DUPLICATEFILE));
+        pcd->prgDuplicates = static_cast<CABC_DUPLICATEFILE*>(pv);
+        pv = NULL;
+    }
+    // Store the duplicate file index.
+    pcd->prgDuplicates[pcd->cDuplicates].dwFileArrayIndex = dwFileArrayIndex;
+    pcd->prgDuplicates[pcd->cDuplicates].dwDuplicateCabFileIndex = dwDuplicateCabFileIndex;
+    pcd->prgFiles[dwFileArrayIndex].fHasDuplicates = TRUE; // Mark original file as having duplicates
+    hr = StrAllocString(&pcd->prgDuplicates[pcd->cDuplicates].pwzSourcePath, wzSourcePath, 0);
+    CabcExitOnFailure(hr, "Failed to copy duplicate file path: %ls", wzSourcePath);
+    if (wzToken && *wzToken)
+    {
+        hr = StrAllocString(&pcd->prgDuplicates[pcd->cDuplicates].pwzToken, wzToken, 0);
+        CabcExitOnFailure(hr, "Failed to copy duplicate file token: %ls", wzToken);
+    }
+    ++pcd->cDuplicates;
+LExit:
+    ReleaseMem(pv);
+    return hr;
+}
+static HRESULT AddNonDuplicateFile(
+    __in CABC_DATA *pcd,
+    __in LPCWSTR wzFile,
+    __in_opt LPCWSTR wzToken,
+    __in_opt const MSIFILEHASHINFO* pmfHash,
+    __in LONGLONG llFileSize,
+    __in DWORD dwCabFileIndex
+    )
+{
+    HRESULT hr = S_OK;
+    LPVOID pv = NULL;
+    // Ensure there is enough memory to store this file index.
+    if (pcd->cFilePaths == pcd->cMaxFilePaths)
+    {
+        pcd->cMaxFilePaths += 100; // grow by a reasonable number (100 is reasonable, right?)
+        size_t cbFilePaths = 0;
+        hr = ::SizeTMult(pcd->cMaxFilePaths, sizeof(CABC_FILE), &cbFilePaths);
+        CabcExitOnFailure(hr, "Maximum allocation exceeded.");
+        pv = MemReAlloc(pcd->prgFiles, cbFilePaths, FALSE);
+        CabcExitOnNull(pv, hr, E_OUTOFMEMORY, "Failed to reallocate memory for file.");
+        ZeroMemory(reinterpret_cast<BYTE*>(pv) + (pcd->cFilePaths * sizeof(CABC_FILE)), (pcd->cMaxFilePaths - pcd->cFilePaths) * sizeof(CABC_FILE));
+        pcd->prgFiles = static_cast<CABC_FILE*>(pv);
+        pv = NULL;
+    }
+    // Store the file index information.
+    // TODO: add this to a sorted list so we can do a binary search later.
+    CABC_FILE *pcf = pcd->prgFiles + pcd->cFilePaths;
+    pcf->dwCabFileIndex = dwCabFileIndex;
+    pcf->llFileSize = llFileSize;
+    if (pmfHash && sizeof(MSIFILEHASHINFO) == pmfHash->dwFileHashInfoSize)
+    {
+        pcf->pmfHash = (PMSIFILEHASHINFO)MemAlloc(sizeof(MSIFILEHASHINFO), FALSE);
+        CabcExitOnNull(pcf->pmfHash, hr, E_OUTOFMEMORY, "Failed to allocate memory for individual file's MSI file hash");
+        pcf->pmfHash->dwFileHashInfoSize = sizeof(MSIFILEHASHINFO);
+        pcf->pmfHash->dwData[0] = pmfHash->dwData[0];
+        pcf->pmfHash->dwData[1] = pmfHash->dwData[1];
+        pcf->pmfHash->dwData[2] = pmfHash->dwData[2];
+        pcf->pmfHash->dwData[3] = pmfHash->dwData[3];
+    }
+    hr = StrAllocString(&pcf->pwzSourcePath, wzFile, 0);
+    CabcExitOnFailure(hr, "Failed to copy file path: %ls", wzFile);
+    if (wzToken && *wzToken)
+    {
+        hr = StrAllocString(&pcf->pwzToken, wzToken, 0);
+        CabcExitOnFailure(hr, "Failed to copy file token: %ls", wzToken);
+    }
+    ++pcd->cFilePaths;
+    hr = DictAddValue(pcd->shDictHandle, pcf);
+    CabcExitOnFailure(hr, "Failed to add file to dictionary of added files");
+LExit:
+    ReleaseMem(pv);
+    return hr;
+}
+static HRESULT UpdateDuplicateFiles(
+    __in const CABC_DATA *pcd
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD cbCabinet = 0;
+    LARGE_INTEGER liCabinetSize = { };
+    HANDLE hCabinet = INVALID_HANDLE_VALUE;
+    HANDLE hCabinetMapping = NULL;
+    LPVOID pv = NULL;
+    MS_CABINET_HEADER *pCabinetHeader = NULL;
+    hCabinet = ::CreateFileW(pcd->wzCabinetPath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+    if (INVALID_HANDLE_VALUE == hCabinet)
+    {
+        CabcExitWithLastError(hr, "Failed to open cabinet: %ls", pcd->wzCabinetPath);
+    }
+    // Shouldn't need more than 16 MB to get the whole cabinet header into memory so use that as
+    // the upper bound for the memory map.
+    if (!::GetFileSizeEx(hCabinet, &liCabinetSize))
+    {
+        CabcExitWithLastError(hr, "Failed to get size of cabinet: %ls", pcd->wzCabinetPath);
+    }
+    if (0 == liCabinetSize.HighPart && liCabinetSize.LowPart < MAX_CABINET_HEADER_SIZE)
+    {
+        cbCabinet = liCabinetSize.LowPart;
+    }
+    else
+    {
+        cbCabinet = MAX_CABINET_HEADER_SIZE;
+    }
+    // CreateFileMapping() returns NULL on failure, not INVALID_HANDLE_VALUE
+    hCabinetMapping = ::CreateFileMappingW(hCabinet, NULL, PAGE_READWRITE | SEC_COMMIT, 0, cbCabinet, NULL);
+    if (NULL == hCabinetMapping || INVALID_HANDLE_VALUE == hCabinetMapping)
+    {
+        CabcExitWithLastError(hr, "Failed to memory map cabinet file: %ls", pcd->wzCabinetPath);
+    }
+    pv = ::MapViewOfFile(hCabinetMapping, FILE_MAP_WRITE, 0, 0, 0);
+    CabcExitOnNullWithLastError(pv, hr, "Failed to map view of cabinet file: %ls", pcd->wzCabinetPath);
+    pCabinetHeader = static_cast<MS_CABINET_HEADER*>(pv);
+    for (DWORD i = 0; i < pcd->cDuplicates; ++i)
+    {
+        const CABC_DUPLICATEFILE *pDuplicateFile = pcd->prgDuplicates + i;
+        hr = DuplicateFile(pCabinetHeader, pcd, pDuplicateFile);
+        CabcExitOnFailure(hr, "Failed to find cabinet file items at index: %d and %d", pDuplicateFile->dwFileArrayIndex, pDuplicateFile->dwDuplicateCabFileIndex);
+    }
+LExit:
+    if (pv)
+    {
+        ::UnmapViewOfFile(pv);
+    }
+    if (hCabinetMapping)
+    {
+        ::CloseHandle(hCabinetMapping);
+    }
+    ReleaseFileHandle(hCabinet);
+    return hr;
+}
+static HRESULT DuplicateFile(
+    __in MS_CABINET_HEADER *pHeader,
+    __in const CABC_DATA *pcd,
+    __in const CABC_DUPLICATEFILE *pDuplicate
+    )
+{
+    HRESULT hr = S_OK;
+    BYTE *pbHeader = reinterpret_cast<BYTE*>(pHeader);
+    BYTE* pbItem = pbHeader + pHeader->coffFiles;
+    const MS_CABINET_ITEM *pOriginalItem = NULL;
+    MS_CABINET_ITEM *pDuplicateItem = NULL;
+    if (pHeader->cFiles <= pcd->prgFiles[pDuplicate->dwFileArrayIndex].dwCabFileIndex ||
+        pHeader->cFiles <= pDuplicate->dwDuplicateCabFileIndex ||
+        pDuplicate->dwDuplicateCabFileIndex <= pcd->prgFiles[pDuplicate->dwFileArrayIndex].dwCabFileIndex)
+    {
+        hr = E_UNEXPECTED;
+        CabcExitOnFailure(hr, "Unexpected duplicate file indices, header cFiles: %d, file index: %d, duplicate index: %d", pHeader->cFiles, pcd->prgFiles[pDuplicate->dwFileArrayIndex].dwCabFileIndex, pDuplicate->dwDuplicateCabFileIndex);
+    }
+    // Step through each cabinet items until we get to the original
+    // file's index.  Notice that the name of the cabinet item is
+    // appended to the end of the MS_CABINET_INFO, that's why we can't
+    // index straight to the data we want.
+    for (DWORD i = 0; i < pcd->prgFiles[pDuplicate->dwFileArrayIndex].dwCabFileIndex; ++i)
+    {
+        LPCSTR szItemName = reinterpret_cast<LPCSTR>(pbItem + sizeof(MS_CABINET_ITEM));
+        pbItem = pbItem + sizeof(MS_CABINET_ITEM) + lstrlenA(szItemName) + 1;
+    }
+    pOriginalItem = reinterpret_cast<const MS_CABINET_ITEM*>(pbItem);
+    // Now pick up where we left off after the original file's index
+    // was found and loop until we find the duplicate file's index.
+    for (DWORD i = pcd->prgFiles[pDuplicate->dwFileArrayIndex].dwCabFileIndex; i < pDuplicate->dwDuplicateCabFileIndex; ++i)
+    {
+        LPCSTR szItemName = reinterpret_cast<LPCSTR>(pbItem + sizeof(MS_CABINET_ITEM));
+        pbItem = pbItem + sizeof(MS_CABINET_ITEM) + lstrlenA(szItemName) + 1;
+    }
+    pDuplicateItem = reinterpret_cast<MS_CABINET_ITEM*>(pbItem);
+    if (0 != pDuplicateItem->cbFile)
+    {
+        hr = E_UNEXPECTED;
+        CabcExitOnFailure(hr, "Failed because duplicate file does not have a file size of zero: %d", pDuplicateItem->cbFile);
+    }
+    pDuplicateItem->cbFile = pOriginalItem->cbFile;
+    pDuplicateItem->uoffFolderStart = pOriginalItem->uoffFolderStart;
+    pDuplicateItem->iFolder = pOriginalItem->iFolder;
+    // Note: we do *not* duplicate the date/time and attributes metadata from
+    // the original item to the duplicate. The following lines are commented
+    // so people are not tempted to put them back.
+    //pDuplicateItem->date = pOriginalItem->date;
+    //pDuplicateItem->time = pOriginalItem->time;
+    //pDuplicateItem->attribs = pOriginalItem->attribs;
+LExit:
+    return hr;
+}
+static HRESULT UtcFileTimeToLocalDosDateTime(
+    __in const FILETIME* pFileTime,
+    __out USHORT* pDate,
+    __out USHORT* pTime
+    )
+{
+    HRESULT hr = S_OK;
+    FILETIME ftLocal = { };
+    if (!::FileTimeToLocalFileTime(pFileTime, &ftLocal))
+    {
+        CabcExitWithLastError(hr, "Filed to convert file time to local file time.");
+    }
+    if (!::FileTimeToDosDateTime(&ftLocal, pDate, pTime))
+    {
+        CabcExitWithLastError(hr, "Filed to convert file time to DOS date time.");
+    }
+LExit:
+    return hr;
+}
+/********************************************************************
+ FCI callback functions
+*********************************************************************/
+static __callback int DIAMONDAPI CabCFilePlaced(
+    __in PCCAB pccab,
+    __in_z PSTR szFile,
+    __in long cbFile,
+    __in BOOL fContinuation,
+    __inout_bcount(CABC_HANDLE_BYTES) void *pv
+    )
+{
+    UNREFERENCED_PARAMETER(pccab);
+    UNREFERENCED_PARAMETER(szFile);
+    UNREFERENCED_PARAMETER(cbFile);
+    UNREFERENCED_PARAMETER(fContinuation);
+    UNREFERENCED_PARAMETER(pv);
+    return 0;
+}
+static __callback void * DIAMONDAPI CabCAlloc(
+    __in ULONG cb
+    )
+{
+    return MemAlloc(cb, FALSE);
+}
+static __callback void DIAMONDAPI CabCFree(
+    __out_bcount(CABC_HANDLE_BYTES) void *pv
+    )
+{
+    MemFree(pv);
+}
+static __callback INT_PTR DIAMONDAPI CabCOpen(
+    __in_z PSTR pszFile,
+    __in int oflag,
+    __in int pmode,
+    __out int *err,
+    __inout_bcount(CABC_HANDLE_BYTES) void *pv
+    )
+{
+    CABC_DATA *pcd = reinterpret_cast<CABC_DATA*>(pv);
+    HRESULT hr = S_OK;
+    INT_PTR pFile = -1;
+    DWORD dwAccess = 0;
+    DWORD dwDisposition = 0;
+    DWORD dwAttributes = 0;
+    //
+    // Translate flags for CreateFile
+    //
+    if (oflag & _O_CREAT)
+    {
+        if (pmode == _S_IREAD)
+            dwAccess |= GENERIC_READ;
+        else if (pmode == _S_IWRITE)
+            dwAccess |= GENERIC_WRITE;
+        else if (pmode == (_S_IWRITE | _S_IREAD))
+            dwAccess |= GENERIC_READ | GENERIC_WRITE;
+        if (oflag & _O_SHORT_LIVED)
+            dwDisposition = FILE_ATTRIBUTE_TEMPORARY;
+        else if (oflag & _O_TEMPORARY)
+            dwAttributes |= FILE_FLAG_DELETE_ON_CLOSE;
+        else if (oflag & _O_EXCL)
+            dwDisposition = CREATE_NEW;
+    }
+    if (oflag & _O_TRUNC)
+        dwDisposition = CREATE_ALWAYS;
+    if (!dwAccess)
+        dwAccess = GENERIC_READ;
+    if (!dwDisposition)
+        dwDisposition = OPEN_EXISTING;
+    if (!dwAttributes)
+        dwAttributes = FILE_ATTRIBUTE_NORMAL;
+    // Check to see if we were passed the magic character that says 'Unicode string follows'.
+    if (pszFile && CABC_MAGIC_UNICODE_STRING_MARKER == *pszFile)
+    {
+        pFile = reinterpret_cast<INT_PTR>(::CreateFileW(reinterpret_cast<LPCWSTR>(pszFile + 1), dwAccess, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, dwDisposition, dwAttributes, NULL));
+    }
+    else
+    {
+#pragma prefast(push)
+#pragma prefast(disable:25068) // We intentionally don't use the unicode API here
+        pFile = reinterpret_cast<INT_PTR>(::CreateFileA(pszFile, dwAccess, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, dwDisposition, dwAttributes, NULL));
+#pragma prefast(pop)
+    }
+    if (INVALID_HANDLE_VALUE == reinterpret_cast<HANDLE>(pFile))
+    {
+        CabcExitOnLastError(hr, "failed to open file: %s", pszFile);
+    }
+LExit:
+    if (FAILED(hr))
+        pcd->hrLastError = *err = hr;
+    return FAILED(hr) ? -1 : pFile;
+}
+static __callback UINT FAR DIAMONDAPI CabCRead(
+    __in INT_PTR hf,
+    __out_bcount(cb) void FAR *memory,
+    __in UINT cb,
+    __out int *err,
+    __inout_bcount(CABC_HANDLE_BYTES) void *pv
+    )
+{
+    CABC_DATA *pcd = reinterpret_cast<CABC_DATA*>(pv);
+    HRESULT hr = S_OK;
+    DWORD cbRead = 0;
+    CabcExitOnNull(hf, *err, E_INVALIDARG, "Failed to read during cabinet extraction because no file handle was provided");
+    if (!::ReadFile(reinterpret_cast<HANDLE>(hf), memory, cb, &cbRead, NULL))
+    {
+        *err = ::GetLastError();
+        CabcExitOnLastError(hr, "failed to read during cabinet extraction");
+    }
+LExit:
+    if (FAILED(hr))
+    {
+        pcd->hrLastError = *err = hr;
+    }
+    return FAILED(hr) ? -1 : cbRead;
+}
+static __callback UINT FAR DIAMONDAPI CabCWrite(
+    __in INT_PTR hf,
+    __in_bcount(cb) void FAR *memory,
+    __in UINT cb,
+    __out int *err,
+    __inout_bcount(CABC_HANDLE_BYTES) void *pv
+    )
+{
+    CABC_DATA *pcd = reinterpret_cast<CABC_DATA*>(pv);
+    HRESULT hr = S_OK;
+    DWORD cbWrite = 0;
+    CabcExitOnNull(hf, *err, E_INVALIDARG, "Failed to write during cabinet extraction because no file handle was provided");
+    if (!::WriteFile(reinterpret_cast<HANDLE>(hf), memory, cb, &cbWrite, NULL))
+    {
+        *err = ::GetLastError();
+        CabcExitOnLastError(hr, "failed to write during cabinet extraction");
+    }
+LExit:
+    if (FAILED(hr))
+        pcd->hrLastError = *err = hr;
+    return FAILED(hr) ? -1 : cbWrite;
+}
+static __callback long FAR DIAMONDAPI CabCSeek(
+    __in INT_PTR hf,
+    __in long dist,
+    __in int seektype,
+    __out int *err,
+    __inout_bcount(CABC_HANDLE_BYTES) void *pv
+    )
+{
+    CABC_DATA *pcd = reinterpret_cast<CABC_DATA*>(pv);
+    HRESULT hr = S_OK;
+    DWORD dwMoveMethod;
+    LONG lMove = 0;
+    switch (seektype)
+    {
+    case 0:   // SEEK_SET
+        dwMoveMethod = FILE_BEGIN;
+        break;
+    case 1:   /// SEEK_CUR
+        dwMoveMethod = FILE_CURRENT;
+        break;
+    case 2:   // SEEK_END
+        dwMoveMethod = FILE_END;
+        break;
+    default :
+        dwMoveMethod = 0;
+        hr = E_UNEXPECTED;
+        CabcExitOnFailure(hr, "unexpected seektype in FCISeek(): %d", seektype);
+    }
+    // SetFilePointer returns -1 if it fails (this will cause FDI to quit with an FDIERROR_USER_ABORT error.
+    // (Unless this happens while working on a cabinet, in which case FDI returns FDIERROR_CORRUPT_CABINET)
+    // Todo: update these comments for FCI (are they accurate for FCI as well?)
+    lMove = ::SetFilePointer(reinterpret_cast<HANDLE>(hf), dist, NULL, dwMoveMethod);
+    if (DWORD_MAX == lMove)
+    {
+        *err = ::GetLastError();
+        CabcExitOnLastError(hr, "failed to move file pointer %d bytes", dist);
+    }
+LExit:
+    if (FAILED(hr))
+    {
+        pcd->hrLastError = *err = hr;
+    }
+    return FAILED(hr) ? -1 : lMove;
+}
+static __callback int FAR DIAMONDAPI CabCClose(
+    __in INT_PTR hf,
+    __out int *err,
+    __inout_bcount(CABC_HANDLE_BYTES) void *pv
+    )
+{
+    CABC_DATA *pcd = reinterpret_cast<CABC_DATA*>(pv);
+    HRESULT hr = S_OK;
+    if (!::CloseHandle(reinterpret_cast<HANDLE>(hf)))
+    {
+        *err = ::GetLastError();
+        CabcExitOnLastError(hr, "failed to close file during cabinet extraction");
+    }
+LExit:
+    if (FAILED(hr))
+    {
+        pcd->hrLastError = *err = hr;
+    }
+    return FAILED(hr) ? -1 : 0;
+}
+static __callback int DIAMONDAPI CabCDelete(
+    __in_z PSTR szFile,
+    __out int *err,
+    __inout_bcount(CABC_HANDLE_BYTES) void *pv
+    )
+{
+    UNREFERENCED_PARAMETER(err);
+    UNREFERENCED_PARAMETER(pv);
+#pragma prefast(push)
+#pragma prefast(disable:25068) // We intentionally don't use the unicode API here
+    ::DeleteFileA(szFile);
+#pragma prefast(pop)
+    return 0;
+}
+__success(return != FALSE)
+static __callback BOOL DIAMONDAPI CabCGetTempFile(
+    __out_bcount_z(cbFile) char *szFile,
+    __in int cbFile,
+    __inout_bcount(CABC_HANDLE_BYTES) void *pv
+    )
+{
+    CABC_DATA *pcd = reinterpret_cast<CABC_DATA*>(pv);
+    static volatile DWORD dwIndex = 0;
+    HRESULT hr = S_OK;
+    char szTempPath[MAX_PATH] = { };
+    DWORD cchTempPath = MAX_PATH;
+    DWORD dwProcessId = ::GetCurrentProcessId();
+    HANDLE hTempFile = INVALID_HANDLE_VALUE;
+    if (MAX_PATH < ::GetTempPathA(cchTempPath, szTempPath))
+    {
+        CabcExitWithLastError(hr, "Failed to get temp path during cabinet creation.");
+    }
+    for (DWORD i = 0; i < DWORD_MAX; ++i)
+    {
+        LONG dwTempIndex = ::InterlockedIncrement(reinterpret_cast<volatile LONG*>(&dwIndex));
+        hr = ::StringCbPrintfA(szFile, cbFile, "%s\\%08x.%03x", szTempPath, dwTempIndex, dwProcessId);
+        CabcExitOnFailure(hr, "failed to format log file path.");
+        hTempFile = ::CreateFileA(szFile, 0, FILE_SHARE_DELETE, NULL, CREATE_NEW, FILE_ATTRIBUTE_TEMPORARY | FILE_FLAG_DELETE_ON_CLOSE, NULL);
+        if (INVALID_HANDLE_VALUE != hTempFile)
+        {
+            // we found one that doesn't exist
+            hr = S_OK;
+            break;
+        }
+        else
+        {
+            hr = E_FAIL; // this file was taken so be pessimistic and assume we're not going to find one.
+        }
+    }
+    CabcExitOnFailure(hr, "failed to find temporary file.");
+LExit:
+    ReleaseFileHandle(hTempFile);
+    if (FAILED(hr))
+    {
+        pcd->hrLastError = hr;
+    }
+    return FAILED(hr)? FALSE : TRUE;
+}
+__success(return != FALSE)
+static __callback BOOL DIAMONDAPI CabCGetNextCabinet(
+    __in PCCAB pccab,
+    __in ULONG ul,
+    __out_bcount(CABC_HANDLE_BYTES) void *pv
+    )
+{
+    UNREFERENCED_PARAMETER(ul);
+    // Construct next cab names like cab1a.cab, cab1b.cab, cab1c.cab, ........
+    CABC_DATA *pcd = reinterpret_cast<CABC_DATA*>(pv);
+    HRESULT hr = S_OK;
+    LPWSTR pwzFileToken = NULL;
+    WCHAR wzNewCabName[MAX_PATH] = L"";
+    if (pccab->iCab == 1)
+    {
+        pcd->wzFirstCabinetName[0] = '\0';
+        LPCWSTR pwzCabinetName = FileFromPath(pcd->wzCabinetPath);
+        size_t len = wcsnlen(pwzCabinetName, sizeof(pwzCabinetName));
+        if (len > 4)
+        {
+            len -= 4; // remove Extention ".cab" of 8.3 Format
+        }
+        hr = ::StringCchCatNW(pcd->wzFirstCabinetName, countof(pcd->wzFirstCabinetName), pwzCabinetName, len);
+        CabcExitOnFailure(hr, "Failed to remove extension to create next Cabinet File Name");
+    }
+    const int nAlphabets = 26; // Number of Alphabets from a to z
+    if (pccab->iCab <= nAlphabets)
+    {
+        // Construct next cab names like cab1a.cab, cab1b.cab, cab1c.cab, ........
+        hr = ::StringCchPrintfA(pccab->szCab, sizeof(pccab->szCab), "%ls%c.cab", pcd->wzFirstCabinetName, char(((int)('a') - 1) + pccab->iCab));
+        CabcExitOnFailure(hr, "Failed to create next Cabinet File Name");
+        hr = ::StringCchPrintfW(wzNewCabName, countof(wzNewCabName), L"%ls%c.cab", pcd->wzFirstCabinetName, WCHAR(((int)('a') - 1) + pccab->iCab));
+        CabcExitOnFailure(hr, "Failed to create next Cabinet File Name");
+    }
+    else if (pccab->iCab <= nAlphabets*nAlphabets)
+    {
+        // Construct next cab names like cab1aa.cab, cab1ab.cab, cab1ac.cab, ......, cabaz.cab, cabaa.cab, cabab.cab, cabac.cab, ......
+        int char2 = (pccab->iCab) % nAlphabets;
+        int char1 = (pccab->iCab - char2)/nAlphabets;
+        if (char2 == 0) 
+        {
+            // e.g. when iCab = 52, we want az
+            char2 = nAlphabets; // Second char must be 'z' in this case
+            char1--; // First Char must be decremented by 1
+        }
+        hr = ::StringCchPrintfA(pccab->szCab, sizeof(pccab->szCab), "%ls%c%c.cab", pcd->wzFirstCabinetName, char(((int)('a') - 1) + char1), char(((int)('a') - 1) + char2));
+        CabcExitOnFailure(hr, "Failed to create next Cabinet File Name");
+        hr = ::StringCchPrintfW(wzNewCabName, countof(wzNewCabName), L"%ls%c%c.cab", pcd->wzFirstCabinetName, WCHAR(((int)('a') - 1) + char1), WCHAR(((int)('a') - 1) + char2));
+        CabcExitOnFailure(hr, "Failed to create next Cabinet File Name");
+    }
+    else
+    {
+        hr = DISP_E_BADINDEX; // Value 0x8002000B stands for Invalid index.
+        CabcExitOnFailure(hr, "Cannot Split Cabinet more than 26*26 = 676 times. Failed to create next Cabinet File Name");
+    }
+    // Callback from PFNFCIGETNEXTCABINET CabCGetNextCabinet method
+    if(pcd->fileSplitCabNamesCallback != 0)
+    {
+        // In following if/else block, getting the Token for the First File in the Cabinets that are getting Split
+        // This code will need updation if we need to send all file tokens for the splitting Cabinets
+        if (pcd->prgFiles[0].pwzToken)
+        {
+            pwzFileToken = pcd->prgFiles[0].pwzToken;
+        }
+        else
+        {
+            LPCWSTR wzSourcePath = pcd->prgFiles[0].pwzSourcePath;
+            pwzFileToken = FileFromPath(wzSourcePath);
+        }
+        // The call back to Binder to Add File Transfer for new Cab and add new Cab to Media table
+        pcd->fileSplitCabNamesCallback(pcd->wzFirstCabinetName, wzNewCabName, pwzFileToken);
+    }
+LExit:
+    if (FAILED(hr))
+    {
+        // Returning False in case of error here as stated by Documentation, However It fails to Abort Cab Creation!!!
+        // So Using separate check for pcd->hrLastError after ::FCIAddFile for Cabinet Splitting
+        pcd->hrLastError = hr;
+        return FALSE;
+    }
+    else
+    {
+        return TRUE;
+    }
+}
+static __callback INT_PTR DIAMONDAPI CabCGetOpenInfo(
+    __in_z PSTR pszName,
+    __out USHORT *pdate,
+    __out USHORT *ptime,
+    __out USHORT *pattribs,
+    __out int *err,
+    __out_bcount(CABC_HANDLE_BYTES) void *pv
+    )
+{
+    HRESULT hr = S_OK;
+    CABC_INTERNAL_ADDFILEINFO* pFileInfo = reinterpret_cast<CABC_INTERNAL_ADDFILEINFO*>(pszName);
+    LPCWSTR wzFile = NULL;
+    DWORD cbFile = 0;
+    LPSTR pszFilePlusMagic = NULL;
+    DWORD cbFilePlusMagic = 0;
+    WIN32_FILE_ATTRIBUTE_DATA fad = { };
+    INT_PTR iResult = -1;
+    // If there is an empty file provided, use that as the source path to cab (since we
+    // must be dealing with a duplicate file). Otherwise, use the source path you'd expect.
+    wzFile = pFileInfo->wzEmptyPath ? pFileInfo->wzEmptyPath : pFileInfo->wzSourcePath;
+    cbFile = (lstrlenW(wzFile) + 1) * sizeof(WCHAR);
+    // Convert the source file path into an Ansi string that our APIs will recognize as
+    // a Unicode string (due to the magic character).
+    cbFilePlusMagic = cbFile + 1; // add one for the magic.
+    pszFilePlusMagic = reinterpret_cast<LPSTR>(MemAlloc(cbFilePlusMagic, TRUE));
+    *pszFilePlusMagic = CABC_MAGIC_UNICODE_STRING_MARKER;
+    memcpy_s(pszFilePlusMagic + 1, cbFilePlusMagic - 1, wzFile, cbFile);
+    if (!::GetFileAttributesExW(pFileInfo->wzSourcePath, GetFileExInfoStandard, &fad))
+    {
+        CabcExitWithLastError(hr, "Failed to get file attributes on '%ls'.", pFileInfo->wzSourcePath);
+    }
+    // Set the attributes but only allow the few attributes that CAB supports.
+    *pattribs = static_cast<USHORT>(fad.dwFileAttributes) & (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_ARCHIVE);
+    hr = UtcFileTimeToLocalDosDateTime(&fad.ftLastWriteTime, pdate, ptime);
+    if (FAILED(hr))
+    {
+        // NOTE: Changed this from ftLastWriteTime to ftCreationTime because of issues around how different OSs were
+        // handling the access of the FILETIME structure and how it would fail conversion to DOS time if it wasn't
+        // found. This would create further problems if the file was written to the CAB without this value. Windows
+        // Installer would then fail to extract the file.
+        hr = UtcFileTimeToLocalDosDateTime(&fad.ftCreationTime, pdate, ptime);
+        CabcExitOnFailure(hr, "Filed to read a valid file time stucture on file '%s'.", pszName);
+    }
+    iResult = CabCOpen(pszFilePlusMagic, _O_BINARY|_O_RDONLY, 0, err, pv);
+LExit:
+    ReleaseMem(pszFilePlusMagic);
+    if (FAILED(hr))
+    {
+        *err = (int)hr;
+    }
+    return FAILED(hr) ? -1 : iResult;
+}
+static __callback long DIAMONDAPI CabCStatus(
+    __in UINT ui,
+    __in ULONG cb1,
+    __in ULONG cb2,
+    __inout_bcount(CABC_HANDLE_BYTES) void *pv
+    )
+{
+    UNREFERENCED_PARAMETER(ui);
+    UNREFERENCED_PARAMETER(cb1);
+    UNREFERENCED_PARAMETER(cb2);
+    UNREFERENCED_PARAMETER(pv);
+    return 0;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/cabutil.cpp b/src/libs/dutil/WixToolset.DUtil/cabutil.cpp
new file mode 100644
index 00000000..5d77e483
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/cabutil.cpp
@@ -0,0 +1,617 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define CabExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_CABUTIL, x, s, __VA_ARGS__)
+#define CabExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_CABUTIL, x, s, __VA_ARGS__)
+#define CabExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_CABUTIL, x, s, __VA_ARGS__)
+#define CabExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_CABUTIL, x, s, __VA_ARGS__)
+#define CabExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_CABUTIL, x, s, __VA_ARGS__)
+#define CabExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_CABUTIL, x, s, __VA_ARGS__)
+#define CabExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_CABUTIL, p, x, e, s, __VA_ARGS__)
+#define CabExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_CABUTIL, p, x, s, __VA_ARGS__)
+#define CabExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_CABUTIL, p, x, e, s, __VA_ARGS__)
+#define CabExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_CABUTIL, p, x, s, __VA_ARGS__)
+#define CabExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_CABUTIL, e, x, s, __VA_ARGS__)
+#define CabExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_CABUTIL, g, x, s, __VA_ARGS__)
+// external prototypes
+typedef BOOL (FAR DIAMONDAPI *PFNFDIDESTROY)(VOID*);
+typedef HFDI (FAR DIAMONDAPI *PFNFDICREATE)(PFNALLOC, PFNFREE, PFNOPEN, PFNREAD, PFNWRITE, PFNCLOSE, PFNSEEK, int, PERF);
+typedef BOOL (FAR DIAMONDAPI *PFNFDIISCABINET)(HFDI, INT_PTR, PFDICABINETINFO);
+typedef BOOL (FAR DIAMONDAPI *PFNFDICOPY)(HFDI, char *, char *, int, PFNFDINOTIFY, PFNFDIDECRYPT, void *);
+//
+// static globals
+//
+static HMODULE vhCabinetDll = NULL;
+static HFDI vhfdi = NULL;
+static PFNFDICREATE vpfnFDICreate = NULL;
+static PFNFDICOPY vpfnFDICopy = NULL;
+static PFNFDIISCABINET vpfnFDIIsCabinet = NULL;
+static PFNFDIDESTROY vpfnFDIDestroy = NULL;
+static ERF verf;
+static DWORD64 vdw64EmbeddedOffset = 0;
+//
+// structs
+//
+struct CAB_CALLBACK_STRUCT
+{
+    BOOL fStopExtracting;   // flag set when no more files are needed
+    LPCWSTR pwzExtract;         // file to extract ("*" means extract all)
+    LPCWSTR pwzExtractDir;      // directory to extract files to
+    // possible user data
+    CAB_CALLBACK_PROGRESS pfnProgress;
+    LPVOID pvContext;
+};
+//
+// prototypes
+//
+static __callback LPVOID DIAMONDAPI CabExtractAlloc(__in DWORD dwSize);
+static __callback void DIAMONDAPI CabExtractFree(__in LPVOID pvData);
+static __callback INT_PTR FAR DIAMONDAPI CabExtractOpen(__in_z PSTR pszFile, __in int oflag, __in int pmode);
+static __callback UINT FAR DIAMONDAPI CabExtractRead(__in INT_PTR hf, __out void FAR *pv, __in UINT cb);
+static __callback UINT FAR DIAMONDAPI CabExtractWrite(__in INT_PTR hf, __in void FAR *pv, __in UINT cb);
+static __callback int FAR DIAMONDAPI CabExtractClose(__in INT_PTR hf);
+static __callback long FAR DIAMONDAPI CabExtractSeek(__in INT_PTR hf, __in long dist, __in int seektype);
+static __callback INT_PTR DIAMONDAPI CabExtractCallback(__in FDINOTIFICATIONTYPE iNotification, __inout FDINOTIFICATION *pFDINotify);
+static HRESULT DAPI CabOperation(__in LPCWSTR wzCabinet, __in LPCWSTR wzExtractFile, __in_opt LPCWSTR wzExtractDir, __in_opt CAB_CALLBACK_PROGRESS pfnProgress, __in_opt LPVOID pvContext, __in_opt STDCALL_PFNFDINOTIFY pfnNotify, __in DWORD64 dw64EmbeddedOffset);
+static STDCALL_PFNFDINOTIFY v_pfnNetFx11Notify = NULL;
+inline HRESULT LoadCabinetDll()
+{
+    HRESULT hr = S_OK;
+    if (!vhCabinetDll)
+    {
+        hr = LoadSystemLibrary(L"cabinet.dll", &vhCabinetDll);
+        CabExitOnFailure(hr, "failed to load cabinet.dll");
+        // retrieve all address functions
+        vpfnFDICreate = reinterpret_cast<PFNFDICREATE>(::GetProcAddress(vhCabinetDll, "FDICreate"));
+        CabExitOnNullWithLastError(vpfnFDICreate, hr, "failed to import FDICreate from CABINET.DLL");
+        vpfnFDICopy = reinterpret_cast<PFNFDICOPY>(::GetProcAddress(vhCabinetDll, "FDICopy"));
+        CabExitOnNullWithLastError(vpfnFDICopy, hr, "failed to import FDICopy from CABINET.DLL");
+        vpfnFDIIsCabinet = reinterpret_cast<PFNFDIISCABINET>(::GetProcAddress(vhCabinetDll, "FDIIsCabinet"));
+        CabExitOnNullWithLastError(vpfnFDIIsCabinet, hr, "failed to import FDIIsCabinetfrom CABINET.DLL");
+        vpfnFDIDestroy = reinterpret_cast<PFNFDIDESTROY>(::GetProcAddress(vhCabinetDll, "FDIDestroy"));
+        CabExitOnNullWithLastError(vpfnFDIDestroy, hr, "failed to import FDIDestroyfrom CABINET.DLL");
+        vhfdi = vpfnFDICreate(CabExtractAlloc, CabExtractFree, CabExtractOpen, CabExtractRead, CabExtractWrite, CabExtractClose, CabExtractSeek, cpuUNKNOWN, &verf);
+        CabExitOnNull(vhfdi, hr, E_FAIL, "failed to initialize cabinet.dll");
+    }
+LExit:
+    if (FAILED(hr) && vhCabinetDll)
+    {
+        ::FreeLibrary(vhCabinetDll);
+        vhCabinetDll = NULL;
+    }
+    return hr;
+}
+static HANDLE OpenFileWithRetry(
+    __in LPCWSTR wzPath,
+    __in DWORD dwDesiredAccess,
+    __in DWORD dwCreationDisposition
+)
+{
+    HANDLE hFile = INVALID_HANDLE_VALUE;
+    for (DWORD i = 0; i < 30; ++i)
+    {
+        hFile = ::CreateFileW(wzPath, dwDesiredAccess, FILE_SHARE_READ, NULL, dwCreationDisposition, FILE_ATTRIBUTE_NORMAL, NULL);
+        if (INVALID_HANDLE_VALUE != hFile)
+        {
+            break;
+        }
+        ::Sleep(100);
+    }
+    return hFile;
+}
+/********************************************************************
+ CabInitialize - initializes internal static variables
+********************************************************************/
+extern "C" HRESULT DAPI CabInitialize(
+    __in BOOL fDelayLoad
+    )
+{
+    HRESULT hr = S_OK;
+    if (!fDelayLoad)
+    {
+        hr = LoadCabinetDll();
+        CabExitOnFailure(hr, "failed to load CABINET.DLL");
+    }
+LExit:
+    return hr;
+}
+/********************************************************************
+ CabUninitialize - initializes internal static variables
+********************************************************************/
+extern "C" void DAPI CabUninitialize(
+    )
+{
+    if (vhfdi)
+    {
+        if (vpfnFDIDestroy)
+        {
+            vpfnFDIDestroy(vhfdi);
+        }
+        vhfdi = NULL;
+    }
+    vpfnFDICreate = NULL;
+    vpfnFDICopy =NULL;
+    vpfnFDIIsCabinet = NULL;
+    vpfnFDIDestroy = NULL;
+    if (vhCabinetDll)
+    {
+        ::FreeLibrary(vhCabinetDll);
+        vhCabinetDll = NULL;
+    }
+}
+/********************************************************************
+ CabEnumerate - list files inside cabinet
+ NOTE: wzCabinet must be full path to cabinet file
+       pfnNotify is callback function to get notified for each file
+       in the cabinet
+********************************************************************/
+extern "C" HRESULT DAPI CabEnumerate(
+    __in_z LPCWSTR wzCabinet,
+    __in_z LPCWSTR wzEnumerateFile,
+    __in STDCALL_PFNFDINOTIFY pfnNotify,
+    __in DWORD64 dw64EmbeddedOffset
+    )
+{
+    return CabOperation(wzCabinet, wzEnumerateFile, NULL, NULL, NULL, pfnNotify, dw64EmbeddedOffset);
+}
+/********************************************************************
+ CabExtract - extracts one or all files from a cabinet
+ NOTE: wzCabinet must be full path to cabinet file
+       wzExtractFile can be a single file id or "*" to extract all files
+       wzExttractDir must be normalized (end in a "\")
+       if pfnBeginFile is NULL pfnEndFile must be NULL and vice versa
+********************************************************************/
+extern "C" HRESULT DAPI CabExtract(
+    __in_z LPCWSTR wzCabinet,
+    __in_z LPCWSTR wzExtractFile,
+    __in_z LPCWSTR wzExtractDir,
+    __in_opt CAB_CALLBACK_PROGRESS pfnProgress,
+    __in_opt LPVOID pvContext,
+    __in DWORD64 dw64EmbeddedOffset
+    )
+{
+    return CabOperation(wzCabinet, wzExtractFile, wzExtractDir, pfnProgress, pvContext, NULL, dw64EmbeddedOffset);
+}
+//
+// private
+//
+/********************************************************************
+ FDINotify -- wrapper that converts call convention from __cdecl to __stdcall.
+ NOTE: Since netfx 1.1 supports only function pointers (delegates) 
+       with __stdcall calling convention and cabinet api uses
+       __cdecl calling convention, we need this wrapper function.
+       netfx 2.0 will work with [UnmanagedFunctionPointer(CallingConvention.Cdecl)] attribute on the delegate.
+       TODO: remove this when upgrading to netfx 2.0.
+********************************************************************/
+static __callback INT_PTR DIAMONDAPI FDINotify(
+    __in FDINOTIFICATIONTYPE iNotification, 
+    __inout FDINOTIFICATION *pFDINotify
+    )
+{
+    if (NULL != v_pfnNetFx11Notify)
+    {
+        return v_pfnNetFx11Notify(iNotification, pFDINotify);
+    }
+    else
+    {
+        return (INT_PTR)0;
+    }
+}
+/********************************************************************
+ CabOperation - helper function that enumerates or extracts files
+                   from cabinet
+ NOTE: wzCabinet must be full path to cabinet file
+       wzExtractFile can be a single file id or "*" to extract all files
+       wzExttractDir must be normalized (end in a "\")
+       if pfnBeginFile is NULL pfnEndFile must be NULL and vice versa
+       pfnNotify is callback function to get notified for each file
+       in the cabinet. If it's NULL, files will be extracted.
+********************************************************************/
+static HRESULT DAPI CabOperation(
+    __in LPCWSTR wzCabinet,
+    __in LPCWSTR wzExtractFile,
+    __in_opt LPCWSTR wzExtractDir,
+    __in_opt CAB_CALLBACK_PROGRESS pfnProgress,
+    __in_opt LPVOID pvContext,
+    __in_opt STDCALL_PFNFDINOTIFY pfnNotify,
+    __in DWORD64 dw64EmbeddedOffset
+    )
+{
+    HRESULT hr = S_OK;
+    BOOL fResult;
+    LPWSTR sczCabinet = NULL;
+    LPWSTR pwz = NULL;
+    CHAR szCabDirectory[MAX_PATH * 4]; // Make sure these are big enough for UTF-8 strings
+    CHAR szCabFile[MAX_PATH * 4];
+    CAB_CALLBACK_STRUCT ccs;
+    PFNFDINOTIFY pfnFdiNotify;
+    //
+    // ensure the cabinet.dll is loaded
+    //
+    if (!vhfdi)
+    {
+        hr = LoadCabinetDll();
+        CabExitOnFailure(hr, "failed to load CABINET.DLL");
+    }
+    hr = StrAllocString(&sczCabinet, wzCabinet, 0);
+    CabExitOnFailure(hr, "Failed to make copy of cabinet name:%ls", wzCabinet);
+    //
+    // split the cabinet full path into directory and filename and convert to multi-byte (ick!)
+    //
+    pwz = FileFromPath(sczCabinet);
+    CabExitOnNull(pwz, hr, E_INVALIDARG, "failed to process cabinet path: %ls", wzCabinet);
+    if (!::WideCharToMultiByte(CP_UTF8, 0, pwz, -1, szCabFile, countof(szCabFile), NULL, NULL))
+    {
+        CabExitWithLastError(hr, "failed to convert cabinet filename to ASCII: %ls", pwz);
+    }
+    *pwz = '\0';
+    // If a full path was not provided, use the relative current directory.
+    if (wzCabinet == pwz)
+    {
+        hr = ::StringCchCopyA(szCabDirectory, countof(szCabDirectory), ".\\");
+        CabExitOnFailure(hr, "Failed to copy relative current directory as cabinet directory.");
+    }
+    else
+    {
+        if (!::WideCharToMultiByte(CP_UTF8, 0, sczCabinet, -1, szCabDirectory, countof(szCabDirectory), NULL, NULL))
+        {
+            CabExitWithLastError(hr, "failed to convert cabinet directory to ASCII: %ls", sczCabinet);
+        }
+    }
+    //
+    // iterate through files in cabinet extracting them to the callback function
+    //
+    ccs.fStopExtracting = FALSE;
+    ccs.pwzExtract = wzExtractFile;
+    ccs.pwzExtractDir = wzExtractDir;
+    ccs.pfnProgress = pfnProgress;
+    ccs.pvContext = pvContext;
+    vdw64EmbeddedOffset = dw64EmbeddedOffset;
+    // if pfnNotify is given, use it, otherwise use default callback
+    if (NULL == pfnNotify)
+    {
+        pfnFdiNotify = CabExtractCallback; 
+    }
+    else
+    {
+        v_pfnNetFx11Notify = pfnNotify;
+        pfnFdiNotify = FDINotify;
+    }
+    fResult = vpfnFDICopy(vhfdi, szCabFile, szCabDirectory, 0, pfnFdiNotify, NULL, static_cast<void*>(&ccs));
+    if (!fResult && !ccs.fStopExtracting)   // if something went wrong and it wasn't us just stopping the extraction, then return a failure
+    {
+        CabExitWithLastError(hr, "failed to extract cabinet file: %ls", sczCabinet);
+    }
+LExit:
+    ReleaseStr(sczCabinet);
+    v_pfnNetFx11Notify = NULL;
+    return hr;
+}
+/****************************************************************************
+ default extract routines
+****************************************************************************/
+static __callback LPVOID DIAMONDAPI CabExtractAlloc(__in DWORD dwSize)
+{
+    return MemAlloc(dwSize, FALSE);
+}
+static __callback void DIAMONDAPI CabExtractFree(__in LPVOID pvData)
+{
+    MemFree(pvData);
+}
+static __callback INT_PTR FAR DIAMONDAPI CabExtractOpen(__in_z PSTR pszFile, __in int oflag, __in int pmode)
+{
+    HRESULT hr = S_OK;
+    HANDLE hFile = INVALID_HANDLE_VALUE;
+    INT_PTR pFile = -1;
+    LPWSTR sczCabFile = NULL;
+    // if FDI asks for some unusual mode (in low memory situation it could ask for a scratch file) fail
+    if ((oflag != (/*_O_BINARY*/ 0x8000 | /*_O_RDONLY*/ 0x0000)) || (pmode != (_S_IREAD | _S_IWRITE)))
+    {
+        hr = E_OUTOFMEMORY;
+        CabExitOnFailure(hr, "FDI asked for a scratch file to be created, which is unsupported");
+    }
+    hr = StrAllocStringAnsi(&sczCabFile, pszFile, 0, CP_UTF8);
+    CabExitOnFailure(hr, "Failed to convert UTF8 cab file name to wide character string");
+    hFile = OpenFileWithRetry(sczCabFile, GENERIC_READ, OPEN_EXISTING);
+    if (INVALID_HANDLE_VALUE == hFile)
+    {
+        CabExitWithLastError(hr, "failed to open file: %ls", sczCabFile);
+    }
+    pFile = reinterpret_cast<INT_PTR>(hFile);
+    if (vdw64EmbeddedOffset)
+    {
+        hr = CabExtractSeek(pFile, 0, 0);
+        CabExitOnFailure(hr, "Failed to seek to embedded offset %I64d", vdw64EmbeddedOffset);
+    }
+    hFile = INVALID_HANDLE_VALUE;
+LExit:
+    ReleaseFileHandle(hFile);
+    ReleaseStr(sczCabFile);
+    return FAILED(hr) ? -1 : pFile;
+}
+static __callback UINT FAR DIAMONDAPI CabExtractRead(__in INT_PTR hf, __out void FAR *pv, __in UINT cb)
+{
+    HRESULT hr = S_OK;
+    DWORD cbRead = 0;
+    CabExitOnNull(hf, hr, E_INVALIDARG, "Failed to read file during cabinet extraction - no file given to read");
+    if (!::ReadFile(reinterpret_cast<HANDLE>(hf), pv, cb, &cbRead, NULL))
+    {
+        CabExitWithLastError(hr, "failed to read during cabinet extraction");
+    }
+LExit:
+    return FAILED(hr) ? -1 : cbRead;
+}
+static __callback UINT FAR DIAMONDAPI CabExtractWrite(__in INT_PTR hf, __in void FAR *pv, __in UINT cb)
+{
+    HRESULT hr = S_OK;
+    DWORD cbWrite = 0;
+    CabExitOnNull(hf, hr, E_INVALIDARG, "Failed to write file during cabinet extraction - no file given to write");
+    if (!::WriteFile(reinterpret_cast<HANDLE>(hf), pv, cb, &cbWrite, NULL))
+    {
+        CabExitWithLastError(hr, "failed to write during cabinet extraction");
+    }
+LExit:
+    return FAILED(hr) ? -1 : cbWrite;
+}
+static __callback long FAR DIAMONDAPI CabExtractSeek(__in INT_PTR hf, __in long dist, __in int seektype)
+{
+    HRESULT hr = S_OK;
+    DWORD dwMoveMethod;
+    LONG lMove = 0;
+    switch (seektype)
+    {
+    case 0:   // SEEK_SET
+        dwMoveMethod = FILE_BEGIN;
+        dist += static_cast<long>(vdw64EmbeddedOffset);
+        break;
+    case 1:   /// SEEK_CUR
+        dwMoveMethod = FILE_CURRENT;
+        break;
+    case 2:   // SEEK_END
+        dwMoveMethod = FILE_END;
+        break;
+    default :
+        dwMoveMethod = 0;
+        hr = E_UNEXPECTED;
+        CabExitOnFailure(hr, "unexpected seektype in FDISeek(): %d", seektype);
+    }
+    // SetFilePointer returns -1 if it fails (this will cause FDI to quit with an FDIERROR_USER_ABORT error. 
+    // (Unless this happens while working on a cabinet, in which case FDI returns FDIERROR_CORRUPT_CABINET)
+    lMove = ::SetFilePointer(reinterpret_cast<HANDLE>(hf), dist, NULL, dwMoveMethod);
+    if (0xFFFFFFFF == lMove)
+    {
+        CabExitWithLastError(hr, "failed to move file pointer %d bytes", dist);
+    }
+LExit:
+    return FAILED(hr) ? -1 : lMove - static_cast<long>(vdw64EmbeddedOffset);
+}
+static __callback int FAR DIAMONDAPI CabExtractClose(__in INT_PTR hf)
+{
+    HRESULT hr = S_OK;
+    if (!::CloseHandle(reinterpret_cast<HANDLE>(hf)))
+    {
+        CabExitWithLastError(hr, "failed to close file during cabinet extraction");
+    }
+LExit:
+    return FAILED(hr) ? -1 : 0;
+}
+static __callback INT_PTR DIAMONDAPI CabExtractCallback(__in FDINOTIFICATIONTYPE iNotification, __inout FDINOTIFICATION *pFDINotify)
+{
+    Assert(pFDINotify->pv);
+    HRESULT hr = S_OK;
+    HANDLE hFile = INVALID_HANDLE_VALUE;
+    INT_PTR ipResult = 0;   // result to return on success
+    CAB_CALLBACK_STRUCT* pccs = static_cast<CAB_CALLBACK_STRUCT*>(pFDINotify->pv);
+    LPCSTR sz;
+    WCHAR wz[MAX_PATH];
+    FILETIME ft;
+    switch (iNotification)
+    {
+    case fdintCOPY_FILE:  // begin extracting a resource from cabinet
+        CabExitOnNull(pFDINotify->psz1, hr, E_INVALIDARG, "No cabinet file ID given to convert");
+        CabExitOnNull(pccs, hr, E_INVALIDARG, "Failed to call cabextract callback, because no callback struct was provided");
+        if (pccs->fStopExtracting)
+        {
+            ExitFunction1(hr = S_FALSE);   // no more extracting
+        }
+        // convert params to useful variables
+        sz = static_cast<LPCSTR>(pFDINotify->psz1);
+        if (!::MultiByteToWideChar(CP_ACP, 0, sz, -1, wz, countof(wz)))
+        {
+            CabExitWithLastError(hr, "failed to convert cabinet file id to unicode: %s", sz);
+        }
+        if (pccs->pfnProgress)
+        {
+            hr = pccs->pfnProgress(TRUE, wz, pccs->pvContext);
+            if (S_OK != hr)
+            {
+                ExitFunction();
+            }
+        }
+        if (L'*' == *pccs->pwzExtract || 0 == lstrcmpW(pccs->pwzExtract, wz))
+        {
+            // get the created date for the resource in the cabinet
+            FILETIME ftLocal;
+            if (!::DosDateTimeToFileTime(pFDINotify->date, pFDINotify->time, &ftLocal))
+            {
+                CabExitWithLastError(hr, "failed to get time for resource: %ls", wz);
+            }
+            ::LocalFileTimeToFileTime(&ftLocal, &ft);
+            WCHAR wzPath[MAX_PATH];
+            hr = ::StringCchCopyW(wzPath, countof(wzPath), pccs->pwzExtractDir);
+            CabExitOnFailure(hr, "failed to copy in extract directory: %ls for file: %ls", pccs->pwzExtractDir, wz);
+            hr = ::StringCchCatW(wzPath, countof(wzPath), wz);
+            CabExitOnFailure(hr, "failed to concat onto path: %ls file: %ls", wzPath, wz);
+            hFile = OpenFileWithRetry(wzPath, GENERIC_WRITE, CREATE_ALWAYS);
+            if (INVALID_HANDLE_VALUE == hFile)
+            {
+                CabExitWithLastError(hr, "failed to create file: %ls", wzPath);
+            }
+            ::SetFileTime(hFile, &ft, &ft, &ft);   // try to set the file time (who cares if it fails)
+            if (::SetFilePointer(hFile, pFDINotify->cb, NULL, FILE_BEGIN))   // try to set the end of the file (don't worry if this fails)
+            {
+                if (::SetEndOfFile(hFile))
+                {
+                    ::SetFilePointer(hFile, 0, NULL, FILE_BEGIN);  // reset the file pointer
+                }
+            }
+            ipResult = reinterpret_cast<INT_PTR>(hFile);
+            hFile = INVALID_HANDLE_VALUE;
+        }
+        else  // resource wasn't requested, skip it
+        {
+            hr = S_OK;
+            ipResult = 0;
+        }
+        break;
+    case fdintCLOSE_FILE_INFO:  // resource extraction complete
+        Assert(pFDINotify->hf && pFDINotify->psz1);
+        CabExitOnNull(pccs, hr, E_INVALIDARG, "Failed to call cabextract callback, because no callback struct was provided");
+        // convert params to useful variables
+        sz = static_cast<LPCSTR>(pFDINotify->psz1);
+        CabExitOnNull(sz, hr, E_INVALIDARG, "Failed to convert cabinet file id, because no cabinet file id was provided");
+        if (!::MultiByteToWideChar(CP_ACP, 0, sz, -1, wz, countof(wz)))
+        {
+            CabExitWithLastError(hr, "failed to convert cabinet file id to unicode: %s", sz);
+        }
+        if (NULL != pFDINotify->hf)  // just close the file
+        {
+            ::CloseHandle(reinterpret_cast<HANDLE>(pFDINotify->hf));
+        }
+        if (pccs->pfnProgress)
+        {
+            hr = pccs->pfnProgress(FALSE, wz, pccs->pvContext);
+        }
+        if (S_OK == hr && L'*' == *pccs->pwzExtract)   // if everything is okay and we're extracting all files, keep going
+        {
+            ipResult = TRUE;
+        }
+        else   // something went wrong or we only needed to extract one file
+        {
+            hr = S_OK;
+            ipResult = FALSE;
+            pccs->fStopExtracting = TRUE;
+        }
+        break;
+    case fdintPARTIAL_FILE: __fallthrough;   // no action needed for these messages, fall through
+    case fdintNEXT_CABINET: __fallthrough;
+    case fdintENUMERATE: __fallthrough;
+    case fdintCABINET_INFO:
+        break;
+    default:
+        AssertSz(FALSE, "CabExtractCallback() - unknown FDI notification command");
+    };
+LExit:
+    ReleaseFileHandle(hFile);
+    return (S_OK == hr) ? ipResult : -1;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/certutil.cpp b/src/libs/dutil/WixToolset.DUtil/certutil.cpp
new file mode 100644
index 00000000..69897b9e
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/certutil.cpp
@@ -0,0 +1,342 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define CertExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_CERTUTIL, x, s, __VA_ARGS__)
+#define CertExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_CERTUTIL, x, s, __VA_ARGS__)
+#define CertExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_CERTUTIL, x, s, __VA_ARGS__)
+#define CertExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_CERTUTIL, x, s, __VA_ARGS__)
+#define CertExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_CERTUTIL, x, s, __VA_ARGS__)
+#define CertExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_CERTUTIL, x, s, __VA_ARGS__)
+#define CertExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_CERTUTIL, p, x, e, s, __VA_ARGS__)
+#define CertExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_CERTUTIL, p, x, s, __VA_ARGS__)
+#define CertExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_CERTUTIL, p, x, e, s, __VA_ARGS__)
+#define CertExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_CERTUTIL, p, x, s, __VA_ARGS__)
+#define CertExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_CERTUTIL, e, x, s, __VA_ARGS__)
+#define CertExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_CERTUTIL, g, x, s, __VA_ARGS__)
+/********************************************************************
+CertReadProperty - reads a property from the certificate.
+NOTE: call MemFree() on the returned pvValue.
+********************************************************************/
+extern "C" HRESULT DAPI CertReadProperty(
+    __in PCCERT_CONTEXT pCertContext,
+    __in DWORD dwProperty,
+    __deref_out_bound LPVOID* ppvValue,
+    __out_opt DWORD* pcbValue
+    )
+{
+    HRESULT hr = S_OK;
+    LPVOID pv = NULL;
+    DWORD cb = 0;
+    if (!::CertGetCertificateContextProperty(pCertContext, dwProperty, NULL, &cb))
+    {
+        CertExitWithLastError(hr, "Failed to get size of certificate property.");
+    }
+    pv = MemAlloc(cb, TRUE);
+    CertExitOnNull(pv, hr, E_OUTOFMEMORY, "Failed to allocate memory for certificate property.");
+    if (!::CertGetCertificateContextProperty(pCertContext, dwProperty, pv, &cb))
+    {
+        CertExitWithLastError(hr, "Failed to get certificate property.");
+    }
+    *ppvValue = pv;
+    pv = NULL;
+    if (pcbValue)
+    {
+        *pcbValue = cb;
+    }
+LExit:
+    ReleaseMem(pv);
+    return hr;
+}
+extern "C" HRESULT DAPI CertGetAuthenticodeSigningTimestamp(
+    __in CMSG_SIGNER_INFO* pSignerInfo,
+    __out FILETIME* pftSigningTimestamp
+    )
+{
+    HRESULT hr = S_OK;
+    CRYPT_INTEGER_BLOB* pBlob = NULL;
+    PCMSG_SIGNER_INFO pCounterSignerInfo = NULL;
+    DWORD cbSigningTimestamp = sizeof(FILETIME);
+    // Find the countersigner blob. The countersigner in Authenticode contains the time
+    // that signing took place. It's a "countersigner" because the signing time was sent
+    // off to the certificate authority in the sky to return the verified time signed.
+    for (DWORD i = 0; i < pSignerInfo->UnauthAttrs.cAttr; ++i)
+    {
+        if (CSTR_EQUAL == ::CompareStringA(LOCALE_NEUTRAL, 0, szOID_RSA_counterSign, -1, pSignerInfo->UnauthAttrs.rgAttr[i].pszObjId, -1))
+        {
+            pBlob = pSignerInfo->UnauthAttrs.rgAttr[i].rgValue;
+            break;
+        }
+    }
+    if (!pBlob)
+    {
+        hr = TRUST_E_FAIL;
+        CertExitOnFailure(hr, "Failed to find countersigner in signer information.");
+    }
+    hr = CrypDecodeObject(PKCS7_SIGNER_INFO, pBlob->pbData, pBlob->cbData, 0, reinterpret_cast<LPVOID*>(&pCounterSignerInfo), NULL);
+    CertExitOnFailure(hr, "Failed to decode countersigner information.");
+    pBlob = NULL; // reset the blob before searching for the signing time.
+    // Find the signing time blob in the countersigner.
+    for (DWORD i = 0; i < pCounterSignerInfo->AuthAttrs.cAttr; ++i)
+    {
+        if (CSTR_EQUAL == ::CompareStringA(LOCALE_NEUTRAL, 0, szOID_RSA_signingTime, -1, pCounterSignerInfo->AuthAttrs.rgAttr[i].pszObjId, -1))
+        {
+            pBlob = pCounterSignerInfo->AuthAttrs.rgAttr[i].rgValue;
+            break;
+        }
+    }
+    if (!pBlob)
+    {
+        hr = TRUST_E_FAIL;
+        CertExitOnFailure(hr, "Failed to find signing time in countersigner information.");
+    }
+    if (!::CryptDecodeObject(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, szOID_RSA_signingTime, pBlob->pbData, pBlob->cbData, 0, pftSigningTimestamp, &cbSigningTimestamp))
+    {
+        CertExitWithLastError(hr, "Failed to decode countersigner signing timestamp.");
+    }
+LExit:
+    ReleaseMem(pCounterSignerInfo);
+    return hr;
+}
+extern "C" HRESULT DAPI GetCryptProvFromCert(
+      __in_opt HWND hwnd,
+      __in PCCERT_CONTEXT pCert,
+      __out HCRYPTPROV *phCryptProv,
+      __out DWORD *pdwKeySpec,
+      __in BOOL *pfDidCryptAcquire,
+      __deref_opt_out LPWSTR *ppwszTmpContainer,
+      __deref_opt_out LPWSTR *ppwszProviderName,
+      __out DWORD *pdwProviderType
+      )
+{
+    HRESULT hr = S_OK;
+    HMODULE hMsSign32 = NULL;
+    typedef BOOL (WINAPI *GETCRYPTPROVFROMCERTPTR)(HWND, PCCERT_CONTEXT, HCRYPTPROV*, DWORD*,BOOL*,LPWSTR*,LPWSTR*,DWORD*);
+    GETCRYPTPROVFROMCERTPTR pGetCryptProvFromCert = NULL;
+    hr = LoadSystemLibrary(L"MsSign32.dll", &hMsSign32);
+    CertExitOnFailure(hr, "Failed to get handle to MsSign32.dll");
+    pGetCryptProvFromCert = (GETCRYPTPROVFROMCERTPTR)::GetProcAddress(hMsSign32, "GetCryptProvFromCert");
+    CertExitOnNullWithLastError(hMsSign32, hr, "Failed to get handle to MsSign32.dll");
+    if (!pGetCryptProvFromCert(hwnd,
+                               pCert,
+                               phCryptProv,
+                               pdwKeySpec,
+                               pfDidCryptAcquire,
+                               ppwszTmpContainer,
+                               ppwszProviderName,
+                               pdwProviderType))
+    {
+        CertExitWithLastError(hr, "Failed to get CSP from cert.");
+    }
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI FreeCryptProvFromCert(
+    __in BOOL fAcquired,
+    __in HCRYPTPROV hProv,
+    __in_opt LPWSTR pwszCapiProvider,
+    __in DWORD dwProviderType,
+    __in_opt LPWSTR pwszTmpContainer
+    )
+{
+    HRESULT hr = S_OK;
+    HMODULE hMsSign32 = NULL;
+    typedef void (WINAPI *FREECRYPTPROVFROMCERT)(BOOL, HCRYPTPROV, LPWSTR, DWORD, LPWSTR);
+    FREECRYPTPROVFROMCERT pFreeCryptProvFromCert = NULL;
+    hr = LoadSystemLibrary(L"MsSign32.dll", &hMsSign32);
+    CertExitOnFailure(hr, "Failed to get handle to MsSign32.dll");
+    pFreeCryptProvFromCert = (FREECRYPTPROVFROMCERT)::GetProcAddress(hMsSign32, "FreeCryptProvFromCert");
+    CertExitOnNullWithLastError(hMsSign32, hr, "Failed to get handle to MsSign32.dll");
+    pFreeCryptProvFromCert(fAcquired, hProv, pwszCapiProvider, dwProviderType, pwszTmpContainer);
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI GetProvSecurityDesc(
+    __in HCRYPTPROV hProv,
+    __deref_out SECURITY_DESCRIPTOR** ppSecurity)
+{
+    HRESULT hr = S_OK;
+    ULONG ulSize = 0;
+    SECURITY_DESCRIPTOR* pSecurity = NULL;
+    // Get the size of the security descriptor.
+    if (!::CryptGetProvParam(
+                             hProv,
+                             PP_KEYSET_SEC_DESCR,
+                             NULL,
+                             &ulSize,
+                             DACL_SECURITY_INFORMATION))
+    {
+        CertExitWithLastError(hr, "Error getting security descriptor size for CSP.");
+    }
+    // Allocate the memory for the security descriptor.
+    pSecurity = static_cast<SECURITY_DESCRIPTOR *>(MemAlloc(ulSize, TRUE));
+    CertExitOnNullWithLastError(pSecurity, hr, "Error allocating memory for CSP DACL");
+    // Get the security descriptor.
+    if (!::CryptGetProvParam(
+                             hProv,
+                             PP_KEYSET_SEC_DESCR,
+                             (BYTE*)pSecurity,
+                             &ulSize,
+                             DACL_SECURITY_INFORMATION))
+    {
+        MemFree(pSecurity);
+        CertExitWithLastError(hr, "Error getting security descriptor for CSP.");
+    }
+    *ppSecurity = pSecurity;
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI SetProvSecurityDesc(
+    __in HCRYPTPROV hProv,
+    __in SECURITY_DESCRIPTOR* pSecurity)
+{
+    HRESULT hr = S_OK;
+    // Set the new security descriptor.
+    if (!::CryptSetProvParam(
+                            hProv,
+                            PP_KEYSET_SEC_DESCR,
+                            (BYTE*)pSecurity,
+                            DACL_SECURITY_INFORMATION))
+    {
+        CertExitWithLastError(hr, "Error setting security descriptor for CSP.");
+    }
+LExit:
+    return hr;
+}
+extern "C" BOOL DAPI CertHasPrivateKey(
+    __in PCCERT_CONTEXT pCertContext,
+    __out_opt DWORD* pdwKeySpec)
+{
+    HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hPrivateKey = NULL;
+    DWORD dwKeySpec = 0;
+    // set CRYPT_ACQUIRE_CACHE_FLAG so that we don't have to release the private key handle
+    BOOL fResult = ::CryptAcquireCertificatePrivateKey(
+                            pCertContext,
+                            CRYPT_ACQUIRE_SILENT_FLAG | CRYPT_ACQUIRE_CACHE_FLAG,
+                            0,      //pvReserved
+                            &hPrivateKey,
+                            &dwKeySpec,
+                            NULL
+                            );
+    if (pdwKeySpec)
+    {
+        *pdwKeySpec = dwKeySpec;
+    }
+    return fResult;
+}
+extern "C" HRESULT DAPI CertInstallSingleCertificate(
+    __in HCERTSTORE hStore,
+    __in PCCERT_CONTEXT pCertContext,
+    __in LPCWSTR wzName
+    )
+{
+    HRESULT hr = S_OK;
+    CERT_BLOB blob = { };
+    DWORD dwKeySpec = 0;
+    HCRYPTPROV hCsp = NULL;
+    LPWSTR pwszTmpContainer = NULL;
+    LPWSTR pwszProviderName = NULL;
+    DWORD dwProviderType = 0;
+    BOOL fAcquired = TRUE;
+    SECURITY_DESCRIPTOR* pSecurity = NULL;
+    SECURITY_DESCRIPTOR* pSecurityNew = NULL;
+    // Update the friendly name of the certificate to be configured.
+    blob.pbData = (BYTE*)wzName;
+    blob.cbData = (lstrlenW(wzName) + 1) * sizeof(WCHAR); // including terminating null
+    if (!::CertSetCertificateContextProperty(pCertContext, CERT_FRIENDLY_NAME_PROP_ID, 0, &blob))
+    {
+        CertExitWithLastError(hr, "Failed to set the friendly name of the certificate: %ls", wzName);
+    }
+    if (!::CertAddCertificateContextToStore(hStore, pCertContext, CERT_STORE_ADD_REPLACE_EXISTING, NULL))
+    {
+        CertExitWithLastError(hr, "Failed to add certificate to the store.");
+    }
+    // if the certificate has a private key, grant Administrators access
+    if (CertHasPrivateKey(pCertContext, &dwKeySpec))
+    {
+        if (AT_KEYEXCHANGE == dwKeySpec || AT_SIGNATURE == dwKeySpec)
+        {
+            // We added a CSP key
+            hr = GetCryptProvFromCert(NULL, pCertContext, &hCsp, &dwKeySpec, &fAcquired, &pwszTmpContainer, &pwszProviderName, &dwProviderType);
+            CertExitOnFailure(hr, "Failed to get handle to CSP");
+            hr = GetProvSecurityDesc(hCsp, &pSecurity);
+            CertExitOnFailure(hr, "Failed to get security descriptor of CSP");
+            hr = AclAddAdminToSecurityDescriptor(pSecurity, &pSecurityNew);
+            CertExitOnFailure(hr, "Failed to create new security descriptor");
+            hr = SetProvSecurityDesc(hCsp, pSecurityNew);
+            CertExitOnFailure(hr, "Failed to set Admin ACL on CSP");
+        }
+        if (CERT_NCRYPT_KEY_SPEC == dwKeySpec)
+        {
+            // We added a CNG key
+            // TODO change ACL on CNG key
+        }
+    }
+LExit:
+    if (hCsp)
+    {
+        FreeCryptProvFromCert(fAcquired, hCsp, NULL, dwProviderType, NULL);
+    }
+    ReleaseMem(pSecurity);
+    if (pSecurityNew)
+    {
+        AclFreeSecurityDescriptor(pSecurityNew);
+    }
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/conutil.cpp b/src/libs/dutil/WixToolset.DUtil/conutil.cpp
new file mode 100644
index 00000000..33e1b59a
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/conutil.cpp
@@ -0,0 +1,673 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define ConExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_CONUTIL, x, s, __VA_ARGS__)
+#define ConExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_CONUTIL, x, s, __VA_ARGS__)
+#define ConExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_CONUTIL, x, s, __VA_ARGS__)
+#define ConExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_CONUTIL, x, s, __VA_ARGS__)
+#define ConExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_CONUTIL, x, s, __VA_ARGS__)
+#define ConExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_CONUTIL, x, s, __VA_ARGS__)
+#define ConExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_CONUTIL, p, x, e, s, __VA_ARGS__)
+#define ConExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_CONUTIL, p, x, s, __VA_ARGS__)
+#define ConExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_CONUTIL, p, x, e, s, __VA_ARGS__)
+#define ConExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_CONUTIL, p, x, s, __VA_ARGS__)
+#define ConExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_CONUTIL, e, x, s, __VA_ARGS__)
+#define ConExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_CONUTIL, g, x, s, __VA_ARGS__)
+static HANDLE vhStdIn = INVALID_HANDLE_VALUE;
+static HANDLE vhStdOut = INVALID_HANDLE_VALUE;
+static BOOL vfConsoleIn = FALSE;
+static BOOL vfConsoleOut = FALSE;
+static CONSOLE_SCREEN_BUFFER_INFO vcsbiInfo;
+extern "C" HRESULT DAPI ConsoleInitialize()
+{
+    Assert(INVALID_HANDLE_VALUE == vhStdOut);
+    HRESULT hr = S_OK;
+    UINT er;
+    vhStdIn = ::GetStdHandle(STD_INPUT_HANDLE);
+    if (INVALID_HANDLE_VALUE == vhStdIn)
+    {
+        ConExitOnLastError(hr, "failed to open stdin");
+    }
+    vhStdOut = ::GetStdHandle(STD_OUTPUT_HANDLE);
+    if (INVALID_HANDLE_VALUE == vhStdOut)
+    {
+        ConExitOnLastError(hr, "failed to open stdout");
+    }
+    // check if we have a std in on the console
+    if (::GetConsoleScreenBufferInfo(vhStdIn, &vcsbiInfo))
+    {
+        vfConsoleIn = TRUE;
+    }
+    else
+    {
+        er = ::GetLastError();
+        if (ERROR_INVALID_HANDLE == er)
+        {
+            vfConsoleIn= FALSE;
+            hr = S_OK;
+        }
+        else
+        {
+            ConExitOnWin32Error(er, hr, "failed to get input console screen buffer info");
+        }
+    }
+    if (::GetConsoleScreenBufferInfo(vhStdOut, &vcsbiInfo))
+    {
+        vfConsoleOut = TRUE;
+    }
+    else   // no console
+    {
+        memset(&vcsbiInfo, 0, sizeof(vcsbiInfo));
+        er = ::GetLastError();
+        if (ERROR_INVALID_HANDLE == er)
+        {
+            vfConsoleOut = FALSE;
+            hr = S_OK;
+        }
+        else
+        {
+            ConExitOnWin32Error(er, hr, "failed to get output console screen buffer info");
+        }
+    }
+LExit:
+    if (FAILED(hr))
+    {
+        if (INVALID_HANDLE_VALUE != vhStdOut)
+        {
+            ::CloseHandle(vhStdOut);
+        }
+        if (INVALID_HANDLE_VALUE != vhStdIn && vhStdOut != vhStdIn)
+        {
+            ::CloseHandle(vhStdIn);
+        }
+        vhStdOut = INVALID_HANDLE_VALUE;
+        vhStdIn = INVALID_HANDLE_VALUE;
+    }
+    return hr;
+}
+extern "C" void DAPI ConsoleUninitialize()
+{
+    BOOL fOutEqualsIn = vhStdOut == vhStdIn;
+    memset(&vcsbiInfo, 0, sizeof(vcsbiInfo));
+    if (INVALID_HANDLE_VALUE != vhStdOut)
+    {
+        ::CloseHandle(vhStdOut);
+    }
+    if (INVALID_HANDLE_VALUE != vhStdIn && !fOutEqualsIn)
+    {
+        ::CloseHandle(vhStdIn);
+    }
+    vhStdOut = INVALID_HANDLE_VALUE;
+    vhStdIn = INVALID_HANDLE_VALUE;
+}
+extern "C" void DAPI ConsoleGreen()
+{
+    AssertSz(INVALID_HANDLE_VALUE != vhStdOut, "ConsoleInitialize() has not been called");
+    if (vfConsoleOut)
+    {
+        ::SetConsoleTextAttribute(vhStdOut, FOREGROUND_GREEN | FOREGROUND_INTENSITY);
+    }
+}
+extern "C" void DAPI ConsoleRed()
+{
+    AssertSz(INVALID_HANDLE_VALUE != vhStdOut, "ConsoleInitialize() has not been called");
+    if (vfConsoleOut)
+    {
+        ::SetConsoleTextAttribute(vhStdOut, FOREGROUND_RED | FOREGROUND_INTENSITY);
+    }
+}
+extern "C" void DAPI ConsoleYellow()
+{
+    AssertSz(INVALID_HANDLE_VALUE != vhStdOut, "ConsoleInitialize() has not been called");
+    if (vfConsoleOut)
+    {
+        ::SetConsoleTextAttribute(vhStdOut, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY);
+    }
+}
+extern "C" void DAPI ConsoleNormal()
+{
+    AssertSz(INVALID_HANDLE_VALUE != vhStdOut, "ConsoleInitialize() has not been called");
+    if (vfConsoleOut)
+    {
+        ::SetConsoleTextAttribute(vhStdOut, vcsbiInfo.wAttributes);
+    }
+}
+/********************************************************************
+ ConsoleWrite - full color printfA without libc
+ NOTE: use FormatMessage formatting ("%1" or "%1!d!") not plain printf formatting ("%ls" or "%d")
+       assumes already in normal color and resets the screen to normal color
+********************************************************************/
+extern "C" HRESULT DAPI ConsoleWrite(
+    CONSOLE_COLOR cc,
+    __in_z __format_string LPCSTR szFormat,
+    ...
+    )
+{
+    AssertSz(INVALID_HANDLE_VALUE != vhStdOut, "ConsoleInitialize() has not been called");
+    HRESULT hr = S_OK;
+    LPSTR pszOutput = NULL;
+    DWORD cchOutput = 0;
+    DWORD cbWrote = 0;
+    DWORD cbTotal = 0;
+    // set the color
+    switch (cc)
+    {
+    case CONSOLE_COLOR_NORMAL: break;   // do nothing
+    case CONSOLE_COLOR_RED: ConsoleRed(); break;
+    case CONSOLE_COLOR_YELLOW: ConsoleYellow(); break;
+    case CONSOLE_COLOR_GREEN: ConsoleGreen(); break;
+    }
+    va_list args;
+    va_start(args, szFormat);
+    hr = StrAnsiAllocFormattedArgs(&pszOutput, szFormat, args);
+    va_end(args);
+    ConExitOnFailure(hr, "failed to format message: \"%s\"", szFormat);
+    cchOutput = lstrlenA(pszOutput);
+    while (cbTotal < (sizeof(*pszOutput) * cchOutput))
+    {
+        if (!::WriteFile(vhStdOut, reinterpret_cast<BYTE*>(pszOutput) + cbTotal, cchOutput * sizeof(*pszOutput) - cbTotal, &cbWrote, NULL))
+        {
+            ConExitOnLastError(hr, "failed to write output to console: %s", pszOutput);
+        }
+        cbTotal += cbWrote;
+    }
+    // reset the color to normal
+    if (CONSOLE_COLOR_NORMAL != cc)
+    {
+        ConsoleNormal();
+    }
+LExit:
+    ReleaseStr(pszOutput);
+    return hr;
+}
+/********************************************************************
+ ConsoleWriteLine - full color printfA plus newline without libc
+ NOTE: use FormatMessage formatting ("%1" or "%1!d!") not plain printf formatting ("%ls" or "%d")
+       assumes already in normal color and resets the screen to normal color
+********************************************************************/
+extern "C" HRESULT DAPI ConsoleWriteLine(
+    CONSOLE_COLOR cc,
+    __in_z __format_string LPCSTR szFormat,
+    ...
+    )
+{
+    AssertSz(INVALID_HANDLE_VALUE != vhStdOut, "ConsoleInitialize() has not been called");
+    HRESULT hr = S_OK;
+    LPSTR pszOutput = NULL;
+    DWORD cchOutput = 0;
+    DWORD cbWrote = 0;
+    DWORD cbTotal = 0;
+    LPCSTR szNewLine = "\r\n";
+    // set the color
+    switch (cc)
+    {
+    case CONSOLE_COLOR_NORMAL: break;   // do nothing
+    case CONSOLE_COLOR_RED: ConsoleRed(); break;
+    case CONSOLE_COLOR_YELLOW: ConsoleYellow(); break;
+    case CONSOLE_COLOR_GREEN: ConsoleGreen(); break;
+    }
+    va_list args;
+    va_start(args, szFormat);
+    hr = StrAnsiAllocFormattedArgs(&pszOutput, szFormat, args);
+    va_end(args);
+    ConExitOnFailure(hr, "failed to format message: \"%s\"", szFormat);
+    //
+    // write the string
+    //
+    cchOutput = lstrlenA(pszOutput);
+    while (cbTotal < (sizeof(*pszOutput) * cchOutput))
+    {
+        if (!::WriteFile(vhStdOut, reinterpret_cast<BYTE*>(pszOutput) + cbTotal, cchOutput * sizeof(*pszOutput) - cbTotal, &cbWrote, NULL))
+            ConExitOnLastError(hr, "failed to write output to console: %s", pszOutput);
+        cbTotal += cbWrote;
+    }
+    //
+    // write the newline
+    //
+    if (!::WriteFile(vhStdOut, reinterpret_cast<const BYTE*>(szNewLine), 2, &cbWrote, NULL))
+    {
+        ConExitOnLastError(hr, "failed to write newline to console");
+    }
+    // reset the color to normal
+    if (CONSOLE_COLOR_NORMAL != cc)
+    {
+        ConsoleNormal();
+    }
+LExit:
+    ReleaseStr(pszOutput);
+    return hr;
+}
+/********************************************************************
+ ConsoleWriteError - display an error to the screen
+ NOTE: use FormatMessage formatting ("%1" or "%1!d!") not plain printf formatting ("%s" or "%d")
+********************************************************************/
+HRESULT ConsoleWriteError(
+    HRESULT hrError,
+    CONSOLE_COLOR cc,
+    __in_z __format_string LPCSTR szFormat,
+    ...
+    )
+{
+    HRESULT hr  = S_OK;
+    LPSTR pszMessage = NULL;
+    va_list args;
+    va_start(args, szFormat);
+    hr = StrAnsiAllocFormattedArgs(&pszMessage, szFormat, args);
+    va_end(args);
+    ConExitOnFailure(hr, "failed to format error message: \"%s\"", szFormat);
+    if (FAILED(hrError))
+    {
+        hr = ConsoleWriteLine(cc, "Error 0x%x: %s", hrError, pszMessage);
+    }
+    else
+    {
+        hr = ConsoleWriteLine(cc, "Error: %s", pszMessage);
+    }
+LExit:
+    ReleaseStr(pszMessage);
+    return hr;
+}
+/********************************************************************
+ ConsoleReadW - get console input without libc
+ NOTE: only supports reading ANSI characters
+********************************************************************/
+extern "C" HRESULT DAPI ConsoleReadW(
+    __deref_out_z LPWSTR* ppwzBuffer
+    )
+{
+    AssertSz(INVALID_HANDLE_VALUE != vhStdIn, "ConsoleInitialize() has not been called");
+    Assert(ppwzBuffer);
+    HRESULT hr = S_OK;
+    LPSTR psz = NULL;
+    DWORD cch = 0;
+    DWORD cchRead = 0;
+    DWORD cchTotalRead = 0;
+    cch  = 64;
+    hr = StrAnsiAlloc(&psz, cch);
+    ConExitOnFailure(hr, "failed to allocate memory to read from console");
+    // loop until we read the \r\n from the console
+    for (;;)
+    {
+        // read one character at a time, since that seems to be the only way to make this work
+        if (!::ReadFile(vhStdIn, psz + cchTotalRead, 1, &cchRead, NULL))
+            ConExitOnLastError(hr, "failed to read string from console");
+        cchTotalRead += cchRead;
+        if (1 < cchTotalRead && '\r' == psz[cchTotalRead - 2] || '\n' == psz[cchTotalRead - 1])
+        {
+            psz[cchTotalRead - 2] = '\0';  // chop off the \r\n
+            break;
+        }
+        else if (0 == cchRead)  // nothing more was read
+        {
+            psz[cchTotalRead] = '\0';  // null termintate and bail
+            break;
+        }
+        if (cchTotalRead == cch)
+        {
+            cch *= 2;   // double everytime we run out of space
+            hr = StrAnsiAlloc(&psz, cch);
+            ConExitOnFailure(hr, "failed to allocate memory to read from console");
+        }
+    }
+    hr = StrAllocStringAnsi(ppwzBuffer, psz, 0, CP_ACP);
+LExit:
+    ReleaseStr(psz);
+    return hr;
+}
+/********************************************************************
+ ConsoleReadNonBlockingW - Read from the console without blocking
+ Won't work for redirected files (exe < txtfile), but will work for stdin redirected to 
+ an anonymous or named pipe
+ if (fReadLine), stop reading immediately when \r\n is found
+*********************************************************************/
+extern "C" HRESULT DAPI ConsoleReadNonBlockingW(
+    __deref_out_ecount_opt(*pcchSize) LPWSTR* ppwzBuffer,
+    __out DWORD* pcchSize,
+    BOOL fReadLine
+    )
+{
+    Assert(INVALID_HANDLE_VALUE != vhStdIn && pcchSize);
+    HRESULT hr = S_OK;
+    LPSTR psz = NULL;
+    ConExitOnNull(ppwzBuffer, hr, E_INVALIDARG, "Failed to read from console because buffer was not provided");
+    DWORD dwRead;
+    DWORD dwNumInput;
+    DWORD cchTotal = 0;
+    DWORD cch = 8;
+    DWORD cchRead = 0;
+    DWORD cchTotalRead = 0;
+    
+    DWORD dwIndex = 0;
+    DWORD er;
+    INPUT_RECORD ir;
+    WCHAR chIn;
+    *ppwzBuffer = NULL;
+    *pcchSize = 0;
+    // If we really have a handle to stdin, and not the end of a pipe
+    if (!PeekNamedPipe(vhStdIn, NULL, 0, NULL, &dwRead, NULL))
+    {
+        er = ::GetLastError();
+        if (ERROR_INVALID_HANDLE != er)
+        {
+            ExitFunction1(hr = HRESULT_FROM_WIN32(er));
+        }
+        if (!GetNumberOfConsoleInputEvents(vhStdIn, &dwRead))
+        {
+            ConExitOnLastError(hr, "failed to peek at console input");
+        }
+        if (0 == dwRead)
+        {
+            ExitFunction1(hr = S_FALSE);
+        }
+        for (/* dwRead from num of input events */; dwRead > 0; dwRead--)
+        {
+            if (!ReadConsoleInputW(vhStdIn, &ir, 1, &dwNumInput))
+            {
+                ConExitOnLastError(hr, "Failed to read input from console");
+            }
+            // If what we have is a KEY_EVENT, and that event signifies keyUp, we're interested
+            if (KEY_EVENT == ir.EventType && FALSE == ir.Event.KeyEvent.bKeyDown)
+            {
+                chIn = ir.Event.KeyEvent.uChar.UnicodeChar;
+                if (0 == cchTotal)
+                {
+                    cchTotal = cch;
+                    cch *= 2;
+                    StrAlloc(ppwzBuffer, cch);
+                }
+                (*ppwzBuffer)[dwIndex] = chIn;
+                if (fReadLine && (L'\r' == (*ppwzBuffer)[dwIndex - 1] && L'\n' == (*ppwzBuffer)[dwIndex]))
+                {
+                    *ppwzBuffer[dwIndex - 1] = L'\0';
+                    dwIndex -= 1;
+                    break;
+                }
+                ++dwIndex;
+                cchTotal--;
+            }
+        }
+        *pcchSize = dwIndex;
+    }
+    else
+    {
+        // otherwise, the peek worked, and we have the end of a pipe
+        if (0 == dwRead)
+            ExitFunction1(hr = S_FALSE);
+        cch = 8;
+        hr = StrAnsiAlloc(&psz, cch);
+        ConExitOnFailure(hr, "failed to allocate memory to read from console");
+        for (/*dwRead from PeekNamedPipe*/; dwRead > 0; dwRead--)
+        {
+            // read one character at a time, since that seems to be the only way to make this work
+            if (!::ReadFile(vhStdIn, psz + cchTotalRead, 1, &cchRead, NULL))
+            {
+                ConExitOnLastError(hr, "failed to read string from console");
+            }
+            cchTotalRead += cchRead;
+            if (fReadLine && '\r' == psz[cchTotalRead - 1] && '\n' == psz[cchTotalRead])
+            {
+                psz[cchTotalRead - 1] = '\0';  // chop off the \r\n
+                cchTotalRead -= 1;
+                break;
+            }
+            else if (0 == cchRead)  // nothing more was read
+            {
+                psz[cchTotalRead] = '\0';  // null termintate and bail
+                break;
+            }
+            if (cchTotalRead == cch)
+            {
+                cch *= 2;   // double everytime we run out of space
+                hr = StrAnsiAlloc(&psz, cch);
+                ConExitOnFailure(hr, "failed to allocate memory to read from console");
+            }
+        }
+        *pcchSize = cchTotalRead;
+        hr = StrAllocStringAnsi(ppwzBuffer, psz, cchTotalRead, CP_ACP);
+    }
+    
+LExit:
+    ReleaseStr(psz);
+    return hr;
+}
+/********************************************************************
+ ConsoleReadStringA - get console input without libc
+*********************************************************************/
+extern "C" HRESULT DAPI ConsoleReadStringA(
+    __deref_inout_ecount_part(cchCharBuffer,*pcchNumCharReturn) LPSTR* ppszCharBuffer,
+    CONST DWORD cchCharBuffer,
+    __out DWORD* pcchNumCharReturn
+    )
+{
+    AssertSz(INVALID_HANDLE_VALUE != vhStdIn, "ConsoleInitialize() has not been called");
+    HRESULT hr = S_OK;
+    if (ppszCharBuffer && (pcchNumCharReturn || cchCharBuffer < 2))
+    {
+        DWORD iRead = 1;
+        DWORD iReadCharTotal = 0;
+        if (ppszCharBuffer && *ppszCharBuffer == NULL)
+        {
+            do
+            {
+                hr = StrAnsiAlloc(ppszCharBuffer, cchCharBuffer * iRead);
+                ConExitOnFailure(hr, "failed to allocate memory for ConsoleReadStringW");
+                // ReadConsoleW will not return until <Return>, the last two chars are 13 and 10.
+                if (!::ReadConsoleA(vhStdIn, *ppszCharBuffer + iReadCharTotal, cchCharBuffer, pcchNumCharReturn, NULL) || *pcchNumCharReturn == 0)
+                {
+                    ConExitOnLastError(hr, "failed to read string from console");
+                }
+                iReadCharTotal += *pcchNumCharReturn;
+                iRead += 1;
+            }
+            while((*ppszCharBuffer)[iReadCharTotal - 1] != 10 || (*ppszCharBuffer)[iReadCharTotal - 2] != 13);
+            *pcchNumCharReturn = iReadCharTotal;
+        }
+        else
+        {
+            if (!::ReadConsoleA(vhStdIn, *ppszCharBuffer, cchCharBuffer, pcchNumCharReturn, NULL) ||
+                *pcchNumCharReturn > cchCharBuffer || *pcchNumCharReturn == 0)
+            {
+                ConExitOnLastError(hr, "failed to read string from console");
+            }
+            if ((*ppszCharBuffer)[*pcchNumCharReturn - 1] != 10 ||
+                (*ppszCharBuffer)[*pcchNumCharReturn - 2] != 13)
+            {
+                // need read more
+                hr = ERROR_MORE_DATA;
+            }
+        }
+    }
+    else
+    {
+        hr = E_INVALIDARG;
+    }
+LExit:
+    return hr;
+}
+/********************************************************************
+ ConsoleReadStringW - get console input without libc
+*********************************************************************/
+extern "C" HRESULT DAPI ConsoleReadStringW(
+    __deref_inout_ecount_part(cchCharBuffer,*pcchNumCharReturn) LPWSTR* ppwzCharBuffer,
+    const DWORD cchCharBuffer,
+    __out DWORD* pcchNumCharReturn
+    )
+{
+    AssertSz(INVALID_HANDLE_VALUE != vhStdIn, "ConsoleInitialize() has not been called");
+    HRESULT hr = S_OK;
+    if (ppwzCharBuffer && (pcchNumCharReturn || cchCharBuffer < 2))
+    {
+        DWORD iRead = 1;
+        DWORD iReadCharTotal = 0;
+        if (*ppwzCharBuffer == NULL)
+        {
+            do
+            {
+                hr = StrAlloc(ppwzCharBuffer, cchCharBuffer * iRead);
+                ConExitOnFailure(hr, "failed to allocate memory for ConsoleReadStringW");
+                // ReadConsoleW will not return until <Return>, the last two chars are 13 and 10.
+                if (!::ReadConsoleW(vhStdIn, *ppwzCharBuffer + iReadCharTotal, cchCharBuffer, pcchNumCharReturn, NULL) || *pcchNumCharReturn == 0)
+                {
+                    ConExitOnLastError(hr, "failed to read string from console");
+                }
+                iReadCharTotal += *pcchNumCharReturn;
+                iRead += 1;
+            }
+            while((*ppwzCharBuffer)[iReadCharTotal - 1] != 10 || (*ppwzCharBuffer)[iReadCharTotal - 2] != 13);
+            *pcchNumCharReturn = iReadCharTotal;
+        }
+        else
+        {
+            if (!::ReadConsoleW(vhStdIn, *ppwzCharBuffer, cchCharBuffer, pcchNumCharReturn, NULL) ||
+                *pcchNumCharReturn > cchCharBuffer || *pcchNumCharReturn == 0)
+            {
+                ConExitOnLastError(hr, "failed to read string from console");
+            }
+            if ((*ppwzCharBuffer)[*pcchNumCharReturn - 1] != 10 ||
+                (*ppwzCharBuffer)[*pcchNumCharReturn - 2] != 13)
+            {
+                // need read more
+                hr = ERROR_MORE_DATA;
+            }
+        }
+    }
+    else
+    {
+        hr = E_INVALIDARG;
+    }
+LExit:
+    return hr;
+}
+/********************************************************************
+ ConsoleSetReadHidden - set console input no echo
+*********************************************************************/
+extern "C" HRESULT DAPI ConsoleSetReadHidden(void)
+{
+    AssertSz(INVALID_HANDLE_VALUE != vhStdIn, "ConsoleInitialize() has not been called");
+    HRESULT hr = S_OK;
+    ::FlushConsoleInputBuffer(vhStdIn);
+    if (!::SetConsoleMode(vhStdIn, ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT))
+    {
+        ConExitOnLastError(hr, "failed to set console input mode to be hidden");
+    }
+LExit:
+    return hr;
+}
+/********************************************************************
+ ConsoleSetReadNormal - reset to echo
+*********************************************************************/
+extern "C" HRESULT DAPI ConsoleSetReadNormal(void)
+{
+    AssertSz(INVALID_HANDLE_VALUE != vhStdIn, "ConsoleInitialize() has not been called");
+    HRESULT hr = S_OK;
+    if (!::SetConsoleMode(vhStdIn, ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_MOUSE_INPUT))
+    {
+        ConExitOnLastError(hr, "failed to set console input mode to be normal");
+    }
+LExit:
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/cryputil.cpp b/src/libs/dutil/WixToolset.DUtil/cryputil.cpp
new file mode 100644
index 00000000..24bb83f1
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/cryputil.cpp
@@ -0,0 +1,404 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define CrypExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_CRYPUTIL, x, s, __VA_ARGS__)
+#define CrypExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_CRYPUTIL, x, s, __VA_ARGS__)
+#define CrypExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_CRYPUTIL, x, s, __VA_ARGS__)
+#define CrypExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_CRYPUTIL, x, s, __VA_ARGS__)
+#define CrypExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_CRYPUTIL, x, s, __VA_ARGS__)
+#define CrypExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_CRYPUTIL, x, s, __VA_ARGS__)
+#define CrypExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_CRYPUTIL, p, x, e, s, __VA_ARGS__)
+#define CrypExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_CRYPUTIL, p, x, s, __VA_ARGS__)
+#define CrypExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_CRYPUTIL, p, x, e, s, __VA_ARGS__)
+#define CrypExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_CRYPUTIL, p, x, s, __VA_ARGS__)
+#define CrypExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_CRYPUTIL, e, x, s, __VA_ARGS__)
+#define CrypExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_CRYPUTIL, g, x, s, __VA_ARGS__)
+static PFN_RTLENCRYPTMEMORY vpfnRtlEncryptMemory = NULL;
+static PFN_RTLDECRYPTMEMORY vpfnRtlDecryptMemory = NULL;
+static PFN_CRYPTPROTECTMEMORY vpfnCryptProtectMemory = NULL;
+static PFN_CRYPTUNPROTECTMEMORY vpfnCryptUnprotectMemory = NULL;
+static HMODULE vhAdvApi32Dll = NULL;
+static HMODULE vhCrypt32Dll = NULL;
+static BOOL vfCrypInitialized = FALSE;
+// function definitions
+/********************************************************************
+ CrypInitialize - initializes cryputil
+*********************************************************************/
+extern "C" HRESULT DAPI CrypInitialize(
+    )
+{
+    HRESULT hr = S_OK;
+    hr = LoadSystemLibrary(L"AdvApi32.dll", &vhAdvApi32Dll);
+    if (SUCCEEDED(hr))
+    {
+        // Ignore failures - if these don't exist, we'll try the Crypt methods.
+        vpfnRtlEncryptMemory = reinterpret_cast<PFN_RTLENCRYPTMEMORY>(::GetProcAddress(vhAdvApi32Dll, "SystemFunction040"));
+        vpfnRtlDecryptMemory = reinterpret_cast<PFN_RTLDECRYPTMEMORY>(::GetProcAddress(vhAdvApi32Dll, "SystemFunction041"));
+    }
+    if (!vpfnRtlEncryptMemory || !vpfnRtlDecryptMemory)
+    {
+        hr = LoadSystemLibrary(L"Crypt32.dll", &vhCrypt32Dll);
+        CrypExitOnFailure(hr, "Failed to load Crypt32.dll");
+        
+        vpfnCryptProtectMemory = reinterpret_cast<PFN_CRYPTPROTECTMEMORY>(::GetProcAddress(vhCrypt32Dll, "CryptProtectMemory"));
+        if (!vpfnRtlEncryptMemory && !vpfnCryptProtectMemory)
+        {
+            CrypExitWithLastError(hr, "Failed to load an encryption method");
+        }
+        vpfnCryptUnprotectMemory = reinterpret_cast<PFN_CRYPTUNPROTECTMEMORY>(::GetProcAddress(vhCrypt32Dll, "CryptUnprotectMemory"));
+        if (!vpfnRtlDecryptMemory && !vpfnCryptUnprotectMemory)
+        {
+            CrypExitWithLastError(hr, "Failed to load a decryption method");
+        }
+    }
+    vfCrypInitialized = TRUE;
+LExit:
+    return hr;
+}
+/********************************************************************
+ CrypUninitialize - uninitializes cryputil
+*********************************************************************/
+extern "C" void DAPI CrypUninitialize(
+    )
+{
+    if (vhAdvApi32Dll)
+    {
+        ::FreeLibrary(vhAdvApi32Dll);
+        vhAdvApi32Dll = NULL;
+        vpfnRtlEncryptMemory = NULL;
+        vpfnRtlDecryptMemory = NULL;
+    }
+    
+    if (vhCrypt32Dll)
+    {
+        ::FreeLibrary(vhCrypt32Dll);
+        vhCrypt32Dll = NULL;
+        vpfnCryptProtectMemory = NULL;
+        vpfnCryptUnprotectMemory = NULL;
+    }
+    vfCrypInitialized = FALSE;
+}
+extern "C" HRESULT DAPI CrypDecodeObject(
+    __in_z LPCSTR szStructType,
+    __in_ecount(cbData) const BYTE* pbData,
+    __in DWORD cbData,
+    __in DWORD dwFlags,
+    __out LPVOID* ppvObject,
+    __out_opt DWORD* pcbObject
+    )
+{
+    HRESULT hr = S_OK;
+    LPVOID pvObject = NULL;
+    DWORD cbObject = 0;
+    if (!::CryptDecodeObject(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, szStructType, pbData, cbData, dwFlags, NULL, &cbObject))
+    {
+        CrypExitWithLastError(hr, "Failed to decode object to determine size.");
+    }
+    pvObject = MemAlloc(cbObject, TRUE);
+    CrypExitOnNull(pvObject, hr, E_OUTOFMEMORY, "Failed to allocate memory for decoded object.");
+    if (!::CryptDecodeObject(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, szStructType, pbData, cbData, dwFlags, pvObject, &cbObject))
+    {
+        CrypExitWithLastError(hr, "Failed to decode object.");
+    }
+    *ppvObject = pvObject;
+    pvObject = NULL;
+    if (pcbObject)
+    {
+        *pcbObject = cbObject;
+    }
+LExit:
+    ReleaseMem(pvObject);
+    return hr;
+}
+extern "C" HRESULT DAPI CrypMsgGetParam(
+    __in HCRYPTMSG hCryptMsg,
+    __in DWORD dwType,
+    __in DWORD dwIndex,
+    __out LPVOID* ppvData,
+    __out_opt DWORD* pcbData
+    )
+{
+    HRESULT hr = S_OK;
+    LPVOID pv = NULL;
+    DWORD cb = 0;
+    if (!::CryptMsgGetParam(hCryptMsg, dwType, dwIndex, NULL, &cb))
+    {
+        CrypExitWithLastError(hr, "Failed to get crypt message parameter data size.");
+    }
+    pv = MemAlloc(cb, TRUE);
+    CrypExitOnNull(pv, hr, E_OUTOFMEMORY, "Failed to allocate memory for crypt message parameter.");
+    if (!::CryptMsgGetParam(hCryptMsg, dwType, dwIndex, pv, &cb))
+    {
+        CrypExitWithLastError(hr, "Failed to get crypt message parameter.");
+    }
+    *ppvData = pv;
+    pv = NULL;
+    if (pcbData)
+    {
+        *pcbData = cb;
+    }
+LExit:
+    ReleaseMem(pv);
+    return hr;
+}
+extern "C" HRESULT DAPI CrypHashFile(
+    __in_z LPCWSTR wzFilePath,
+    __in DWORD dwProvType,
+    __in ALG_ID algid,
+    __out_bcount(cbHash) BYTE* pbHash,
+    __in DWORD cbHash,
+    __out_opt DWORD64* pqwBytesHashed
+    )
+{
+    HRESULT hr = S_OK;
+    HANDLE hFile = INVALID_HANDLE_VALUE;
+    // open input file
+    hFile = ::CreateFileW(wzFilePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL);
+    if (INVALID_HANDLE_VALUE == hFile)
+    {
+        CrypExitWithLastError(hr, "Failed to open input file.");
+    }
+    hr = CrypHashFileHandle(hFile, dwProvType, algid, pbHash, cbHash, pqwBytesHashed);
+    CrypExitOnFailure(hr, "Failed to hash file: %ls", wzFilePath);
+LExit:
+    ReleaseFileHandle(hFile);
+    return hr;
+}
+extern "C" HRESULT DAPI CrypHashFileHandle(
+    __in HANDLE hFile,
+    __in DWORD dwProvType,
+    __in ALG_ID algid,
+    __out_bcount(cbHash) BYTE* pbHash,
+    __in DWORD cbHash,
+    __out_opt DWORD64* pqwBytesHashed
+    )
+{
+    HRESULT hr = S_OK;
+    HCRYPTPROV hProv = NULL;
+    HCRYPTHASH hHash = NULL;
+    DWORD cbRead = 0;
+    BYTE rgbBuffer[4096] = { };
+    const LARGE_INTEGER liZero = { };
+    // get handle to the crypto provider
+    if (!::CryptAcquireContextW(&hProv, NULL, NULL, dwProvType, CRYPT_VERIFYCONTEXT | CRYPT_SILENT))
+    {
+        CrypExitWithLastError(hr, "Failed to acquire crypto context.");
+    }
+    // initiate hash
+    if (!::CryptCreateHash(hProv, algid, 0, 0, &hHash))
+    {
+        CrypExitWithLastError(hr, "Failed to initiate hash.");
+    }
+    for (;;)
+    {
+        // read data block
+        if (!::ReadFile(hFile, rgbBuffer, sizeof(rgbBuffer), &cbRead, NULL))
+        {
+            CrypExitWithLastError(hr, "Failed to read data block.");
+        }
+        if (!cbRead)
+        {
+            break; // end of file
+        }
+        // hash data block
+        if (!::CryptHashData(hHash, rgbBuffer, cbRead, 0))
+        {
+            CrypExitWithLastError(hr, "Failed to hash data block.");
+        }
+    }
+    // get hash value
+    if (!::CryptGetHashParam(hHash, HP_HASHVAL, pbHash, &cbHash, 0))
+    {
+        CrypExitWithLastError(hr, "Failed to get hash value.");
+    }
+    if (pqwBytesHashed)
+    {
+        if (!::SetFilePointerEx(hFile, liZero, (LARGE_INTEGER*)pqwBytesHashed, FILE_CURRENT))
+        {
+            CrypExitWithLastError(hr, "Failed to get file pointer.");
+        }
+    }
+LExit:
+    if (hHash)
+    {
+        ::CryptDestroyHash(hHash);
+    }
+    if (hProv)
+    {
+        ::CryptReleaseContext(hProv, 0);
+    }
+    return hr;
+}
+HRESULT DAPI CrypHashBuffer(
+    __in_bcount(cbBuffer) const BYTE* pbBuffer,
+    __in SIZE_T cbBuffer,
+    __in DWORD dwProvType,
+    __in ALG_ID algid,
+    __out_bcount(cbHash) BYTE* pbHash,
+    __in DWORD cbHash
+    )
+{
+    HRESULT hr = S_OK;
+    HCRYPTPROV hProv = NULL;
+    HCRYPTHASH hHash = NULL;
+    DWORD cbDataHashed = 0;
+    SIZE_T cbTotal = 0;
+    SIZE_T cbRemaining = 0;
+    // get handle to the crypto provider
+    if (!::CryptAcquireContextW(&hProv, NULL, NULL, dwProvType, CRYPT_VERIFYCONTEXT | CRYPT_SILENT))
+    {
+        CrypExitWithLastError(hr, "Failed to acquire crypto context.");
+    }
+    // initiate hash
+    if (!::CryptCreateHash(hProv, algid, 0, 0, &hHash))
+    {
+        CrypExitWithLastError(hr, "Failed to initiate hash.");
+    }
+    do
+    {
+        cbRemaining = cbBuffer - cbTotal;
+        cbDataHashed = (DWORD)min(DWORD_MAX, cbRemaining);
+        if (!::CryptHashData(hHash, pbBuffer + cbTotal, cbDataHashed, 0))
+        {
+            CrypExitWithLastError(hr, "Failed to hash data.");
+        }
+        cbTotal += cbDataHashed;
+    } while (cbTotal < cbBuffer);
+    // get hash value
+    if (!::CryptGetHashParam(hHash, HP_HASHVAL, pbHash, &cbHash, 0))
+    {
+        CrypExitWithLastError(hr, "Failed to get hash value.");
+    }
+LExit:
+    if (hHash)
+    {
+        ::CryptDestroyHash(hHash);
+    }
+    if (hProv)
+    {
+        ::CryptReleaseContext(hProv, 0);
+    }
+    return hr;
+}
+HRESULT DAPI CrypEncryptMemory(
+        __inout LPVOID pData,
+        __in DWORD cbData,
+        __in DWORD dwFlags
+    )
+{
+    HRESULT hr = E_FAIL;
+    if (0 != cbData % CRYP_ENCRYPT_MEMORY_SIZE)
+    {
+        hr = E_INVALIDARG;
+    }
+    else if (vpfnRtlEncryptMemory)
+    {
+        hr = static_cast<HRESULT>(vpfnRtlEncryptMemory(pData, cbData, dwFlags));
+    }
+    else if (vpfnCryptProtectMemory)
+    {
+        if (vpfnCryptProtectMemory(pData, cbData, dwFlags))
+        {
+            hr = S_OK;
+        }
+        else
+        {
+            hr = HRESULT_FROM_WIN32(::GetLastError());
+        }
+    }
+    CrypExitOnFailure(hr, "Failed to encrypt memory");
+LExit:
+    return hr;
+}
+HRESULT DAPI CrypDecryptMemory(
+        __inout LPVOID pData,
+        __in DWORD cbData,
+        __in DWORD dwFlags
+    )
+{
+    HRESULT hr = E_FAIL;
+    
+    if (0 != cbData % CRYP_ENCRYPT_MEMORY_SIZE)
+    {
+        hr = E_INVALIDARG;
+    }
+    else if (vpfnRtlDecryptMemory)
+    {
+        hr = static_cast<HRESULT>(vpfnRtlDecryptMemory(pData, cbData, dwFlags));
+    }
+    else if (vpfnCryptUnprotectMemory)
+    {
+        if (vpfnCryptUnprotectMemory(pData, cbData, dwFlags))
+        {
+            hr = S_OK;
+        }
+        else
+        {
+            hr = HRESULT_FROM_WIN32(::GetLastError());
+        }
+    }
+    CrypExitOnFailure(hr, "Failed to decrypt memory");
+LExit:
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/deputil.cpp b/src/libs/dutil/WixToolset.DUtil/deputil.cpp
new file mode 100644
index 00000000..2e6d6a6c
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/deputil.cpp
@@ -0,0 +1,699 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define DepExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_DEPUTIL, x, s, __VA_ARGS__)
+#define DepExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_DEPUTIL, x, s, __VA_ARGS__)
+#define DepExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_DEPUTIL, x, s, __VA_ARGS__)
+#define DepExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_DEPUTIL, x, s, __VA_ARGS__)
+#define DepExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_DEPUTIL, x, s, __VA_ARGS__)
+#define DepExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_DEPUTIL, x, s, __VA_ARGS__)
+#define DepExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_DEPUTIL, p, x, e, s, __VA_ARGS__)
+#define DepExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_DEPUTIL, p, x, s, __VA_ARGS__)
+#define DepExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_DEPUTIL, p, x, e, s, __VA_ARGS__)
+#define DepExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_DEPUTIL, p, x, s, __VA_ARGS__)
+#define DepExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_DEPUTIL, e, x, s, __VA_ARGS__)
+#define DepExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_DEPUTIL, g, x, s, __VA_ARGS__)
+#define ARRAY_GROWTH_SIZE 5
+static LPCWSTR vcszVersionValue = L"Version";
+static LPCWSTR vcszDisplayNameValue = L"DisplayName";
+static LPCWSTR vcszMinVersionValue = L"MinVersion";
+static LPCWSTR vcszMaxVersionValue = L"MaxVersion";
+static LPCWSTR vcszAttributesValue = L"Attributes";
+enum eRequiresAttributes { RequiresAttributesMinVersionInclusive = 256, RequiresAttributesMaxVersionInclusive = 512 };
+// We write to Software\Classes explicitly based on the current security context instead of HKCR.
+// See http://msdn.microsoft.com/en-us/library/ms724475(VS.85).aspx for more information.
+static LPCWSTR vsczRegistryRoot = L"Software\\Classes\\Installer\\Dependencies\\";
+static LPCWSTR vsczRegistryDependents = L"Dependents";
+static HRESULT AllocDependencyKeyName(
+    __in_z LPCWSTR wzName,
+    __deref_out_z LPWSTR* psczKeyName
+    );
+static HRESULT GetDependencyNameFromKey(
+    __in HKEY hkHive,
+    __in LPCWSTR wzKey,
+    __deref_out_z LPWSTR* psczName
+    );
+DAPI_(HRESULT) DepGetProviderInformation(
+    __in HKEY hkHive,
+    __in_z LPCWSTR wzProviderKey,
+    __deref_out_z_opt LPWSTR* psczId,
+    __deref_out_z_opt LPWSTR* psczName,
+    __deref_out_z_opt LPWSTR* psczVersion
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczKey = NULL;
+    HKEY hkKey = NULL;
+    // Format the provider dependency registry key.
+    hr = AllocDependencyKeyName(wzProviderKey, &sczKey);
+    DepExitOnFailure(hr, "Failed to allocate the registry key for dependency \"%ls\".", wzProviderKey);
+    // Try to open the dependency key.
+    hr = RegOpen(hkHive, sczKey, KEY_READ, &hkKey);
+    if (E_FILENOTFOUND == hr)
+    {
+        ExitFunction1(hr = E_NOTFOUND);
+    }
+    DepExitOnFailure(hr, "Failed to open the registry key for the dependency \"%ls\".", wzProviderKey);
+    // Get the Id if requested and available.
+    if (psczId)
+    {
+        hr = RegReadString(hkKey, NULL, psczId);
+        if (E_FILENOTFOUND == hr)
+        {
+            hr = S_OK;
+        }
+        DepExitOnFailure(hr, "Failed to get the id for the dependency \"%ls\".", wzProviderKey);
+    }
+    // Get the DisplayName if requested and available.
+    if (psczName)
+    {
+        hr = RegReadString(hkKey, vcszDisplayNameValue, psczName);
+        if (E_FILENOTFOUND == hr)
+        {
+            hr = S_OK;
+        }
+        DepExitOnFailure(hr, "Failed to get the name for the dependency \"%ls\".", wzProviderKey);
+    }
+    // Get the Version if requested and available.
+    if (psczVersion)
+    {
+        hr = RegReadString(hkKey, vcszVersionValue, psczVersion);
+        if (E_FILENOTFOUND == hr)
+        {
+            hr = S_OK;
+        }
+        DepExitOnFailure(hr, "Failed to get the version for the dependency \"%ls\".", wzProviderKey);
+    }
+LExit:
+    ReleaseRegKey(hkKey);
+    ReleaseStr(sczKey);
+    return hr;
+}
+DAPI_(HRESULT) DepCheckDependency(
+    __in HKEY hkHive,
+    __in_z LPCWSTR wzProviderKey,
+    __in_z_opt LPCWSTR wzMinVersion,
+    __in_z_opt LPCWSTR wzMaxVersion,
+    __in int iAttributes,
+    __in STRINGDICT_HANDLE sdDependencies,
+    __deref_inout_ecount_opt(*pcDependencies) DEPENDENCY** prgDependencies,
+    __inout LPUINT pcDependencies
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczKey = NULL;
+    HKEY hkKey = NULL;
+    DWORD64 dw64Version = 0;
+    DWORD64 dw64MinVersion = 0;
+    DWORD64 dw64MaxVersion = 0;
+    BOOL fAllowEqual = FALSE;
+    LPWSTR sczName = NULL;
+    // Format the provider dependency registry key.
+    hr = AllocDependencyKeyName(wzProviderKey, &sczKey);
+    DepExitOnFailure(hr, "Failed to allocate the registry key for dependency \"%ls\".", wzProviderKey);
+    // Try to open the key. If that fails, add the missing dependency key to the dependency array if it doesn't already exist.
+    hr = RegOpen(hkHive, sczKey, KEY_READ, &hkKey);
+    if (E_FILENOTFOUND != hr)
+    {
+        DepExitOnFailure(hr, "Failed to open the registry key for dependency \"%ls\".", wzProviderKey);
+        // If there are no registry values, consider the key orphaned and treat it as missing.
+        hr = RegReadVersion(hkKey, vcszVersionValue, &dw64Version);
+        if (E_FILENOTFOUND != hr)
+        {
+            DepExitOnFailure(hr, "Failed to read the %ls registry value for dependency \"%ls\".", vcszVersionValue, wzProviderKey);
+        }
+    }
+    // If the key was not found or the Version value was not found, add the missing dependency key to the dependency array.
+    if (E_FILENOTFOUND == hr)
+    {
+        hr = DictKeyExists(sdDependencies, wzProviderKey);
+        if (E_NOTFOUND != hr)
+        {
+            DepExitOnFailure(hr, "Failed to check the dictionary for missing dependency \"%ls\".", wzProviderKey);
+        }
+        else
+        {
+            hr = DepDependencyArrayAlloc(prgDependencies, pcDependencies, wzProviderKey, NULL);
+            DepExitOnFailure(hr, "Failed to add the missing dependency \"%ls\" to the array.", wzProviderKey);
+            hr = DictAddKey(sdDependencies, wzProviderKey);
+            DepExitOnFailure(hr, "Failed to add the missing dependency \"%ls\" to the dictionary.", wzProviderKey);
+        }
+        // Exit since the check already failed.
+        ExitFunction1(hr = E_NOTFOUND);
+    }
+    // Check MinVersion if provided.
+    if (wzMinVersion)
+    {
+        if (*wzMinVersion)
+        {
+            hr = FileVersionFromStringEx(wzMinVersion, 0, &dw64MinVersion);
+            DepExitOnFailure(hr, "Failed to get the 64-bit version number from \"%ls\".", wzMinVersion);
+            fAllowEqual = iAttributes & RequiresAttributesMinVersionInclusive;
+            if (!(fAllowEqual && dw64MinVersion <= dw64Version || dw64MinVersion < dw64Version))
+            {
+                hr = DictKeyExists(sdDependencies, wzProviderKey);
+                if (E_NOTFOUND != hr)
+                {
+                    DepExitOnFailure(hr, "Failed to check the dictionary for the older dependency \"%ls\".", wzProviderKey);
+                }
+                else
+                {
+                    hr = RegReadString(hkKey, vcszDisplayNameValue, &sczName);
+                    DepExitOnFailure(hr, "Failed to get the display name of the older dependency \"%ls\".", wzProviderKey);
+                    hr = DepDependencyArrayAlloc(prgDependencies, pcDependencies, wzProviderKey, sczName);
+                    DepExitOnFailure(hr, "Failed to add the older dependency \"%ls\" to the dependencies array.", wzProviderKey);
+                    hr = DictAddKey(sdDependencies, wzProviderKey);
+                    DepExitOnFailure(hr, "Failed to add the older dependency \"%ls\" to the unique dependency string list.", wzProviderKey);
+                }
+                // Exit since the check already failed.
+                ExitFunction1(hr = E_NOTFOUND);
+            }
+        }
+    }
+    // Check MaxVersion if provided.
+    if (wzMaxVersion)
+    {
+        if (*wzMaxVersion)
+        {
+            hr = FileVersionFromStringEx(wzMaxVersion, 0, &dw64MaxVersion);
+            DepExitOnFailure(hr, "Failed to get the 64-bit version number from \"%ls\".", wzMaxVersion);
+            fAllowEqual = iAttributes & RequiresAttributesMaxVersionInclusive;
+            if (!(fAllowEqual && dw64Version <= dw64MaxVersion || dw64Version < dw64MaxVersion))
+            {
+                hr = DictKeyExists(sdDependencies, wzProviderKey);
+                if (E_NOTFOUND != hr)
+                {
+                    DepExitOnFailure(hr, "Failed to check the dictionary for the newer dependency \"%ls\".", wzProviderKey);
+                }
+                else
+                {
+                    hr = RegReadString(hkKey, vcszDisplayNameValue, &sczName);
+                    DepExitOnFailure(hr, "Failed to get the display name of the newer dependency \"%ls\".", wzProviderKey);
+                    hr = DepDependencyArrayAlloc(prgDependencies, pcDependencies, wzProviderKey, sczName);
+                    DepExitOnFailure(hr, "Failed to add the newer dependency \"%ls\" to the dependencies array.", wzProviderKey);
+                    hr = DictAddKey(sdDependencies, wzProviderKey);
+                    DepExitOnFailure(hr, "Failed to add the newer dependency \"%ls\" to the unique dependency string list.", wzProviderKey);
+                }
+                // Exit since the check already failed.
+                ExitFunction1(hr = E_NOTFOUND);
+            }
+        }
+    }
+LExit:
+    ReleaseStr(sczName);
+    ReleaseRegKey(hkKey);
+    ReleaseStr(sczKey);
+    return hr;
+}
+DAPI_(HRESULT) DepCheckDependents(
+    __in HKEY hkHive,
+    __in_z LPCWSTR wzProviderKey,
+    __reserved int /*iAttributes*/,
+    __in C_STRINGDICT_HANDLE sdIgnoredDependents,
+    __deref_inout_ecount_opt(*pcDependents) DEPENDENCY** prgDependents,
+    __inout LPUINT pcDependents
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczKey = NULL;
+    HKEY hkProviderKey = NULL;
+    HKEY hkDependentsKey = NULL;
+    LPWSTR sczDependentKey = NULL;
+    LPWSTR sczDependentName = NULL;
+    // Format the provider dependency registry key.
+    hr = AllocDependencyKeyName(wzProviderKey, &sczKey);
+    DepExitOnFailure(hr, "Failed to allocate the registry key for dependency \"%ls\".", wzProviderKey);
+    // Try to open the key. If that fails, the dependency information is corrupt.
+    hr = RegOpen(hkHive, sczKey, KEY_READ, &hkProviderKey);
+    DepExitOnFailure(hr, "Failed to open the registry key \"%ls\". The dependency store is corrupt.", sczKey);
+    // Try to open the dependencies key. If that does not exist, there are no dependents.
+    hr = RegOpen(hkProviderKey, vsczRegistryDependents, KEY_READ, &hkDependentsKey);
+    if (E_FILENOTFOUND != hr)
+    {
+        DepExitOnFailure(hr, "Failed to open the registry key for dependents of \"%ls\".", wzProviderKey);
+    }
+    else
+    {
+        ExitFunction1(hr = S_OK);
+    }
+    // Now enumerate the dependent keys. If they are not defined in the ignored list, add them to the array.
+    for (DWORD dwIndex = 0; ; ++dwIndex)
+    {
+        hr = RegKeyEnum(hkDependentsKey, dwIndex, &sczDependentKey);
+        if (E_NOMOREITEMS != hr)
+        {
+            DepExitOnFailure(hr, "Failed to enumerate the dependents key of \"%ls\".", wzProviderKey);
+        }
+        else
+        {
+            hr = S_OK;
+            break;
+        }
+        // If the key isn't ignored, add it to the dependent array.
+        hr = DictKeyExists(sdIgnoredDependents, sczDependentKey);
+        if (E_NOTFOUND != hr)
+        {
+            DepExitOnFailure(hr, "Failed to check the dictionary of ignored dependents.");
+        }
+        else
+        {
+            // Get the name of the dependent from the key.
+            hr = GetDependencyNameFromKey(hkHive, sczDependentKey, &sczDependentName);
+            DepExitOnFailure(hr, "Failed to get the name of the dependent from the key \"%ls\".", sczDependentKey);
+            hr = DepDependencyArrayAlloc(prgDependents, pcDependents, sczDependentKey, sczDependentName);
+            DepExitOnFailure(hr, "Failed to add the dependent key \"%ls\" to the string array.", sczDependentKey);
+        }
+    }
+LExit:
+    ReleaseStr(sczDependentName);
+    ReleaseStr(sczDependentKey);
+    ReleaseRegKey(hkDependentsKey);
+    ReleaseRegKey(hkProviderKey);
+    ReleaseStr(sczKey);
+    return hr;
+}
+DAPI_(HRESULT) DepRegisterDependency(
+    __in HKEY hkHive,
+    __in_z LPCWSTR wzProviderKey,
+    __in_z LPCWSTR wzVersion,
+    __in_z LPCWSTR wzDisplayName,
+    __in_z_opt LPCWSTR wzId,
+    __in int iAttributes
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczKey = NULL;
+    HKEY hkKey = NULL;
+    BOOL fCreated = FALSE;
+    // Format the provider dependency registry key.
+    hr = AllocDependencyKeyName(wzProviderKey, &sczKey);
+    DepExitOnFailure(hr, "Failed to allocate the registry key for dependency \"%ls\".", wzProviderKey);
+    // Create the dependency key (or open it if it already exists).
+    hr = RegCreateEx(hkHive, sczKey, KEY_WRITE, FALSE, NULL, &hkKey, &fCreated);
+    DepExitOnFailure(hr, "Failed to create the dependency registry key \"%ls\".", sczKey);
+    // Set the id if it was provided.
+    if (wzId)
+    {
+        hr = RegWriteString(hkKey, NULL, wzId);
+        DepExitOnFailure(hr, "Failed to set the %ls registry value to \"%ls\".", L"default", wzId);
+    }
+    // Set the version.
+    hr = RegWriteString(hkKey, vcszVersionValue, wzVersion);
+    DepExitOnFailure(hr, "Failed to set the %ls registry value to \"%ls\".", vcszVersionValue, wzVersion);
+    // Set the display name.
+    hr = RegWriteString(hkKey, vcszDisplayNameValue, wzDisplayName);
+    DepExitOnFailure(hr, "Failed to set the %ls registry value to \"%ls\".", vcszDisplayNameValue, wzDisplayName);
+    // Set the attributes if non-zero.
+    if (0 != iAttributes)
+    {
+        hr = RegWriteNumber(hkKey, vcszAttributesValue, static_cast<DWORD>(iAttributes));
+        DepExitOnFailure(hr, "Failed to set the %ls registry value to %d.", vcszAttributesValue, iAttributes);
+    }
+LExit:
+    ReleaseRegKey(hkKey);
+    ReleaseStr(sczKey);
+    return hr;
+}
+DAPI_(HRESULT) DepDependentExists(
+    __in HKEY hkHive,
+    __in_z LPCWSTR wzDependencyProviderKey,
+    __in_z LPCWSTR wzProviderKey
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczDependentKey = NULL;
+    HKEY hkDependentKey = NULL;
+    // Format the provider dependents registry key.
+    hr = StrAllocFormatted(&sczDependentKey, L"%ls%ls\\%ls\\%ls", vsczRegistryRoot, wzDependencyProviderKey, vsczRegistryDependents, wzProviderKey);
+    DepExitOnFailure(hr, "Failed to format registry key to dependent.");
+    hr = RegOpen(hkHive, sczDependentKey, KEY_READ, &hkDependentKey);
+    if (E_FILENOTFOUND != hr)
+    {
+        DepExitOnFailure(hr, "Failed to open the dependent registry key at: \"%ls\".", sczDependentKey);
+    }
+LExit:
+    ReleaseRegKey(hkDependentKey);
+    ReleaseStr(sczDependentKey);
+    return hr;
+}
+DAPI_(HRESULT) DepRegisterDependent(
+    __in HKEY hkHive,
+    __in_z LPCWSTR wzDependencyProviderKey,
+    __in_z LPCWSTR wzProviderKey,
+    __in_z_opt LPCWSTR wzMinVersion,
+    __in_z_opt LPCWSTR wzMaxVersion,
+    __in int iAttributes
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczDependencyKey = NULL;
+    HKEY hkDependencyKey = NULL;
+    LPWSTR sczKey = NULL;
+    HKEY hkKey = NULL;
+    BOOL fCreated = FALSE;
+    // Format the provider dependency registry key.
+    hr = AllocDependencyKeyName(wzDependencyProviderKey, &sczDependencyKey);
+    DepExitOnFailure(hr, "Failed to allocate the registry key for dependency \"%ls\".", wzDependencyProviderKey);
+    // Create the dependency key (or open it if it already exists).
+    hr = RegCreateEx(hkHive, sczDependencyKey, KEY_WRITE, FALSE, NULL, &hkDependencyKey, &fCreated);
+    DepExitOnFailure(hr, "Failed to create the dependency registry key \"%ls\".", sczDependencyKey);
+    // Create the subkey to register the dependent.
+    hr = StrAllocFormatted(&sczKey, L"%ls\\%ls", vsczRegistryDependents, wzProviderKey);
+    DepExitOnFailure(hr, "Failed to allocate dependent subkey \"%ls\" under dependency \"%ls\".", wzProviderKey, wzDependencyProviderKey);
+    hr = RegCreateEx(hkDependencyKey, sczKey, KEY_WRITE, FALSE, NULL, &hkKey, &fCreated);
+    DepExitOnFailure(hr, "Failed to create the dependency subkey \"%ls\".", sczKey);
+    // Set the minimum version if not NULL.
+    hr = RegWriteString(hkKey, vcszMinVersionValue, wzMinVersion);
+    DepExitOnFailure(hr, "Failed to set the %ls registry value to \"%ls\".", vcszMinVersionValue, wzMinVersion);
+    // Set the maximum version if not NULL.
+    hr = RegWriteString(hkKey, vcszMaxVersionValue, wzMaxVersion);
+    DepExitOnFailure(hr, "Failed to set the %ls registry value to \"%ls\".", vcszMaxVersionValue, wzMaxVersion);
+    // Set the attributes if non-zero.
+    if (0 != iAttributes)
+    {
+        hr = RegWriteNumber(hkKey, vcszAttributesValue, static_cast<DWORD>(iAttributes));
+        DepExitOnFailure(hr, "Failed to set the %ls registry value to %d.", vcszAttributesValue, iAttributes);
+    }
+LExit:
+    ReleaseRegKey(hkKey);
+    ReleaseStr(sczKey);
+    ReleaseRegKey(hkDependencyKey);
+    ReleaseStr(sczDependencyKey);
+    return hr;
+}
+DAPI_(HRESULT) DepUnregisterDependency(
+    __in HKEY hkHive,
+    __in_z LPCWSTR wzProviderKey
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczKey = NULL;
+    HKEY hkKey = NULL;
+    // Format the provider dependency registry key.
+    hr = AllocDependencyKeyName(wzProviderKey, &sczKey);
+    DepExitOnFailure(hr, "Failed to allocate the registry key for dependency \"%ls\".", wzProviderKey);
+    // Delete the entire key including all sub-keys.
+    hr = RegDelete(hkHive, sczKey, REG_KEY_DEFAULT, TRUE);
+    if (E_FILENOTFOUND != hr)
+    {
+        DepExitOnFailure(hr, "Failed to delete the key \"%ls\".", sczKey);
+    }
+LExit:
+    ReleaseRegKey(hkKey);
+    ReleaseStr(sczKey);
+    return hr;
+}
+DAPI_(HRESULT) DepUnregisterDependent(
+    __in HKEY hkHive,
+    __in_z LPCWSTR wzDependencyProviderKey,
+    __in_z LPCWSTR wzProviderKey
+    )
+{
+    HRESULT hr = S_OK;
+    HKEY hkRegistryRoot = NULL;
+    HKEY hkDependencyProviderKey = NULL;
+    HKEY hkRegistryDependents = NULL;
+    DWORD cSubKeys = 0;
+    DWORD cValues = 0;
+    // Open the root key. We may delete the wzDependencyProviderKey during clean up.
+    hr = RegOpen(hkHive, vsczRegistryRoot, KEY_READ, &hkRegistryRoot);
+    if (E_FILENOTFOUND != hr)
+    {
+        DepExitOnFailure(hr, "Failed to open root registry key \"%ls\".", vsczRegistryRoot);
+    }
+    else
+    {
+        ExitFunction();
+    }
+    // Try to open the dependency key. If that does not exist, simply return.
+    hr = RegOpen(hkRegistryRoot, wzDependencyProviderKey, KEY_READ, &hkDependencyProviderKey);
+    if (E_FILENOTFOUND != hr)
+    {
+        DepExitOnFailure(hr, "Failed to open the registry key for the dependency \"%ls\".", wzDependencyProviderKey);
+    }
+    else
+    {
+        ExitFunction();
+    }
+    // Try to open the dependents subkey to enumerate.
+    hr = RegOpen(hkDependencyProviderKey, vsczRegistryDependents, KEY_READ, &hkRegistryDependents);
+    if (E_FILENOTFOUND != hr)
+    {
+        DepExitOnFailure(hr, "Failed to open the dependents subkey under the dependency \"%ls\".", wzDependencyProviderKey);
+    }
+    else
+    {
+        ExitFunction();
+    }
+    // Delete the wzProviderKey dependent sub-key.
+    hr = RegDelete(hkRegistryDependents, wzProviderKey, REG_KEY_DEFAULT, TRUE);
+    DepExitOnFailure(hr, "Failed to delete the dependent \"%ls\" under the dependency \"%ls\".", wzProviderKey, wzDependencyProviderKey);
+    // If there are no remaining dependents, delete the Dependents subkey.
+    hr = RegQueryKey(hkRegistryDependents, &cSubKeys, NULL);
+    DepExitOnFailure(hr, "Failed to get the number of dependent subkeys under the dependency \"%ls\".", wzDependencyProviderKey);
+    
+    if (0 < cSubKeys)
+    {
+        ExitFunction();
+    }
+    // Release the handle to make sure it's deleted immediately.
+    ReleaseRegKey(hkRegistryDependents);
+    // Fail if there are any subkeys since we just checked.
+    hr = RegDelete(hkDependencyProviderKey, vsczRegistryDependents, REG_KEY_DEFAULT, FALSE);
+    DepExitOnFailure(hr, "Failed to delete the dependents subkey under the dependency \"%ls\".", wzDependencyProviderKey);
+    // If there are no values, delete the provider dependency key.
+    hr = RegQueryKey(hkDependencyProviderKey, NULL, &cValues);
+    DepExitOnFailure(hr, "Failed to get the number of values under the dependency \"%ls\".", wzDependencyProviderKey);
+    if (0 == cValues)
+    {
+        // Release the handle to make sure it's deleted immediately.
+        ReleaseRegKey(hkDependencyProviderKey);
+        // Fail if there are any subkeys since we just checked.
+        hr = RegDelete(hkRegistryRoot, wzDependencyProviderKey, REG_KEY_DEFAULT, FALSE);
+        DepExitOnFailure(hr, "Failed to delete the dependency \"%ls\".", wzDependencyProviderKey);
+    }
+LExit:
+    ReleaseRegKey(hkRegistryDependents);
+    ReleaseRegKey(hkDependencyProviderKey);
+    ReleaseRegKey(hkRegistryRoot);
+    return hr;
+}
+DAPI_(HRESULT) DepDependencyArrayAlloc(
+    __deref_inout_ecount_opt(*pcDependencies) DEPENDENCY** prgDependencies,
+    __inout LPUINT pcDependencies,
+    __in_z LPCWSTR wzKey,
+    __in_z_opt LPCWSTR wzName
+    )
+{
+    HRESULT hr = S_OK;
+    UINT cRequired = 0;
+    DEPENDENCY* pDependency = NULL;
+    hr = ::UIntAdd(*pcDependencies, 1, &cRequired);
+    DepExitOnFailure(hr, "Failed to increment the number of elements required in the dependency array.");
+    hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(prgDependencies), cRequired, sizeof(DEPENDENCY), ARRAY_GROWTH_SIZE);
+    DepExitOnFailure(hr, "Failed to allocate memory for the dependency array.");
+    pDependency = static_cast<DEPENDENCY*>(&(*prgDependencies)[*pcDependencies]);
+    DepExitOnNull(pDependency, hr, E_POINTER, "The dependency element in the array is invalid.");
+    hr = StrAllocString(&(pDependency->sczKey), wzKey, 0);
+    DepExitOnFailure(hr, "Failed to allocate the string key in the dependency array.");
+    if (wzName)
+    {
+        hr = StrAllocString(&(pDependency->sczName), wzName, 0);
+        DepExitOnFailure(hr, "Failed to allocate the string name in the dependency array.");
+    }
+    // Update the number of current elements in the dependency array.
+    *pcDependencies = cRequired;
+LExit:
+    return hr;
+}
+DAPI_(void) DepDependencyArrayFree(
+    __in_ecount(cDependencies) DEPENDENCY* rgDependencies,
+    __in UINT cDependencies
+    )
+{
+    for (UINT i = 0; i < cDependencies; ++i)
+    {
+        ReleaseStr(rgDependencies[i].sczKey);
+        ReleaseStr(rgDependencies[i].sczName);
+    }
+    ReleaseMem(rgDependencies);
+}
+/***************************************************************************
+ AllocDependencyKeyName - Allocates and formats the root registry key name.
+***************************************************************************/
+static HRESULT AllocDependencyKeyName(
+    __in_z LPCWSTR wzName,
+    __deref_out_z LPWSTR* psczKeyName
+    )
+{
+    HRESULT hr = S_OK;
+    size_t cchName = 0;
+    size_t cchKeyName = 0;
+    // Get the length of the static registry root once.
+    static size_t cchRegistryRoot = ::lstrlenW(vsczRegistryRoot);
+    // Get the length of the dependency, and add to the length of the root.
+    hr = ::StringCchLengthW(wzName, STRSAFE_MAX_CCH, &cchName);
+    DepExitOnFailure(hr, "Failed to get string length of dependency name.");
+    // Add the sizes together to allocate memory once (callee will add space for nul).
+    hr = ::SizeTAdd(cchRegistryRoot, cchName, &cchKeyName);
+    DepExitOnFailure(hr, "Failed to add the string lengths together.");
+    // Allocate and concat the strings together.
+    hr = StrAllocString(psczKeyName, vsczRegistryRoot, cchKeyName);
+    DepExitOnFailure(hr, "Failed to allocate string for dependency registry root.");
+    hr = StrAllocConcat(psczKeyName, wzName, cchName);
+    DepExitOnFailure(hr, "Failed to concatenate the dependency key name.");
+LExit:
+    return hr;
+}
+/***************************************************************************
+ GetDependencyNameFromKey - Attempts to name of the dependency from the key.
+***************************************************************************/
+static HRESULT GetDependencyNameFromKey(
+    __in HKEY hkHive,
+    __in LPCWSTR wzProviderKey,
+    __deref_out_z LPWSTR* psczName
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczKey = NULL;
+    HKEY hkKey = NULL;
+    // Format the provider dependency registry key.
+    hr = AllocDependencyKeyName(wzProviderKey, &sczKey);
+    DepExitOnFailure(hr, "Failed to allocate the registry key for dependency \"%ls\".", wzProviderKey);
+    // Try to open the dependency key.
+    hr = RegOpen(hkHive, sczKey, KEY_READ, &hkKey);
+    if (E_FILENOTFOUND != hr)
+    {
+        DepExitOnFailure(hr, "Failed to open the registry key for the dependency \"%ls\".", wzProviderKey);
+    }
+    else
+    {
+        ExitFunction1(hr = S_OK);
+    }
+    // Get the DisplayName if available.
+    hr = RegReadString(hkKey, vcszDisplayNameValue, psczName);
+    if (E_FILENOTFOUND != hr)
+    {
+        DepExitOnFailure(hr, "Failed to get the dependency name for the dependency \"%ls\".", wzProviderKey);
+    }
+    else
+    {
+        ExitFunction1(hr = S_OK);
+    }
+LExit:
+    ReleaseRegKey(hkKey);
+    ReleaseStr(sczKey);
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/dictutil.cpp b/src/libs/dutil/WixToolset.DUtil/dictutil.cpp
new file mode 100644
index 00000000..0d0743eb
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/dictutil.cpp
@@ -0,0 +1,784 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define DictExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_DICTUTIL, x, s, __VA_ARGS__)
+#define DictExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_DICTUTIL, x, s, __VA_ARGS__)
+#define DictExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_DICTUTIL, x, s, __VA_ARGS__)
+#define DictExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_DICTUTIL, x, s, __VA_ARGS__)
+#define DictExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_DICTUTIL, x, s, __VA_ARGS__)
+#define DictExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_DICTUTIL, x, s, __VA_ARGS__)
+#define DictExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_DICTUTIL, p, x, e, s, __VA_ARGS__)
+#define DictExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_DICTUTIL, p, x, s, __VA_ARGS__)
+#define DictExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_DICTUTIL, p, x, e, s, __VA_ARGS__)
+#define DictExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_DICTUTIL, p, x, s, __VA_ARGS__)
+#define DictExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_DICTUTIL, e, x, s, __VA_ARGS__)
+#define DictExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_DICTUTIL, g, x, s, __VA_ARGS__)
+// These should all be primes, and spaced reasonably apart (currently each is about 4x the last)
+const DWORD MAX_BUCKET_SIZES[] = {
+    503,
+    2017,
+    7937,
+    32779,
+    131111,
+    524341,
+    2097709,
+    8390857,
+    33563437,
+    134253719,
+    537014927,
+    2148059509
+    };
+// However many items are in the cab, let's keep the buckets at least 8 times that to avoid collisions
+#define MAX_BUCKETS_TO_ITEMS_RATIO 8
+enum DICT_TYPE
+{
+    DICT_INVALID = 0,
+    DICT_EMBEDDED_KEY = 1,
+    DICT_STRING_LIST = 2
+};
+struct STRINGDICT_STRUCT
+{
+    DICT_TYPE dtType;
+    // Optional flags to control the behavior of the dictionary.
+    DICT_FLAG dfFlags;
+    // Index into MAX_BUCKET_SIZES (array of primes), representing number of buckets we've allocated
+    DWORD dwBucketSizeIndex;
+    // Number of items currently stored in the dict buckets
+    DWORD dwNumItems;
+    // Byte offset of key within bucket value, for collision checking - see
+    // comments above DictCreateEmbeddedKey() implementation for further details
+    size_t cByteOffset;
+    // The actual stored buckets
+    void **ppvBuckets;
+    // The actual stored items in the order they were added (used for auto freeing or enumerating)
+    void **ppvItemList;
+    // Pointer to the array of items, so the caller is free to resize the array of values out from under us without harm
+    void **ppvValueArray;
+};
+const int STRINGDICT_HANDLE_BYTES = sizeof(STRINGDICT_STRUCT);
+static HRESULT StringHash(
+    __in const STRINGDICT_STRUCT *psd,
+    __in DWORD dwNumBuckets,
+    __in_z LPCWSTR pszString,
+    __out DWORD *pdwHash
+    );
+static BOOL IsMatchExact(
+    __in const STRINGDICT_STRUCT *psd,
+    __in DWORD dwMatchIndex,
+    __in_z LPCWSTR wzOriginalString
+    );
+static HRESULT GetValue(
+    __in const STRINGDICT_STRUCT *psd,
+    __in_z LPCWSTR pszString,
+    __out_opt void **ppvValue
+    );
+static HRESULT GetInsertIndex(
+    __in const STRINGDICT_STRUCT *psd,
+    __in DWORD dwBucketCount,
+    __in void **ppvBuckets,
+    __in_z LPCWSTR pszString,
+    __out DWORD *pdwOutput
+    );
+static HRESULT GetIndex(
+    __in const STRINGDICT_STRUCT *psd,
+    __in_z LPCWSTR pszString,
+    __out DWORD *pdwOutput
+    );
+static LPCWSTR GetKey(
+    __in const STRINGDICT_STRUCT *psd,
+    __in void *pvValue
+    );
+static HRESULT GrowDictionary(
+    __inout STRINGDICT_STRUCT *psd
+    );
+// These 2 helper functions allow us to safely handle dictutil consumers resizing
+// the value array by storing "offsets" instead of raw void *'s in our buckets.
+static void * TranslateOffsetToValue(
+    __in const STRINGDICT_STRUCT *psd,
+    __in void *pvValue
+    );
+static void * TranslateValueToOffset(
+    __in const STRINGDICT_STRUCT *psd,
+    __in void *pvValue
+    );
+// The dict will store a set of keys (as wide-char strings) and a set of values associated with those keys (as void *'s).
+// However, to support collision checking, the key needs to be represented in the "value" object (pointed to
+// by the void *). The "stByteOffset" parameter tells this dict the byte offset of the "key" string pointer
+// within the "value" object. Use the offsetof() macro to fill this out.
+// The "ppvArray" parameter gives dictutil the address of your value array. If you provide this parameter,
+// dictutil will remember all pointer values provided as "offsets" against this array. It is only necessary to provide
+// this parameter to dictutil if it is possible you will realloc the array.
+//
+// Use DictAddValue() and DictGetValue() with this dictionary type.
+extern "C" HRESULT DAPI DictCreateWithEmbeddedKey(
+    __out_bcount(STRINGDICT_HANDLE_BYTES) STRINGDICT_HANDLE* psdHandle,
+    __in DWORD dwNumExpectedItems,
+    __in_opt void **ppvArray,
+    __in size_t cByteOffset,
+    __in DICT_FLAG dfFlags
+    )
+{
+    HRESULT hr = S_OK;
+    DictExitOnNull(psdHandle, hr, E_INVALIDARG, "Handle not specified while creating dict");
+    // Allocate the handle
+    *psdHandle = static_cast<STRINGDICT_HANDLE>(MemAlloc(sizeof(STRINGDICT_STRUCT), FALSE));
+    DictExitOnNull(*psdHandle, hr, E_OUTOFMEMORY, "Failed to allocate dictionary object");
+    STRINGDICT_STRUCT *psd = static_cast<STRINGDICT_STRUCT *>(*psdHandle);
+    // Fill out the new handle's values
+    psd->dtType = DICT_EMBEDDED_KEY;
+    psd->dfFlags = dfFlags;
+    psd->cByteOffset = cByteOffset;
+    psd->dwBucketSizeIndex = 0;
+    psd->dwNumItems = 0;
+    psd->ppvItemList = NULL;
+    psd->ppvValueArray = ppvArray;
+    // Make psd->dwBucketSizeIndex point to the appropriate spot in the prime
+    // array based on expected number of items and items to buckets ratio
+    // Careful: the "-1" in "countof(MAX_BUCKET_SIZES)-1" ensures we don't end
+    // this loop past the end of the array!
+    while (psd->dwBucketSizeIndex < (countof(MAX_BUCKET_SIZES)-1) &&
+           MAX_BUCKET_SIZES[psd->dwBucketSizeIndex] < dwNumExpectedItems * MAX_BUCKETS_TO_ITEMS_RATIO)
+    {
+        ++psd->dwBucketSizeIndex;
+    }
+    // Finally, allocate our initial buckets
+    psd->ppvBuckets = static_cast<void**>(MemAlloc(sizeof(void *) * MAX_BUCKET_SIZES[psd->dwBucketSizeIndex], TRUE));
+    DictExitOnNull(psd->ppvBuckets, hr, E_OUTOFMEMORY, "Failed to allocate buckets for dictionary");
+LExit:
+    return hr;
+}
+// The dict will store a set of keys, with no values associated with them. Use DictAddKey() and DictKeyExists() with this dictionary type.
+extern "C" HRESULT DAPI DictCreateStringList(
+    __out_bcount(STRINGDICT_HANDLE_BYTES) STRINGDICT_HANDLE* psdHandle,
+    __in DWORD dwNumExpectedItems,
+    __in DICT_FLAG dfFlags
+    )
+{
+    HRESULT hr = S_OK;
+    DictExitOnNull(psdHandle, hr, E_INVALIDARG, "Handle not specified while creating dict");
+    // Allocate the handle
+    *psdHandle = static_cast<STRINGDICT_HANDLE>(MemAlloc(sizeof(STRINGDICT_STRUCT), FALSE));
+    DictExitOnNull(*psdHandle, hr, E_OUTOFMEMORY, "Failed to allocate dictionary object");
+    STRINGDICT_STRUCT *psd = static_cast<STRINGDICT_STRUCT *>(*psdHandle);
+    // Fill out the new handle's values
+    psd->dtType = DICT_STRING_LIST;
+    psd->dfFlags = dfFlags;
+    psd->cByteOffset = 0;
+    psd->dwBucketSizeIndex = 0;
+    psd->dwNumItems = 0;
+    psd->ppvItemList = NULL;
+    psd->ppvValueArray = NULL;
+    // Make psd->dwBucketSizeIndex point to the appropriate spot in the prime
+    // array based on expected number of items and items to buckets ratio
+    // Careful: the "-1" in "countof(MAX_BUCKET_SIZES)-1" ensures we don't end
+    // this loop past the end of the array!
+    while (psd->dwBucketSizeIndex < (countof(MAX_BUCKET_SIZES)-1) &&
+           MAX_BUCKET_SIZES[psd->dwBucketSizeIndex] < dwNumExpectedItems * MAX_BUCKETS_TO_ITEMS_RATIO)
+    {
+        ++psd->dwBucketSizeIndex;
+    }
+    // Finally, allocate our initial buckets
+    psd->ppvBuckets = static_cast<void**>(MemAlloc(sizeof(void *) * MAX_BUCKET_SIZES[psd->dwBucketSizeIndex], TRUE));
+    DictExitOnNull(psd->ppvBuckets, hr, E_OUTOFMEMORY, "Failed to allocate buckets for dictionary");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI DictCreateStringListFromArray(
+    __out_bcount(STRINGDICT_HANDLE_BYTES) STRINGDICT_HANDLE* psdHandle,
+    __in_ecount(cStringArray) const LPCWSTR* rgwzStringArray,
+    __in const DWORD cStringArray,
+    __in DICT_FLAG dfFlags
+    )
+{
+    HRESULT hr = S_OK;
+    STRINGDICT_HANDLE sd = NULL;
+    hr = DictCreateStringList(&sd, cStringArray, dfFlags);
+    DictExitOnFailure(hr, "Failed to create the string dictionary.");
+    for (DWORD i = 0; i < cStringArray; ++i)
+    {
+        const LPCWSTR wzKey = rgwzStringArray[i];
+        hr = DictKeyExists(sd, wzKey);
+        if (E_NOTFOUND != hr)
+        {
+            DictExitOnFailure(hr, "Failed to check the string dictionary.");
+        }
+        else
+        {
+            hr = DictAddKey(sd, wzKey);
+            DictExitOnFailure(hr, "Failed to add \"%ls\" to the string dictionary.", wzKey);
+        }
+    }
+    *psdHandle = sd;
+    sd = NULL;
+LExit:
+    ReleaseDict(sd);
+    return hr;
+}
+extern "C" HRESULT DAPI DictCompareStringListToArray(
+    __in_bcount(STRINGDICT_HANDLE_BYTES) STRINGDICT_HANDLE sdStringList,
+    __in_ecount(cStringArray) const LPCWSTR* rgwzStringArray,
+    __in const DWORD cStringArray
+    )
+{
+    HRESULT hr = S_OK;
+    for (DWORD i = 0; i < cStringArray; ++i)
+    {
+        hr = DictKeyExists(sdStringList, rgwzStringArray[i]);
+        if (E_NOTFOUND != hr)
+        {
+            DictExitOnFailure(hr, "Failed to check the string dictionary.");
+            ExitFunction1(hr = S_OK);
+        }
+    }
+    ExitFunction1(hr = HRESULT_FROM_WIN32(ERROR_NO_MATCH));
+LExit:
+    return hr;
+}
+// Todo: Dict should resize itself when (number of items) exceeds (number of buckets / MAX_BUCKETS_TO_ITEMS_RATIO)
+extern "C" HRESULT DAPI DictAddKey(
+    __in_bcount(STRINGDICT_HANDLE_BYTES) STRINGDICT_HANDLE sdHandle,
+    __in_z LPCWSTR pszString
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD dwIndex = 0;
+    STRINGDICT_STRUCT *psd = static_cast<STRINGDICT_STRUCT *>(sdHandle);
+    DictExitOnNull(sdHandle, hr, E_INVALIDARG, "Handle not specified while adding value to dict");
+    DictExitOnNull(pszString, hr, E_INVALIDARG, "String not specified while adding value to dict");
+    if (psd->dwBucketSizeIndex >= countof(MAX_BUCKET_SIZES))
+    {
+        hr = E_INVALIDARG;
+        DictExitOnFailure(hr, "Invalid dictionary - bucket size index is out of range");
+    }
+    if (DICT_STRING_LIST != psd->dtType)
+    {
+        hr = E_INVALIDARG;
+        DictExitOnFailure(hr, "Tried to add key without value to wrong dictionary type! This dictionary type is: %d", psd->dtType);
+    }
+    if ((psd->dwNumItems + 1) >= MAX_BUCKET_SIZES[psd->dwBucketSizeIndex] / MAX_BUCKETS_TO_ITEMS_RATIO)
+    {
+        hr = GrowDictionary(psd);
+        if (HRESULT_FROM_WIN32(ERROR_DATABASE_FULL) == hr)
+        {
+            // If we fail to proactively grow the dictionary, don't fail unless the dictionary is completely full
+            if (psd->dwNumItems < MAX_BUCKET_SIZES[psd->dwBucketSizeIndex])
+            {
+                hr = S_OK;
+            }
+        }
+        DictExitOnFailure(hr, "Failed to grow dictionary");
+    }
+    hr = GetInsertIndex(psd, MAX_BUCKET_SIZES[psd->dwBucketSizeIndex], psd->ppvBuckets, pszString, &dwIndex);
+    DictExitOnFailure(hr, "Failed to get index to insert into");
+    hr = MemEnsureArraySize(reinterpret_cast<void **>(&(psd->ppvItemList)), psd->dwNumItems + 1, sizeof(void *), 1000);
+    DictExitOnFailure(hr, "Failed to resize list of items in dictionary");
+    ++psd->dwNumItems;
+    hr = StrAllocString(reinterpret_cast<LPWSTR *>(&(psd->ppvBuckets[dwIndex])), pszString, 0);
+    DictExitOnFailure(hr, "Failed to allocate copy of string");
+    psd->ppvItemList[psd->dwNumItems-1] = psd->ppvBuckets[dwIndex];
+LExit:
+    return hr;
+}
+// Todo: Dict should resize itself when (number of items) exceeds (number of buckets / MAX_BUCKETS_TO_ITEMS_RATIO)
+extern "C" HRESULT DAPI DictAddValue(
+    __in_bcount(STRINGDICT_HANDLE_BYTES) STRINGDICT_HANDLE sdHandle,
+    __in void *pvValue
+    )
+{
+    HRESULT hr = S_OK;
+    void *pvOffset = NULL;
+    LPCWSTR wzKey = NULL;
+    DWORD dwIndex = 0;
+    STRINGDICT_STRUCT *psd = static_cast<STRINGDICT_STRUCT *>(sdHandle);
+    DictExitOnNull(sdHandle, hr, E_INVALIDARG, "Handle not specified while adding value to dict");
+    DictExitOnNull(pvValue, hr, E_INVALIDARG, "Value not specified while adding value to dict");
+    if (psd->dwBucketSizeIndex >= countof(MAX_BUCKET_SIZES))
+    {
+        hr = E_INVALIDARG;
+        DictExitOnFailure(hr, "Invalid dictionary - bucket size index is out of range");
+    }
+    if (DICT_EMBEDDED_KEY != psd->dtType)
+    {
+        hr = E_INVALIDARG;
+        DictExitOnFailure(hr, "Tried to add key/value pair to wrong dictionary type! This dictionary type is: %d", psd->dtType);
+    }
+    wzKey = GetKey(psd, pvValue);
+    DictExitOnNull(wzKey, hr, E_INVALIDARG, "String not specified while adding value to dict");
+    if ((psd->dwNumItems + 1) >= MAX_BUCKET_SIZES[psd->dwBucketSizeIndex] / MAX_BUCKETS_TO_ITEMS_RATIO)
+    {
+        hr = GrowDictionary(psd);
+        if (HRESULT_FROM_WIN32(ERROR_DATABASE_FULL) == hr && psd->dwNumItems + 1 )
+        {
+            // If we fail to proactively grow the dictionary, don't fail unless the dictionary is completely full
+            if (psd->dwNumItems < MAX_BUCKET_SIZES[psd->dwBucketSizeIndex])
+            {
+                hr = S_OK;
+            }
+        }
+        DictExitOnFailure(hr, "Failed to grow dictionary");
+    }
+    hr = GetInsertIndex(psd, MAX_BUCKET_SIZES[psd->dwBucketSizeIndex], psd->ppvBuckets, wzKey, &dwIndex);
+    DictExitOnFailure(hr, "Failed to get index to insert into");
+    hr = MemEnsureArraySize(reinterpret_cast<void **>(&(psd->ppvItemList)), psd->dwNumItems + 1, sizeof(void *), 1000);
+    DictExitOnFailure(hr, "Failed to resize list of items in dictionary");
+    ++psd->dwNumItems;
+    pvOffset = TranslateValueToOffset(psd, pvValue);
+    psd->ppvBuckets[dwIndex] = pvOffset;
+    psd->ppvItemList[psd->dwNumItems-1] = pvOffset;
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI DictGetValue(
+    __in_bcount(STRINGDICT_HANDLE_BYTES) C_STRINGDICT_HANDLE sdHandle,
+    __in_z LPCWSTR pszString,
+    __out void **ppvValue
+    )
+{
+    HRESULT hr = S_OK;
+    DictExitOnNull(sdHandle, hr, E_INVALIDARG, "Handle not specified while searching dict");
+    DictExitOnNull(pszString, hr, E_INVALIDARG, "String not specified while searching dict");
+    const STRINGDICT_STRUCT *psd = static_cast<const STRINGDICT_STRUCT *>(sdHandle);
+    if (DICT_EMBEDDED_KEY != psd->dtType)
+    {
+        hr = E_INVALIDARG;
+        DictExitOnFailure(hr, "Tried to lookup value in wrong dictionary type! This dictionary type is: %d", psd->dtType);
+    }
+    hr = GetValue(psd, pszString, ppvValue);
+    if (E_NOTFOUND == hr)
+    {
+        ExitFunction();
+    }
+    DictExitOnFailure(hr, "Failed to call internal GetValue()");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI DictKeyExists(
+    __in_bcount(STRINGDICT_HANDLE_BYTES) C_STRINGDICT_HANDLE sdHandle,
+    __in_z LPCWSTR pszString
+    )
+{
+    HRESULT hr = S_OK;
+    DictExitOnNull(sdHandle, hr, E_INVALIDARG, "Handle not specified while searching dict");
+    DictExitOnNull(pszString, hr, E_INVALIDARG, "String not specified while searching dict");
+    const STRINGDICT_STRUCT *psd = static_cast<const STRINGDICT_STRUCT *>(sdHandle);
+    // This works with either type of dictionary
+    hr = GetValue(psd, pszString, NULL);
+    if (E_NOTFOUND == hr)
+    {
+        ExitFunction();
+    }
+    DictExitOnFailure(hr, "Failed to call internal GetValue()");
+LExit:
+    return hr;
+}
+extern "C" void DAPI DictDestroy(
+    __in_bcount(STRINGDICT_HANDLE_BYTES) STRINGDICT_HANDLE sdHandle
+    )
+{
+    DWORD i;
+    STRINGDICT_STRUCT *psd = static_cast<STRINGDICT_STRUCT *>(sdHandle);
+    if (DICT_STRING_LIST == psd->dtType)
+    {
+        for (i = 0; i < psd->dwNumItems; ++i)
+        {
+            ReleaseStr(reinterpret_cast<LPWSTR>(psd->ppvItemList[i]));
+        }
+    }
+    ReleaseMem(psd->ppvItemList);
+    ReleaseMem(psd->ppvBuckets);
+    ReleaseMem(psd);
+}
+static HRESULT StringHash(
+    __in const STRINGDICT_STRUCT *psd,
+    __in DWORD dwNumBuckets,
+    __in_z LPCWSTR pszString,
+    __out DWORD *pdwHash
+    )
+{
+    HRESULT hr = S_OK;
+    LPCWSTR wzKey = NULL;
+    LPWSTR sczNewKey = NULL;
+    DWORD result = 0;
+    if (DICT_FLAG_CASEINSENSITIVE & psd->dfFlags)
+    {
+        hr = StrAllocStringToUpperInvariant(&sczNewKey, pszString, 0);
+        DictExitOnFailure(hr, "Failed to convert the string to upper-case.");
+        wzKey = sczNewKey;
+    }
+    else
+    {
+        wzKey = pszString;
+    }
+    while (*wzKey)
+    {
+        result = ~(*wzKey++ * 509) + result * 65599;
+    }
+    *pdwHash = result % dwNumBuckets;
+LExit:
+    ReleaseStr(sczNewKey);
+    return hr;
+}
+static BOOL IsMatchExact(
+    __in const STRINGDICT_STRUCT *psd,
+    __in DWORD dwMatchIndex,
+    __in_z LPCWSTR wzOriginalString
+    )
+{
+    LPCWSTR wzMatchString = GetKey(psd, TranslateOffsetToValue(psd, psd->ppvBuckets[dwMatchIndex]));
+    DWORD dwFlags = 0;
+    if (DICT_FLAG_CASEINSENSITIVE & psd->dfFlags)
+    {
+        dwFlags |= NORM_IGNORECASE;
+    }
+    if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, dwFlags, wzOriginalString, -1, wzMatchString, -1))
+    {
+        return TRUE;
+    }
+    return FALSE;
+}
+static HRESULT GetValue(
+    __in const STRINGDICT_STRUCT *psd,
+    __in_z LPCWSTR pszString,
+    __out_opt void **ppvValue
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD dwOriginalIndexCandidate = 0;
+    void *pvCandidateValue = NULL;
+    DWORD dwIndex = 0;
+    DictExitOnNull(psd, hr, E_INVALIDARG, "Handle not specified while searching dict");
+    DictExitOnNull(pszString, hr, E_INVALIDARG, "String not specified while searching dict");
+    if (psd->dwBucketSizeIndex >= countof(MAX_BUCKET_SIZES))
+    {
+        hr = E_INVALIDARG;
+        DictExitOnFailure(hr, "Invalid dictionary - bucket size index is out of range");
+    }
+    hr = StringHash(psd, MAX_BUCKET_SIZES[psd->dwBucketSizeIndex], pszString, &dwOriginalIndexCandidate);
+    DictExitOnFailure(hr, "Failed to hash the string.");
+    DWORD dwIndexCandidate = dwOriginalIndexCandidate;
+    pvCandidateValue = TranslateOffsetToValue(psd, psd->ppvBuckets[dwIndexCandidate]);
+    // If no match exists in the dict
+    if (NULL == pvCandidateValue)
+    {
+        if (NULL != ppvValue)
+        {
+            *ppvValue = NULL;
+        }
+        ExitFunction1(hr = E_NOTFOUND);
+    }
+    hr = GetIndex(psd, pszString, &dwIndex);
+    if (E_NOTFOUND == hr)
+    {
+        ExitFunction();
+    }
+    DictExitOnFailure(hr, "Failed to find index to get");
+    if (NULL != ppvValue)
+    {
+        *ppvValue = TranslateOffsetToValue(psd, psd->ppvBuckets[dwIndex]);
+    }
+LExit:
+    if (FAILED(hr) && NULL != ppvValue)
+    {
+        *ppvValue = NULL;
+    }
+    return hr;
+}
+static HRESULT GetInsertIndex(
+    __in const STRINGDICT_STRUCT *psd,
+    __in DWORD dwBucketCount,
+    __in void **ppvBuckets,
+    __in_z LPCWSTR pszString,
+    __out DWORD *pdwOutput
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD dwOriginalIndexCandidate = 0;
+    hr = StringHash(psd, dwBucketCount, pszString, &dwOriginalIndexCandidate);
+    DictExitOnFailure(hr, "Failed to hash the string.");
+    DWORD dwIndexCandidate = dwOriginalIndexCandidate;
+    // If we collide, keep iterating forward from our intended position, even wrapping around to zero, until we find an empty bucket
+#pragma prefast(push)
+#pragma prefast(disable:26007)
+    while (NULL != ppvBuckets[dwIndexCandidate])
+#pragma prefast(pop)
+    {
+        ++dwIndexCandidate;
+        // If we got to the end of the array, wrap around to zero index
+        if (dwIndexCandidate >= dwBucketCount)
+        {
+            dwIndexCandidate = 0;
+        }
+        // If we wrapped all the way back around to our original index, the dict is full - throw an error
+        if (dwIndexCandidate == dwOriginalIndexCandidate)
+        {
+            // The dict table is full - this error seems to be a reasonably close match 
+            hr = HRESULT_FROM_WIN32(ERROR_DATABASE_FULL);
+            DictExitOnRootFailure(hr, "Failed to add item '%ls' to dict table because dict table is full of items", pszString);
+        }
+    }
+    *pdwOutput = dwIndexCandidate;
+LExit:
+    return hr;
+}
+static HRESULT GetIndex(
+    __in const STRINGDICT_STRUCT *psd,
+    __in_z LPCWSTR pszString,
+    __out DWORD *pdwOutput
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD dwOriginalIndexCandidate = 0;
+    if (psd->dwBucketSizeIndex >= countof(MAX_BUCKET_SIZES))
+    {
+        hr = E_INVALIDARG;
+        DictExitOnFailure(hr, "Invalid dictionary - bucket size index is out of range");
+    }
+    hr = StringHash(psd, MAX_BUCKET_SIZES[psd->dwBucketSizeIndex], pszString, &dwOriginalIndexCandidate);
+    DictExitOnFailure(hr, "Failed to hash the string.");
+    DWORD dwIndexCandidate = dwOriginalIndexCandidate;
+    while (!IsMatchExact(psd, dwIndexCandidate, pszString))
+    {
+        ++dwIndexCandidate;
+        // If we got to the end of the array, wrap around to zero index
+        if (dwIndexCandidate >= MAX_BUCKET_SIZES[psd->dwBucketSizeIndex])
+        {
+            dwIndexCandidate = 0;
+        }
+        // If no match exists in the dict
+        if (NULL == psd->ppvBuckets[dwIndexCandidate])
+        {
+            ExitFunction1(hr = E_NOTFOUND);
+        }
+        // If we wrapped all the way back around to our original index, the dict is full and we found nothing, so return as such
+        if (dwIndexCandidate == dwOriginalIndexCandidate)
+        {
+            ExitFunction1(hr = E_NOTFOUND);
+        }
+    }
+    *pdwOutput = dwIndexCandidate;
+LExit:
+    return hr;
+}
+static LPCWSTR GetKey(
+    __in const STRINGDICT_STRUCT *psd,
+    __in void *pvValue
+    )
+{
+    const BYTE *lpByte = reinterpret_cast<BYTE *>(pvValue);
+    if (DICT_EMBEDDED_KEY == psd->dtType)
+    {
+        void *pvKey = reinterpret_cast<void *>(reinterpret_cast<BYTE *>(pvValue) + psd->cByteOffset);
+#pragma prefast(push)
+#pragma prefast(disable:26010)
+        return *(reinterpret_cast<LPCWSTR *>(pvKey));
+#pragma prefast(pop)
+    }
+    else
+    {
+        return (reinterpret_cast<LPCWSTR>(lpByte));
+    }
+}
+static HRESULT GrowDictionary(
+    __inout STRINGDICT_STRUCT *psd
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD dwInsertIndex = 0;
+    LPCWSTR wzKey = NULL;
+    DWORD dwNewBucketSizeIndex = 0;
+    size_t cbAllocSize = 0;
+    void **ppvNewBuckets = NULL;
+    dwNewBucketSizeIndex = psd->dwBucketSizeIndex + 1;
+    if (dwNewBucketSizeIndex >= countof(MAX_BUCKET_SIZES))
+    {
+        ExitFunction1(hr = HRESULT_FROM_WIN32(ERROR_DATABASE_FULL));
+    }
+    hr = ::SizeTMult(sizeof(void *), MAX_BUCKET_SIZES[dwNewBucketSizeIndex], &cbAllocSize);
+    DictExitOnFailure(hr, "Overflow while calculating allocation size to grow dictionary");
+    ppvNewBuckets = static_cast<void**>(MemAlloc(cbAllocSize, TRUE));
+    DictExitOnNull(ppvNewBuckets, hr, E_OUTOFMEMORY, "Failed to allocate %u buckets while growing dictionary", MAX_BUCKET_SIZES[dwNewBucketSizeIndex]);
+    for (DWORD i = 0; i < psd->dwNumItems; ++i)
+    {
+        wzKey = GetKey(psd, TranslateOffsetToValue(psd, psd->ppvItemList[i]));
+        DictExitOnNull(wzKey, hr, E_INVALIDARG, "String not specified in existing dict value");
+        hr = GetInsertIndex(psd, MAX_BUCKET_SIZES[dwNewBucketSizeIndex], ppvNewBuckets, wzKey, &dwInsertIndex);
+        DictExitOnFailure(hr, "Failed to get index to insert into");
+        ppvNewBuckets[dwInsertIndex] = psd->ppvItemList[i];
+    }
+    psd->dwBucketSizeIndex = dwNewBucketSizeIndex;
+    ReleaseMem(psd->ppvBuckets);
+    psd->ppvBuckets = ppvNewBuckets;
+    ppvNewBuckets = NULL;
+LExit:
+    ReleaseMem(ppvNewBuckets);
+    return hr;
+}
+static void * TranslateOffsetToValue(
+    __in const STRINGDICT_STRUCT *psd,
+    __in void *pvValue
+    )
+{
+    if (NULL == pvValue)
+    {
+        return NULL;
+    }
+    // All offsets are stored as (real offset + 1), so subtract 1 to get back to the real value
+    if (NULL != psd->ppvValueArray)
+    {
+        return reinterpret_cast<void *>(reinterpret_cast<DWORD_PTR>(pvValue) + reinterpret_cast<DWORD_PTR>(*psd->ppvValueArray) - 1);
+    }
+    else
+    {
+        return pvValue;
+    }
+}
+static void * TranslateValueToOffset(
+    __in const STRINGDICT_STRUCT *psd,
+    __in void *pvValue
+    )
+{
+    if (NULL != psd->ppvValueArray)
+    {
+        // 0 has a special meaning - we don't want offset 0 into the array to have NULL for the offset - so add 1 to avoid this issue
+        return reinterpret_cast<void *>(reinterpret_cast<DWORD_PTR>(pvValue) - reinterpret_cast<DWORD_PTR>(*psd->ppvValueArray) + 1);
+    }
+    else
+    {
+        return pvValue;
+    }
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/dirutil.cpp b/src/libs/dutil/WixToolset.DUtil/dirutil.cpp
new file mode 100644
index 00000000..ae2c5e1c
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/dirutil.cpp
@@ -0,0 +1,441 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define DirExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_DIRUTIL, x, s, __VA_ARGS__)
+#define DirExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_DIRUTIL, x, s, __VA_ARGS__)
+#define DirExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_DIRUTIL, x, s, __VA_ARGS__)
+#define DirExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_DIRUTIL, x, s, __VA_ARGS__)
+#define DirExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_DIRUTIL, x, s, __VA_ARGS__)
+#define DirExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_DIRUTIL, x, s, __VA_ARGS__)
+#define DirExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_DIRUTIL, p, x, e, s, __VA_ARGS__)
+#define DirExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_DIRUTIL, p, x, s, __VA_ARGS__)
+#define DirExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_DIRUTIL, p, x, e, s, __VA_ARGS__)
+#define DirExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_DIRUTIL, p, x, s, __VA_ARGS__)
+#define DirExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_DIRUTIL, e, x, s, __VA_ARGS__)
+#define DirExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_DIRUTIL, g, x, s, __VA_ARGS__)
+/*******************************************************************
+ DirExists
+*******************************************************************/
+extern "C" BOOL DAPI DirExists(
+    __in_z LPCWSTR wzPath, 
+    __out_opt DWORD *pdwAttributes
+    )
+{
+    Assert(wzPath);
+    BOOL fExists = FALSE;
+    DWORD dwAttributes = ::GetFileAttributesW(wzPath);
+    if (0xFFFFFFFF == dwAttributes) // TODO: figure out why "INVALID_FILE_ATTRIBUTES" can't be used here
+    {
+        ExitFunction();
+    }
+    if (dwAttributes & FILE_ATTRIBUTE_DIRECTORY)
+    {
+        if (pdwAttributes)
+        {
+            *pdwAttributes = dwAttributes;
+        }
+        fExists = TRUE;
+    }
+LExit:
+    return fExists;
+}
+/*******************************************************************
+ DirCreateTempPath
+ *******************************************************************/
+extern "C" HRESULT DAPI DirCreateTempPath(
+    __in_z LPCWSTR wzPrefix,
+    __out_ecount_z(cchPath) LPWSTR wzPath,
+    __in DWORD cchPath
+    )
+{
+    Assert(wzPrefix);
+    Assert(wzPath);
+    HRESULT hr = S_OK;
+    WCHAR wzDir[MAX_PATH];
+    WCHAR wzFile[MAX_PATH];
+    DWORD cch = 0;
+    cch = ::GetTempPathW(countof(wzDir), wzDir);
+    if (!cch || cch >= countof(wzDir))
+    {
+        DirExitWithLastError(hr, "Failed to GetTempPath.");
+    }
+    if (!::GetTempFileNameW(wzDir, wzPrefix, 0, wzFile))
+    {
+        DirExitWithLastError(hr, "Failed to GetTempFileName.");
+    }
+    hr = ::StringCchCopyW(wzPath, cchPath, wzFile);
+LExit:
+    return hr;
+}
+/*******************************************************************
+ DirEnsureExists
+*******************************************************************/
+extern "C" HRESULT DAPI DirEnsureExists(
+    __in_z LPCWSTR wzPath, 
+    __in_opt LPSECURITY_ATTRIBUTES psa
+    )
+{
+    HRESULT hr = S_OK;
+    UINT er;
+    // try to create this directory
+    if (!::CreateDirectoryW(wzPath, psa))
+    {
+        // if the directory already exists, bail
+        er = ::GetLastError();
+        if (ERROR_ALREADY_EXISTS == er)
+        {
+            ExitFunction1(hr = S_OK);
+        }
+        else if (ERROR_PATH_NOT_FOUND != er && DirExists(wzPath, NULL)) // if the directory happens to exist (don't check if CreateDirectory said it doesn't), declare success.
+        {
+            ExitFunction1(hr = S_OK);
+        }
+        // get the parent path and try to create it
+        LPWSTR pwzLastSlash = NULL;
+        for (LPWSTR pwz = const_cast<LPWSTR>(wzPath); *pwz; ++pwz)
+        {
+            if (*pwz == L'\\')
+            {
+                pwzLastSlash = pwz;
+            }
+        }
+        // if there is no parent directory fail
+        DirExitOnNullDebugTrace(pwzLastSlash, hr, HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "cannot find parent path");
+        *pwzLastSlash = L'\0'; // null terminate the parent path
+        hr = DirEnsureExists(wzPath, psa);   // recurse!
+        *pwzLastSlash = L'\\';  // put the slash back
+        DirExitOnFailureDebugTrace(hr, "failed to create path: %ls", wzPath);
+        // try to create the directory now that all parents are created
+        if (!::CreateDirectoryW(wzPath, psa))
+        {
+            // if the directory already exists for some reason no error
+            er = ::GetLastError();
+            if (ERROR_ALREADY_EXISTS == er)
+            {
+                hr = S_FALSE;
+            }
+            else
+            {
+                hr = HRESULT_FROM_WIN32(er);
+            }
+        }
+        else
+        {
+            hr = S_OK;
+        }
+    }
+LExit:
+    return hr;
+}
+/*******************************************************************
+ DirEnsureDelete - removes an entire directory structure
+*******************************************************************/
+extern "C" HRESULT DAPI DirEnsureDelete(
+    __in_z LPCWSTR wzPath,
+    __in BOOL fDeleteFiles,
+    __in BOOL fRecurse
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD dwDeleteFlags = 0;
+    dwDeleteFlags |= fDeleteFiles ? DIR_DELETE_FILES : 0;
+    dwDeleteFlags |= fRecurse ? DIR_DELETE_RECURSE : 0;
+    hr = DirEnsureDeleteEx(wzPath, dwDeleteFlags);
+    return hr;
+}
+/*******************************************************************
+ DirEnsureDeleteEx - removes an entire directory structure
+*******************************************************************/
+extern "C" HRESULT DAPI DirEnsureDeleteEx(
+    __in_z LPCWSTR wzPath,
+    __in DWORD dwFlags
+    )
+{
+    Assert(wzPath && *wzPath);
+    HRESULT hr = S_OK;
+    DWORD er;
+    DWORD dwAttrib;
+    HANDLE hFind = INVALID_HANDLE_VALUE;
+    LPWSTR sczDelete = NULL;
+    WIN32_FIND_DATAW wfd;
+    BOOL fDeleteFiles = (DIR_DELETE_FILES == (dwFlags & DIR_DELETE_FILES));
+    BOOL fRecurse = (DIR_DELETE_RECURSE == (dwFlags & DIR_DELETE_RECURSE));
+    BOOL fScheduleDelete = (DIR_DELETE_SCHEDULE == (dwFlags & DIR_DELETE_SCHEDULE));
+    WCHAR wzTempDirectory[MAX_PATH] = { };
+    WCHAR wzTempPath[MAX_PATH] = { };
+    if (-1 == (dwAttrib = ::GetFileAttributesW(wzPath)))
+    {
+        er = ::GetLastError();
+        if (ERROR_FILE_NOT_FOUND == er) // change "file not found" to "path not found" since we were looking for a directory.
+        {
+            er = ERROR_PATH_NOT_FOUND;
+        }
+        hr = HRESULT_FROM_WIN32(er);
+        DirExitOnRootFailure(hr, "Failed to get attributes for path: %ls", wzPath);
+    }
+    if (dwAttrib & FILE_ATTRIBUTE_DIRECTORY)
+    {
+        if (dwAttrib & FILE_ATTRIBUTE_READONLY)
+        {
+            if (!::SetFileAttributesW(wzPath, FILE_ATTRIBUTE_NORMAL))
+            {
+                DirExitWithLastError(hr, "Failed to remove read-only attribute from path: %ls", wzPath);
+            }
+        }
+        // If we're deleting files and/or child directories loop through the contents of the directory.
+        if (fDeleteFiles || fRecurse)
+        {
+            if (fScheduleDelete)
+            {
+                if (!::GetTempPathW(countof(wzTempDirectory), wzTempDirectory))
+                {
+                    DirExitWithLastError(hr, "Failed to get temp directory.");
+                }
+            }
+            // Delete everything in this directory.
+            hr = PathConcat(wzPath, L"*.*", &sczDelete);
+            DirExitOnFailure(hr, "Failed to concat wild cards to string: %ls", wzPath);
+            hFind = ::FindFirstFileW(sczDelete, &wfd);
+            if (INVALID_HANDLE_VALUE == hFind)
+            {
+                DirExitWithLastError(hr, "failed to get first file in directory: %ls", wzPath);
+            }
+            do
+            {
+                // Skip the dot directories.
+                if (L'.' == wfd.cFileName[0] && (L'\0' == wfd.cFileName[1] || (L'.' == wfd.cFileName[1] && L'\0' == wfd.cFileName[2])))
+                {
+                    continue;
+                }
+                // For extra safety and to silence OACR.
+                wfd.cFileName[MAX_PATH - 1] = L'\0';
+                hr = PathConcat(wzPath, wfd.cFileName, &sczDelete);
+                DirExitOnFailure(hr, "Failed to concat filename '%ls' to directory: %ls", wfd.cFileName, wzPath);
+                if (fRecurse && wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+                {
+                    hr = PathBackslashTerminate(&sczDelete);
+                    DirExitOnFailure(hr, "Failed to ensure path is backslash terminated: %ls", sczDelete);
+                    hr = DirEnsureDeleteEx(sczDelete, dwFlags); // recursive call
+                    if (FAILED(hr))
+                    {
+                      // if we failed to delete a subdirectory, keep trying to finish any remaining files
+                      ExitTraceSource(DUTIL_SOURCE_DIRUTIL, hr, "Failed to delete subdirectory; continuing: %ls", sczDelete);
+                      hr = S_OK;
+                    }
+                }
+                else if (fDeleteFiles)  // this is a file, just delete it
+                {
+                    if (wfd.dwFileAttributes & FILE_ATTRIBUTE_READONLY || wfd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN || wfd.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM)
+                    {
+                        if (!::SetFileAttributesW(sczDelete, FILE_ATTRIBUTE_NORMAL))
+                        {
+                            DirExitWithLastError(hr, "Failed to remove attributes from file: %ls", sczDelete);
+                        }
+                    }
+                    if (!::DeleteFileW(sczDelete))
+                    {
+                        if (fScheduleDelete)
+                        {
+                            if (!::GetTempFileNameW(wzTempDirectory, L"DEL", 0, wzTempPath))
+                            {
+                                DirExitWithLastError(hr, "Failed to get temp file to move to.");
+                            }
+                            // Try to move the file to the temp directory then schedule for delete,
+                            // otherwise just schedule for delete.
+                            if (::MoveFileExW(sczDelete, wzTempPath, MOVEFILE_REPLACE_EXISTING))
+                            {
+                                ::MoveFileExW(wzTempPath, NULL, MOVEFILE_DELAY_UNTIL_REBOOT);
+                            }
+                            else
+                            {
+                                ::MoveFileExW(sczDelete, NULL, MOVEFILE_DELAY_UNTIL_REBOOT);
+                            }
+                        }
+                        else
+                        {
+                            DirExitWithLastError(hr, "Failed to delete file: %ls", sczDelete);
+                        }
+                    }
+                }
+            } while (::FindNextFileW(hFind, &wfd));
+            er = ::GetLastError();
+            if (ERROR_NO_MORE_FILES == er)
+            {
+                hr = S_OK;
+            }
+            else
+            {
+                DirExitWithLastError(hr, "Failed while looping through files in directory: %ls", wzPath);
+            }
+        }
+        if (!::RemoveDirectoryW(wzPath))
+        {
+            hr = HRESULT_FROM_WIN32(::GetLastError());
+            if (HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION) == hr && fScheduleDelete)
+            {
+                if (::MoveFileExW(wzPath, NULL, MOVEFILE_DELAY_UNTIL_REBOOT))
+                {
+                    hr = S_OK;
+                }
+            }
+            DirExitOnRootFailure(hr, "Failed to remove directory: %ls", wzPath);
+        }
+    }
+    else
+    {
+        hr = E_UNEXPECTED;
+        DirExitOnFailure(hr, "Directory delete cannot delete file: %ls", wzPath);
+    }
+    Assert(S_OK == hr);
+LExit:
+    ReleaseFileFindHandle(hFind);
+    ReleaseStr(sczDelete);
+    return hr;
+}
+/*******************************************************************
+DirDeleteEmptyDirectoriesToRoot - removes an empty directory and as many
+                                  of its parents as possible.
+ Returns: count of directories deleted.
+*******************************************************************/
+extern "C" DWORD DAPI DirDeleteEmptyDirectoriesToRoot(
+    __in_z LPCWSTR wzPath,
+    __in DWORD /*dwFlags*/
+    )
+{
+    DWORD cDeletedDirs = 0;
+    LPWSTR sczPath = NULL;
+    while (wzPath && *wzPath && ::RemoveDirectoryW(wzPath))
+    {
+        ++cDeletedDirs;
+        HRESULT hr = PathGetParentPath(wzPath, &sczPath);
+        DirExitOnFailure(hr, "Failed to get parent directory for path: %ls", wzPath);
+        wzPath = sczPath;
+    }
+LExit:
+    ReleaseStr(sczPath);
+    return cDeletedDirs;
+}
+/*******************************************************************
+ DirGetCurrent - gets the current directory.
+*******************************************************************/
+extern "C" HRESULT DAPI DirGetCurrent(
+    __deref_out_z LPWSTR* psczCurrentDirectory
+    )
+{
+    HRESULT hr = S_OK;
+    SIZE_T cch = 0;
+    if (psczCurrentDirectory && *psczCurrentDirectory)
+    {
+        hr = StrMaxLength(*psczCurrentDirectory, &cch);
+        DirExitOnFailure(hr, "Failed to determine size of current directory.");
+    }
+    DWORD cchRequired = ::GetCurrentDirectoryW((DWORD)min(DWORD_MAX, cch), 0 == cch ? NULL : *psczCurrentDirectory);
+    if (0 == cchRequired)
+    {
+        DirExitWithLastError(hr, "Failed to get current directory.");
+    }
+    else if (cch < cchRequired)
+    {
+        hr = StrAlloc(psczCurrentDirectory, cchRequired);
+        DirExitOnFailure(hr, "Failed to allocate string for current directory.");
+        if (!::GetCurrentDirectoryW(cchRequired, *psczCurrentDirectory))
+        {
+            DirExitWithLastError(hr, "Failed to get current directory using allocated string.");
+        }
+    }
+LExit:
+    return hr;
+}
+/*******************************************************************
+ DirSetCurrent - sets the current directory.
+*******************************************************************/
+extern "C" HRESULT DAPI DirSetCurrent(
+    __in_z LPCWSTR wzDirectory
+    )
+{
+    HRESULT hr = S_OK;
+    if (!::SetCurrentDirectoryW(wzDirectory))
+    {
+        DirExitWithLastError(hr, "Failed to set current directory to: %ls", wzDirectory);
+    }
+LExit:
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/dlutil.cpp b/src/libs/dutil/WixToolset.DUtil/dlutil.cpp
new file mode 100644
index 00000000..70155e6f
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/dlutil.cpp
@@ -0,0 +1,802 @@
+// 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.
+#include "precomp.h"
+#include <inetutil.h>
+#include <uriutil.h>
+// Exit macros
+#define DlExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_DLUTIL, x, s, __VA_ARGS__)
+#define DlExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_DLUTIL, x, s, __VA_ARGS__)
+#define DlExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_DLUTIL, x, s, __VA_ARGS__)
+#define DlExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_DLUTIL, x, s, __VA_ARGS__)
+#define DlExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_DLUTIL, x, s, __VA_ARGS__)
+#define DlExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_DLUTIL, x, s, __VA_ARGS__)
+#define DlExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_DLUTIL, p, x, e, s, __VA_ARGS__)
+#define DlExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_DLUTIL, p, x, s, __VA_ARGS__)
+#define DlExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_DLUTIL, p, x, e, s, __VA_ARGS__)
+#define DlExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_DLUTIL, p, x, s, __VA_ARGS__)
+#define DlExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_DLUTIL, e, x, s, __VA_ARGS__)
+#define DlExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_DLUTIL, g, x, s, __VA_ARGS__)
+static const DWORD64 DOWNLOAD_ENGINE_TWO_GIGABYTES = DWORD64(2) * 1024 * 1024 * 1024;
+static LPCWSTR DOWNLOAD_ENGINE_ACCEPT_TYPES[] = { L"*/*", NULL };
+// internal function declarations
+static HRESULT InitializeResume(
+    __in LPCWSTR wzDestinationPath,
+    __out LPWSTR* psczResumePath,
+    __out HANDLE* phResumeFile,
+    __out DWORD64* pdw64ResumeOffset
+    );
+static HRESULT GetResourceMetadata(
+    __in HINTERNET hSession,
+    __inout_z LPWSTR* psczUrl,
+    __in_z_opt LPCWSTR wzUser,
+    __in_z_opt LPCWSTR wzPassword,
+    __in_opt DOWNLOAD_AUTHENTICATION_CALLBACK* pAuthenticate,
+    __out DWORD64* pdw64ResourceSize,
+    __out FILETIME* pftResourceCreated
+    );
+static HRESULT DownloadResource(
+    __in HINTERNET hSession,
+    __inout_z LPWSTR* psczUrl,
+    __in_z_opt LPCWSTR wzUser,
+    __in_z_opt LPCWSTR wzPassword,
+    __in_z LPCWSTR wzDestinationPath,
+    __in DWORD64 dw64AuthoredResourceLength,
+    __in DWORD64 dw64ResourceLength,
+    __in DWORD64 dw64ResumeOffset,
+    __in HANDLE hResumeFile,
+    __in_opt DOWNLOAD_CACHE_CALLBACK* pCache,
+    __in_opt DOWNLOAD_AUTHENTICATION_CALLBACK* pAuthenticate
+    );
+static HRESULT AllocateRangeRequestHeader(
+    __in DWORD64 dw64ResumeOffset,
+    __in DWORD64 dw64ResourceLength,
+    __deref_inout_z LPWSTR* psczHeader
+    );
+static HRESULT WriteToFile(
+    __in HINTERNET hUrl,
+    __in HANDLE hPayloadFile,
+    __inout DWORD64* pdw64ResumeOffset,
+    __in HANDLE hResumeFile,
+    __in DWORD64 dw64ResourceLength,
+    __in LPBYTE pbData,
+    __in DWORD cbData,
+    __in_opt DOWNLOAD_CACHE_CALLBACK* pCallback
+    );
+static HRESULT UpdateResumeOffset(
+    __inout DWORD64* pdw64ResumeOffset,
+    __in HANDLE hResumeFile,
+    __in DWORD cbData
+    );
+static HRESULT MakeRequest(
+    __in HINTERNET hSession,
+    __inout_z LPWSTR* psczSourceUrl,
+    __in_z_opt LPCWSTR wzMethod,
+    __in_z_opt LPCWSTR wzHeaders,
+    __in_z_opt LPCWSTR wzUser,
+    __in_z_opt LPCWSTR wzPassword,
+    __in_opt DOWNLOAD_AUTHENTICATION_CALLBACK* pAuthenticate,
+    __out HINTERNET* phConnect,
+    __out HINTERNET* phUrl,
+    __out BOOL* pfRangeRequestsAccepted
+    );
+static HRESULT OpenRequest(
+    __in HINTERNET hConnect,
+    __in_z_opt LPCWSTR wzMethod,
+    __in INTERNET_SCHEME scheme,
+    __in_z LPCWSTR wzResource,
+    __in_z_opt LPCWSTR wzQueryString,
+    __in_z_opt LPCWSTR wzHeader,
+    __out HINTERNET* phUrl
+    );
+static HRESULT SendRequest(
+    __in HINTERNET hUrl,
+    __inout_z LPWSTR* psczUrl,
+    __in_opt DOWNLOAD_AUTHENTICATION_CALLBACK* pAuthenticate,
+    __out BOOL* pfRetry,
+    __out BOOL* pfRangesAccepted
+    );
+static HRESULT AuthenticationRequired(
+    __in HINTERNET hUrl,
+    __in long lHttpCode,
+    __in_opt DOWNLOAD_AUTHENTICATION_CALLBACK* pAuthenticate,
+    __out BOOL* pfRetrySend,
+    __out BOOL* pfRetry
+    );
+static HRESULT DownloadGetResumePath(
+    __in_z LPCWSTR wzPayloadWorkingPath,
+    __deref_out_z LPWSTR* psczResumePath
+    );
+static HRESULT DownloadSendProgressCallback(
+    __in DOWNLOAD_CACHE_CALLBACK* pCallback,
+    __in DWORD64 dw64Progress,
+    __in DWORD64 dw64Total,
+    __in HANDLE hDestinationFile
+    );
+// function definitions
+extern "C" HRESULT DAPI DownloadUrl(
+    __in DOWNLOAD_SOURCE* pDownloadSource,
+    __in DWORD64 dw64AuthoredDownloadSize,
+    __in LPCWSTR wzDestinationPath,
+    __in_opt DOWNLOAD_CACHE_CALLBACK* pCache,
+    __in_opt DOWNLOAD_AUTHENTICATION_CALLBACK* pAuthenticate
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczUrl = NULL;
+    HINTERNET hSession = NULL;
+    DWORD dwTimeout = 0;
+    LPWSTR sczResumePath = NULL;
+    HANDLE hResumeFile = INVALID_HANDLE_VALUE;
+    DWORD64 dw64ResumeOffset = 0;
+    DWORD64 dw64Size = 0;
+    FILETIME ftCreated = { };
+    // Copy the download source into a working variable to handle redirects then
+    // open the internet session.
+    hr = StrAllocString(&sczUrl, pDownloadSource->sczUrl, 0);
+    DlExitOnFailure(hr, "Failed to copy download source URL.");
+    hSession = ::InternetOpenW(L"Burn", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0);
+    DlExitOnNullWithLastError(hSession, hr, "Failed to open internet session");
+    // Make a best effort to set the download timeouts to 2 minutes or whatever policy says.
+    PolcReadNumber(POLICY_BURN_REGISTRY_PATH, L"DownloadTimeout", 2 * 60, &dwTimeout);
+    if (0 < dwTimeout)
+    {
+        dwTimeout *= 1000; // convert to milliseconds.
+        ::InternetSetOptionW(hSession, INTERNET_OPTION_CONNECT_TIMEOUT, &dwTimeout, sizeof(dwTimeout));
+        ::InternetSetOptionW(hSession, INTERNET_OPTION_RECEIVE_TIMEOUT, &dwTimeout, sizeof(dwTimeout));
+        ::InternetSetOptionW(hSession, INTERNET_OPTION_SEND_TIMEOUT, &dwTimeout, sizeof(dwTimeout));
+    }
+    // Get the resource size and creation time from the internet.
+    hr = GetResourceMetadata(hSession, &sczUrl, pDownloadSource->sczUser, pDownloadSource->sczPassword, pAuthenticate, &dw64Size, &ftCreated);
+    DlExitOnFailure(hr, "Failed to get size and time for URL: %ls", sczUrl);
+    // Ignore failure to initialize resume because we will fall back to full download then
+    // download.
+    InitializeResume(wzDestinationPath, &sczResumePath, &hResumeFile, &dw64ResumeOffset);
+    hr = DownloadResource(hSession, &sczUrl, pDownloadSource->sczUser, pDownloadSource->sczPassword, wzDestinationPath, dw64AuthoredDownloadSize, dw64Size, dw64ResumeOffset, hResumeFile, pCache, pAuthenticate);
+    DlExitOnFailure(hr, "Failed to download URL: %ls", sczUrl);
+    // Cleanup the resume file because we successfully downloaded the whole file.
+    if (sczResumePath && *sczResumePath)
+    {
+        ::DeleteFileW(sczResumePath);
+    }
+LExit:
+    ReleaseFileHandle(hResumeFile);
+    ReleaseStr(sczResumePath);
+    ReleaseInternet(hSession);
+    ReleaseStr(sczUrl);
+    return hr;
+}
+// internal helper functions
+static HRESULT InitializeResume(
+    __in LPCWSTR wzDestinationPath,
+    __out LPWSTR* psczResumePath,
+    __out HANDLE* phResumeFile,
+    __out DWORD64* pdw64ResumeOffset
+    )
+{
+    HRESULT hr = S_OK;
+    HANDLE hResumeFile = INVALID_HANDLE_VALUE;
+    DWORD cbTotalReadResumeData = 0;
+    DWORD cbReadData = 0;
+    *pdw64ResumeOffset = 0;
+    hr = DownloadGetResumePath(wzDestinationPath, psczResumePath);
+    DlExitOnFailure(hr, "Failed to calculate resume path from working path: %ls", wzDestinationPath);
+    hResumeFile = ::CreateFileW(*psczResumePath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_DELETE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+    if (INVALID_HANDLE_VALUE == hResumeFile)
+    {
+        DlExitWithLastError(hr, "Failed to create resume file: %ls", *psczResumePath);
+    }
+    do
+    {
+        if (!::ReadFile(hResumeFile, reinterpret_cast<BYTE*>(pdw64ResumeOffset) + cbTotalReadResumeData, sizeof(DWORD64) - cbTotalReadResumeData, &cbReadData, NULL))
+        {
+            DlExitWithLastError(hr, "Failed to read resume file: %ls", *psczResumePath);
+        }
+        cbTotalReadResumeData += cbReadData;
+    } while (cbReadData && sizeof(DWORD64) > cbTotalReadResumeData);
+    // Start over if we couldn't get a resume offset.
+    if (cbTotalReadResumeData != sizeof(DWORD64))
+    {
+        *pdw64ResumeOffset = 0;
+    }
+    *phResumeFile = hResumeFile;
+    hResumeFile = INVALID_HANDLE_VALUE;
+LExit:
+    ReleaseFileHandle(hResumeFile);
+    return hr;
+}
+static HRESULT GetResourceMetadata(
+    __in HINTERNET hSession,
+    __inout_z LPWSTR* psczUrl,
+    __in_z_opt LPCWSTR wzUser,
+    __in_z_opt LPCWSTR wzPassword,
+    __in_opt DOWNLOAD_AUTHENTICATION_CALLBACK* pAuthenticate,
+    __out DWORD64* pdw64ResourceSize,
+    __out FILETIME* pftResourceCreated
+    )
+{
+    HRESULT hr = S_OK;
+    BOOL fRangeRequestsAccepted = TRUE;
+    HINTERNET hConnect = NULL;
+    HINTERNET hUrl = NULL;
+    LONGLONG llLength = 0;
+    hr = MakeRequest(hSession, psczUrl, L"HEAD", NULL, wzUser, wzPassword, pAuthenticate, &hConnect, &hUrl, &fRangeRequestsAccepted);
+    DlExitOnFailure(hr, "Failed to connect to URL: %ls", *psczUrl);
+    hr = InternetGetSizeByHandle(hUrl, &llLength);
+    if (FAILED(hr))
+    {
+        llLength = 0;
+        hr = S_OK;
+    }
+    *pdw64ResourceSize = llLength;
+    // Get the last modified time from the server, we'll use that as our downloaded time here. If
+    // the server time isn't available then use the local system time.
+    hr = InternetGetCreateTimeByHandle(hUrl, pftResourceCreated);
+    if (FAILED(hr))
+    {
+        ::GetSystemTimeAsFileTime(pftResourceCreated);
+        hr = S_OK;
+    }
+LExit:
+    ReleaseInternet(hUrl);
+    ReleaseInternet(hConnect);
+    return hr;
+}
+static HRESULT DownloadResource(
+    __in HINTERNET hSession,
+    __inout_z LPWSTR* psczUrl,
+    __in_z_opt LPCWSTR wzUser,
+    __in_z_opt LPCWSTR wzPassword,
+    __in_z LPCWSTR wzDestinationPath,
+    __in DWORD64 dw64AuthoredResourceLength,
+    __in DWORD64 dw64ResourceLength,
+    __in DWORD64 dw64ResumeOffset,
+    __in HANDLE hResumeFile,
+    __in_opt DOWNLOAD_CACHE_CALLBACK* pCache,
+    __in_opt DOWNLOAD_AUTHENTICATION_CALLBACK* pAuthenticate
+    )
+{
+    HRESULT hr = S_OK;
+    HANDLE hPayloadFile = INVALID_HANDLE_VALUE;
+    DWORD cbMaxData = 64 * 1024; // 64 KB
+    BYTE* pbData = NULL;
+    BOOL fRangeRequestsAccepted = TRUE;
+    LPWSTR sczRangeRequestHeader = NULL;
+    HINTERNET hConnect = NULL;
+    HINTERNET hUrl = NULL;
+    LONGLONG llLength = 0;
+    hPayloadFile = ::CreateFileW(wzDestinationPath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_DELETE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+    if (INVALID_HANDLE_VALUE == hPayloadFile)
+    {
+        DlExitWithLastError(hr, "Failed to create download destination file: %ls", wzDestinationPath);
+    }
+    // Allocate a memory block on a page boundary in case we want to do optimal writing.
+    pbData = static_cast<BYTE*>(::VirtualAlloc(NULL, cbMaxData, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE));
+    DlExitOnNullWithLastError(pbData, hr, "Failed to allocate buffer to download files into.");
+    // Let's try downloading the file assuming that range requests are accepted. If range requests
+    // are not supported we'll have to start over and accept the fact that we only get one shot
+    // downloading the file however big it is. Hopefully, not more than 2 GB since wininet doesn't
+    // like files that big.
+    while (fRangeRequestsAccepted && (0 == dw64ResourceLength || dw64ResumeOffset < dw64ResourceLength))
+    {
+        hr = AllocateRangeRequestHeader(dw64ResumeOffset, 0 == dw64ResourceLength ? dw64AuthoredResourceLength : dw64ResourceLength, &sczRangeRequestHeader);
+        DlExitOnFailure(hr, "Failed to allocate range request header.");
+        ReleaseNullInternet(hConnect);
+        ReleaseNullInternet(hUrl);
+        hr = MakeRequest(hSession, psczUrl, L"GET", sczRangeRequestHeader, wzUser, wzPassword, pAuthenticate, &hConnect, &hUrl, &fRangeRequestsAccepted);
+        DlExitOnFailure(hr, "Failed to request URL for download: %ls", *psczUrl);
+        // If we didn't get the size of the resource from the initial "HEAD" request
+        // then let's try to get the size from this "GET" request.
+        if (0 == dw64ResourceLength)
+        {
+            hr = InternetGetSizeByHandle(hUrl, &llLength);
+            if (SUCCEEDED(hr))
+            {
+                dw64ResourceLength = llLength;
+            }
+            else // server didn't tell us the resource length.
+            {
+                // Fallback to the authored size of the resource. However, since we
+                // don't really know the size on the server, don't try to use
+                // range requests either.
+                dw64ResourceLength = dw64AuthoredResourceLength;
+                fRangeRequestsAccepted = FALSE;
+            }
+        }
+        // If we just tried to do a range request and found out that it isn't supported, start over.
+        if (!fRangeRequestsAccepted)
+        {
+            // TODO: log a message that the server did not accept range requests.
+            dw64ResumeOffset = 0;
+        }
+        hr = WriteToFile(hUrl, hPayloadFile, &dw64ResumeOffset, hResumeFile, dw64ResourceLength, pbData, cbMaxData, pCache);
+        DlExitOnFailure(hr, "Failed while reading from internet and writing to: %ls", wzDestinationPath);
+    }
+LExit:
+    ReleaseInternet(hUrl);
+    ReleaseInternet(hConnect);
+    ReleaseStr(sczRangeRequestHeader);
+    if (pbData)
+    {
+        ::VirtualFree(pbData, 0, MEM_RELEASE);
+    }
+    ReleaseFileHandle(hPayloadFile);
+    return hr;
+}
+static HRESULT AllocateRangeRequestHeader(
+    __in DWORD64 dw64ResumeOffset,
+    __in DWORD64 dw64ResourceLength,
+    __deref_inout_z LPWSTR* psczHeader
+    )
+{
+    HRESULT hr = S_OK;
+    // If the remaining length is less that 2GB we'll be able to ask for everything.
+    DWORD64 dw64RemainingLength = dw64ResourceLength - dw64ResumeOffset;
+    if (DOWNLOAD_ENGINE_TWO_GIGABYTES > dw64RemainingLength)
+    {
+        // If we have a resume offset, let's download everything from there. Otherwise, we'll
+        // just get everything with no headers in the way.
+        if (0 < dw64ResumeOffset)
+        {
+            hr = StrAllocFormatted(psczHeader, L"Range: bytes=%I64u-", dw64ResumeOffset);
+            DlExitOnFailure(hr, "Failed to add range read header.");
+        }
+        else
+        {
+            ReleaseNullStr(*psczHeader);
+        }
+    }
+    else // we'll have to download in chunks.
+    {
+        hr = StrAllocFormatted(psczHeader, L"Range: bytes=%I64u-%I64u", dw64ResumeOffset, dw64ResumeOffset + dw64RemainingLength - 1);
+        DlExitOnFailure(hr, "Failed to add range read header.");
+    }
+LExit:
+    return hr;
+}
+static HRESULT WriteToFile(
+    __in HINTERNET hUrl,
+    __in HANDLE hPayloadFile,
+    __inout DWORD64* pdw64ResumeOffset,
+    __in HANDLE hResumeFile,
+    __in DWORD64 dw64ResourceLength,
+    __in LPBYTE pbData,
+    __in DWORD cbData,
+    __in_opt DOWNLOAD_CACHE_CALLBACK* pCallback
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD cbReadData = 0;
+    hr = FileSetPointer(hPayloadFile, *pdw64ResumeOffset, NULL, FILE_BEGIN);
+    DlExitOnFailure(hr, "Failed to seek to start point in file.");
+    do
+    {
+        // Read bits from the internet.
+        if (!::InternetReadFile(hUrl, static_cast<void*>(pbData), cbData, &cbReadData))
+        {
+            DlExitWithLastError(hr, "Failed while reading from internet.");
+        }
+        // Write bits to disk (if there are any).
+        if (cbReadData)
+        {
+            DWORD cbTotalWritten = 0;
+            DWORD cbWritten = 0;
+            do
+            {
+                if (!::WriteFile(hPayloadFile, pbData + cbTotalWritten, cbReadData - cbTotalWritten, &cbWritten, NULL))
+                {
+                    DlExitWithLastError(hr, "Failed to write data from internet.");
+                }
+                cbTotalWritten += cbWritten;
+            } while (cbWritten && cbTotalWritten < cbReadData);
+            // Ignore failure from updating resume file as this doesn't mean the download cannot succeed.
+            UpdateResumeOffset(pdw64ResumeOffset, hResumeFile, cbTotalWritten);
+            if (pCallback && pCallback->pfnProgress)
+            {
+                hr = DownloadSendProgressCallback(pCallback, *pdw64ResumeOffset, dw64ResourceLength, hPayloadFile);
+                DlExitOnFailure(hr, "UX aborted on cache progress.");
+            }
+        }
+    } while (cbReadData);
+LExit:
+    return hr;
+}
+static HRESULT UpdateResumeOffset(
+    __inout DWORD64* pdw64ResumeOffset,
+    __in HANDLE hResumeFile,
+    __in DWORD cbData
+    )
+{
+    HRESULT hr = S_OK;
+    *pdw64ResumeOffset += cbData;
+    if (INVALID_HANDLE_VALUE != hResumeFile)
+    {
+        DWORD cbTotalWrittenResumeData = 0;
+        DWORD cbWrittenResumeData = 0;
+        hr = FileSetPointer(hResumeFile, 0, NULL, FILE_BEGIN);
+        DlExitOnFailure(hr, "Failed to seek to start point in file.");
+        do
+        {
+            // Ignore failure to write to the resume file as that should not prevent the download from happening.
+            if (!::WriteFile(hResumeFile, pdw64ResumeOffset + cbTotalWrittenResumeData, sizeof(DWORD64) - cbTotalWrittenResumeData, &cbWrittenResumeData, NULL))
+            {
+                DlExitOnFailure(hr, "Failed to seek to write to file.");
+            }
+            cbTotalWrittenResumeData += cbWrittenResumeData;
+        } while (cbWrittenResumeData && sizeof(DWORD64) > cbTotalWrittenResumeData);
+    }
+LExit:
+    return hr;
+}
+static HRESULT MakeRequest(
+    __in HINTERNET hSession,
+    __inout_z LPWSTR* psczSourceUrl,
+    __in_z_opt LPCWSTR wzMethod,
+    __in_z_opt LPCWSTR wzHeaders,
+    __in_z_opt LPCWSTR wzUser,
+    __in_z_opt LPCWSTR wzPassword,
+    __in_opt DOWNLOAD_AUTHENTICATION_CALLBACK* pAuthenticate,
+    __out HINTERNET* phConnect,
+    __out HINTERNET* phUrl,
+    __out BOOL* pfRangeRequestsAccepted
+    )
+{
+    HRESULT hr = S_OK;
+    HINTERNET hConnect = NULL;
+    HINTERNET hUrl = NULL;
+    URI_INFO uri = { };
+    // Try to open the URL.
+    BOOL fRetry;
+    do
+    {
+        fRetry = FALSE;
+        // If the URL was opened close it, so we can reopen it again.
+        ReleaseInternet(hUrl);
+        ReleaseInternet(hConnect);
+        // Open the url.
+        hr = UriCrackEx(*psczSourceUrl, &uri);
+        DlExitOnFailure(hr, "Failed to break URL into server and resource parts.");
+        hConnect = ::InternetConnectW(hSession, uri.sczHostName, uri.port, (wzUser && *wzUser) ? wzUser : uri.sczUser, (wzPassword && *wzPassword) ? wzPassword : uri.sczPassword, INTERNET_SCHEME_FTP == uri.scheme ? INTERNET_SERVICE_FTP : INTERNET_SERVICE_HTTP, 0, 0);
+        DlExitOnNullWithLastError(hConnect, hr, "Failed to connect to URL: %ls", *psczSourceUrl);
+        // Best effort set the proxy username and password, if they were provided.
+        if ((wzUser && *wzUser) && (wzPassword && *wzPassword))
+        {
+            if (::InternetSetOptionW(hConnect, INTERNET_OPTION_PROXY_USERNAME, (LPVOID)wzUser, lstrlenW(wzUser)))
+            {
+                ::InternetSetOptionW(hConnect, INTERNET_OPTION_PROXY_PASSWORD, (LPVOID)wzPassword, lstrlenW(wzPassword));
+            }
+        }
+        hr = OpenRequest(hConnect, wzMethod, uri.scheme, uri.sczPath, uri.sczQueryString, wzHeaders, &hUrl);
+        DlExitOnFailure(hr, "Failed to open internet URL: %ls", *psczSourceUrl);
+        hr = SendRequest(hUrl, psczSourceUrl, pAuthenticate, &fRetry, pfRangeRequestsAccepted);
+        DlExitOnFailure(hr, "Failed to send request to URL: %ls", *psczSourceUrl);
+    } while (fRetry);
+    // Okay, we're all ready to start downloading. Update the connection information.
+    *phConnect = hConnect;
+    hConnect = NULL;
+    *phUrl = hUrl;
+    hUrl = NULL;
+LExit:
+    UriInfoUninitialize(&uri);
+    ReleaseInternet(hUrl);
+    ReleaseInternet(hConnect);
+    return hr;
+}
+static HRESULT OpenRequest(
+    __in HINTERNET hConnect,
+    __in_z_opt LPCWSTR wzMethod,
+    __in INTERNET_SCHEME scheme,
+    __in_z LPCWSTR wzResource,
+    __in_z_opt LPCWSTR wzQueryString,
+    __in_z_opt LPCWSTR wzHeader,
+    __out HINTERNET* phUrl
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD dwRequestFlags = INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_NO_CACHE_WRITE | INTERNET_FLAG_NO_UI | INTERNET_FLAG_RELOAD;
+    LPWSTR sczResource = NULL;
+    HINTERNET hUrl = NULL;
+    if (INTERNET_SCHEME_HTTPS == scheme)
+    {
+        dwRequestFlags |= INTERNET_FLAG_SECURE;
+    }
+    else if (INTERNET_SCHEME_HTTP == scheme)
+    {
+        dwRequestFlags |= INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTPS;
+    }
+    
+    // Allocate the resource name.
+    hr = StrAllocString(&sczResource, wzResource, 0);
+    DlExitOnFailure(hr, "Failed to allocate string for resource URI.");
+    if (wzQueryString && *wzQueryString)
+    {
+        hr = StrAllocConcat(&sczResource, wzQueryString, 0);
+        DlExitOnFailure(hr, "Failed to append query strong to resource from URI.");
+    }
+    // Open the request and add the header if provided.
+    hUrl = ::HttpOpenRequestW(hConnect, wzMethod, sczResource, NULL, NULL, DOWNLOAD_ENGINE_ACCEPT_TYPES, dwRequestFlags, NULL);
+    DlExitOnNullWithLastError(hUrl, hr, "Failed to open internet request.");
+    if (wzHeader && *wzHeader)
+    {
+        if (!::HttpAddRequestHeadersW(hUrl, wzHeader, static_cast<DWORD>(-1), HTTP_ADDREQ_FLAG_COALESCE))
+        {
+            DlExitWithLastError(hr, "Failed to add header to HTTP request.");
+        }
+    }
+    *phUrl = hUrl;
+    hUrl = NULL;
+LExit:
+    ReleaseInternet(hUrl);
+    ReleaseStr(sczResource);
+    return hr;
+}
+static HRESULT SendRequest(
+    __in HINTERNET hUrl,
+    __inout_z LPWSTR* psczUrl,
+    __in_opt DOWNLOAD_AUTHENTICATION_CALLBACK* pAuthenticate,
+    __out BOOL* pfRetry,
+    __out BOOL* pfRangesAccepted
+    )
+{
+    HRESULT hr = S_OK;
+    BOOL fRetrySend = FALSE;
+    LONG lCode = 0;
+    do
+    {
+        fRetrySend = FALSE;
+        if (!::HttpSendRequestW(hUrl, NULL, 0, NULL, 0))
+        {
+            hr = HRESULT_FROM_WIN32(::GetLastError()); // remember the error that occurred and log it.
+            LogErrorString(hr, "Failed to send request to URL: %ls, trying to process HTTP status code anyway.", *psczUrl);
+            // Try to get the HTTP status code and, if good, handle via the switch statement below but if it
+            // fails return the error code from the send request above as the result of the function.
+            HRESULT hrQueryStatusCode = InternetQueryInfoNumber(hUrl, HTTP_QUERY_STATUS_CODE, &lCode);
+            DlExitOnFailure(hrQueryStatusCode, "Failed to get HTTP status code for failed request to URL: %ls", *psczUrl);
+        }
+        else // get the http status code.
+        {
+            hr = InternetQueryInfoNumber(hUrl, HTTP_QUERY_STATUS_CODE, &lCode);
+            DlExitOnFailure(hr, "Failed to get HTTP status code for request to URL: %ls", *psczUrl);
+        }
+        switch (lCode)
+        {
+        case 200: // OK but range requests don't work.
+            *pfRangesAccepted = FALSE;
+            hr = S_OK;
+            break;
+        case 206: // Partial content means that range requests work!
+            *pfRangesAccepted = TRUE;
+            hr = S_OK;
+            break;
+        // redirection cases
+        case 301: __fallthrough; // file moved
+        case 302: __fallthrough; // temporary
+        case 303: // redirect method
+            hr = InternetQueryInfoString(hUrl, HTTP_QUERY_CONTENT_LOCATION, psczUrl);
+            DlExitOnFailure(hr, "Failed to get redirect url: %ls", *psczUrl);
+            *pfRetry = TRUE;
+            break;
+        // error cases
+        case 400: // bad request
+            hr = HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME);
+            break;
+        case 401: __fallthrough; // unauthorized
+        case 407: __fallthrough; // proxy unauthorized                  
+            hr = AuthenticationRequired(hUrl, lCode, pAuthenticate, &fRetrySend, pfRetry);
+            break;
+        case 403: // forbidden
+            hr = HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED);
+            break;
+        case 404: // file not found
+        case 410: // gone
+            hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND);
+            break;
+        case 405: // method not allowed
+            hr = HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
+            break;
+        case 408: __fallthrough; // request timedout
+        case 504: // gateway timeout
+            hr = HRESULT_FROM_WIN32(WAIT_TIMEOUT);
+            break;
+        case 414: // request URI too long
+            hr = CO_E_PATHTOOLONG;
+            break;
+        case 502: __fallthrough; // server (through a gateway) was not found
+        case 503: // server unavailable
+            hr = HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND);
+            break;
+        case 418: // I'm a teapot.
+        default:
+            // If the request failed and the HTTP status code was invalid (but wininet gave us a number anyway)
+            // do not overwrite the error code from the failed request. Otherwise, the error was unexpected.
+            if (SUCCEEDED(hr))
+            {
+                hr = E_UNEXPECTED;
+            }
+            LogErrorString(hr, "Unknown HTTP status code %d, returned from URL: %ls", lCode, *psczUrl);
+            break;
+        }
+    } while (fRetrySend);
+LExit:
+    return hr;
+}
+static HRESULT AuthenticationRequired(
+    __in HINTERNET hUrl,
+    __in long lHttpCode,
+    __in_opt DOWNLOAD_AUTHENTICATION_CALLBACK* pAuthenticate,
+    __out BOOL* pfRetrySend,
+    __out BOOL* pfRetry
+    )
+{
+    Assert(401 == lHttpCode || 407 == lHttpCode);
+    HRESULT hr = HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED);
+    *pfRetrySend = FALSE;
+    *pfRetry = FALSE;
+    if (pAuthenticate && pAuthenticate->pfnAuthenticate)
+    {
+        hr = (*pAuthenticate->pfnAuthenticate)(pAuthenticate->pv, hUrl, lHttpCode, pfRetrySend, pfRetry);
+    }
+    return hr;
+}
+static HRESULT DownloadGetResumePath(
+    __in_z LPCWSTR wzPayloadWorkingPath,
+    __deref_out_z LPWSTR* psczResumePath
+    )
+{
+    HRESULT hr = S_OK;
+    hr = StrAllocFormatted(psczResumePath, L"%ls.R", wzPayloadWorkingPath);
+    DlExitOnFailure(hr, "Failed to create resume path.");
+LExit:
+    return hr;
+}
+static HRESULT DownloadSendProgressCallback(
+    __in DOWNLOAD_CACHE_CALLBACK* pCallback,
+    __in DWORD64 dw64Progress,
+    __in DWORD64 dw64Total,
+    __in HANDLE hDestinationFile
+    )
+{
+    static LARGE_INTEGER LARGE_INTEGER_ZERO = { };
+    HRESULT hr = S_OK;
+    DWORD dwResult = PROGRESS_CONTINUE;
+    LARGE_INTEGER liTotalSize = { };
+    LARGE_INTEGER liTotalTransferred = { };
+    if (pCallback->pfnProgress)
+    {
+        liTotalSize.QuadPart = dw64Total;
+        liTotalTransferred.QuadPart = dw64Progress;
+        dwResult = (*pCallback->pfnProgress)(liTotalSize, liTotalTransferred, LARGE_INTEGER_ZERO, LARGE_INTEGER_ZERO, 1, CALLBACK_CHUNK_FINISHED, INVALID_HANDLE_VALUE, hDestinationFile, pCallback->pv);
+        switch (dwResult)
+        {
+        case PROGRESS_CONTINUE:
+            hr = S_OK;
+            break;
+        case PROGRESS_CANCEL: __fallthrough; // TODO: should cancel and stop be treated differently?
+        case PROGRESS_STOP:
+            hr = HRESULT_FROM_WIN32(ERROR_INSTALL_USEREXIT);
+            DlExitOnRootFailure(hr, "UX aborted on download progress.");
+        case PROGRESS_QUIET: // Not actually an error, just an indication to the caller to stop requesting progress.
+            pCallback->pfnProgress = NULL;
+            hr = S_OK;
+            break;
+        default:
+            hr = E_UNEXPECTED;
+            DlExitOnRootFailure(hr, "Invalid return code from progress routine.");
+        }
+    }
+LExit:
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/dpiutil.cpp b/src/libs/dutil/WixToolset.DUtil/dpiutil.cpp
new file mode 100644
index 00000000..4096c8d3
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/dpiutil.cpp
@@ -0,0 +1,274 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define DpiuExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_DPIUTIL, x, s, __VA_ARGS__)
+#define DpiuExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_DPIUTIL, x, s, __VA_ARGS__)
+#define DpiuExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_DPIUTIL, x, s, __VA_ARGS__)
+#define DpiuExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_DPIUTIL, x, s, __VA_ARGS__)
+#define DpiuExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_DPIUTIL, x, s, __VA_ARGS__)
+#define DpiuExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_DPIUTIL, x, s, __VA_ARGS__)
+#define DpiuExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_DPIUTIL, p, x, e, s, __VA_ARGS__)
+#define DpiuExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_DPIUTIL, p, x, s, __VA_ARGS__)
+#define DpiuExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_DPIUTIL, p, x, e, s, __VA_ARGS__)
+#define DpiuExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_DPIUTIL, p, x, s, __VA_ARGS__)
+#define DpiuExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_DPIUTIL, e, x, s, __VA_ARGS__)
+static PFN_ADJUSTWINDOWRECTEXFORDPI vpfnAdjustWindowRectExForDpi = NULL;
+static PFN_GETDPIFORMONITOR vpfnGetDpiForMonitor = NULL;
+static PFN_GETDPIFORWINDOW vpfnGetDpiForWindow = NULL;
+static PFN_SETPROCESSDPIAWARE vpfnSetProcessDPIAware = NULL;
+static PFN_SETPROCESSDPIAWARENESS vpfnSetProcessDpiAwareness = NULL;
+static PFN_SETPROCESSDPIAWARENESSCONTEXT vpfnSetProcessDpiAwarenessContext = NULL;
+static HMODULE vhShcoreDll = NULL;
+static HMODULE vhUser32Dll = NULL;
+static BOOL vfDpiuInitialized = FALSE;
+DAPI_(void) DpiuInitialize()
+{
+    HRESULT hr = S_OK;
+    hr = LoadSystemLibrary(L"Shcore.dll", &vhShcoreDll);
+    if (SUCCEEDED(hr))
+    {
+        // Ignore failures.
+        vpfnGetDpiForMonitor = reinterpret_cast<PFN_GETDPIFORMONITOR>(::GetProcAddress(vhShcoreDll, "GetDpiForMonitor"));
+        vpfnSetProcessDpiAwareness = reinterpret_cast<PFN_SETPROCESSDPIAWARENESS>(::GetProcAddress(vhShcoreDll, "SetProcessDpiAwareness"));
+    }
+    hr = LoadSystemLibrary(L"User32.dll", &vhUser32Dll);
+    if (SUCCEEDED(hr))
+    {
+        // Ignore failures.
+        vpfnAdjustWindowRectExForDpi = reinterpret_cast<PFN_ADJUSTWINDOWRECTEXFORDPI>(::GetProcAddress(vhUser32Dll, "AdjustWindowRectExForDpi"));
+        vpfnGetDpiForWindow = reinterpret_cast<PFN_GETDPIFORWINDOW>(::GetProcAddress(vhUser32Dll, "GetDpiForWindow"));
+        vpfnSetProcessDPIAware = reinterpret_cast<PFN_SETPROCESSDPIAWARE>(::GetProcAddress(vhUser32Dll, "SetProcessDPIAware"));
+        vpfnSetProcessDpiAwarenessContext = reinterpret_cast<PFN_SETPROCESSDPIAWARENESSCONTEXT>(::GetProcAddress(vhUser32Dll, "SetProcessDpiAwarenessContext"));
+    }
+    vfDpiuInitialized = TRUE;
+}
+DAPI_(void) DpiuUninitialize()
+{
+    if (vhShcoreDll)
+    {
+        ::FreeLibrary(vhShcoreDll);
+    }
+    if (vhUser32Dll)
+    {
+        ::FreeLibrary(vhUser32Dll);
+    }
+    vhShcoreDll = NULL;
+    vhUser32Dll = NULL;
+    vpfnAdjustWindowRectExForDpi = NULL;
+    vpfnGetDpiForMonitor = NULL;
+    vpfnGetDpiForWindow = NULL;
+    vfDpiuInitialized = FALSE;
+}
+DAPI_(void) DpiuAdjustWindowRect(
+    __in RECT* pWindowRect,
+    __in DWORD dwStyle,
+    __in BOOL fMenu,
+    __in DWORD dwExStyle,
+    __in UINT nDpi
+    )
+{
+    if (WS_SYSMENU & dwStyle)
+    {
+        dwStyle |= WS_CAPTION; // WS_CAPTION is required with WS_SYSMENU, AdjustWindowRect* won't work properly when it's not specified.
+    }
+    if (vpfnAdjustWindowRectExForDpi)
+    {
+        vpfnAdjustWindowRectExForDpi(pWindowRect, dwStyle, fMenu, dwExStyle, nDpi);
+    }
+    else
+    {
+        ::AdjustWindowRectEx(pWindowRect, dwStyle, fMenu, dwExStyle);
+    }
+}
+DAPI_(HRESULT) DpiuGetMonitorContextFromPoint(
+    __in const POINT* pt,
+    __out DPIU_MONITOR_CONTEXT** ppMonitorContext
+    )
+{
+    HRESULT hr = S_OK;
+    DPIU_MONITOR_CONTEXT* pMonitorContext = NULL;
+    HMONITOR hMonitor = NULL;
+    UINT dpiX = 0;
+    UINT dpiY = 0;
+    HDC hdc = NULL;
+    pMonitorContext = reinterpret_cast<DPIU_MONITOR_CONTEXT*>(MemAlloc(sizeof(DPIU_MONITOR_CONTEXT), TRUE));
+    DpiuExitOnNull(pMonitorContext, hr, E_OUTOFMEMORY, "Failed to allocate memory for DpiuMonitorContext.");
+    hMonitor = ::MonitorFromPoint(*pt, MONITOR_DEFAULTTONEAREST);
+    DpiuExitOnNull(hMonitor, hr, E_FAIL, "Failed to get monitor from point.");
+    pMonitorContext->mi.cbSize = sizeof(pMonitorContext->mi);
+    if (!::GetMonitorInfoW(hMonitor, &pMonitorContext->mi))
+    {
+        DpiuExitOnFailure(hr = E_OUTOFMEMORY, "Failed to get monitor info for point.");
+    }
+    if (vpfnGetDpiForMonitor)
+    {
+        hr = vpfnGetDpiForMonitor(hMonitor, MDT_EFFECTIVE_DPI, &dpiX, &dpiY);
+        DpiuExitOnFailure(hr, "Failed to get DPI for monitor.");
+        pMonitorContext->nDpi = dpiX;
+    }
+    else
+    {
+        hdc = ::CreateDCW(L"DISPLAY", pMonitorContext->mi.szDevice, NULL, NULL);
+        DpiuExitOnNull(hdc, hr, E_OUTOFMEMORY, "Failed to get device context for monitor.");
+        pMonitorContext->nDpi = ::GetDeviceCaps(hdc, LOGPIXELSX);
+    }
+    *ppMonitorContext = pMonitorContext;
+    pMonitorContext = NULL;
+LExit:
+    if (hdc)
+    {
+        ::ReleaseDC(NULL, hdc);
+    }
+    MemFree(pMonitorContext);
+    return hr;
+}
+DAPI_(void) DpiuGetWindowContext(
+    __in HWND hWnd,
+    __in DPIU_WINDOW_CONTEXT* pWindowContext
+    )
+{
+    HRESULT hr = S_OK;
+    HMONITOR hMonitor = NULL;
+    UINT dpiX = 0;
+    UINT dpiY = 0;
+    HDC hdc = NULL;
+    pWindowContext->nDpi = USER_DEFAULT_SCREEN_DPI;
+    if (vpfnGetDpiForWindow)
+    {
+        pWindowContext->nDpi = vpfnGetDpiForWindow(hWnd);
+        ExitFunction();
+    }
+    if (vpfnGetDpiForMonitor)
+    {
+        hMonitor = ::MonitorFromWindow(hWnd, MONITOR_DEFAULTTONEAREST);
+        if (hMonitor)
+        {
+            hr = vpfnGetDpiForMonitor(hMonitor, MDT_EFFECTIVE_DPI, &dpiX, &dpiY);
+            if (SUCCEEDED(hr))
+            {
+                pWindowContext->nDpi = dpiX;
+                ExitFunction();
+            }
+        }
+    }
+    hdc = ::GetDC(hWnd);
+    if (hdc)
+    {
+        pWindowContext->nDpi = ::GetDeviceCaps(hdc, LOGPIXELSX);
+    }
+LExit:
+    if (hdc)
+    {
+        ::ReleaseDC(hWnd, hdc);
+    }
+}
+DAPI_(int) DpiuScaleValue(
+    __in int nDefaultDpiValue,
+    __in UINT nTargetDpi
+    )
+{
+    return ::MulDiv(nDefaultDpiValue, nTargetDpi, USER_DEFAULT_SCREEN_DPI);
+}
+DAPI_(HRESULT) DpiuSetProcessDpiAwareness(
+    __in DPIU_AWARENESS supportedAwareness,
+    __in_opt DPIU_AWARENESS* pSelectedAwareness
+    )
+{
+    HRESULT hr = S_OK;
+    DPIU_AWARENESS selectedAwareness = DPIU_AWARENESS_NONE;
+    DPI_AWARENESS_CONTEXT awarenessContext = DPI_AWARENESS_CONTEXT_UNAWARE;
+    PROCESS_DPI_AWARENESS awareness = PROCESS_DPI_UNAWARE;
+    if (vpfnSetProcessDpiAwarenessContext)
+    {
+        if (DPIU_AWARENESS_PERMONITORV2 & supportedAwareness)
+        {
+            awarenessContext = DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2;
+            selectedAwareness = DPIU_AWARENESS_PERMONITORV2;
+        }
+        else if (DPIU_AWARENESS_PERMONITOR & supportedAwareness)
+        {
+            awarenessContext = DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE;
+            selectedAwareness = DPIU_AWARENESS_PERMONITOR;
+        }
+        else if (DPIU_AWARENESS_SYSTEM & supportedAwareness)
+        {
+            awarenessContext = DPI_AWARENESS_CONTEXT_SYSTEM_AWARE;
+            selectedAwareness = DPIU_AWARENESS_SYSTEM;
+        }
+        else if (DPIU_AWARENESS_GDISCALED & supportedAwareness)
+        {
+            awarenessContext = DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED;
+            selectedAwareness = DPIU_AWARENESS_GDISCALED;
+        }
+        if (!vpfnSetProcessDpiAwarenessContext(awarenessContext))
+        {
+            DpiuExitOnLastError(hr, "Failed to set process DPI awareness context.");
+        }
+    }
+    else if (vpfnSetProcessDpiAwareness)
+    {
+        if (DPIU_AWARENESS_PERMONITOR & supportedAwareness)
+        {
+            awareness = PROCESS_PER_MONITOR_DPI_AWARE;
+            selectedAwareness = DPIU_AWARENESS_PERMONITOR;
+        }
+        else if (DPIU_AWARENESS_SYSTEM & supportedAwareness)
+        {
+            awareness = PROCESS_SYSTEM_DPI_AWARE;
+            selectedAwareness = DPIU_AWARENESS_SYSTEM;
+        }
+        hr = vpfnSetProcessDpiAwareness(awareness);
+        DpiuExitOnFailure(hr, "Failed to set process DPI awareness.");
+    }
+    else if (vpfnSetProcessDPIAware && (DPIU_AWARENESS_SYSTEM & supportedAwareness))
+    {
+        selectedAwareness = DPIU_AWARENESS_SYSTEM;
+        if (!vpfnSetProcessDPIAware())
+        {
+            DpiuExitOnLastError(hr, "Failed to set process DPI aware.");
+        }
+    }
+LExit:
+    if (pSelectedAwareness)
+    {
+        *pSelectedAwareness = selectedAwareness;
+    }
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.cpp b/src/libs/dutil/WixToolset.DUtil/dutil.cpp
new file mode 100644
index 00000000..56b85207
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/dutil.cpp
@@ -0,0 +1,524 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define DExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_DUTIL, x, s, __VA_ARGS__)
+#define DExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_DUTIL, x, s, __VA_ARGS__)
+#define DExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_DUTIL, x, s, __VA_ARGS__)
+#define DExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_DUTIL, x, s, __VA_ARGS__)
+#define DExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_DUTIL, x, s, __VA_ARGS__)
+#define DExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_DUTIL, x, s, __VA_ARGS__)
+#define DExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_DUTIL, p, x, e, s, __VA_ARGS__)
+#define DExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_DUTIL, p, x, s, __VA_ARGS__)
+#define DExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_DUTIL, p, x, e, s, __VA_ARGS__)
+#define DExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_DUTIL, p, x, s, __VA_ARGS__)
+#define DExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_DUTIL, e, x, s, __VA_ARGS__)
+#define DExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_DUTIL, g, x, s, __VA_ARGS__)
+// No need for OACR to warn us about using non-unicode APIs in this file.
+#pragma prefast(disable:25068)
+// Asserts & Tracing
+const int DUTIL_STRING_BUFFER = 1024;
+static HMODULE Dutil_hAssertModule = NULL;
+static DUTIL_ASSERTDISPLAYFUNCTION Dutil_pfnDisplayAssert = NULL;
+static BOOL Dutil_fNoAsserts = FALSE;
+static REPORT_LEVEL Dutil_rlCurrentTrace = REPORT_STANDARD;
+static BOOL Dutil_fTraceFilenames = FALSE;
+static DUTIL_CALLBACK_TRACEERROR vpfnTraceErrorCallback = NULL;
+DAPI_(HRESULT) DutilInitialize(
+    __in_opt DUTIL_CALLBACK_TRACEERROR pfnTraceErrorCallback
+    )
+{
+    HRESULT hr = S_OK;
+    vpfnTraceErrorCallback = pfnTraceErrorCallback;
+    return hr;
+}
+DAPI_(void) DutilUninitialize()
+{
+    vpfnTraceErrorCallback = NULL;
+}
+/*******************************************************************
+Dutil_SetAssertModule
+*******************************************************************/
+extern "C" void DAPI Dutil_SetAssertModule(
+    __in HMODULE hAssertModule
+    )
+{
+    Dutil_hAssertModule = hAssertModule;
+}
+/*******************************************************************
+Dutil_SetAssertDisplayFunction
+*******************************************************************/
+extern "C" void DAPI Dutil_SetAssertDisplayFunction(
+    __in DUTIL_ASSERTDISPLAYFUNCTION pfn
+    )
+{
+    Dutil_pfnDisplayAssert = pfn;
+}
+/*******************************************************************
+Dutil_AssertMsg
+*******************************************************************/
+extern "C" void DAPI Dutil_AssertMsg(
+    __in_z LPCSTR szMessage
+    )
+{
+    static BOOL fInAssert = FALSE; // TODO: make this thread safe (this is a cheap hack to prevent re-entrant Asserts)
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    int id = IDRETRY;
+    HKEY hkDebug = NULL;
+    HANDLE hAssertFile = INVALID_HANDLE_VALUE;
+    char szPath[MAX_PATH] = { };
+    DWORD cch = 0;
+    if (fInAssert)
+    {
+        return;
+    }
+    fInAssert = TRUE;
+    char szMsg[DUTIL_STRING_BUFFER];
+    hr = ::StringCchCopyA(szMsg, countof(szMsg), szMessage);
+    DExitOnFailure(hr, "failed to copy message while building assert message");
+    if (Dutil_pfnDisplayAssert)
+    {
+        // call custom function to display the assert string
+        if (!Dutil_pfnDisplayAssert(szMsg))
+        {
+            ExitFunction();
+        }
+    }
+    else
+    {
+        OutputDebugStringA(szMsg);
+    }
+    if (!Dutil_fNoAsserts)
+    {
+        er = ::RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Delivery\\Debug", 0, KEY_QUERY_VALUE, &hkDebug);
+        if (ERROR_SUCCESS == er)
+        {
+            cch = countof(szPath);
+            er = ::RegQueryValueExA(hkDebug, "DeliveryAssertsLog", NULL, NULL, reinterpret_cast<BYTE*>(szPath), &cch);
+            szPath[countof(szPath) - 1] = '\0'; // ensure string is null terminated since registry won't guarantee that.
+            if (ERROR_SUCCESS == er)
+            {
+                hAssertFile = ::CreateFileA(szPath, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+                if (INVALID_HANDLE_VALUE != hAssertFile)
+                {
+                    if (INVALID_SET_FILE_POINTER != ::SetFilePointer(hAssertFile, 0, 0, FILE_END))
+                    {
+                        if (SUCCEEDED(::StringCchCatA(szMsg, countof(szMsg), "\r\n")))
+                        {
+                            ::WriteFile(hAssertFile, szMsg, lstrlenA(szMsg), &cch, NULL);
+                        }
+                    }
+                }
+            }
+        }
+        // if anything went wrong while fooling around with the registry, just show the usual assert dialog box
+        if (ERROR_SUCCESS != er)
+        {
+            hr = ::StringCchCatA(szMsg, countof(szMsg), "\nAbort=Debug, Retry=Skip, Ignore=Skip all");
+            DExitOnFailure(hr, "failed to concat string while building assert message");
+            id = ::MessageBoxA(0, szMsg, "Debug Assert Message",
+                MB_SERVICE_NOTIFICATION | MB_TOPMOST | 
+                MB_DEFBUTTON2 | MB_ABORTRETRYIGNORE);
+        }
+    }
+    if (id == IDABORT)
+    {
+        if (Dutil_hAssertModule)
+        {
+            ::GetModuleFileNameA(Dutil_hAssertModule, szPath, countof(szPath));
+            hr = ::StringCchPrintfA(szMsg, countof(szMsg), "Module is running from: %s\nIf you are not using pdb-stamping, place your PDB near the module and attach to process id: %d (0x%x)", szPath, ::GetCurrentProcessId(), ::GetCurrentProcessId());
+            if (SUCCEEDED(hr))
+            {
+                ::MessageBoxA(0, szMsg, "Debug Assert Message", MB_SERVICE_NOTIFICATION | MB_TOPMOST | MB_OK);
+            }
+        }
+        ::DebugBreak();
+    }
+    else if (id == IDIGNORE)
+    {
+        Dutil_fNoAsserts = TRUE;
+    }
+LExit:
+    ReleaseFileHandle(hAssertFile);
+    ReleaseRegKey(hkDebug);
+    fInAssert = FALSE;
+}
+/*******************************************************************
+Dutil_Assert
+*******************************************************************/
+extern "C" void DAPI Dutil_Assert(
+    __in_z LPCSTR szFile, 
+    __in int iLine
+    )
+{
+    HRESULT hr = S_OK;
+    char szMessage[DUTIL_STRING_BUFFER] = { };
+    hr = ::StringCchPrintfA(szMessage, countof(szMessage), "Assertion failed in %s, %i", szFile, iLine);
+    if (SUCCEEDED(hr))
+    {
+        Dutil_AssertMsg(szMessage);
+    }
+    else
+    {
+        Dutil_AssertMsg("Assert failed to build string");
+    }
+}
+/*******************************************************************
+Dutil_AssertSz
+*******************************************************************/
+extern "C" void DAPI Dutil_AssertSz(
+    __in_z LPCSTR szFile, 
+    __in int iLine, 
+    __in_z __format_string LPCSTR szMsg
+    )
+{
+    HRESULT hr = S_OK;
+    char szMessage[DUTIL_STRING_BUFFER] = { };
+    hr = ::StringCchPrintfA(szMessage, countof(szMessage), "Assertion failed in %s, %i\n%s", szFile, iLine, szMsg);
+    if (SUCCEEDED(hr))
+    {
+        Dutil_AssertMsg(szMessage);
+    }
+    else
+    {
+        Dutil_AssertMsg("Assert failed to build string");
+    }
+}
+/*******************************************************************
+Dutil_TraceSetLevel
+*******************************************************************/
+extern "C" void DAPI Dutil_TraceSetLevel(
+    __in REPORT_LEVEL rl,
+    __in BOOL fTraceFilenames
+    )
+{
+    Dutil_rlCurrentTrace = rl;
+    Dutil_fTraceFilenames = fTraceFilenames;
+}
+/*******************************************************************
+Dutil_TraceGetLevel
+*******************************************************************/
+extern "C" REPORT_LEVEL DAPI Dutil_TraceGetLevel()
+{
+    return Dutil_rlCurrentTrace;
+}
+/*******************************************************************
+Dutil_Trace
+*******************************************************************/
+extern "C" void DAPIV Dutil_Trace(
+    __in_z LPCSTR szFile, 
+    __in int iLine, 
+    __in REPORT_LEVEL rl, 
+    __in_z __format_string LPCSTR szFormat, 
+    ...
+    )
+{
+    AssertSz(REPORT_NONE != rl, "REPORT_NONE is not a valid tracing level");
+    HRESULT hr = S_OK;
+    char szOutput[DUTIL_STRING_BUFFER] = { };
+    char szMsg[DUTIL_STRING_BUFFER] = { };
+    if (Dutil_rlCurrentTrace < rl)
+    {
+        return;
+    }
+    va_list args;
+    va_start(args, szFormat);
+    hr = ::StringCchVPrintfA(szOutput, countof(szOutput), szFormat, args);
+    va_end(args);
+    if (SUCCEEDED(hr))
+    {
+        LPCSTR szPrefix = "Trace/u";
+        switch (rl)
+        {
+        case REPORT_STANDARD:
+            szPrefix = "Trace/s";
+            break;
+        case REPORT_VERBOSE:
+            szPrefix = "Trace/v";
+            break;
+        case REPORT_DEBUG:
+            szPrefix = "Trace/d";
+            break;
+        }
+        if (Dutil_fTraceFilenames)
+        {
+            hr = ::StringCchPrintfA(szMsg, countof(szMsg), "%s [%s,%d]: %s\r\n", szPrefix, szFile, iLine, szOutput);
+        }
+        else
+        {
+            hr = ::StringCchPrintfA(szMsg, countof(szMsg), "%s: %s\r\n", szPrefix, szOutput);
+        }
+        if (SUCCEEDED(hr))
+        {
+            OutputDebugStringA(szMsg);
+        }
+        // else fall through to the case below
+    }
+    if (FAILED(hr))
+    {
+        if (Dutil_fTraceFilenames)
+        {
+            ::StringCchPrintfA(szMsg, countof(szMsg), "Trace [%s,%d]: message too long, skipping\r\n", szFile, iLine);
+        }
+        else
+        {
+            ::StringCchPrintfA(szMsg, countof(szMsg), "Trace: message too long, skipping\r\n");
+        }
+        szMsg[countof(szMsg)-1] = '\0';
+        OutputDebugStringA(szMsg);
+    }
+}
+/*******************************************************************
+Dutil_TraceError
+*******************************************************************/
+extern "C" void DAPIV Dutil_TraceError(
+    __in_z LPCSTR szFile, 
+    __in int iLine, 
+    __in REPORT_LEVEL rl, 
+    __in HRESULT hrError, 
+    __in_z __format_string LPCSTR szFormat, 
+    ...
+    )
+{
+    HRESULT hr = S_OK;
+    char szOutput[DUTIL_STRING_BUFFER] = { };
+    char szMsg[DUTIL_STRING_BUFFER] = { };
+    // if this is NOT an error report and we're not logging at this level, bail
+    if (REPORT_ERROR != rl && Dutil_rlCurrentTrace < rl)
+    {
+        return;
+    }
+    va_list args;
+    va_start(args, szFormat);
+    hr = ::StringCchVPrintfA(szOutput, countof(szOutput), szFormat, args);
+    va_end(args);
+    if (SUCCEEDED(hr))
+    {
+        if (Dutil_fTraceFilenames)
+        {
+            if (FAILED(hrError))
+            {
+                hr = ::StringCchPrintfA(szMsg, countof(szMsg), "TraceError 0x%x [%s,%d]: %s\r\n", hrError, szFile, iLine, szOutput);
+            }
+            else
+            {
+                hr = ::StringCchPrintfA(szMsg, countof(szMsg), "TraceError [%s,%d]: %s\r\n", szFile, iLine, szOutput);
+            }
+        }
+        else
+        {
+            if (FAILED(hrError))
+            {
+                hr = ::StringCchPrintfA(szMsg, countof(szMsg), "TraceError 0x%x: %s\r\n", hrError, szOutput);
+            }
+            else
+            {
+                hr = ::StringCchPrintfA(szMsg, countof(szMsg), "TraceError: %s\r\n", szOutput);
+            }
+        }
+        if (SUCCEEDED(hr))
+        {
+            OutputDebugStringA(szMsg);
+        }
+        // else fall through to the failure case below
+    }
+    if (FAILED(hr))
+    {
+        if (Dutil_fTraceFilenames)
+        {
+            if (FAILED(hrError))
+            {
+                ::StringCchPrintfA(szMsg, countof(szMsg), "TraceError 0x%x [%s,%d]: message too long, skipping\r\n", hrError, szFile, iLine);
+            }
+            else
+            {
+                ::StringCchPrintfA(szMsg, countof(szMsg), "TraceError [%s,%d]: message too long, skipping\r\n", szFile, iLine);
+            }
+        }
+        else
+        {
+            if (FAILED(hrError))
+            {
+                ::StringCchPrintfA(szMsg, countof(szMsg), "TraceError 0x%x: message too long, skipping\r\n", hrError);
+            }
+            else
+            {
+                ::StringCchPrintfA(szMsg, countof(szMsg), "TraceError: message too long, skipping\r\n");
+            }
+        }
+        szMsg[countof(szMsg)-1] = '\0';
+        OutputDebugStringA(szMsg);
+    }
+}
+DAPIV_(void) Dutil_TraceErrorSource(
+    __in_z LPCSTR szFile,
+    __in int iLine,
+    __in REPORT_LEVEL rl,
+    __in UINT source,
+    __in HRESULT hr,
+    __in_z __format_string LPCSTR szFormat,
+    ...
+    )
+{
+    // if this is NOT an error report and we're not logging at this level, bail
+    if (REPORT_ERROR != rl && Dutil_rlCurrentTrace < rl)
+    {
+        return;
+    }
+    if (DUTIL_SOURCE_UNKNOWN != source && vpfnTraceErrorCallback)
+    {
+        va_list args;
+        va_start(args, szFormat);
+        vpfnTraceErrorCallback(szFile, iLine, rl, source, hr, szFormat, args);
+        va_end(args);
+    }
+}
+/*******************************************************************
+Dutil_RootFailure
+*******************************************************************/
+extern "C" void DAPI Dutil_RootFailure(
+    __in_z LPCSTR szFile,
+    __in int iLine,
+    __in HRESULT hrError
+    )
+{
+#ifndef DEBUG
+    UNREFERENCED_PARAMETER(szFile);
+    UNREFERENCED_PARAMETER(iLine);
+    UNREFERENCED_PARAMETER(hrError);
+#endif // DEBUG
+    TraceError(hrError, "Root failure at %s:%d", szFile, iLine);
+}
+/*******************************************************************
+ LoadSystemLibrary - Fully qualifies the path to a module in the
+                     Windows system directory and loads it.
+ Returns
+   E_MODNOTFOUND - The module could not be found.
+   * - Another error occured.
+********************************************************************/
+extern "C" HRESULT DAPI LoadSystemLibrary(
+    __in_z LPCWSTR wzModuleName,
+    __out HMODULE *phModule
+    )
+{
+    HRESULT hr = LoadSystemLibraryWithPath(wzModuleName, phModule, NULL);
+    return hr;
+}
+/*******************************************************************
+ LoadSystemLibraryWithPath - Fully qualifies the path to a module in
+                             the Windows system directory and loads it
+                             and returns the path
+ Returns
+   E_MODNOTFOUND - The module could not be found.
+   * - Another error occured.
+********************************************************************/
+extern "C" HRESULT DAPI LoadSystemLibraryWithPath(
+    __in_z LPCWSTR wzModuleName,
+    __out HMODULE *phModule,
+    __deref_out_z_opt LPWSTR* psczPath
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD cch = 0;
+    WCHAR wzPath[MAX_PATH] = { };
+    cch = ::GetSystemDirectoryW(wzPath, MAX_PATH);
+    DExitOnNullWithLastError(cch, hr, "Failed to get the Windows system directory.");
+    if (L'\\' != wzPath[cch - 1])
+    {
+        hr = ::StringCchCatNW(wzPath, MAX_PATH, L"\\", 1);
+        DExitOnRootFailure(hr, "Failed to terminate the string with a backslash.");
+    }
+    hr = ::StringCchCatW(wzPath, MAX_PATH, wzModuleName);
+    DExitOnRootFailure(hr, "Failed to create the fully-qualified path to %ls.", wzModuleName);
+    *phModule = ::LoadLibraryW(wzPath);
+    DExitOnNullWithLastError(*phModule, hr, "Failed to load the library %ls.", wzModuleName);
+    if (psczPath)
+    {
+        hr = StrAllocString(psczPath, wzPath, MAX_PATH);
+        DExitOnFailure(hr, "Failed to copy the path to library.");
+    }
+LExit:
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
new file mode 100644
index 00000000..3499a2d5
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>$id$</id>
+    <version>$version$</version>
+    <authors>$authors$</authors>
+    <owners>$authors$</owners>
+    <license type="expression">MS-RL</license>
+    <projectUrl>https://github.com/wixtoolset/dutil</projectUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>$description$</description>
+    <copyright>$copyright$</copyright>
+  </metadata>
+  <files>
+    <file src="build\$id$.props" target="build\" />
+    <file src="inc\*" target="build\native\include" />
+    <file src="..\..\build\$configuration$\v140\x64\dutil.lib" target="build\native\v140\x64" />
+    <file src="..\..\build\$configuration$\v140\x86\dutil.lib" target="build\native\v140\x86" />
+    <file src="..\..\build\$configuration$\v141\x64\dutil.lib" target="build\native\v141\x64" />
+    <file src="..\..\build\$configuration$\v141\x86\dutil.lib" target="build\native\v141\x86" />
+    <file src="..\..\build\$configuration$\v141\ARM64\dutil.lib" target="build\native\v141\ARM64" />
+    <file src="..\..\build\$configuration$\v142\x64\dutil.lib" target="build\native\v142\x64" />
+    <file src="..\..\build\$configuration$\v142\x86\dutil.lib" target="build\native\v142\x86" />
+    <file src="..\..\build\$configuration$\v142\ARM64\dutil.lib" target="build\native\v142\ARM64" />
+  </files>
+</package>
diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj
new file mode 100644
index 00000000..4e341438
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj
@@ -0,0 +1,183 @@
+<?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" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{1244E671-F108-4334-BA52-8A7517F26ECD}</ProjectGuid>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <TargetName>dutil</TargetName>
+    <MultiTargetLibrary>true</MultiTargetLibrary>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <Description>WiX Toolset native library foundation</Description>
+    <PackageId>WixToolset.DUtil</PackageId>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="..\NativeMultiTargeting.Build.props" />
+  <ItemGroup>
+    <ClCompile Include="acl2util.cpp" />
+    <ClCompile Include="aclutil.cpp" />
+    <ClCompile Include="apputil.cpp" />
+    <ClCompile Include="apuputil.cpp" />
+    <ClCompile Include="atomutil.cpp" />
+    <ClCompile Include="butil.cpp" />
+    <ClCompile Include="buffutil.cpp" />
+    <ClCompile Include="cabcutil.cpp" />
+    <ClCompile Include="cabutil.cpp" />
+    <ClCompile Include="certutil.cpp" />
+    <ClCompile Include="conutil.cpp" />
+    <ClCompile Include="cryputil.cpp" />
+    <ClCompile Include="deputil.cpp" />
+    <ClCompile Include="dictutil.cpp" />
+    <ClCompile Include="dirutil.cpp" />
+    <ClCompile Include="dlutil.cpp" />
+    <ClCompile Include="dpiutil.cpp" />
+    <ClCompile Include="dutil.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+      <DisableSpecificWarnings>4091;4458</DisableSpecificWarnings>
+    </ClCompile>
+    <ClCompile Include="eseutil.cpp" />
+    <ClCompile Include="fileutil.cpp" />
+    <ClCompile Include="gdiputil.cpp" />
+    <ClCompile Include="guidutil.cpp" />
+    <ClCompile Include="iis7util.cpp" />
+    <ClCompile Include="inetutil.cpp" />
+    <ClCompile Include="iniutil.cpp" />
+    <ClCompile Include="jsonutil.cpp" />
+    <ClCompile Include="locutil.cpp" />
+    <ClCompile Include="logutil.cpp" />
+    <ClCompile Include="memutil.cpp" />
+    <ClCompile Include="metautil.cpp" />
+    <ClCompile Include="monutil.cpp" />
+    <ClCompile Include="osutil.cpp" />
+    <ClCompile Include="path2utl.cpp" />
+    <ClCompile Include="pathutil.cpp" />
+    <ClCompile Include="perfutil.cpp" />
+    <ClCompile Include="polcutil.cpp" />
+    <ClCompile Include="proc2utl.cpp" />
+    <ClCompile Include="proc3utl.cpp" />
+    <ClCompile Include="procutil.cpp" />
+    <ClCompile Include="regutil.cpp" />
+    <ClCompile Include="resrutil.cpp" />
+    <ClCompile Include="reswutil.cpp" />
+    <ClCompile Include="rexutil.cpp" />
+    <ClCompile Include="rmutil.cpp" />
+    <ClCompile Include="rssutil.cpp" />
+    <ClCompile Include="sceutil.cpp" Condition=" Exists('$(SqlCESdkIncludePath)') " />
+    <ClCompile Include="shelutil.cpp" />
+    <ClCompile Include="sqlutil.cpp" />
+    <ClCompile Include="srputil.cpp" />
+    <ClCompile Include="strutil.cpp" />
+    <ClCompile Include="svcutil.cpp" />
+    <ClCompile Include="thmutil.cpp" />
+    <ClCompile Include="timeutil.cpp" />
+    <ClCompile Include="uncutil.cpp" />
+    <ClCompile Include="uriutil.cpp" />
+    <ClCompile Include="userutil.cpp" />
+    <ClCompile Include="verutil.cpp" />
+    <ClCompile Include="wiutil.cpp" />
+    <ClCompile Include="wuautil.cpp" />
+    <ClCompile Include="xmlutil.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="inc\aclutil.h" />
+    <ClInclude Include="inc\apputil.h" />
+    <ClInclude Include="inc\apuputil.h" />
+    <ClInclude Include="inc\atomutil.h" />
+    <ClInclude Include="inc\buffutil.h" />
+    <ClInclude Include="inc\butil.h" />
+    <ClInclude Include="inc\cabcutil.h" />
+    <ClInclude Include="inc\cabutil.h" />
+    <ClInclude Include="inc\certutil.h" />
+    <ClInclude Include="inc\conutil.h" />
+    <ClInclude Include="inc\cryputil.h" />
+    <ClInclude Include="inc\deputil.h" />
+    <ClInclude Include="inc\dictutil.h" />
+    <ClInclude Include="inc\dirutil.h" />
+    <ClInclude Include="inc\dlutil.h" />
+    <ClInclude Include="inc\dpiutil.h" />
+    <ClInclude Include="inc\dutil.h" />
+    <ClInclude Include="inc\dutilsources.h" />
+    <ClInclude Include="inc\eseutil.h" />
+    <ClInclude Include="inc\fileutil.h" />
+    <ClInclude Include="inc\gdiputil.h" />
+    <ClInclude Include="inc\guidutil.h" />
+    <ClInclude Include="inc\inetutil.h" />
+    <ClInclude Include="inc\iniutil.h" />
+    <ClInclude Include="inc\jsonutil.h" />
+    <ClInclude Include="inc\locutil.h" />
+    <ClInclude Include="inc\logutil.h" />
+    <ClInclude Include="inc\memutil.h" />
+    <ClInclude Include="inc\metautil.h" />
+    <ClInclude Include="inc\monutil.h" />
+    <ClInclude Include="inc\osutil.h" />
+    <ClInclude Include="inc\pathutil.h" />
+    <ClInclude Include="inc\perfutil.h" />
+    <ClInclude Include="inc\polcutil.h" />
+    <ClInclude Include="inc\procutil.h" />
+    <ClInclude Include="inc\regutil.h" />
+    <ClInclude Include="inc\resrutil.h" />
+    <ClInclude Include="inc\reswutil.h" />
+    <ClInclude Include="inc\rexutil.h" />
+    <ClInclude Include="inc\rssutil.h" />
+    <ClInclude Include="inc\sceutil.h" />
+    <ClInclude Include="inc\shelutil.h" />
+    <ClInclude Include="inc\sqlutil.h" />
+    <ClInclude Include="inc\srputil.h" />
+    <ClInclude Include="inc\strutil.h" />
+    <ClInclude Include="inc\svcutil.h" />
+    <ClInclude Include="inc\thmutil.h" />
+    <ClInclude Include="inc\timeutil.h" />
+    <ClInclude Include="inc\uriutil.h" />
+    <ClInclude Include="inc\userutil.h" />
+    <ClInclude Include="inc\verutil.h" />
+    <ClInclude Include="inc\wiutil.h" />
+    <ClInclude Include="inc\wuautil.h" />
+    <ClInclude Include="inc\xmlutil.h" />
+    <ClInclude Include="precomp.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="xsd\thmutil.xsd" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj.filters b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj.filters
new file mode 100644
index 00000000..b93d166b
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj.filters
@@ -0,0 +1,372 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="acl2util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="aclutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="apputil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="apuputil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="atomutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="buffutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="butil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="cabcutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="cabutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="certutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="conutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="cryputil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="dictutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="dirutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="dlutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="dpiutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="dutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="eseutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="fileutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="gdiputil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="guidutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="iis7util.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="inetutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="jsonutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="locutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="logutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="memutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="metautil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="monutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="osutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="path2utl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="pathutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="perfutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proc2utl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="procutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="resrutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="reswutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="rexutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="rmutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="rssutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="shelutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="sqlutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="strutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="thmutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="timeutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="uncutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="uriutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="userutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="verutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="wiutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="xmlutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="svcutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="regutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="iniutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="proc3utl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="wuautil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="srputil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="polcutil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="deputil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="inc\aclutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\apputil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\apuputil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\atomutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\buffutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\butil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\cabcutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\cabutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\certutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\conutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\cryputil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\dictutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\dirutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\dlutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\dpiutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\dutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\dutilsources.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\eseutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\fileutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\gdiputil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\guidutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\inetutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\jsonutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\locutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\logutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\memutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\metautil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\monutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\osutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\pathutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\perfutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\procutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\regutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\resrutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\reswutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\rmutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\rexutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\rssutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\sceutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\shelutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\sqlutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\strutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\thmutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\timeutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\uriutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\userutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\verutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\wiutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\xmlutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="precomp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\svcutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\iniutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\wuautil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\srputil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\polcutil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="inc\deputil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="xsd\thmutil.xsd">
+      <Filter>Header Files</Filter>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/libs/dutil/WixToolset.DUtil/eseutil.cpp b/src/libs/dutil/WixToolset.DUtil/eseutil.cpp
new file mode 100644
index 00000000..b9455d4b
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/eseutil.cpp
@@ -0,0 +1,1340 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define EseExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_ESEUTIL, x, s, __VA_ARGS__)
+#define EseExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_ESEUTIL, x, s, __VA_ARGS__)
+#define EseExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_ESEUTIL, x, s, __VA_ARGS__)
+#define EseExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_ESEUTIL, x, s, __VA_ARGS__)
+#define EseExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_ESEUTIL, x, s, __VA_ARGS__)
+#define EseExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_ESEUTIL, x, s, __VA_ARGS__)
+#define EseExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_ESEUTIL, p, x, e, s, __VA_ARGS__)
+#define EseExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_ESEUTIL, p, x, s, __VA_ARGS__)
+#define EseExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_ESEUTIL, p, x, e, s, __VA_ARGS__)
+#define EseExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_ESEUTIL, p, x, s, __VA_ARGS__)
+#define EseExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_ESEUTIL, e, x, s, __VA_ARGS__)
+#define EseExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_ESEUTIL, g, x, s, __VA_ARGS__)
+struct ESE_QUERY
+{
+    ESE_QUERY_TYPE qtQueryType;
+    BOOL fIndexRangeSet;
+    JET_SESID jsSession;
+    JET_TABLEID jtTable;
+    DWORD dwColumns;
+    void *pvData[10]; // The data queried for for this column
+    DWORD cbData[10]; // One for each column, describes the size of the corresponding entry in ppvData
+};
+// Todo: convert more JET_ERR to HRESULTS here
+HRESULT HresultFromJetError(JET_ERR jEr)
+{
+    HRESULT hr = S_OK;
+    switch (jEr)
+    {
+    case JET_errSuccess:
+        return S_OK;
+    case JET_wrnNyi:
+        return E_NOTIMPL;
+        break;
+    case JET_errOutOfMemory:
+        hr = E_OUTOFMEMORY;
+        break;
+    case JET_errInvalidParameter: __fallthrough;
+    case JET_errInvalidInstance:
+        hr = E_INVALIDARG;
+        break;
+    case JET_errDatabaseInUse:
+        hr = HRESULT_FROM_WIN32(ERROR_DEVICE_IN_USE);
+        break;
+    case JET_errKeyDuplicate:
+        hr = HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS);
+        break;
+    case JET_errInvalidSystemPath: __fallthrough;
+    case JET_errInvalidLogDirectory: __fallthrough;
+    case JET_errInvalidPath: __fallthrough;
+    case JET_errDatabaseInvalidPath:
+        hr = HRESULT_FROM_WIN32(ERROR_INVALID_NAME);
+        break;
+    case JET_errDatabaseLocked:
+        hr = HRESULT_FROM_WIN32(ERROR_FILE_CHECKED_OUT);
+        break;
+    case JET_errInvalidDatabase:
+        hr = HRESULT_FROM_WIN32(ERROR_INTERNAL_DB_CORRUPTION);
+        break;
+    case JET_errCallbackNotResolved:
+        hr = HRESULT_FROM_WIN32(ERROR_INVALID_FUNCTION);
+        break;
+    case JET_errNoCurrentRecord: __fallthrough;
+    case JET_errRecordNotFound: __fallthrough;
+    case JET_errFileNotFound: __fallthrough;
+    case JET_errObjectNotFound:
+        hr = E_NOTFOUND;
+        break;
+    case JET_wrnBufferTruncated:
+        hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+        break;
+    case JET_errFileAccessDenied:
+        hr = E_ACCESSDENIED;
+        break;
+    default:
+        hr = E_FAIL;
+    }
+    // Log the actual Jet error code so we have record of it before it's morphed into an HRESULT to be compatible with the rest of our code
+    ExitTraceSource(DUTIL_SOURCE_ESEUTIL, hr, "Encountered Jet Error: 0x%08x", jEr);
+    return hr;
+}
+#define ExitOnJetFailure(e, x, s, ...) { x = HresultFromJetError(e); if (S_OK != x) { ExitTraceSource(DUTIL_SOURCE_ESEUTIL, x, s, __VA_ARGS__); goto LExit; }}
+#define ExitOnRootJetFailure(e, x, s, ...) { x = HresultFromJetError(e); if (S_OK != x) { Dutil_RootFailure(__FILE__, __LINE__, x); ExitTraceSource(DUTIL_SOURCE_ESEUTIL, x, s, __VA_ARGS__); goto LExit; }}
+HRESULT DAPI EseBeginSession(
+    __out JET_INSTANCE *pjiInstance,
+    __out JET_SESID *pjsSession,
+    __in_z LPCWSTR pszInstance,
+    __in_z LPCWSTR pszPath
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    LPSTR pszAnsiInstance = NULL;
+    LPSTR pszAnsiPath = NULL;
+    hr = DirEnsureExists(pszPath, NULL);
+    EseExitOnFailure(hr, "Failed to ensure database directory exists");
+    // Sigh. JETblue requires Vista and up for the wide character version of this function, so we'll convert to ANSI before calling,
+    // likely breaking everyone with unicode characters in their path.
+    hr = StrAnsiAllocString(&pszAnsiInstance, pszInstance, 0, CP_ACP);
+    EseExitOnFailure(hr, "Failed converting instance name to ansi");
+    hr = StrAnsiAllocString(&pszAnsiPath, pszPath, 0, CP_ACP);
+    EseExitOnFailure(hr, "Failed converting session path name to ansi");
+    jEr = JetCreateInstanceA(pjiInstance, pszAnsiInstance);
+    ExitOnJetFailure(jEr, hr, "Failed to create instance");
+    jEr = JetSetSystemParameter(pjiInstance, NULL, JET_paramSystemPath, NULL, pszAnsiPath);
+    ExitOnJetFailure(jEr, hr, "Failed to set jet system path to: %s", pszAnsiPath);
+    // This makes sure log files that are created are created next to the database, not next to our EXE (note they last after execution)
+    jEr = JetSetSystemParameter(pjiInstance, NULL, JET_paramLogFilePath, NULL, pszAnsiPath);
+    ExitOnJetFailure(jEr, hr, "Failed to set jet log file path to: %s", pszAnsiPath);
+    jEr = JetSetSystemParameter(pjiInstance, NULL, JET_paramMaxOpenTables, 10, NULL);
+    ExitOnJetFailure(jEr, hr, "Failed to set jet max open tables parameter");
+    // TODO: Use callback hooks so that Jet Engine uses our memory allocation methods, etc.? (search docs for "JET_PFNREALLOC" - there are other callbacks too)
+    jEr = JetInit(pjiInstance);
+    ExitOnJetFailure(jEr, hr, "Failed to initialize jet engine instance");
+    jEr = JetBeginSession(*pjiInstance, pjsSession, NULL, NULL);
+    ExitOnJetFailure(jEr, hr, "Failed to begin jet session");
+LExit:
+    ReleaseStr(pszAnsiInstance);
+    ReleaseStr(pszAnsiPath);
+    return hr;
+}
+HRESULT DAPI EseEndSession(
+    __in JET_INSTANCE jiInstance,
+    __in JET_SESID jsSession
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    jEr = JetEndSession(jsSession, 0);
+    ExitOnJetFailure(jEr, hr, "Failed to end jet session");
+    jEr = JetTerm(jiInstance);
+    ExitOnJetFailure(jEr, hr, "Failed to uninitialize jet engine instance");
+LExit:
+    return hr;
+}
+// Utility function used by EnsureSchema()
+HRESULT AllocColumnCreateStruct(
+    __in const ESE_TABLE_SCHEMA *ptsSchema,
+    __deref_out JET_COLUMNCREATE **ppjccColumnCreate
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD_PTR i;
+    size_t cbAllocSize = 0;
+    hr = ::SizeTMult(ptsSchema->dwColumns, sizeof(JET_COLUMNCREATE), &(cbAllocSize));
+    EseExitOnFailure(hr, "Maximum allocation exceeded.");
+    *ppjccColumnCreate = static_cast<JET_COLUMNCREATE*>(MemAlloc(cbAllocSize, TRUE));
+    EseExitOnNull(*ppjccColumnCreate, hr, E_OUTOFMEMORY, "Failed to allocate column create structure for database");
+    for (i = 0; i < ptsSchema->dwColumns; ++i)
+    {
+        (*ppjccColumnCreate)[i].cbStruct = sizeof(JET_COLUMNCREATE);
+        hr = StrAnsiAllocString(&(*ppjccColumnCreate)[i].szColumnName, ptsSchema->pcsColumns[i].pszName, 0, CP_ACP);
+        EseExitOnFailure(hr, "Failed to allocate ansi column name: %ls", ptsSchema->pcsColumns[i].pszName);
+        (*ppjccColumnCreate)[i].coltyp = ptsSchema->pcsColumns[i].jcColumnType;
+        if (JET_coltypText == (*ppjccColumnCreate)[i].coltyp)
+        {
+            (*ppjccColumnCreate)[i].cbMax = 256;
+        }
+        else if (JET_coltypLongText == (*ppjccColumnCreate)[i].coltyp)
+        {
+            (*ppjccColumnCreate)[i].cbMax = 2147483648;
+            (*ppjccColumnCreate)[i].grbit = JET_bitColumnTagged; // LongText columns must be tagged
+            ptsSchema->pcsColumns[i].fNullable = TRUE;
+        }
+        else if (JET_coltypLong == (*ppjccColumnCreate)[i].coltyp)
+        {
+            (*ppjccColumnCreate)[i].cbMax = 4;
+            if (ptsSchema->pcsColumns[i].fAutoIncrement)
+            {
+                (*ppjccColumnCreate)[i].grbit |= JET_bitColumnAutoincrement;
+            }
+        }
+        if (!(ptsSchema->pcsColumns[i].fNullable))
+        {
+            (*ppjccColumnCreate)[i].grbit |= JET_bitColumnNotNULL;
+        }
+        (*ppjccColumnCreate)[i].pvDefault = NULL;
+        (*ppjccColumnCreate)[i].cbDefault = 0;
+        (*ppjccColumnCreate)[i].cp = 1200;
+        (*ppjccColumnCreate)[i].columnid = 0;
+        (*ppjccColumnCreate)[i].err = 0;
+    }
+LExit:
+    return hr;
+}
+HRESULT FreeColumnCreateStruct(
+    __in_ecount(dwColumns) JET_COLUMNCREATE *pjccColumnCreate,
+    __in DWORD dwColumns
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD i;
+    for (i = 0; i < dwColumns; ++i)
+    {
+        ReleaseStr((pjccColumnCreate[i]).szColumnName);
+    }
+    hr = MemFree(pjccColumnCreate);
+    EseExitOnFailure(hr, "Failed to release core column create struct");
+LExit:
+    return hr;
+}
+// Utility function used by EnsureSchema()
+HRESULT AllocIndexCreateStruct(
+    __in const ESE_TABLE_SCHEMA *ptsSchema,
+    __deref_out JET_INDEXCREATE **ppjicIndexCreate
+    )
+{
+    HRESULT hr = S_OK;
+    LPSTR pszMultiSzKeys = NULL;
+    LPSTR pszIndexName = NULL;
+    LPSTR pszTempString = NULL;
+    BOOL fKeyColumns = FALSE;
+    DWORD_PTR i;
+    for (i=0; i < ptsSchema->dwColumns; ++i)
+    {
+        if (ptsSchema->pcsColumns[i].fKey)
+        {
+            hr = StrAnsiAllocString(&pszTempString, ptsSchema->pcsColumns[i].pszName, 0, CP_ACP);
+            EseExitOnFailure(hr, "Failed to convert string to ansi: %ls", ptsSchema->pcsColumns[i].pszName);
+            hr = StrAnsiAllocConcat(&pszMultiSzKeys, "+", 0);
+            EseExitOnFailure(hr, "Failed to append plus sign to multisz string: %s", pszTempString);
+            hr = StrAnsiAllocConcat(&pszMultiSzKeys, pszTempString, 0);
+            EseExitOnFailure(hr, "Failed to append column name to multisz string: %s", pszTempString);
+            ReleaseNullStr(pszTempString);
+            // All question marks will be converted to null characters later; this is just to trick dutil
+            // into letting us create an ansi, double-null-terminated list of single-null-terminated strings
+            hr = StrAnsiAllocConcat(&pszMultiSzKeys, "?", 0);
+            EseExitOnFailure(hr, "Failed to append placeholder character to multisz string: %hs", pszMultiSzKeys);
+            // Record that at least one key column was found
+            fKeyColumns = TRUE;
+        }
+    }
+    // If no key columns were found, don't create an index - just return
+    if (!fKeyColumns)
+    {
+        ExitFunction1(hr = S_OK);
+    }
+    hr = StrAnsiAllocString(&pszIndexName, ptsSchema->pszName, 0, CP_ACP);
+    EseExitOnFailure(hr, "Failed to allocate ansi string version of %ls", ptsSchema->pszName);
+    hr = StrAnsiAllocConcat(&pszIndexName, "_Index", 0);
+    EseExitOnFailure(hr, "Failed to append table name string version of %ls", ptsSchema->pszName);
+    *ppjicIndexCreate = static_cast<JET_INDEXCREATE*>(MemAlloc(sizeof(JET_INDEXCREATE), TRUE));
+    EseExitOnNull(*ppjicIndexCreate, hr, E_OUTOFMEMORY, "Failed to allocate index create structure for database");
+    // Record the size including both null terminators - the struct requires this
+    size_t cchSize = 0;
+    hr = ::StringCchLengthA(pszMultiSzKeys, STRSAFE_MAX_LENGTH, &cchSize);
+    EseExitOnRootFailure(hr, "Failed to get size of keys string");
+    ++cchSize; // add 1 to include null character at the end
+    // At this point convert all question marks to null characters
+    for (i = 0; i < cchSize; ++i)
+    {
+        if ('?' == pszMultiSzKeys[i])
+        {
+            pszMultiSzKeys[i] = '\0';
+        }
+    }
+    (*ppjicIndexCreate)->cbStruct = sizeof(JET_INDEXCREATE);
+    (*ppjicIndexCreate)->szIndexName = pszIndexName;
+    (*ppjicIndexCreate)->szKey = pszMultiSzKeys;
+    (*ppjicIndexCreate)->cbKey = (DWORD)cchSize;
+    (*ppjicIndexCreate)->grbit = JET_bitIndexUnique | JET_bitIndexPrimary;
+    (*ppjicIndexCreate)->ulDensity = 80;
+    (*ppjicIndexCreate)->lcid = 1033;
+    (*ppjicIndexCreate)->pidxunicode = NULL;
+    (*ppjicIndexCreate)->cbVarSegMac = 0;
+    (*ppjicIndexCreate)->rgconditionalcolumn = NULL;
+    (*ppjicIndexCreate)->cConditionalColumn = 0;
+    (*ppjicIndexCreate)->err = 0;
+LExit:
+    ReleaseStr(pszTempString);
+    return hr;
+}
+HRESULT EnsureSchema(
+    __in JET_DBID jdbDb,
+    __in JET_SESID jsSession,
+    __in ESE_DATABASE_SCHEMA *pdsSchema
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    BOOL fTransaction = FALSE;
+    DWORD dwTable;
+    DWORD dwColumn;
+    JET_TABLECREATE jtTableCreate = { };
+    // Set parameters which apply to all tables here
+    jtTableCreate.cbStruct = sizeof(jtTableCreate);
+    jtTableCreate.ulPages = 100;
+    jtTableCreate.ulDensity = 0; // per the docs, 0 means "use the default value"
+    jtTableCreate.cIndexes = 1;
+    hr = EseBeginTransaction(jsSession);
+    EseExitOnFailure(hr, "Failed to begin transaction to create tables");
+    fTransaction = TRUE;
+   
+    for (dwTable = 0;dwTable < pdsSchema->dwTables; ++dwTable)
+    {
+        // Don't free this pointer - it's just a shortcut to the current table's name within the struct
+        LPCWSTR pwzTableName = pdsSchema->ptsTables[dwTable].pszName;
+        // Ensure table exists
+        hr = EseOpenTable(jsSession, jdbDb, pwzTableName, &pdsSchema->ptsTables[dwTable].jtTable);
+        if (E_NOTFOUND == hr) // if the table is missing, create it
+        {
+            // Fill out the JET_TABLECREATE struct
+            hr = StrAnsiAllocString(&jtTableCreate.szTableName, pdsSchema->ptsTables[dwTable].pszName, 0, CP_ACP);
+            EseExitOnFailure(hr, "Failed converting table name to ansi");
+            hr = AllocColumnCreateStruct(&(pdsSchema->ptsTables[dwTable]), &jtTableCreate.rgcolumncreate);
+            EseExitOnFailure(hr, "Failed to allocate column create struct");
+            hr = AllocIndexCreateStruct(&(pdsSchema->ptsTables[dwTable]), &jtTableCreate.rgindexcreate);
+            EseExitOnFailure(hr, "Failed to allocate index create struct");
+            jtTableCreate.cColumns = pdsSchema->ptsTables[dwTable].dwColumns;
+            jtTableCreate.tableid = NULL;
+            // TODO: Investigate why we can't create a table without a key column?
+            // Actually create the table using our JET_TABLECREATE struct
+            jEr = JetCreateTableColumnIndex(jsSession, jdbDb, &jtTableCreate);
+            ExitOnJetFailure(jEr, hr, "Failed to create %ls table", pwzTableName);
+            // Record the table ID in our cache
+            pdsSchema->ptsTables[dwTable].jtTable = jtTableCreate.tableid;
+            // Record the column IDs in our cache
+            for (dwColumn = 0; dwColumn < pdsSchema->ptsTables[dwTable].dwColumns; ++dwColumn)
+            {
+                pdsSchema->ptsTables[dwTable].pcsColumns[dwColumn].jcColumn = jtTableCreate.rgcolumncreate[dwColumn].columnid;
+            }
+            // Free and NULL things we allocated in this struct
+            ReleaseNullStr(jtTableCreate.szTableName);
+            hr = FreeColumnCreateStruct(jtTableCreate.rgcolumncreate, jtTableCreate.cColumns);
+            EseExitOnFailure(hr, "Failed to free column create struct");
+            jtTableCreate.rgcolumncreate = NULL;
+        }
+        else
+        {
+            // If the table already exists, grab the column ids and put them into our cache
+            for (dwColumn = 0;dwColumn < pdsSchema->ptsTables[dwTable].dwColumns; ++dwColumn)
+            {
+                // Don't free this - it's just a shortcut to the current column within the struct
+                ESE_COLUMN_SCHEMA *pcsColumn = &(pdsSchema->ptsTables[dwTable].pcsColumns[dwColumn]);
+                ULONG ulColumnSize = 0;
+                BOOL fNullable = pcsColumn->fNullable;
+                // Todo: this code is nearly duplicated from AllocColumnCreateStruct - factor it out!
+                if (JET_coltypText == pcsColumn->jcColumnType)
+                {
+                    ulColumnSize = 256;
+                }
+                else if (JET_coltypLongText == pcsColumn->jcColumnType)
+                {
+                    ulColumnSize = 2147483648;
+                    fNullable = TRUE;
+                }
+                else if (JET_coltypLong == pcsColumn->jcColumnType)
+                {
+                    ulColumnSize = 4;
+                    fNullable = TRUE;
+                }
+                hr = EseEnsureColumn(jsSession, pdsSchema->ptsTables[dwTable].jtTable, pcsColumn->pszName, pcsColumn->jcColumnType, ulColumnSize, pcsColumn->fFixed, fNullable, &pcsColumn->jcColumn);
+                EseExitOnFailure(hr, "Failed to create column %u of %ls table", dwColumn, pwzTableName);
+            }
+        }
+    }
+LExit:
+    ReleaseStr(jtTableCreate.szTableName);
+    if (NULL != jtTableCreate.rgcolumncreate)
+    {
+        // Don't record the HRESULT here or it will override the return value of this function
+        FreeColumnCreateStruct(jtTableCreate.rgcolumncreate, jtTableCreate.cColumns);
+    }
+    if (fTransaction)
+    {
+        EseCommitTransaction(jsSession);
+    }
+    return hr;
+}
+// Todo: support overwrite flag? Unfortunately, requires WinXP and up
+// Todo: Add version parameter, and a built-in dutil table that stores the version of the database schema on disk - then allow overriding the "migrate to new schema" functionality with a callback
+HRESULT DAPI EseEnsureDatabase(
+    __in JET_SESID jsSession,
+    __in_z LPCWSTR pszFile,
+    __in ESE_DATABASE_SCHEMA *pdsSchema,
+    __out JET_DBID* pjdbDb,
+    __in BOOL fExclusive,
+    __in BOOL fReadonly
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    JET_GRBIT jgrOptions = 0;
+    LPWSTR pszDir = NULL;
+    LPSTR pszAnsiFile = NULL;
+    // Sigh. JETblue requires Vista and up for the wide character version of this function, so we'll convert to ANSI before calling,
+    // likely breaking all those with unicode characters in their path.
+    hr = StrAnsiAllocString(&pszAnsiFile, pszFile, 0, CP_ACP);
+    EseExitOnFailure(hr, "Failed converting database name to ansi");
+    hr = PathGetDirectory(pszFile, &pszDir);
+    EseExitOnFailure(hr, "Failed to get directory that will contain database file");
+    hr = DirEnsureExists(pszDir, NULL);
+    EseExitOnFailure(hr, "Failed to ensure directory exists for database: %ls", pszDir);
+    if (FileExistsEx(pszFile, NULL))
+    {
+        if (fReadonly)
+        {
+            jgrOptions = jgrOptions | JET_bitDbReadOnly;
+        }
+        jEr = JetAttachDatabaseA(jsSession, pszAnsiFile, jgrOptions);
+        ExitOnJetFailure(jEr, hr, "Failed to attach to database %s", pszAnsiFile);
+        // This flag doesn't apply to attach, only applies to Open, so only set it after the attach
+        if (fExclusive)
+        {
+            jgrOptions = jgrOptions | JET_bitDbExclusive;
+        }
+        jEr = JetOpenDatabaseA(jsSession, pszAnsiFile, NULL, pjdbDb, jgrOptions);
+        ExitOnJetFailure(jEr, hr, "Failed to open database %s", pszAnsiFile);
+    }
+    else
+    {
+        jEr = JetCreateDatabase2A(jsSession, pszAnsiFile, 0, pjdbDb, 0);
+        ExitOnJetFailure(jEr, hr, "Failed to create database %ls", pszFile);
+    }
+    hr = EnsureSchema(*pjdbDb, jsSession, pdsSchema);
+    EseExitOnFailure(hr, "Failed to ensure database schema matches expectations");
+        
+LExit:
+    ReleaseStr(pszDir);
+    ReleaseStr(pszAnsiFile);
+    return hr;
+}
+HRESULT DAPI EseCloseDatabase(
+    __in JET_SESID jsSession,
+    __in JET_DBID jdbDb
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    JET_GRBIT jgrOptions = 0;
+    jEr = JetCloseDatabase(jsSession, jdbDb, jgrOptions);
+    ExitOnJetFailure(jEr, hr, "Failed to close database");
+LExit:
+    return hr;
+}
+HRESULT DAPI EseCreateTable(
+    __in JET_SESID jsSession,
+    __in JET_DBID jdbDb,
+    __in_z LPCWSTR pszTable,
+    __out JET_TABLEID *pjtTable
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    LPSTR pszAnsiTable = NULL;
+    hr = StrAnsiAllocString(&pszAnsiTable, pszTable, 0, CP_ACP);
+    EseExitOnFailure(hr, "Failed converting table name to ansi");
+    jEr = JetCreateTableA(jsSession, jdbDb, pszAnsiTable, 100, 0, pjtTable);
+    ExitOnJetFailure(jEr, hr, "Failed to create table %s", pszAnsiTable);
+LExit:
+    ReleaseStr(pszAnsiTable);
+    return hr;
+}
+HRESULT DAPI EseOpenTable(
+    __in JET_SESID jsSession,
+    __in JET_DBID jdbDb,
+    __in_z LPCWSTR pszTable,
+    __out JET_TABLEID *pjtTable
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    LPSTR pszAnsiTable = NULL;
+    hr = StrAnsiAllocString(&pszAnsiTable, pszTable, 0, CP_ACP);
+    EseExitOnFailure(hr, "Failed converting table name to ansi");
+    jEr = JetOpenTableA(jsSession, jdbDb, pszAnsiTable, NULL, 0, 0, pjtTable);
+    ExitOnJetFailure(jEr, hr, "Failed to open table %s", pszAnsiTable);
+LExit:
+    ReleaseStr(pszAnsiTable);
+    return hr;
+}
+HRESULT DAPI EseCloseTable(
+    __in JET_SESID jsSession,
+    __in JET_TABLEID jtTable
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    jEr = JetCloseTable(jsSession, jtTable);
+    ExitOnJetFailure(jEr, hr, "Failed to close table");
+LExit:
+    return hr;
+}
+HRESULT DAPI EseEnsureColumn(
+    __in JET_SESID jsSession,
+    __in JET_TABLEID jtTable,
+    __in_z LPCWSTR pszColumnName,
+    __in JET_COLTYP jcColumnType,
+    __in ULONG ulColumnSize,
+    __in BOOL fFixed,
+    __in BOOL fNullable,
+    __out_opt JET_COLUMNID *pjcColumn
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    LPSTR pszAnsiColumnName = NULL;
+    JET_COLUMNDEF jcdColumnDef = { sizeof(JET_COLUMNDEF) };
+    JET_COLUMNBASE jcdTempBase = { sizeof(JET_COLUMNBASE) };
+    hr = StrAnsiAllocString(&pszAnsiColumnName, pszColumnName, 0, CP_ACP);
+    EseExitOnFailure(hr, "Failed converting column name to ansi");
+    jEr = JetGetTableColumnInfoA(jsSession, jtTable, pszAnsiColumnName, &jcdTempBase, sizeof(JET_COLUMNBASE), JET_ColInfoBase);
+    if (JET_errSuccess == jEr)
+    {
+        // Return the found columnID
+        if (NULL != pjcColumn)
+        {
+            *pjcColumn = jcdTempBase.columnid;
+        }
+        ExitFunction1(hr = S_OK);
+    }
+    else if (JET_errColumnNotFound == jEr)
+    {
+        jEr = JET_errSuccess;
+    }
+    ExitOnJetFailure(jEr, hr, "Failed to check if column exists: %s", pszAnsiColumnName);
+    jcdColumnDef.columnid = 0;
+    jcdColumnDef.coltyp = jcColumnType;
+    jcdColumnDef.wCountry = 0;
+    jcdColumnDef.langid = 0;
+    jcdColumnDef.cp = 1200;
+    jcdColumnDef.wCollate = 0;
+    jcdColumnDef.cbMax = ulColumnSize;
+    jcdColumnDef.grbit = 0;
+    if (fFixed)
+    {
+        jcdColumnDef.grbit = jcdColumnDef.grbit | JET_bitColumnFixed;
+    }
+    if (!fNullable)
+    {
+        jcdColumnDef.grbit = jcdColumnDef.grbit | JET_bitColumnNotNULL;
+    }
+    jEr = JetAddColumnA(jsSession, jtTable, pszAnsiColumnName, &jcdColumnDef, NULL, 0, pjcColumn);
+    ExitOnJetFailure(jEr, hr, "Failed to add column %ls", pszColumnName);
+LExit:
+    ReleaseStr(pszAnsiColumnName);
+    return hr;
+}
+HRESULT DAPI EseGetColumn(
+    __in JET_SESID jsSession,
+    __in JET_TABLEID jtTable,
+    __in_z LPCWSTR pszColumnName,
+    __out JET_COLUMNID *pjcColumn
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    LPSTR pszAnsiColumnName = NULL;
+    JET_COLUMNBASE jcdTempBase = { sizeof(JET_COLUMNBASE) };
+    hr = StrAnsiAllocString(&pszAnsiColumnName, pszColumnName, 0, CP_ACP);
+    EseExitOnFailure(hr, "Failed converting column name to ansi");
+    jEr = JetGetTableColumnInfoA(jsSession, jtTable, pszAnsiColumnName, &jcdTempBase, sizeof(JET_COLUMNBASE), JET_ColInfoBase);
+    if (JET_errSuccess == jEr)
+    {
+        // Return the found columnID
+        if (NULL != pjcColumn)
+        {
+            *pjcColumn = jcdTempBase.columnid;
+        }
+        ExitFunction1(hr = S_OK);
+    }
+    ExitOnJetFailure(jEr, hr, "Failed to check if column exists: %s", pszAnsiColumnName);
+LExit:
+    ReleaseStr(pszAnsiColumnName);
+    return hr;
+}
+HRESULT DAPI EseMoveCursor(
+    __in JET_SESID jsSession,
+    __in JET_TABLEID jtTable,
+    __in LONG lRow
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    jEr = JetMove(jsSession, jtTable, lRow, 0);
+    ExitOnJetFailure(jEr, hr, "Failed to move jet cursor by amount: %d", lRow);
+LExit:
+    return hr;
+}
+HRESULT DAPI EseDeleteRow(
+    __in JET_SESID jsSession,
+    __in JET_TABLEID jtTable
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    jEr = JetDelete(jsSession, jtTable);
+    ExitOnJetFailure(jEr, hr, "Failed to delete row");
+LExit:
+    return hr;
+}
+HRESULT DAPI EseBeginTransaction(
+    __in JET_SESID jsSession
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    jEr = JetBeginTransaction(jsSession);
+    ExitOnJetFailure(jEr, hr, "Failed to begin transaction");
+LExit:
+    return hr;
+}
+HRESULT DAPI EseRollbackTransaction(
+    __in JET_SESID jsSession,
+    __in BOOL fAll
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    jEr = JetRollback(jsSession, fAll ? JET_bitRollbackAll : 0);
+    ExitOnJetFailure(jEr, hr, "Failed to rollback transaction");
+LExit:
+    return hr;
+}
+HRESULT DAPI EseCommitTransaction(
+    __in JET_SESID jsSession
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    jEr = JetCommitTransaction(jsSession, 0);
+    ExitOnJetFailure(jEr, hr, "Failed to commit transaction");
+LExit:
+    return hr;
+}
+HRESULT DAPI EsePrepareUpdate(
+    __in JET_SESID jsSession,
+    __in JET_TABLEID jtTable,
+    __in ULONG ulPrep
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    jEr = JetPrepareUpdate(jsSession, jtTable, ulPrep);
+    ExitOnJetFailure(jEr, hr, "Failed to prepare for update of type: %ul", ulPrep);
+LExit:
+    return hr;
+}
+HRESULT DAPI EseFinishUpdate(
+    __in JET_SESID jsSession,
+    __in JET_TABLEID jtTable,
+    __in BOOL fSeekToInsertedRecord
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    unsigned char rgbBookmark[JET_cbBookmarkMost + 1];
+    DWORD cbBookmark;
+    if (fSeekToInsertedRecord)
+    {
+        jEr = JetUpdate(jsSession, jtTable, rgbBookmark, sizeof(rgbBookmark), &cbBookmark);
+        ExitOnJetFailure(jEr, hr, "Failed to run update and retrieve bookmark");
+        jEr = JetGotoBookmark(jsSession, jtTable, rgbBookmark, cbBookmark);
+        ExitOnJetFailure(jEr, hr, "Failed to seek to recently updated record using bookmark");
+    }
+    else
+    {
+        jEr = JetUpdate(jsSession, jtTable, NULL, 0, NULL);
+        ExitOnJetFailure(jEr, hr, "Failed to run update (without retrieving bookmark)");
+    }
+LExit:
+    // If we fail, the caller won't expect that the update wasn't finished, so we'll cancel their entire update to leave them in a good state
+    if (FAILED(hr))
+    {
+        JetPrepareUpdate(jsSession, jtTable, JET_prepCancel);
+    }
+    return hr;
+}
+HRESULT DAPI EseSetColumnBinary(
+    __in JET_SESID jsSession,
+    __in ESE_TABLE_SCHEMA tsTable,
+    __in DWORD dwColumn,
+    __in_bcount(cbBuffer) const BYTE* pbBuffer,
+    __in SIZE_T cbBuffer
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    jEr = JetSetColumn(jsSession, tsTable.jtTable, tsTable.pcsColumns[dwColumn].jcColumn, pbBuffer, static_cast<unsigned long>(cbBuffer), 0, NULL);
+    ExitOnJetFailure(jEr, hr, "Failed to set binary value into column of database");
+LExit:
+    return hr;
+}
+HRESULT DAPI EseSetColumnDword(
+    __in JET_SESID jsSession,
+    __in ESE_TABLE_SCHEMA tsTable,
+    __in DWORD dwColumn,
+    __in DWORD dwValue
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    jEr = JetSetColumn(jsSession, tsTable.jtTable, tsTable.pcsColumns[dwColumn].jcColumn, &dwValue, sizeof(DWORD), 0, NULL);
+    ExitOnJetFailure(jEr, hr, "Failed to set dword value into column of database: %u", dwValue);
+LExit:
+    return hr;
+}
+HRESULT DAPI EseSetColumnBool(
+    __in JET_SESID jsSession,
+    __in ESE_TABLE_SCHEMA tsTable,
+    __in DWORD dwColumn,
+    __in BOOL fValue
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    BYTE bValue = fValue ? 0xFF : 0x00;
+    jEr = JetSetColumn(jsSession, tsTable.jtTable, tsTable.pcsColumns[dwColumn].jcColumn, &bValue, 1, 0, NULL);
+    ExitOnJetFailure(jEr, hr, "Failed to set bool value into column of database");
+LExit:
+    return hr;
+}
+HRESULT DAPI EseSetColumnString(
+    __in JET_SESID jsSession,
+    __in ESE_TABLE_SCHEMA tsTable,
+    __in DWORD dwColumn,
+    __in_z LPCWSTR pwzValue
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    size_t cchValue = 0;
+    ULONG cbValueSize = 0;
+    if (pwzValue)
+    {
+        hr = ::StringCchLengthW(pwzValue, STRSAFE_MAX_LENGTH, &cchValue);
+        EseExitOnRootFailure(hr, "Failed to get string length: %ls", pwzValue);
+    }
+    cbValueSize = static_cast<ULONG>((cchValue + 1) * sizeof(WCHAR)); // add 1 for null character, then multiply by size of WCHAR to get bytes
+    jEr = JetSetColumn(jsSession, tsTable.jtTable, tsTable.pcsColumns[dwColumn].jcColumn, pwzValue, cbValueSize, 0, NULL);
+    ExitOnJetFailure(jEr, hr, "Failed to set string value into column of database: %ls", pwzValue);
+LExit:
+    return hr;
+}
+HRESULT DAPI EseSetColumnEmpty(
+    __in JET_SESID jsSession,
+    __in ESE_TABLE_SCHEMA tsTable,
+    __in DWORD dwColumn
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    jEr = JetSetColumn(jsSession, tsTable.jtTable, tsTable.pcsColumns[dwColumn].jcColumn, NULL, 0, 0, NULL);
+    ExitOnJetFailure(jEr, hr, "Failed to set empty value into column of database");
+LExit:
+    return hr;
+}
+HRESULT DAPI EseGetColumnBinary(
+    __in JET_SESID jsSession,
+    __in ESE_TABLE_SCHEMA tsTable,
+    __in DWORD dwColumn,
+    __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
+    __inout SIZE_T* piBuffer
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    ULONG ulActualSize = 0;
+    jEr = JetRetrieveColumn(jsSession, tsTable.jtTable, tsTable.pcsColumns[dwColumn].jcColumn, NULL, 0, &ulActualSize, 0, NULL);
+    if (JET_wrnBufferTruncated == jEr)
+    {
+        jEr = JET_errSuccess;
+    }
+    ExitOnJetFailure(jEr, hr, "Failed to check size of binary value from record");
+    if (NULL == *ppbBuffer)
+    {
+        *ppbBuffer = reinterpret_cast<BYTE *>(MemAlloc(ulActualSize, FALSE));
+        EseExitOnNull(*ppbBuffer, hr, E_OUTOFMEMORY, "Failed to allocate memory for reading binary value column");
+    }
+    else
+    {
+        *ppbBuffer = reinterpret_cast<BYTE *>(MemReAlloc(*ppbBuffer, ulActualSize, FALSE));
+        EseExitOnNull(*ppbBuffer, hr, E_OUTOFMEMORY, "Failed to reallocate memory for reading binary value column");
+    }
+    jEr = JetRetrieveColumn(jsSession, tsTable.jtTable, tsTable.pcsColumns[dwColumn].jcColumn, *ppbBuffer, ulActualSize, NULL, 0, NULL);
+    ExitOnJetFailure(jEr, hr, "Failed to retrieve binary value from record");
+    *piBuffer = static_cast<SIZE_T>(ulActualSize);
+LExit:
+    if (FAILED(hr))
+    {
+        ReleaseNullMem(*ppbBuffer);
+    }
+    return hr;
+}
+HRESULT DAPI EseGetColumnDword(
+    __in JET_SESID jsSession,
+    __in ESE_TABLE_SCHEMA tsTable,
+    __in DWORD dwColumn,
+    __out DWORD *pdwValue
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    jEr = JetRetrieveColumn(jsSession, tsTable.jtTable, tsTable.pcsColumns[dwColumn].jcColumn, pdwValue, sizeof(DWORD), NULL, 0, NULL);
+    ExitOnJetFailure(jEr, hr, "Failed to retrieve dword value from record");
+LExit:
+    return hr;
+}
+HRESULT DAPI EseGetColumnBool(
+    __in JET_SESID jsSession,
+    __in ESE_TABLE_SCHEMA tsTable,
+    __in DWORD dwColumn,
+    __out BOOL *pfValue
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    BYTE bValue = 0;
+    jEr = JetRetrieveColumn(jsSession, tsTable.jtTable, tsTable.pcsColumns[dwColumn].jcColumn, &bValue, 1, NULL, 0, NULL);
+    ExitOnJetFailure(jEr, hr, "Failed to retrieve bool value from record");
+    if (bValue == 0)
+    {
+        *pfValue = FALSE;
+    }
+    else
+    {
+        *pfValue = TRUE;
+    }
+LExit:
+    return hr;
+}
+HRESULT DAPI EseGetColumnString(
+    __in JET_SESID jsSession,
+    __in ESE_TABLE_SCHEMA tsTable,
+    __in DWORD dwColumn,
+    __out LPWSTR *ppszValue
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    ULONG ulActualSize = 0;
+    jEr = JetRetrieveColumn(jsSession, tsTable.jtTable, tsTable.pcsColumns[dwColumn].jcColumn, NULL, 0, &ulActualSize, 0, NULL);
+    if (JET_wrnBufferTruncated == jEr)
+    {
+        jEr = JET_errSuccess;
+    }
+    ExitOnJetFailure(jEr, hr, "Failed to check size of string value from record");
+    hr = StrAlloc(ppszValue, ulActualSize);
+    EseExitOnFailure(hr, "Failed to allocate string while retrieving column value");
+    jEr = JetRetrieveColumn(jsSession, tsTable.jtTable, tsTable.pcsColumns[dwColumn].jcColumn, *ppszValue, ulActualSize, NULL, 0, NULL);
+    ExitOnJetFailure(jEr, hr, "Failed to retrieve string value from record");
+LExit:
+    return hr;
+}
+HRESULT DAPI EseBeginQuery(
+    __in JET_SESID jsSession,
+    __in JET_TABLEID jtTable,
+    __in ESE_QUERY_TYPE qtQueryType,
+    __out ESE_QUERY_HANDLE *peqhHandle
+    )
+{
+    UNREFERENCED_PARAMETER(jsSession);
+    UNREFERENCED_PARAMETER(jtTable);
+    HRESULT hr = S_OK;
+    *peqhHandle = static_cast<ESE_QUERY*>(MemAlloc(sizeof(ESE_QUERY), TRUE));
+    EseExitOnNull(*peqhHandle, hr, E_OUTOFMEMORY, "Failed to allocate new query");
+    ESE_QUERY *peqHandle = static_cast<ESE_QUERY *>(*peqhHandle);
+    peqHandle->qtQueryType = qtQueryType;
+    peqHandle->jsSession = jsSession;
+    peqHandle->jtTable = jtTable;
+LExit:
+    return hr;
+}
+// Utility function used by other functions to set a query column
+HRESULT DAPI SetQueryColumn(
+    __in ESE_QUERY_HANDLE eqhHandle,
+    __in_bcount(cbData) const void *pvData,
+    __in DWORD cbData,
+    __in JET_GRBIT jGrb
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    ESE_QUERY *peqHandle = static_cast<ESE_QUERY *>(eqhHandle);
+    if (peqHandle->dwColumns == countof(peqHandle->pvData))
+    {
+        hr = E_NOTIMPL;
+        EseExitOnFailure(hr, "Dutil hasn't implemented support for queries of more than %d columns", countof(peqHandle->pvData));
+    }
+    if (0 == peqHandle->dwColumns) // If it's the first column, start a new key
+    {
+        jGrb = jGrb | JET_bitNewKey;
+    }
+    jEr = JetMakeKey(peqHandle->jsSession, peqHandle->jtTable, pvData, cbData, jGrb);
+    ExitOnJetFailure(jEr, hr, "Failed to begin new query");
+    // If the query is wildcard, setup the cached copy of pvData
+    if (ESE_QUERY_EXACT != peqHandle->qtQueryType)
+    {
+        peqHandle->pvData[peqHandle->dwColumns] = MemAlloc(cbData, FALSE);
+        EseExitOnNull(peqHandle->pvData[peqHandle->dwColumns], hr, E_OUTOFMEMORY, "Failed to allocate memory");
+        memcpy(peqHandle->pvData[peqHandle->dwColumns], pvData, cbData);
+        peqHandle->cbData[peqHandle->dwColumns] = cbData;
+    }
+    // Increment the number of total columns
+    ++peqHandle->dwColumns;
+LExit:
+    return hr;
+}
+HRESULT DAPI EseSetQueryColumnBinary(
+    __in ESE_QUERY_HANDLE eqhHandle,
+    __in_bcount(cbBuffer) const BYTE* pbBuffer,
+    __in SIZE_T cbBuffer,
+    __in BOOL fFinal // If this is true, all other key columns in the query will be set to "*"
+    )
+{
+    HRESULT hr = S_OK;
+    ESE_QUERY *peqHandle = static_cast<ESE_QUERY *>(eqhHandle);
+    JET_GRBIT jGrb = 0;
+    if (cbBuffer > DWORD_MAX)
+    {
+        ExitFunction1(hr = E_INVALIDARG);
+    }
+    if (fFinal)
+    {
+        if (ESE_QUERY_FROM_TOP == peqHandle->qtQueryType)
+        {
+            jGrb = jGrb | JET_bitFullColumnStartLimit;
+        }
+        else if (ESE_QUERY_FROM_BOTTOM == peqHandle->qtQueryType)
+        {
+            jGrb = jGrb | JET_bitFullColumnEndLimit;
+        }
+    }
+    hr = SetQueryColumn(eqhHandle, reinterpret_cast<const void *>(pbBuffer), static_cast<DWORD>(cbBuffer), jGrb);
+    EseExitOnFailure(hr, "Failed to set value of query colum (as binary) to:");
+LExit:
+    return hr;
+}
+HRESULT DAPI EseSetQueryColumnDword(
+    __in ESE_QUERY_HANDLE eqhHandle,
+    __in DWORD dwData,
+    __in BOOL fFinal
+    )
+{
+    HRESULT hr = S_OK;
+    ESE_QUERY *peqHandle = static_cast<ESE_QUERY *>(eqhHandle);
+    JET_GRBIT jGrb = 0;
+    if (fFinal)
+    {
+        if (ESE_QUERY_FROM_TOP == peqHandle->qtQueryType)
+        {
+            jGrb = jGrb | JET_bitFullColumnStartLimit;
+        }
+        else if (ESE_QUERY_FROM_BOTTOM == peqHandle->qtQueryType)
+        {
+            jGrb = jGrb | JET_bitFullColumnEndLimit;
+        }
+    }
+    hr = SetQueryColumn(eqhHandle, (const void *)&dwData, sizeof(DWORD), jGrb);
+    EseExitOnFailure(hr, "Failed to set value of query colum (as dword) to: %u", dwData);
+LExit:
+    return hr;
+}
+HRESULT DAPI EseSetQueryColumnBool(
+    __in ESE_QUERY_HANDLE eqhHandle,
+    __in BOOL fValue,
+    __in BOOL fFinal
+    )
+{
+    HRESULT hr = S_OK;
+    BYTE bByte = fValue ? 0xFF : 0x00;
+    ESE_QUERY *peqHandle = static_cast<ESE_QUERY *>(eqhHandle);
+    JET_GRBIT jGrb = 0;
+    if (fFinal)
+    {
+        if (ESE_QUERY_FROM_TOP == peqHandle->qtQueryType)
+        {
+            jGrb = jGrb | JET_bitFullColumnStartLimit;
+        }
+        else if (ESE_QUERY_FROM_BOTTOM == peqHandle->qtQueryType)
+        {
+            jGrb = jGrb | JET_bitFullColumnEndLimit;
+        }
+    }
+    hr = SetQueryColumn(eqhHandle, (const void *)&bByte, 1, jGrb);
+    EseExitOnFailure(hr, "Failed to set value of query colum (as bool) to: %s", fValue ? "TRUE" : "FALSE");
+LExit:
+    return hr;
+}
+HRESULT DAPI EseSetQueryColumnString(
+    __in ESE_QUERY_HANDLE eqhHandle,
+    __in_z LPCWSTR pszString,
+    __in BOOL fFinal
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD dwStringSize = 0;
+    size_t cchString = 0;
+    ESE_QUERY *peqHandle = static_cast<ESE_QUERY *>(eqhHandle);
+    JET_GRBIT jGrb = 0;
+    if (pszString)
+    {
+        hr = ::StringCchLengthW(pszString, STRSAFE_MAX_LENGTH, &cchString);
+        EseExitOnRootFailure(hr, "Failed to get size of column string");
+    }
+    dwStringSize = static_cast<DWORD>(sizeof(WCHAR) * (cchString + 1)); // Add 1 for null terminator
+    if (fFinal)
+    {
+        if (ESE_QUERY_FROM_TOP == peqHandle->qtQueryType)
+        {
+            jGrb = jGrb | JET_bitFullColumnStartLimit;
+        }
+        else if (ESE_QUERY_FROM_BOTTOM == peqHandle->qtQueryType)
+        {
+            jGrb = jGrb | JET_bitFullColumnEndLimit;
+        }
+    }
+    hr = SetQueryColumn(eqhHandle, (const void *)pszString, dwStringSize, jGrb);
+    EseExitOnFailure(hr, "Failed to set value of query colum (as string) to: %ls", pszString);
+LExit:
+    return hr;
+}
+HRESULT DAPI EseFinishQuery(
+    __in ESE_QUERY_HANDLE eqhHandle
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    ESE_QUERY *peqHandle = static_cast<ESE_QUERY *>(eqhHandle);
+    if (peqHandle->fIndexRangeSet)
+    {
+        jEr = JetSetIndexRange(peqHandle->jsSession, peqHandle->jtTable, JET_bitRangeRemove);
+        ExitOnJetFailure(jEr, hr, "Failed to release index range");
+        peqHandle->fIndexRangeSet = FALSE;
+    }
+    for (int i=0; i < countof(peqHandle->pvData); ++i)
+    {
+        ReleaseMem(peqHandle->pvData[i]);
+    }
+    ReleaseMem(peqHandle);
+LExit:
+    return hr;
+}
+HRESULT DAPI EseRunQuery(
+    __in ESE_QUERY_HANDLE eqhHandle
+    )
+{
+    HRESULT hr = S_OK;
+    JET_ERR jEr = JET_errSuccess;
+    JET_GRBIT jGrb = 0;
+    JET_GRBIT jGrbSeekType = 0;
+    DWORD i;
+    ESE_QUERY *peqHandle = static_cast<ESE_QUERY *>(eqhHandle);
+    if (ESE_QUERY_EXACT == peqHandle->qtQueryType)
+    {
+        jEr = JetSeek(peqHandle->jsSession, peqHandle->jtTable, JET_bitSeekEQ);
+        ExitOnJetFailure(jEr, hr, "Failed to seek EQ within jet table");
+    }
+    else
+    {
+        if (ESE_QUERY_FROM_TOP == peqHandle->qtQueryType)
+        {
+            jGrbSeekType = JET_bitSeekGE;
+        }
+        else if (ESE_QUERY_FROM_BOTTOM == peqHandle->qtQueryType)
+        {
+            jGrbSeekType = JET_bitSeekLE;
+        }
+        jEr = JetSeek(peqHandle->jsSession, peqHandle->jtTable, jGrbSeekType);
+        if (jEr == JET_wrnSeekNotEqual)
+        {
+            jEr = JET_errSuccess;
+        }
+        // At this point we've already set our cursor to the beginning of the range of records to select.
+        // Now we'll make a key pointing to the end of the range of records to select, so we can call JetSetIndexRange()
+        // For a semi-explanation, see this doc page: http://msdn.microsoft.com/en-us/library/aa964799%28EXCHG.10%29.aspx
+        for (i = 0; i < peqHandle->dwColumns; ++i)
+        {
+            if (i == 0)
+            {
+                jGrb = JET_bitNewKey;
+            }
+            else
+            {
+                jGrb = 0;
+            }
+            // On the last iteration
+            if (i == peqHandle->dwColumns - 1)
+            {
+                jGrb |= JET_bitFullColumnEndLimit;
+            }
+            jEr = JetMakeKey(peqHandle->jsSession, peqHandle->jtTable, peqHandle->pvData[i], peqHandle->cbData[i], jGrb);
+            ExitOnJetFailure(jEr, hr, "Failed to begin new query");
+        }
+        jEr = JetSetIndexRange(peqHandle->jsSession, peqHandle->jtTable, JET_bitRangeUpperLimit);
+        ExitOnJetFailure(jEr, hr, "Failed to set index range");
+        peqHandle->fIndexRangeSet = TRUE;
+        // Sometimes JetBlue doesn't check if there is a current record when calling the above function (and sometimes it does)
+        // So, let's check if there is a current record before returning (by reading the first byte of one).
+        jEr = JetMove(peqHandle->jsSession, peqHandle->jtTable, 0, 0);
+        ExitOnJetFailure(jEr, hr, "Failed to check if there is a current record after query");
+    }
+LExit:
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/fileutil.cpp b/src/libs/dutil/WixToolset.DUtil/fileutil.cpp
new file mode 100644
index 00000000..1822727a
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/fileutil.cpp
@@ -0,0 +1,2032 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define FileExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_FILEUTIL, x, s, __VA_ARGS__)
+#define FileExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_FILEUTIL, x, s, __VA_ARGS__)
+#define FileExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_FILEUTIL, x, s, __VA_ARGS__)
+#define FileExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_FILEUTIL, x, s, __VA_ARGS__)
+#define FileExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_FILEUTIL, x, s, __VA_ARGS__)
+#define FileExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_FILEUTIL, x, s, __VA_ARGS__)
+#define FileExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_FILEUTIL, p, x, e, s, __VA_ARGS__)
+#define FileExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_FILEUTIL, p, x, s, __VA_ARGS__)
+#define FileExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_FILEUTIL, p, x, e, s, __VA_ARGS__)
+#define FileExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_FILEUTIL, p, x, s, __VA_ARGS__)
+#define FileExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_FILEUTIL, e, x, s, __VA_ARGS__)
+#define FileExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_FILEUTIL, g, x, s, __VA_ARGS__)
+// constants
+const BYTE UTF8BOM[] = {0xEF, 0xBB, 0xBF};
+const BYTE UTF16BOM[] = {0xFF, 0xFE};
+const LPCWSTR REGISTRY_PENDING_FILE_RENAME_KEY = L"SYSTEM\\CurrentControlSet\\Control\\Session Manager";
+const LPCWSTR REGISTRY_PENDING_FILE_RENAME_VALUE = L"PendingFileRenameOperations";
+/*******************************************************************
+ FileFromPath -  returns a pointer to the file part of the path
+********************************************************************/
+extern "C" LPWSTR DAPI FileFromPath(
+    __in_z LPCWSTR wzPath
+    )
+{
+    if (!wzPath)
+        return NULL;
+    LPWSTR wzFile = const_cast<LPWSTR>(wzPath);
+    for (LPWSTR wz = wzFile; *wz; ++wz)
+    {
+        // valid delineators
+        //     \ => Windows path
+        //     / => unix and URL path
+        //     : => relative path from mapped root
+        if (L'\\' == *wz || L'/' == *wz || L':' == *wz)
+            wzFile = wz + 1;
+    }
+    return wzFile;
+}
+/*******************************************************************
+ FileResolvePath - gets the full path to a file resolving environment
+                   variables along the way.
+********************************************************************/
+extern "C" HRESULT DAPI FileResolvePath(
+    __in_z LPCWSTR wzRelativePath,
+    __out LPWSTR *ppwzFullPath
+    )
+{
+    Assert(wzRelativePath && *wzRelativePath);
+    HRESULT hr = S_OK;
+    DWORD cch = 0;
+    LPWSTR pwzExpandedPath = NULL;
+    DWORD cchExpandedPath = 0;
+    LPWSTR pwzFullPath = NULL;
+    DWORD cchFullPath = 0;
+    LPWSTR wzFileName = NULL;
+    //
+    // First, expand any environment variables.
+    //
+    cchExpandedPath = MAX_PATH;
+    hr = StrAlloc(&pwzExpandedPath, cchExpandedPath);
+    FileExitOnFailure(hr, "Failed to allocate space for expanded path.");
+    cch = ::ExpandEnvironmentStringsW(wzRelativePath, pwzExpandedPath, cchExpandedPath);
+    if (0 == cch)
+    {
+        FileExitWithLastError(hr, "Failed to expand environment variables in string: %ls", wzRelativePath);
+    }
+    else if (cchExpandedPath < cch)
+    {
+        cchExpandedPath = cch;
+        hr = StrAlloc(&pwzExpandedPath, cchExpandedPath);
+        FileExitOnFailure(hr, "Failed to re-allocate more space for expanded path.");
+        cch = ::ExpandEnvironmentStringsW(wzRelativePath, pwzExpandedPath, cchExpandedPath);
+        if (0 == cch)
+        {
+            FileExitWithLastError(hr, "Failed to expand environment variables in string: %ls", wzRelativePath);
+        }
+        else if (cchExpandedPath < cch)
+        {
+            hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+            FileExitOnRootFailure(hr, "Failed to allocate buffer for expanded path.");
+        }
+    }
+    //
+    // Second, get the full path.
+    //
+    cchFullPath = MAX_PATH;
+    hr = StrAlloc(&pwzFullPath, cchFullPath);
+    FileExitOnFailure(hr, "Failed to allocate space for full path.");
+    cch = ::GetFullPathNameW(pwzExpandedPath, cchFullPath, pwzFullPath, &wzFileName);
+    if (0 == cch)
+    {
+        FileExitWithLastError(hr, "Failed to get full path for string: %ls", pwzExpandedPath);
+    }
+    else if (cchFullPath < cch)
+    {
+        cchFullPath = cch;
+        hr = StrAlloc(&pwzFullPath, cchFullPath);
+        FileExitOnFailure(hr, "Failed to re-allocate more space for full path.");
+        cch = ::GetFullPathNameW(pwzExpandedPath, cchFullPath, pwzFullPath, &wzFileName);
+        if (0 == cch)
+        {
+            FileExitWithLastError(hr, "Failed to get full path for string: %ls", pwzExpandedPath);
+        }
+        else if (cchFullPath < cch)
+        {
+            hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+            FileExitOnRootFailure(hr, "Failed to allocate buffer for full path.");
+        }
+    }
+    *ppwzFullPath = pwzFullPath;
+    pwzFullPath = NULL;
+LExit:
+    ReleaseStr(pwzFullPath);
+    ReleaseStr(pwzExpandedPath);
+    return hr;
+}
+/*******************************************************************
+FileStripExtension - Strip extension from filename
+********************************************************************/
+extern "C" HRESULT DAPI FileStripExtension(
+__in_z LPCWSTR wzFileName,
+__out LPWSTR *ppwzFileNameNoExtension
+)
+{
+    Assert(wzFileName && *wzFileName);
+   
+    HRESULT hr = S_OK;
+    size_t cchFileName = 0;
+    LPWSTR pwzFileNameNoExtension = NULL;
+    size_t cchFileNameNoExtension = 0;
+    errno_t err = 0;
+    hr = ::StringCchLengthW(wzFileName, STRSAFE_MAX_LENGTH, &cchFileName);
+    FileExitOnRootFailure(hr, "failed to get length of file name: %ls", wzFileName);
+    cchFileNameNoExtension = cchFileName + 1;
+    hr = StrAlloc(&pwzFileNameNoExtension, cchFileNameNoExtension);
+    FileExitOnFailure(hr, "failed to allocate space for File Name without extension");
+    // _wsplitpath_s can handle drive/path/filename/extension
+    err = _wsplitpath_s(wzFileName, NULL, NULL, NULL, NULL, pwzFileNameNoExtension, cchFileNameNoExtension, NULL, NULL);
+    if (err)
+    {
+        hr = E_INVALIDARG;
+        FileExitOnRootFailure(hr, "failed to parse filename: '%ls', error: %d", wzFileName, err);
+    }
+    *ppwzFileNameNoExtension = pwzFileNameNoExtension;
+    pwzFileNameNoExtension = NULL;
+LExit:
+    ReleaseStr(pwzFileNameNoExtension);
+    return hr;
+}
+/*******************************************************************
+FileChangeExtension - Changes the extension of a filename
+********************************************************************/
+extern "C" HRESULT DAPI FileChangeExtension(
+    __in_z LPCWSTR wzFileName,
+    __in_z LPCWSTR wzNewExtension,
+    __out LPWSTR *ppwzFileNameNewExtension
+    )
+{
+    Assert(wzFileName && *wzFileName);
+    HRESULT hr = S_OK;
+    LPWSTR sczFileName = NULL;
+    hr = FileStripExtension(wzFileName, &sczFileName);
+    FileExitOnFailure(hr, "Failed to strip extension from file name: %ls", wzFileName);
+    hr = StrAllocConcat(&sczFileName, wzNewExtension, 0);
+    FileExitOnFailure(hr, "Failed to add new extension.");
+    *ppwzFileNameNewExtension = sczFileName;
+    sczFileName = NULL;
+LExit:
+    ReleaseStr(sczFileName);
+   
+    return hr;
+}
+/*******************************************************************
+FileAddSuffixToBaseName - Adds a suffix the base portion of a file
+name; e.g., file.ext to fileSuffix.ext.
+********************************************************************/
+extern "C" HRESULT DAPI FileAddSuffixToBaseName(
+    __in_z LPCWSTR wzFileName,
+    __in_z LPCWSTR wzSuffix,
+    __out_z LPWSTR* psczNewFileName
+    )
+{
+    Assert(wzFileName && *wzFileName);
+    HRESULT hr = S_OK;
+    LPWSTR sczNewFileName = NULL;
+    size_t cchFileName = 0;
+    hr = ::StringCchLengthW(wzFileName, STRSAFE_MAX_CCH, &cchFileName);
+    FileExitOnRootFailure(hr, "Failed to get length of file name: %ls", wzFileName);
+    LPCWSTR wzExtension = wzFileName + cchFileName;
+    while (wzFileName < wzExtension && L'.' != *wzExtension)
+    {
+        --wzExtension;
+    }
+    if (wzFileName < wzExtension)
+    {
+        // found an extension so add the suffix before it
+        hr = StrAllocFormatted(&sczNewFileName, L"%.*ls%ls%ls", static_cast<int>(wzExtension - wzFileName), wzFileName, wzSuffix, wzExtension);
+    }
+    else
+    {
+        // no extension, so add the suffix at the end of the whole name
+        hr = StrAllocString(&sczNewFileName, wzFileName, 0);
+        FileExitOnFailure(hr, "Failed to allocate new file name.");
+        hr = StrAllocConcat(&sczNewFileName, wzSuffix, 0);
+    }
+    FileExitOnFailure(hr, "Failed to allocate new file name with suffix.");
+    *psczNewFileName = sczNewFileName;
+    sczNewFileName = NULL;
+LExit:
+    ReleaseStr(sczNewFileName);
+   
+    return hr;
+}
+/*******************************************************************
+ FileVersion
+********************************************************************/
+extern "C" HRESULT DAPI FileVersion(
+    __in_z LPCWSTR wzFilename,
+    __out DWORD *pdwVerMajor,
+    __out DWORD* pdwVerMinor
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD dwHandle = 0;
+    UINT cbVerBuffer = 0;
+    LPVOID pVerBuffer = NULL;
+    VS_FIXEDFILEINFO* pvsFileInfo = NULL;
+    UINT cbFileInfo = 0;
+    if (0 == (cbVerBuffer = ::GetFileVersionInfoSizeW(wzFilename, &dwHandle)))
+    {
+        FileExitOnLastErrorDebugTrace(hr, "failed to get version info for file: %ls", wzFilename);
+    }
+    pVerBuffer = ::GlobalAlloc(GMEM_FIXED, cbVerBuffer);
+    FileExitOnNullDebugTrace(pVerBuffer, hr, E_OUTOFMEMORY, "failed to allocate version info for file: %ls", wzFilename);
+    if (!::GetFileVersionInfoW(wzFilename, dwHandle, cbVerBuffer, pVerBuffer))
+    {
+        FileExitOnLastErrorDebugTrace(hr, "failed to get version info for file: %ls", wzFilename);
+    }
+    if (!::VerQueryValueW(pVerBuffer, L"\\", (void**)&pvsFileInfo, &cbFileInfo))
+    {
+        FileExitOnLastErrorDebugTrace(hr, "failed to get version value for file: %ls", wzFilename);
+    }
+    *pdwVerMajor = pvsFileInfo->dwFileVersionMS;
+    *pdwVerMinor = pvsFileInfo->dwFileVersionLS;
+LExit:
+    if (pVerBuffer)
+    {
+        ::GlobalFree(pVerBuffer);
+    }
+    return hr;
+}
+/*******************************************************************
+ FileVersionFromString
+*******************************************************************/
+extern "C" HRESULT DAPI FileVersionFromString(
+    __in_z LPCWSTR wzVersion,
+    __out DWORD* pdwVerMajor,
+    __out DWORD* pdwVerMinor
+    )
+{
+    Assert(pdwVerMajor && pdwVerMinor);
+    HRESULT hr = S_OK;
+    LPCWSTR pwz = wzVersion;
+    DWORD dw;
+    *pdwVerMajor = 0;
+    *pdwVerMinor = 0;
+    if ((L'v' == *pwz) || (L'V' == *pwz))
+    {
+        ++pwz;
+    }
+    dw = wcstoul(pwz, (WCHAR**)&pwz, 10);
+    if (pwz && (L'.' == *pwz && dw < 0x10000) || !*pwz)
+    {
+        *pdwVerMajor = dw << 16;
+        if (!*pwz)
+        {
+            ExitFunction1(hr = S_OK);
+        }
+        ++pwz;
+    }
+    else
+    {
+        ExitFunction1(hr = S_FALSE);
+    }
+    dw = wcstoul(pwz, (WCHAR**)&pwz, 10);
+    if (pwz && (L'.' == *pwz && dw < 0x10000) || !*pwz)
+    {
+        *pdwVerMajor |= dw;
+        if (!*pwz)
+        {
+            ExitFunction1(hr = S_OK);
+        }
+        ++pwz;
+    }
+    else
+    {
+        ExitFunction1(hr = S_FALSE);
+    }
+    dw = wcstoul(pwz, (WCHAR**)&pwz, 10);
+    if (pwz && (L'.' == *pwz && dw < 0x10000) || !*pwz)
+    {
+        *pdwVerMinor = dw << 16;
+        if (!*pwz)
+        {
+            ExitFunction1(hr = S_OK);
+        }
+        ++pwz;
+    }
+    else
+    {
+        ExitFunction1(hr = S_FALSE);
+    }
+    dw = wcstoul(pwz, (WCHAR**)&pwz, 10);
+    if (pwz && L'\0' == *pwz && dw < 0x10000)
+    {
+        *pdwVerMinor |= dw;
+    }
+    else
+    {
+        ExitFunction1(hr = S_FALSE);
+    }
+LExit:
+    return hr;
+}
+/*******************************************************************
+ FileVersionFromStringEx
+*******************************************************************/
+extern "C" HRESULT DAPI FileVersionFromStringEx(
+    __in_z LPCWSTR wzVersion,
+    __in SIZE_T cchVersion,
+    __out DWORD64* pqwVersion
+    )
+{
+    Assert(wzVersion);
+    Assert(pqwVersion);
+    HRESULT hr = S_OK;
+    LPCWSTR wzEnd = NULL;
+    LPCWSTR wzPartBegin = wzVersion;
+    LPCWSTR wzPartEnd = wzVersion;
+    DWORD iPart = 0;
+    USHORT us = 0;
+    DWORD64 qwVersion = 0;
+    // get string length if not provided
+    if (0 >= cchVersion)
+    {
+        hr = ::StringCchLengthW(wzVersion, STRSAFE_MAX_CCH, reinterpret_cast<size_t*>(&cchVersion));
+        FileExitOnRootFailure(hr, "Failed to get length of file version string: %ls", wzVersion);
+        if (0 >= cchVersion)
+        {
+            ExitFunction1(hr = E_INVALIDARG);
+        }
+    }
+    if ((L'v' == *wzVersion) || (L'V' == *wzVersion))
+    {
+        ++wzVersion;
+        --cchVersion;
+        wzPartBegin = wzVersion;
+        wzPartEnd = wzVersion;
+    }
+    // save end pointer
+    wzEnd = wzVersion + cchVersion;
+    // loop through parts
+    for (;;)
+    {
+        if (4 <= iPart)
+        {
+            // error, too many parts
+            ExitFunction1(hr = E_INVALIDARG);
+        }
+        // find end of part
+        while (wzPartEnd < wzEnd && L'.' != *wzPartEnd)
+        {
+            ++wzPartEnd;
+        }
+        if (wzPartBegin == wzPartEnd)
+        {
+            // error, empty part
+            ExitFunction1(hr = E_INVALIDARG);
+        }
+        DWORD cchPart;
+        hr = ::PtrdiffTToDWord(wzPartEnd - wzPartBegin, &cchPart);
+        FileExitOnFailure(hr, "Version number part was too long.");
+        // parse version part
+        hr = StrStringToUInt16(wzPartBegin, cchPart, &us);
+        FileExitOnFailure(hr, "Failed to parse version number part.");
+        // add part to qword version
+        qwVersion |= (DWORD64)us << ((3 - iPart) * 16);
+        if (wzPartEnd >= wzEnd)
+        {
+            // end of string
+            break;
+        }
+        wzPartBegin = ++wzPartEnd; // skip over separator
+        ++iPart;
+    }
+    *pqwVersion = qwVersion;
+LExit:
+    return hr;
+}
+/*******************************************************************
+ FileVersionFromStringEx - Formats the DWORD64 as a string version.
+*******************************************************************/
+extern "C" HRESULT DAPI FileVersionToStringEx(
+    __in DWORD64 qwVersion,
+    __out LPWSTR* psczVersion
+    )
+{
+    HRESULT hr = S_OK;
+    WORD wMajor = 0;
+    WORD wMinor = 0;
+    WORD wBuild = 0;
+    WORD wRevision = 0;
+    // Mask and shift each WORD for each field.
+    wMajor = (WORD)(qwVersion >> 48 & 0xffff);
+    wMinor = (WORD)(qwVersion >> 32 & 0xffff);
+    wBuild = (WORD)(qwVersion >> 16 & 0xffff);
+    wRevision = (WORD)(qwVersion & 0xffff);
+    // Format and return the version string.
+    hr = StrAllocFormatted(psczVersion, L"%u.%u.%u.%u", wMajor, wMinor, wBuild, wRevision);
+    FileExitOnFailure(hr, "Failed to allocate and format the version number.");
+LExit:
+    return hr;
+}
+/*******************************************************************
+ FileSetPointer - sets the file pointer.
+********************************************************************/
+extern "C" HRESULT DAPI FileSetPointer(
+    __in HANDLE hFile,
+    __in DWORD64 dw64Move,
+    __out_opt DWORD64* pdw64NewPosition,
+    __in DWORD dwMoveMethod
+    )
+{
+    Assert(INVALID_HANDLE_VALUE != hFile);
+    HRESULT hr = S_OK;
+    LARGE_INTEGER liMove;
+    LARGE_INTEGER liNewPosition;
+    liMove.QuadPart = dw64Move;
+    if (!::SetFilePointerEx(hFile, liMove, &liNewPosition, dwMoveMethod))
+    {
+        FileExitWithLastError(hr, "Failed to set file pointer.");
+    }
+    if (pdw64NewPosition)
+    {
+        *pdw64NewPosition = liNewPosition.QuadPart;
+    }
+LExit:
+    return hr;
+}
+/*******************************************************************
+ FileSize
+********************************************************************/
+extern "C" HRESULT DAPI FileSize(
+    __in_z LPCWSTR pwzFileName,
+    __out LONGLONG* pllSize
+    )
+{
+    HRESULT hr = S_OK;
+    HANDLE hFile = INVALID_HANDLE_VALUE;
+    FileExitOnNull(pwzFileName, hr, E_INVALIDARG, "Attempted to check filename, but no filename was provided");
+    hFile = ::CreateFileW(pwzFileName, FILE_READ_ATTRIBUTES, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+    if (INVALID_HANDLE_VALUE == hFile)
+    {
+        FileExitWithLastError(hr, "Failed to open file %ls while checking file size", pwzFileName);
+    }
+    hr = FileSizeByHandle(hFile, pllSize);
+    FileExitOnFailure(hr, "Failed to check size of file %ls by handle", pwzFileName);
+LExit:
+    ReleaseFileHandle(hFile);
+    return hr;
+}
+/*******************************************************************
+ FileSizeByHandle
+********************************************************************/
+extern "C" HRESULT DAPI FileSizeByHandle(
+    __in HANDLE hFile,
+    __out LONGLONG* pllSize
+    )
+{
+    Assert(INVALID_HANDLE_VALUE != hFile && pllSize);
+    HRESULT hr = S_OK;
+    LARGE_INTEGER li;
+    *pllSize = 0;
+    if (!::GetFileSizeEx(hFile, &li))
+    {
+        FileExitWithLastError(hr, "Failed to get size of file.");
+    }
+    *pllSize = li.QuadPart;
+LExit:
+    return hr;
+}
+/*******************************************************************
+ FileExistsEx
+********************************************************************/
+extern "C" BOOL DAPI FileExistsEx(
+    __in_z LPCWSTR wzPath,
+    __out_opt DWORD *pdwAttributes
+    )
+{
+    Assert(wzPath && *wzPath);
+    BOOL fExists = FALSE;
+    WIN32_FIND_DATAW fd = { };
+    HANDLE hff;
+    if (INVALID_HANDLE_VALUE != (hff = ::FindFirstFileW(wzPath, &fd)))
+    {
+        ::FindClose(hff);
+        if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
+        {
+            if (pdwAttributes)
+            {
+                *pdwAttributes = fd.dwFileAttributes;
+            }
+            fExists = TRUE;
+        }
+    }
+    return fExists;
+}
+/*******************************************************************
+ FileExistsAfterRestart - checks that a file exists and will continue
+                          to exist after restart.
+********************************************************************/
+extern "C" BOOL DAPI FileExistsAfterRestart(
+    __in_z LPCWSTR wzPath,
+    __out_opt DWORD *pdwAttributes
+    )
+{
+    HRESULT hr = S_OK;
+    BOOL fExists = FALSE;
+    HKEY hkPendingFileRename = NULL;
+    LPWSTR* rgsczRenames = NULL;
+    DWORD cRenames = 0;
+    int nCompare = 0;
+    fExists = FileExistsEx(wzPath, pdwAttributes);
+    if (fExists)
+    {
+        hr = RegOpen(HKEY_LOCAL_MACHINE, REGISTRY_PENDING_FILE_RENAME_KEY, KEY_QUERY_VALUE, &hkPendingFileRename);
+        if (E_FILENOTFOUND == hr)
+        {
+            ExitFunction1(hr = S_OK);
+        }
+        FileExitOnFailure(hr, "Failed to open pending file rename registry key.");
+        hr = RegReadStringArray(hkPendingFileRename, REGISTRY_PENDING_FILE_RENAME_VALUE, &rgsczRenames, &cRenames);
+        if (E_FILENOTFOUND == hr)
+        {
+            ExitFunction1(hr = S_OK);
+        }
+        FileExitOnFailure(hr, "Failed to read pending file renames.");
+        // The pending file renames array is pairs of source and target paths. We only care
+        // about checking the source paths so skip the target paths (i += 2).
+        for (DWORD i = 0; i < cRenames; i += 2)
+        {
+            LPWSTR wzRename = rgsczRenames[i];
+            if (wzRename && *wzRename)
+            {
+                // Skip the long path designator if present.
+                if (L'\\' == wzRename[0] && L'?' == wzRename[1] && L'?' == wzRename[2] && L'\\' == wzRename[3])
+                {
+                    wzRename += 4;
+                }
+                hr = PathCompare(wzPath, wzRename, &nCompare);
+                FileExitOnFailure(hr, "Failed to compare path from pending file rename to check path.");
+                if (CSTR_EQUAL == nCompare)
+                {
+                    fExists = FALSE;
+                    break;
+                }
+            }
+        }
+    }
+LExit:
+    ReleaseStrArray(rgsczRenames, cRenames);
+    ReleaseRegKey(hkPendingFileRename);
+    return fExists;
+}
+/*******************************************************************
+ FileRemoveFromPendingRename - removes the file path from the pending
+                               file rename list.
+********************************************************************/
+extern "C" HRESULT DAPI FileRemoveFromPendingRename(
+    __in_z LPCWSTR wzPath
+    )
+{
+    HRESULT hr = S_OK;
+    HKEY hkPendingFileRename = NULL;
+    LPWSTR* rgsczRenames = NULL;
+    DWORD cRenames = 0;
+    int nCompare = 0;
+    BOOL fRemoved = FALSE;
+    DWORD cNewRenames = 0;
+    hr = RegOpen(HKEY_LOCAL_MACHINE, REGISTRY_PENDING_FILE_RENAME_KEY, KEY_QUERY_VALUE | KEY_SET_VALUE, &hkPendingFileRename);
+    if (E_FILENOTFOUND == hr)
+    {
+        ExitFunction1(hr = S_OK);
+    }
+    FileExitOnFailure(hr, "Failed to open pending file rename registry key.");
+    hr = RegReadStringArray(hkPendingFileRename, REGISTRY_PENDING_FILE_RENAME_VALUE, &rgsczRenames, &cRenames);
+    if (E_FILENOTFOUND == hr)
+    {
+        ExitFunction1(hr = S_OK);
+    }
+    FileExitOnFailure(hr, "Failed to read pending file renames.");
+    // The pending file renames array is pairs of source and target paths. We only care
+    // about checking the source paths so skip the target paths (i += 2).
+    for (DWORD i = 0; i < cRenames; i += 2)
+    {
+        LPWSTR wzRename = rgsczRenames[i];
+        if (wzRename && *wzRename)
+        {
+            // Skip the long path designator if present.
+            if (L'\\' == wzRename[0] && L'?' == wzRename[1] && L'?' == wzRename[2] && L'\\' == wzRename[3])
+            {
+                wzRename += 4;
+            }
+            hr = PathCompare(wzPath, wzRename, &nCompare);
+            FileExitOnFailure(hr, "Failed to compare path from pending file rename to check path.");
+            // If we find our path in the list, null out the source and target slot and
+            // we'll compact the array next.
+            if (CSTR_EQUAL == nCompare)
+            {
+                ReleaseNullStr(rgsczRenames[i]);
+                ReleaseNullStr(rgsczRenames[i + 1]);
+                fRemoved = TRUE;
+            }
+        }
+    }
+    if (fRemoved)
+    {
+        // Compact the array by removing any nulls.
+        for (DWORD i = 0; i < cRenames; ++i)
+        {
+            LPWSTR wzRename = rgsczRenames[i];
+            if (wzRename)
+            {
+                rgsczRenames[cNewRenames] = wzRename;
+                ++cNewRenames;
+            }
+        }
+        cRenames = cNewRenames; // ignore the pointers on the end of the array since an early index points to them already.
+        // Write the new array back to the pending file rename key.
+        hr = RegWriteStringArray(hkPendingFileRename, REGISTRY_PENDING_FILE_RENAME_VALUE, rgsczRenames, cRenames);
+        FileExitOnFailure(hr, "Failed to update pending file renames.");
+    }
+LExit:
+    ReleaseStrArray(rgsczRenames, cRenames);
+    ReleaseRegKey(hkPendingFileRename);
+    return hr;
+}
+/*******************************************************************
+ FileRead - read a file into memory
+********************************************************************/
+extern "C" HRESULT DAPI FileRead(
+    __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest,
+    __out SIZE_T* pcbDest,
+    __in_z LPCWSTR wzSrcPath
+    )
+{
+    HRESULT hr = FileReadPartial(ppbDest, pcbDest, wzSrcPath, FALSE, 0, 0xFFFFFFFF, FALSE);
+    return hr;
+}
+/*******************************************************************
+ FileRead - read a file into memory with specified share mode
+********************************************************************/
+extern "C" HRESULT DAPI FileReadEx(
+    __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest,
+    __out SIZE_T* pcbDest,
+    __in_z LPCWSTR wzSrcPath,
+    __in DWORD dwShareMode
+    )
+{
+    HRESULT hr = FileReadPartialEx(ppbDest, pcbDest, wzSrcPath, FALSE, 0, 0xFFFFFFFF, FALSE, dwShareMode);
+    return hr;
+}
+/*******************************************************************
+ FileReadUntil - read a file into memory with a maximum size
+********************************************************************/
+extern "C" HRESULT DAPI FileReadUntil(
+    __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest,
+    __out_range(<=, cbMaxRead) SIZE_T* pcbDest,
+    __in_z LPCWSTR wzSrcPath,
+    __in DWORD cbMaxRead
+    )
+{
+    HRESULT hr = FileReadPartial(ppbDest, pcbDest, wzSrcPath, FALSE, 0, cbMaxRead, FALSE);
+    return hr;
+}
+/*******************************************************************
+ FileReadPartial - read a portion of a file into memory
+********************************************************************/
+extern "C" HRESULT DAPI FileReadPartial(
+    __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest,
+    __out_range(<=, cbMaxRead) SIZE_T* pcbDest,
+    __in_z LPCWSTR wzSrcPath,
+    __in BOOL fSeek,
+    __in DWORD cbStartPosition,
+    __in DWORD cbMaxRead,
+    __in BOOL fPartialOK
+    )
+{
+    return FileReadPartialEx(ppbDest, pcbDest, wzSrcPath, fSeek, cbStartPosition, cbMaxRead, fPartialOK, FILE_SHARE_READ | FILE_SHARE_DELETE);
+}
+/*******************************************************************
+ FileReadPartial - read a portion of a file into memory
+                   (with specified share mode)
+********************************************************************/
+extern "C" HRESULT DAPI FileReadPartialEx(
+    __deref_inout_bcount_full(*pcbDest) LPBYTE* ppbDest,
+    __out_range(<=, cbMaxRead) SIZE_T* pcbDest,
+    __in_z LPCWSTR wzSrcPath,
+    __in BOOL fSeek,
+    __in DWORD cbStartPosition,
+    __in DWORD cbMaxRead,
+    __in BOOL fPartialOK,
+    __in DWORD dwShareMode
+    )
+{
+    HRESULT hr = S_OK;
+    UINT er = ERROR_SUCCESS;
+    HANDLE hFile = INVALID_HANDLE_VALUE;
+    LARGE_INTEGER liFileSize = { };
+    DWORD cbData = 0;
+    BYTE* pbData = NULL;
+    FileExitOnNull(pcbDest, hr, E_INVALIDARG, "Invalid argument pcbDest");
+    FileExitOnNull(ppbDest, hr, E_INVALIDARG, "Invalid argument ppbDest");
+    FileExitOnNull(wzSrcPath, hr, E_INVALIDARG, "Invalid argument wzSrcPath");
+    FileExitOnNull(*wzSrcPath, hr, E_INVALIDARG, "*wzSrcPath is null");
+    hFile = ::CreateFileW(wzSrcPath, GENERIC_READ, dwShareMode, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL);
+    if (INVALID_HANDLE_VALUE == hFile)
+    {
+        er = ::GetLastError();
+        if (E_FILENOTFOUND == HRESULT_FROM_WIN32(er))
+        {
+            ExitFunction1(hr = E_FILENOTFOUND);
+        }
+        FileExitOnWin32Error(er, hr, "Failed to open file: %ls", wzSrcPath);
+    }
+    if (!::GetFileSizeEx(hFile, &liFileSize))
+    {
+        FileExitWithLastError(hr, "Failed to get size of file: %ls", wzSrcPath);
+    }
+    if (fSeek)
+    {
+        if (cbStartPosition > liFileSize.QuadPart)
+        {
+            hr = E_INVALIDARG;
+            FileExitOnFailure(hr, "Start position %d bigger than file '%ls' size %llu", cbStartPosition, wzSrcPath, liFileSize.QuadPart);
+        }
+        DWORD dwErr = ::SetFilePointer(hFile, cbStartPosition, NULL, FILE_CURRENT);
+        if (INVALID_SET_FILE_POINTER == dwErr)
+        {
+            FileExitOnLastError(hr, "Failed to seek position %d", cbStartPosition);
+        }
+    }
+    else
+    {
+        cbStartPosition = 0;
+    }
+    if (fPartialOK)
+    {
+        cbData = cbMaxRead;
+    }
+    else
+    {
+        cbData = liFileSize.LowPart - cbStartPosition; // should only need the low part because we cap at DWORD
+        if (cbMaxRead < liFileSize.QuadPart - cbStartPosition)
+        {
+            hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+            FileExitOnRootFailure(hr, "Failed to load file: %ls, too large.", wzSrcPath);
+        }
+    }
+    if (*ppbDest)
+    {
+        if (0 == cbData)
+        {
+            ReleaseNullMem(*ppbDest);
+            *pcbDest = 0;
+            ExitFunction1(hr = S_OK);
+        }
+        LPVOID pv = MemReAlloc(*ppbDest, cbData, TRUE);
+        FileExitOnNull(pv, hr, E_OUTOFMEMORY, "Failed to re-allocate memory to read in file: %ls", wzSrcPath);
+        pbData = static_cast<BYTE*>(pv);
+    }
+    else
+    {
+        if (0 == cbData)
+        {
+            *pcbDest = 0;
+            ExitFunction1(hr = S_OK);
+        }
+        pbData = static_cast<BYTE*>(MemAlloc(cbData, TRUE));
+        FileExitOnNull(pbData, hr, E_OUTOFMEMORY, "Failed to allocate memory to read in file: %ls", wzSrcPath);
+    }
+    DWORD cbTotalRead = 0;
+    DWORD cbRead = 0;
+    do
+    {
+        DWORD cbRemaining = 0;
+        hr = ::ULongSub(cbData, cbTotalRead, &cbRemaining);
+        FileExitOnFailure(hr, "Underflow calculating remaining buffer size.");
+        if (!::ReadFile(hFile, pbData + cbTotalRead, cbRemaining, &cbRead, NULL))
+        {
+            FileExitWithLastError(hr, "Failed to read from file: %ls", wzSrcPath);
+        }
+        cbTotalRead += cbRead;
+    } while (cbRead);
+    if (cbTotalRead != cbData)
+    {
+        hr = E_UNEXPECTED;
+        FileExitOnFailure(hr, "Failed to completely read file: %ls", wzSrcPath);
+    }
+    *ppbDest = pbData;
+    pbData = NULL;
+    *pcbDest = cbData;
+LExit:
+    ReleaseMem(pbData);
+    ReleaseFile(hFile);
+    return hr;
+}
+extern "C" HRESULT DAPI FileReadHandle(
+    __in HANDLE hFile,
+    __in_bcount(cbDest) LPBYTE pbDest,
+    __in SIZE_T cbDest
+    )
+{
+    HRESULT hr = 0;
+    DWORD cbDataRead = 0;
+    SIZE_T cbRemaining = cbDest;
+    SIZE_T cbTotal = 0;
+    while (0 < cbRemaining)
+    {
+        if (!::ReadFile(hFile, pbDest + cbTotal, (DWORD)min(DWORD_MAX, cbRemaining), &cbDataRead, NULL))
+        {
+            DWORD er = ::GetLastError();
+            if (ERROR_MORE_DATA == er)
+            {
+                hr = S_OK;
+            }
+            else
+            {
+                hr = HRESULT_FROM_WIN32(er);
+            }
+            FileExitOnRootFailure(hr, "Failed to read data from file handle.");
+        }
+        cbRemaining -= cbDataRead;
+        cbTotal += cbDataRead;
+    }
+LExit:
+    return hr;
+}
+/*******************************************************************
+ FileWrite - write a file from memory
+********************************************************************/
+extern "C" HRESULT DAPI FileWrite(
+    __in_z LPCWSTR pwzFileName,
+    __in DWORD dwFlagsAndAttributes,
+    __in_bcount_opt(cbData) LPCBYTE pbData,
+    __in SIZE_T cbData,
+    __out_opt HANDLE* pHandle
+    )
+{
+    HRESULT hr = S_OK;
+    HANDLE hFile = INVALID_HANDLE_VALUE;
+    // Open the file
+    hFile = ::CreateFileW(pwzFileName, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, dwFlagsAndAttributes, NULL);
+    FileExitOnInvalidHandleWithLastError(hFile, hr, "Failed to open file: %ls", pwzFileName);
+    hr = FileWriteHandle(hFile, pbData, cbData);
+    FileExitOnFailure(hr, "Failed to write to file: %ls", pwzFileName);
+    if (pHandle)
+    {
+        *pHandle = hFile;
+        hFile = INVALID_HANDLE_VALUE;
+    }
+LExit:
+    ReleaseFile(hFile);
+    return hr;
+}
+/*******************************************************************
+ FileWriteHandle - write to a file handle from memory
+********************************************************************/
+extern "C" HRESULT DAPI FileWriteHandle(
+    __in HANDLE hFile,
+    __in_bcount_opt(cbData) LPCBYTE pbData,
+    __in SIZE_T cbData
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD cbDataWritten = 0;
+    SIZE_T cbTotal = 0;
+    SIZE_T cbRemaining = cbData;
+    // Write out all of the data.
+    while (0 < cbRemaining)
+    {
+        if (!::WriteFile(hFile, pbData + cbTotal, (DWORD)min(DWORD_MAX, cbRemaining), &cbDataWritten, NULL))
+        {
+            FileExitOnLastError(hr, "Failed to write data to file handle.");
+        }
+        cbRemaining -= cbDataWritten;
+        cbTotal += cbDataWritten;
+    }
+LExit:
+    return hr;
+}
+/*******************************************************************
+ FileCopyUsingHandles
+*******************************************************************/
+extern "C" HRESULT DAPI FileCopyUsingHandles(
+    __in HANDLE hSource,
+    __in HANDLE hTarget,
+    __in DWORD64 cbCopy,
+    __out_opt DWORD64* pcbCopied
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD64 cbTotalCopied = 0;
+    BYTE rgbData[4 * 1024];
+    DWORD cbRead = 0;
+    do
+    {
+        cbRead = static_cast<DWORD>((0 == cbCopy) ? countof(rgbData) : min(countof(rgbData), cbCopy - cbTotalCopied));
+        if (!::ReadFile(hSource, rgbData, cbRead, &cbRead, NULL))
+        {
+            FileExitWithLastError(hr, "Failed to read from source.");
+        }
+        if (cbRead)
+        {
+            hr = FileWriteHandle(hTarget, rgbData, cbRead);
+            FileExitOnFailure(hr, "Failed to write to target.");
+        }
+        cbTotalCopied += cbRead;
+    } while (cbTotalCopied < cbCopy && 0 != cbRead);
+    if (pcbCopied)
+    {
+        *pcbCopied = cbTotalCopied;
+    }
+LExit:
+    return hr;
+}
+/*******************************************************************
+ FileCopyUsingHandlesWithProgress
+*******************************************************************/
+extern "C" HRESULT DAPI FileCopyUsingHandlesWithProgress(
+    __in HANDLE hSource,
+    __in HANDLE hTarget,
+    __in DWORD64 cbCopy,
+    __in_opt LPPROGRESS_ROUTINE lpProgressRoutine,
+    __in_opt LPVOID lpData
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD64 cbTotalCopied = 0;
+    BYTE rgbData[64 * 1024];
+    DWORD cbRead = 0;
+    LARGE_INTEGER liSourceSize = { };
+    LARGE_INTEGER liTotalCopied = { };
+    LARGE_INTEGER liZero = { };
+    DWORD dwResult = 0;
+    hr = FileSizeByHandle(hSource, &liSourceSize.QuadPart);
+    FileExitOnFailure(hr, "Failed to get size of source.");
+    if (0 < cbCopy && cbCopy < (DWORD64)liSourceSize.QuadPart)
+    {
+        liSourceSize.QuadPart = cbCopy;
+    }
+    if (lpProgressRoutine)
+    {
+        dwResult = lpProgressRoutine(liSourceSize, liTotalCopied, liZero, liZero, 0, CALLBACK_STREAM_SWITCH, hSource, hTarget, lpData);
+        switch (dwResult)
+        {
+        case PROGRESS_CONTINUE:
+            break;
+        case PROGRESS_CANCEL:
+            ExitFunction1(hr = HRESULT_FROM_WIN32(ERROR_REQUEST_ABORTED));
+        case PROGRESS_STOP:
+            ExitFunction1(hr = HRESULT_FROM_WIN32(ERROR_REQUEST_ABORTED));
+        case PROGRESS_QUIET:
+            lpProgressRoutine = NULL;
+            break;
+        }
+    }
+    // Set size of the target file.
+    ::SetFilePointerEx(hTarget, liSourceSize, NULL, FILE_BEGIN);
+    if (!::SetEndOfFile(hTarget))
+    {
+        FileExitWithLastError(hr, "Failed to set end of target file.");
+    }
+    if (!::SetFilePointerEx(hTarget, liZero, NULL, FILE_BEGIN))
+    {
+        FileExitWithLastError(hr, "Failed to reset target file pointer.");
+    }
+    // Copy with progress.
+    while (0 == cbCopy || cbTotalCopied < cbCopy)
+    {
+        cbRead = static_cast<DWORD>((0 == cbCopy) ? countof(rgbData) : min(countof(rgbData), cbCopy - cbTotalCopied));
+        if (!::ReadFile(hSource, rgbData, cbRead, &cbRead, NULL))
+        {
+            FileExitWithLastError(hr, "Failed to read from source.");
+        }
+        if (cbRead)
+        {
+            hr = FileWriteHandle(hTarget, rgbData, cbRead);
+            FileExitOnFailure(hr, "Failed to write to target.");
+            cbTotalCopied += cbRead;
+            if (lpProgressRoutine)
+            {
+                liTotalCopied.QuadPart = cbTotalCopied;
+                dwResult = lpProgressRoutine(liSourceSize, liTotalCopied, liZero, liZero, 0, CALLBACK_CHUNK_FINISHED, hSource, hTarget, lpData);
+                switch (dwResult)
+                {
+                case PROGRESS_CONTINUE:
+                    break;
+                case PROGRESS_CANCEL:
+                    ExitFunction1(hr = HRESULT_FROM_WIN32(ERROR_REQUEST_ABORTED));
+                case PROGRESS_STOP:
+                    ExitFunction1(hr = HRESULT_FROM_WIN32(ERROR_REQUEST_ABORTED));
+                case PROGRESS_QUIET:
+                    lpProgressRoutine = NULL;
+                    break;
+                }
+            }
+        }
+        else
+        {
+            break;
+        }
+    }
+LExit:
+    return hr;
+}
+/*******************************************************************
+ FileEnsureCopy
+*******************************************************************/
+extern "C" HRESULT DAPI FileEnsureCopy(
+    __in_z LPCWSTR wzSource,
+    __in_z LPCWSTR wzTarget,
+    __in BOOL fOverwrite
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er;
+    // try to copy the file first
+    if (::CopyFileW(wzSource, wzTarget, !fOverwrite))
+    {
+        ExitFunction();  // we're done
+    }
+    er = ::GetLastError();  // check the error and do the right thing below
+    if (!fOverwrite && (ERROR_FILE_EXISTS == er || ERROR_ALREADY_EXISTS == er))
+    {
+        // if not overwriting this is an expected error
+        ExitFunction1(hr = S_FALSE);
+    }
+    else if (ERROR_PATH_NOT_FOUND == er)  // if the path doesn't exist
+    {
+        // try to create the directory then do the copy
+        LPWSTR pwzLastSlash = NULL;
+        for (LPWSTR pwz = const_cast<LPWSTR>(wzTarget); *pwz; ++pwz)
+        {
+            if (*pwz == L'\\')
+            {
+                pwzLastSlash = pwz;
+            }
+        }
+        if (pwzLastSlash)
+        {
+            *pwzLastSlash = L'\0'; // null terminate
+            hr = DirEnsureExists(wzTarget, NULL);
+            *pwzLastSlash = L'\\'; // now put the slash back
+            FileExitOnFailureDebugTrace(hr, "failed to create directory while copying file: '%ls' to: '%ls'", wzSource, wzTarget);
+            // try to copy again
+            if (!::CopyFileW(wzSource, wzTarget, fOverwrite))
+            {
+                FileExitOnLastErrorDebugTrace(hr, "failed to copy file: '%ls' to: '%ls'", wzSource, wzTarget);
+            }
+        }
+        else // no path was specified so just return the error
+        {
+            hr = HRESULT_FROM_WIN32(er);
+        }
+    }
+    else // unexpected error
+    {
+        hr = HRESULT_FROM_WIN32(er);
+    }
+LExit:
+    return hr;
+}
+/*******************************************************************
+ FileEnsureCopyWithRetry
+*******************************************************************/
+extern "C" HRESULT DAPI FileEnsureCopyWithRetry(
+    __in LPCWSTR wzSource,
+    __in LPCWSTR wzTarget,
+    __in BOOL fOverwrite,
+    __in DWORD cRetry,
+    __in DWORD dwWaitMilliseconds
+    )
+{
+    AssertSz(cRetry != DWORD_MAX, "Cannot pass DWORD_MAX for retry.");
+    HRESULT hr = E_FAIL;
+    DWORD i = 0;
+    for (i = 0; FAILED(hr) && i <= cRetry; ++i)
+    {
+        if (0 < i)
+        {
+            ::Sleep(dwWaitMilliseconds);
+        }
+        hr = FileEnsureCopy(wzSource, wzTarget, fOverwrite);
+        if (HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) == hr || HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) == hr
+            || HRESULT_FROM_WIN32(ERROR_FILE_EXISTS) == hr || HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS) == hr)
+        {
+            break; // no reason to retry these errors.
+        }
+    }
+    FileExitOnFailure(hr, "Failed to copy file: '%ls' to: '%ls' after %u retries.", wzSource, wzTarget, i);
+LExit:
+    return hr;
+}
+/*******************************************************************
+ FileEnsureMove
+*******************************************************************/
+extern "C" HRESULT DAPI FileEnsureMove(
+    __in_z LPCWSTR wzSource,
+    __in_z LPCWSTR wzTarget,
+    __in BOOL fOverwrite,
+    __in BOOL fAllowCopy
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er;
+    DWORD dwFlags = 0;
+    if (fOverwrite)
+    {
+        dwFlags |= MOVEFILE_REPLACE_EXISTING;
+    }
+    if (fAllowCopy)
+    {
+        dwFlags |= MOVEFILE_COPY_ALLOWED;
+    }
+    // try to move the file first
+    if (::MoveFileExW(wzSource, wzTarget, dwFlags))
+    {
+        ExitFunction();  // we're done
+    }
+    er = ::GetLastError();  // check the error and do the right thing below
+    if (!fOverwrite && (ERROR_FILE_EXISTS == er || ERROR_ALREADY_EXISTS == er))
+    {
+        // if not overwriting this is an expected error
+        ExitFunction1(hr = S_FALSE);
+    }
+    else if (ERROR_FILE_NOT_FOUND == er)
+    {
+        // We are seeing some cases where ::MoveFileEx() says a file was not found
+        // but the source file is actually present. In that case, return path not
+        // found so we try to create the target path since that is most likely
+        // what is missing. Otherwise, the source file is missing and we're obviously
+        // not going to be recovering from that.
+        if (FileExistsEx(wzSource, NULL))
+        {
+            er = ERROR_PATH_NOT_FOUND;
+        }
+    }
+    // If the path doesn't exist, try to create the directory tree then do the move.
+    if (ERROR_PATH_NOT_FOUND == er)
+    {
+        LPWSTR pwzLastSlash = NULL;
+        for (LPWSTR pwz = const_cast<LPWSTR>(wzTarget); *pwz; ++pwz)
+        {
+            if (*pwz == L'\\')
+            {
+                pwzLastSlash = pwz;
+            }
+        }
+        if (pwzLastSlash)
+        {
+            *pwzLastSlash = L'\0'; // null terminate
+            hr = DirEnsureExists(wzTarget, NULL);
+            *pwzLastSlash = L'\\'; // now put the slash back
+            FileExitOnFailureDebugTrace(hr, "failed to create directory while moving file: '%ls' to: '%ls'", wzSource, wzTarget);
+            // try to move again
+            if (!::MoveFileExW(wzSource, wzTarget, dwFlags))
+            {
+                FileExitOnLastErrorDebugTrace(hr, "failed to move file: '%ls' to: '%ls'", wzSource, wzTarget);
+            }
+        }
+        else // no path was specified so just return the error
+        {
+            hr = HRESULT_FROM_WIN32(er);
+        }
+    }
+    else // unexpected error
+    {
+        hr = HRESULT_FROM_WIN32(er);
+    }
+LExit:
+    return hr;
+}
+/*******************************************************************
+ FileEnsureMoveWithRetry
+*******************************************************************/
+extern "C" HRESULT DAPI FileEnsureMoveWithRetry(
+    __in LPCWSTR wzSource,
+    __in LPCWSTR wzTarget,
+    __in BOOL fOverwrite,
+    __in BOOL fAllowCopy,
+    __in DWORD cRetry,
+    __in DWORD dwWaitMilliseconds
+    )
+{
+    AssertSz(cRetry != DWORD_MAX, "Cannot pass DWORD_MAX for retry.");
+    HRESULT hr = E_FAIL;
+    DWORD i = 0;
+    for (i = 0; FAILED(hr) && i < cRetry + 1; ++i)
+    {
+        if (0 < i)
+        {
+            ::Sleep(dwWaitMilliseconds);
+        }
+        hr = FileEnsureMove(wzSource, wzTarget, fOverwrite, fAllowCopy);
+    }
+    FileExitOnFailure(hr, "Failed to move file: '%ls' to: '%ls' after %u retries.", wzSource, wzTarget, i);
+LExit:
+    return hr;
+}
+/*******************************************************************
+ FileCreateTemp - creates an empty temp file
+ NOTE: uses ANSI functions internally so it is Win9x safe
+********************************************************************/
+extern "C" HRESULT DAPI FileCreateTemp(
+    __in_z LPCWSTR wzPrefix,
+    __in_z LPCWSTR wzExtension,
+    __deref_opt_out_z LPWSTR* ppwzTempFile,
+    __out_opt HANDLE* phTempFile
+    )
+{
+    Assert(wzPrefix && *wzPrefix);
+    HRESULT hr = S_OK;
+    LPSTR pszTempPath = NULL;
+    DWORD cchTempPath = MAX_PATH;
+    HANDLE hTempFile = INVALID_HANDLE_VALUE;
+    LPSTR pszTempFile = NULL;
+    int i = 0;
+    hr = StrAnsiAlloc(&pszTempPath, cchTempPath);
+    FileExitOnFailure(hr, "failed to allocate memory for the temp path");
+    ::GetTempPathA(cchTempPath, pszTempPath);
+    for (i = 0; i < 1000 && INVALID_HANDLE_VALUE == hTempFile; ++i)
+    {
+        hr = StrAnsiAllocFormatted(&pszTempFile, "%s%ls%05d.%ls", pszTempPath, wzPrefix, i, wzExtension);
+        FileExitOnFailure(hr, "failed to allocate memory for log file");
+        hTempFile = ::CreateFileA(pszTempFile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL);
+        if (INVALID_HANDLE_VALUE == hTempFile)
+        {
+            // if the file already exists, just try again
+            hr = HRESULT_FROM_WIN32(::GetLastError());
+            if (HRESULT_FROM_WIN32(ERROR_FILE_EXISTS) == hr)
+            {
+                hr = S_OK;
+                continue;
+            }
+            FileExitOnFailureDebugTrace(hr, "failed to create file: %hs", pszTempFile);
+        }
+    }
+    if (ppwzTempFile)
+    {
+        hr = StrAllocStringAnsi(ppwzTempFile, pszTempFile, 0, CP_UTF8);
+    }
+    if (phTempFile)
+    {
+        *phTempFile = hTempFile;
+        hTempFile = INVALID_HANDLE_VALUE;
+    }
+LExit:
+    ReleaseFile(hTempFile);
+    ReleaseStr(pszTempFile);
+    ReleaseStr(pszTempPath);
+    return hr;
+}
+/*******************************************************************
+ FileCreateTempW - creates an empty temp file
+*******************************************************************/
+extern "C" HRESULT DAPI FileCreateTempW(
+    __in_z LPCWSTR wzPrefix,
+    __in_z LPCWSTR wzExtension,
+    __deref_opt_out_z LPWSTR* ppwzTempFile,
+    __out_opt HANDLE* phTempFile
+    )
+{
+    Assert(wzPrefix && *wzPrefix);
+    HRESULT hr = E_FAIL;
+    WCHAR wzTempPath[MAX_PATH];
+    DWORD cchTempPath = countof(wzTempPath);
+    LPWSTR pwzTempFile = NULL;
+    HANDLE hTempFile = INVALID_HANDLE_VALUE;
+    int i = 0;
+    if (!::GetTempPathW(cchTempPath, wzTempPath))
+    {
+        FileExitOnLastError(hr, "failed to get temp path");
+    }
+    for (i = 0; i < 1000 && INVALID_HANDLE_VALUE == hTempFile; ++i)
+    {
+        hr = StrAllocFormatted(&pwzTempFile, L"%s%s%05d.%s", wzTempPath, wzPrefix, i, wzExtension);
+        FileExitOnFailure(hr, "failed to allocate memory for temp filename");
+        hTempFile = ::CreateFileW(pwzTempFile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL);
+        if (INVALID_HANDLE_VALUE == hTempFile)
+        {
+            // if the file already exists, just try again
+            hr = HRESULT_FROM_WIN32(::GetLastError());
+            if (HRESULT_FROM_WIN32(ERROR_FILE_EXISTS) == hr)
+            {
+                hr = S_OK;
+                continue;
+            }
+            FileExitOnFailureDebugTrace(hr, "failed to create file: %ls", pwzTempFile);
+        }
+    }
+    if (phTempFile)
+    {
+        *phTempFile = hTempFile;
+        hTempFile = INVALID_HANDLE_VALUE;
+    }
+    if (ppwzTempFile)
+    {
+        *ppwzTempFile = pwzTempFile;
+        pwzTempFile = NULL;
+    }
+LExit:
+    ReleaseFile(hTempFile);
+    ReleaseStr(pwzTempFile);
+    return hr;
+}
+/*******************************************************************
+ FileIsSame
+********************************************************************/
+extern "C" HRESULT DAPI FileIsSame(
+    __in_z LPCWSTR wzFile1,
+    __in_z LPCWSTR wzFile2,
+    __out LPBOOL lpfSameFile
+    )
+{
+    HRESULT hr = S_OK;
+    HANDLE hFile1 = NULL;
+    HANDLE hFile2 = NULL;
+    BY_HANDLE_FILE_INFORMATION fileInfo1 = { };
+    BY_HANDLE_FILE_INFORMATION fileInfo2 = { };
+    hFile1 = ::CreateFileW(wzFile1, FILE_READ_ATTRIBUTES, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
+    FileExitOnInvalidHandleWithLastError(hFile1, hr, "Failed to open file 1. File = '%ls'", wzFile1);
+    hFile2 = ::CreateFileW(wzFile2, FILE_READ_ATTRIBUTES, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
+    FileExitOnInvalidHandleWithLastError(hFile2, hr, "Failed to open file 2. File = '%ls'", wzFile2);
+    if (!::GetFileInformationByHandle(hFile1, &fileInfo1))
+    {
+        FileExitWithLastError(hr, "Failed to get information for file 1. File = '%ls'", wzFile1);
+    }
+    if (!::GetFileInformationByHandle(hFile2, &fileInfo2))
+    {
+        FileExitWithLastError(hr, "Failed to get information for file 2. File = '%ls'", wzFile2);
+    }
+    *lpfSameFile = fileInfo1.dwVolumeSerialNumber == fileInfo2.dwVolumeSerialNumber &&
+        fileInfo1.nFileIndexHigh == fileInfo2.nFileIndexHigh &&
+        fileInfo1.nFileIndexLow == fileInfo2.nFileIndexLow ? TRUE : FALSE;
+LExit:
+    ReleaseFile(hFile1);
+    ReleaseFile(hFile2);
+    return hr;
+}
+/*******************************************************************
+ FileEnsureDelete - deletes a file, first removing read-only,
+    hidden, or system attributes if necessary.
+********************************************************************/
+extern "C" HRESULT DAPI FileEnsureDelete(
+    __in_z LPCWSTR wzFile
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD dwAttrib = INVALID_FILE_ATTRIBUTES;
+    if (FileExistsEx(wzFile, &dwAttrib))
+    {
+        if (dwAttrib & FILE_ATTRIBUTE_READONLY || dwAttrib & FILE_ATTRIBUTE_HIDDEN || dwAttrib & FILE_ATTRIBUTE_SYSTEM)
+        {
+            if (!::SetFileAttributesW(wzFile, FILE_ATTRIBUTE_NORMAL))
+            {
+                FileExitOnLastError(hr, "Failed to remove attributes from file: %ls", wzFile);
+            }
+        }
+        if (!::DeleteFileW(wzFile))
+        {
+            FileExitOnLastError(hr, "Failed to delete file: %ls", wzFile);
+        }
+    }
+LExit:
+    return hr;
+}
+/*******************************************************************
+ FileGetTime - Gets the file time of a specified file
+********************************************************************/
+extern "C" HRESULT DAPI FileGetTime(
+    __in_z LPCWSTR wzFile,
+    __out_opt  LPFILETIME lpCreationTime,
+    __out_opt  LPFILETIME lpLastAccessTime,
+    __out_opt  LPFILETIME lpLastWriteTime
+    )
+{
+    HRESULT hr = S_OK;
+    HANDLE hFile = NULL;
+    hFile = ::CreateFileW(wzFile, FILE_READ_ATTRIBUTES, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, NULL);
+    FileExitOnInvalidHandleWithLastError(hFile, hr, "Failed to open file. File = '%ls'", wzFile);
+    if (!::GetFileTime(hFile, lpCreationTime, lpLastAccessTime, lpLastWriteTime))
+    {
+        FileExitWithLastError(hr, "Failed to get file time for file. File = '%ls'", wzFile);
+    }
+LExit:
+    ReleaseFile(hFile);
+    return hr;
+}
+/*******************************************************************
+ FileSetTime - Sets the file time of a specified file
+********************************************************************/
+extern "C" HRESULT DAPI FileSetTime(
+    __in_z LPCWSTR wzFile,
+    __in_opt  const FILETIME *lpCreationTime,
+    __in_opt  const FILETIME *lpLastAccessTime,
+    __in_opt  const FILETIME *lpLastWriteTime
+    )
+{
+    HRESULT hr = S_OK;
+    HANDLE hFile = NULL;
+    hFile = ::CreateFileW(wzFile, FILE_WRITE_ATTRIBUTES, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, NULL);
+    FileExitOnInvalidHandleWithLastError(hFile, hr, "Failed to open file. File = '%ls'", wzFile);
+    if (!::SetFileTime(hFile, lpCreationTime, lpLastAccessTime, lpLastWriteTime))
+    {
+        FileExitWithLastError(hr, "Failed to set file time for file. File = '%ls'", wzFile);
+    }
+LExit:
+    ReleaseFile(hFile);
+    return hr;
+}
+/*******************************************************************
+ FileReSetTime - ReSets a file's last acess and modified time to the
+ creation time of the file
+********************************************************************/
+extern "C" HRESULT DAPI FileResetTime(
+    __in_z LPCWSTR wzFile
+    )
+{
+    HRESULT hr = S_OK;
+    HANDLE hFile = NULL;
+    FILETIME ftCreateTime;
+    hFile = ::CreateFileW(wzFile, FILE_WRITE_ATTRIBUTES | FILE_READ_ATTRIBUTES, FILE_SHARE_WRITE | FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
+    FileExitOnInvalidHandleWithLastError(hFile, hr, "Failed to open file. File = '%ls'", wzFile);
+    
+    if (!::GetFileTime(hFile, &ftCreateTime, NULL, NULL))
+    {
+        FileExitWithLastError(hr, "Failed to get file time for file. File = '%ls'", wzFile);
+    }
+    if (!::SetFileTime(hFile, NULL, NULL, &ftCreateTime))
+    {
+        FileExitWithLastError(hr, "Failed to reset file time for file. File = '%ls'", wzFile);
+    }
+LExit:
+    ReleaseFile(hFile);
+    return hr;
+}
+/*******************************************************************
+ FileExecutableArchitecture
+*******************************************************************/
+extern "C" HRESULT DAPI FileExecutableArchitecture(
+    __in_z LPCWSTR wzFile,
+    __out FILE_ARCHITECTURE *pArchitecture
+    )
+{
+    HRESULT hr = S_OK;
+    HANDLE hFile = INVALID_HANDLE_VALUE;
+    DWORD cbRead = 0;
+    IMAGE_DOS_HEADER DosImageHeader = { };
+    IMAGE_NT_HEADERS NtImageHeader = { };
+    hFile = ::CreateFileW(wzFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+    if (hFile == INVALID_HANDLE_VALUE)
+    {
+        FileExitWithLastError(hr, "Failed to open file: %ls", wzFile);
+    }
+    if (!::ReadFile(hFile, &DosImageHeader, sizeof(DosImageHeader), &cbRead, NULL))
+    {
+        FileExitWithLastError(hr, "Failed to read DOS header from file: %ls", wzFile);
+    }
+    if (DosImageHeader.e_magic != IMAGE_DOS_SIGNATURE)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT);
+        FileExitOnRootFailure(hr, "Read invalid DOS header from file: %ls", wzFile);
+    }
+    if (INVALID_SET_FILE_POINTER == ::SetFilePointer(hFile, DosImageHeader.e_lfanew, NULL, FILE_BEGIN))
+    {
+        FileExitWithLastError(hr, "Failed to seek the NT header in file: %ls", wzFile);
+    }
+    if (!::ReadFile(hFile, &NtImageHeader, sizeof(NtImageHeader), &cbRead, NULL))
+    {
+        FileExitWithLastError(hr, "Failed to read NT header from file: %ls", wzFile);
+    }
+    if (NtImageHeader.Signature != IMAGE_NT_SIGNATURE)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT);
+        FileExitOnRootFailure(hr, "Read invalid NT header from file: %ls", wzFile);
+    }
+    if (IMAGE_SUBSYSTEM_NATIVE == NtImageHeader.OptionalHeader.Subsystem ||
+        IMAGE_SUBSYSTEM_WINDOWS_GUI == NtImageHeader.OptionalHeader.Subsystem ||
+        IMAGE_SUBSYSTEM_WINDOWS_CUI == NtImageHeader.OptionalHeader.Subsystem)
+    {
+        switch (NtImageHeader.FileHeader.Machine)
+        {
+        case IMAGE_FILE_MACHINE_I386:
+            *pArchitecture = FILE_ARCHITECTURE_X86;
+            break;
+        case IMAGE_FILE_MACHINE_IA64:
+            *pArchitecture = FILE_ARCHITECTURE_IA64;
+            break;
+        case IMAGE_FILE_MACHINE_AMD64:
+            *pArchitecture = FILE_ARCHITECTURE_X64;
+            break;
+        default:
+            hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT);
+            break;
+        }
+    }
+    else
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_BAD_FORMAT);
+    }
+    FileExitOnFailure(hr, "Unexpected subsystem: %d machine type: %d specified in NT header from file: %ls", NtImageHeader.OptionalHeader.Subsystem, NtImageHeader.FileHeader.Machine, wzFile);
+LExit:
+    if (hFile != INVALID_HANDLE_VALUE)
+    {
+        ::CloseHandle(hFile);
+    }
+    return hr;
+}
+/*******************************************************************
+ FileToString
+*******************************************************************/
+extern "C" HRESULT DAPI FileToString(
+    __in_z LPCWSTR wzFile,
+    __out LPWSTR *psczString,
+    __out_opt FILE_ENCODING *pfeEncoding
+    )
+{
+    HRESULT hr = S_OK;
+    BYTE *pbFullFileBuffer = NULL;
+    SIZE_T cbFullFileBuffer = 0;
+    BOOL fNullCharFound = FALSE;
+    LPWSTR sczFileText = NULL;
+    // Check if the file is ANSI
+    hr = FileRead(&pbFullFileBuffer, &cbFullFileBuffer, wzFile);
+    FileExitOnFailure(hr, "Failed to read file: %ls", wzFile);
+    if (0 == cbFullFileBuffer)
+    {
+        *psczString = NULL;
+        ExitFunction1(hr = S_OK);
+    }
+    // UTF-8 BOM
+    if (cbFullFileBuffer > sizeof(UTF8BOM) && 0 == memcmp(pbFullFileBuffer, UTF8BOM, sizeof(UTF8BOM)))
+    {
+        if (pfeEncoding)
+        {
+            *pfeEncoding = FILE_ENCODING_UTF8_WITH_BOM;
+        }
+        hr = StrAllocStringAnsi(&sczFileText, reinterpret_cast<LPCSTR>(pbFullFileBuffer + 3), cbFullFileBuffer - 3, CP_UTF8);
+        FileExitOnFailure(hr, "Failed to convert file %ls from UTF-8 as its BOM indicated", wzFile);
+        *psczString = sczFileText;
+        sczFileText = NULL;
+    }
+    // UTF-16 BOM, little endian (windows regular UTF-16)
+    else if (cbFullFileBuffer > sizeof(UTF16BOM) && 0 == memcmp(pbFullFileBuffer, UTF16BOM, sizeof(UTF16BOM)))
+    {
+        if (pfeEncoding)
+        {
+            *pfeEncoding = FILE_ENCODING_UTF16_WITH_BOM;
+        }
+        hr = StrAllocString(psczString, reinterpret_cast<LPWSTR>(pbFullFileBuffer + 2), (cbFullFileBuffer - 2) / sizeof(WCHAR));
+        FileExitOnFailure(hr, "Failed to allocate copy of string");
+    }
+    // No BOM, let's try to detect
+    else
+    {
+        for (DWORD i = 0; i < cbFullFileBuffer; ++i)
+        {
+            if (pbFullFileBuffer[i] == '\0')
+            {
+                fNullCharFound = TRUE;
+                break;
+            }
+        }
+        if (!fNullCharFound)
+        {
+            if (pfeEncoding)
+            {
+                *pfeEncoding = FILE_ENCODING_UTF8;
+            }
+            hr = StrAllocStringAnsi(&sczFileText, reinterpret_cast<LPCSTR>(pbFullFileBuffer), cbFullFileBuffer, CP_UTF8);
+            if (FAILED(hr))
+            {
+                if (E_OUTOFMEMORY == hr)
+                {
+                    FileExitOnFailure(hr, "Failed to convert file %ls from UTF-8", wzFile);
+                }
+            }
+            else
+            {
+                *psczString = sczFileText;
+                sczFileText = NULL;
+            }
+        }
+        else if (NULL == *psczString)
+        {
+            if (pfeEncoding)
+            {
+                *pfeEncoding = FILE_ENCODING_UTF16;
+            }
+            hr = StrAllocString(psczString, reinterpret_cast<LPWSTR>(pbFullFileBuffer), cbFullFileBuffer / sizeof(WCHAR));
+            FileExitOnFailure(hr, "Failed to allocate copy of string");
+        }
+    }
+LExit:
+    ReleaseStr(sczFileText);
+    ReleaseMem(pbFullFileBuffer);
+    return hr;
+}
+/*******************************************************************
+ FileFromString
+*******************************************************************/
+extern "C" HRESULT DAPI FileFromString(
+    __in_z LPCWSTR wzFile,
+    __in DWORD dwFlagsAndAttributes,
+    __in_z LPCWSTR sczString,
+    __in FILE_ENCODING feEncoding
+    )
+{
+    HRESULT hr = S_OK;
+    LPSTR sczUtf8String = NULL;
+    BYTE *pbFullFileBuffer = NULL;
+    const BYTE *pcbFullFileBuffer = NULL;
+    SIZE_T cbFullFileBuffer = 0;
+    SIZE_T cbStrLen = 0;
+    switch (feEncoding)
+    {
+    case FILE_ENCODING_UTF8:
+        hr = StrAnsiAllocString(&sczUtf8String, sczString, 0, CP_UTF8);
+        FileExitOnFailure(hr, "Failed to convert string to UTF-8 to write UTF-8 file");
+        hr = ::StringCchLengthA(sczUtf8String, STRSAFE_MAX_CCH, reinterpret_cast<size_t*>(&cbFullFileBuffer));
+        FileExitOnRootFailure(hr, "Failed to get length of UTF-8 string");
+        pcbFullFileBuffer = reinterpret_cast<BYTE *>(sczUtf8String);
+        break;
+    case FILE_ENCODING_UTF8_WITH_BOM:
+        hr = StrAnsiAllocString(&sczUtf8String, sczString, 0, CP_UTF8);
+        FileExitOnFailure(hr, "Failed to convert string to UTF-8 to write UTF-8 file");
+        hr = ::StringCchLengthA(sczUtf8String, STRSAFE_MAX_CCH, reinterpret_cast<size_t*>(&cbStrLen));
+        FileExitOnRootFailure(hr, "Failed to get length of UTF-8 string");
+        cbFullFileBuffer = sizeof(UTF8BOM) + cbStrLen;
+        pbFullFileBuffer = reinterpret_cast<BYTE *>(MemAlloc(cbFullFileBuffer, TRUE));
+        FileExitOnNull(pbFullFileBuffer, hr, E_OUTOFMEMORY, "Failed to allocate memory for output file buffer");
+        memcpy_s(pbFullFileBuffer, sizeof(UTF8BOM), UTF8BOM, sizeof(UTF8BOM));
+        memcpy_s(pbFullFileBuffer + sizeof(UTF8BOM), cbStrLen, sczUtf8String, cbStrLen);
+        pcbFullFileBuffer = pbFullFileBuffer;
+        break;
+    case FILE_ENCODING_UTF16:
+        hr = ::StringCchLengthW(sczString, STRSAFE_MAX_CCH, reinterpret_cast<size_t*>(&cbStrLen));
+        FileExitOnRootFailure(hr, "Failed to get length of string");
+        cbFullFileBuffer = cbStrLen * sizeof(WCHAR);
+        pcbFullFileBuffer = reinterpret_cast<const BYTE *>(sczString);
+        break;
+    case FILE_ENCODING_UTF16_WITH_BOM:
+        hr = ::StringCchLengthW(sczString, STRSAFE_MAX_CCH, reinterpret_cast<size_t*>(&cbStrLen));
+        FileExitOnRootFailure(hr, "Failed to get length of string");
+        cbStrLen *= sizeof(WCHAR);
+        cbFullFileBuffer = sizeof(UTF16BOM) + cbStrLen;
+        pbFullFileBuffer = reinterpret_cast<BYTE *>(MemAlloc(cbFullFileBuffer, TRUE));
+        FileExitOnNull(pbFullFileBuffer, hr, E_OUTOFMEMORY, "Failed to allocate memory for output file buffer");
+        memcpy_s(pbFullFileBuffer, sizeof(UTF16BOM), UTF16BOM, sizeof(UTF16BOM));
+        memcpy_s(pbFullFileBuffer + sizeof(UTF16BOM), cbStrLen, sczString, cbStrLen);
+        pcbFullFileBuffer = pbFullFileBuffer;
+        break;
+    }
+    hr = FileWrite(wzFile, dwFlagsAndAttributes, pcbFullFileBuffer, cbFullFileBuffer, NULL);
+    FileExitOnFailure(hr, "Failed to write file from string to: %ls", wzFile);
+LExit:
+    ReleaseStr(sczUtf8String);
+    ReleaseMem(pbFullFileBuffer);
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/gdiputil.cpp b/src/libs/dutil/WixToolset.DUtil/gdiputil.cpp
new file mode 100644
index 00000000..b5a0087c
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/gdiputil.cpp
@@ -0,0 +1,227 @@
+// 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.
+#include "precomp.h"
+using namespace Gdiplus;
+// Exit macros
+#define GdipExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_GDIPUTIL, x, s, __VA_ARGS__)
+#define GdipExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_GDIPUTIL, x, s, __VA_ARGS__)
+#define GdipExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_GDIPUTIL, x, s, __VA_ARGS__)
+#define GdipExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_GDIPUTIL, x, s, __VA_ARGS__)
+#define GdipExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_GDIPUTIL, x, s, __VA_ARGS__)
+#define GdipExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_GDIPUTIL, x, s, __VA_ARGS__)
+#define GdipExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_GDIPUTIL, p, x, e, s, __VA_ARGS__)
+#define GdipExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_GDIPUTIL, p, x, s, __VA_ARGS__)
+#define GdipExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_GDIPUTIL, p, x, e, s, __VA_ARGS__)
+#define GdipExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_GDIPUTIL, p, x, s, __VA_ARGS__)
+#define GdipExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_GDIPUTIL, e, x, s, __VA_ARGS__)
+#define GdipExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_GDIPUTIL, g, x, s, __VA_ARGS__)
+/********************************************************************
+ GdipInitialize - initializes GDI+.
+ Note: pOutput must be non-NULL if pInput->SuppressBackgroundThread
+       is TRUE. See GdiplusStartup() for more information.
+********************************************************************/
+extern "C" HRESULT DAPI GdipInitialize(
+    __in const Gdiplus::GdiplusStartupInput* pInput,
+    __out ULONG_PTR* pToken,
+    __out_opt Gdiplus::GdiplusStartupOutput *pOutput
+    )
+{
+    AssertSz(!pInput->SuppressBackgroundThread || pOutput, "pOutput required if background thread suppressed.");
+    HRESULT hr = S_OK;
+    Status status = Ok;
+    status = GdiplusStartup(pToken, pInput, pOutput);
+    GdipExitOnGdipFailure(status, hr, "Failed to initialize GDI+.");
+LExit:
+    return hr;
+}
+/********************************************************************
+ GdipUninitialize - uninitializes GDI+.
+********************************************************************/
+extern "C" void DAPI GdipUninitialize(
+    __in ULONG_PTR token
+    )
+{
+    GdiplusShutdown(token);
+}
+/********************************************************************
+ GdipBitmapFromResource - read a GDI+ image out of a resource stream
+********************************************************************/
+extern "C" HRESULT DAPI GdipBitmapFromResource(
+    __in_opt HINSTANCE hinst,
+    __in_z LPCSTR szId,
+    __out Bitmap **ppBitmap
+    )
+{
+    HRESULT hr = S_OK;
+    LPVOID pvData = NULL;
+    DWORD cbData = 0;
+    HGLOBAL hGlobal = NULL;;
+    LPVOID pv = NULL;
+    IStream *pStream = NULL;
+    Bitmap *pBitmap = NULL;
+    Status gs = Ok;
+    hr = ResReadData(hinst, szId, &pvData, &cbData);
+    GdipExitOnFailure(hr, "Failed to load GDI+ bitmap from resource.");
+    // Have to copy the fixed resource data into moveable (heap) memory
+    // since that's what GDI+ expects.
+    hGlobal = ::GlobalAlloc(GMEM_MOVEABLE, cbData);
+    GdipExitOnNullWithLastError(hGlobal, hr, "Failed to allocate global memory.");
+    pv = ::GlobalLock(hGlobal);
+    GdipExitOnNullWithLastError(pv, hr, "Failed to lock global memory.");
+    memcpy(pv, pvData, cbData);
+    ::GlobalUnlock(pv); // no point taking any more memory than we have already
+    pv = NULL;
+    hr = ::CreateStreamOnHGlobal(hGlobal, TRUE, &pStream);
+    GdipExitOnFailure(hr, "Failed to allocate stream from global memory.");
+    hGlobal = NULL; // we gave the global memory to the stream object so it will close it
+    pBitmap = Bitmap::FromStream(pStream);
+    GdipExitOnNull(pBitmap, hr, E_OUTOFMEMORY, "Failed to allocate bitmap from stream.");
+    gs = pBitmap->GetLastStatus();
+    GdipExitOnGdipFailure(gs, hr, "Failed to load bitmap from stream.");
+    *ppBitmap = pBitmap;
+    pBitmap = NULL;
+LExit:
+    if (pBitmap)
+    {
+        delete pBitmap;
+    }
+    ReleaseObject(pStream);
+    if (pv)
+    {
+        ::GlobalUnlock(pv);
+    }
+    if (hGlobal)
+    {
+        ::GlobalFree(hGlobal);
+    }
+    return hr;
+}
+/********************************************************************
+ GdipBitmapFromFile - read a GDI+ image from a file.
+********************************************************************/
+extern "C" HRESULT DAPI GdipBitmapFromFile(
+    __in_z LPCWSTR wzFileName,
+    __out Bitmap **ppBitmap
+    )
+{
+    HRESULT hr = S_OK;
+    Bitmap *pBitmap = NULL;
+    Status gs = Ok;
+    GdipExitOnNull(ppBitmap, hr, E_INVALIDARG, "Invalid null wzFileName");
+    pBitmap = Bitmap::FromFile(wzFileName);
+    GdipExitOnNull(pBitmap, hr, E_OUTOFMEMORY, "Failed to allocate bitmap from file.");
+    gs = pBitmap->GetLastStatus();
+    GdipExitOnGdipFailure(gs, hr, "Failed to load bitmap from file: %ls", wzFileName);
+    *ppBitmap = pBitmap;
+    pBitmap = NULL;
+LExit:
+    if (pBitmap)
+    {
+        delete pBitmap;
+    }
+    return hr;
+}
+HRESULT DAPI GdipHresultFromStatus(
+    __in Gdiplus::Status gs
+    )
+{
+    switch (gs)
+    {
+    case Ok:
+        return S_OK;
+    case GenericError:
+        return E_FAIL;
+    case InvalidParameter:
+        return E_INVALIDARG;
+    case OutOfMemory:
+        return E_OUTOFMEMORY;
+    case ObjectBusy:
+        return HRESULT_FROM_WIN32(ERROR_BUSY);
+    case InsufficientBuffer:
+        return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+    case NotImplemented:
+        return E_NOTIMPL;
+    case Win32Error:
+        return E_FAIL;
+    case WrongState:
+        return E_FAIL;
+    case Aborted:
+        return E_ABORT;
+    case FileNotFound:
+        return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND);
+    case ValueOverflow:
+        return HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW);
+    case AccessDenied:
+        return E_ACCESSDENIED;
+    case UnknownImageFormat:
+        return HRESULT_FROM_WIN32(ERROR_BAD_FORMAT);
+    case FontFamilyNotFound: __fallthrough;
+    case FontStyleNotFound: __fallthrough;
+    case NotTrueTypeFont:
+        return E_UNEXPECTED;
+    case UnsupportedGdiplusVersion:
+        return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
+    case GdiplusNotInitialized:
+        return E_UNEXPECTED;
+    case PropertyNotFound: __fallthrough;
+    case PropertyNotSupported:
+        return E_FAIL;
+    }
+    return E_UNEXPECTED;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/guidutil.cpp b/src/libs/dutil/WixToolset.DUtil/guidutil.cpp
new file mode 100644
index 00000000..204c9af2
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/guidutil.cpp
@@ -0,0 +1,54 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define GuidExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_GUIDUTIL, x, s, __VA_ARGS__)
+#define GuidExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_GUIDUTIL, x, s, __VA_ARGS__)
+#define GuidExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_GUIDUTIL, x, s, __VA_ARGS__)
+#define GuidExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_GUIDUTIL, x, s, __VA_ARGS__)
+#define GuidExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_GUIDUTIL, x, s, __VA_ARGS__)
+#define GuidExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_GUIDUTIL, x, s, __VA_ARGS__)
+#define GuidExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_GUIDUTIL, p, x, e, s, __VA_ARGS__)
+#define GuidExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_GUIDUTIL, p, x, s, __VA_ARGS__)
+#define GuidExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_GUIDUTIL, p, x, e, s, __VA_ARGS__)
+#define GuidExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_GUIDUTIL, p, x, s, __VA_ARGS__)
+#define GuidExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_GUIDUTIL, e, x, s, __VA_ARGS__)
+#define GuidExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_GUIDUTIL, g, x, s, __VA_ARGS__)
+extern "C" HRESULT DAPI GuidFixedCreate(
+    _Out_z_cap_c_(GUID_STRING_LENGTH) WCHAR* wzGuid
+    )
+{
+    HRESULT hr = S_OK;
+    UUID guid = { };
+    hr = HRESULT_FROM_RPC(::UuidCreate(&guid));
+    GuidExitOnFailure(hr, "UuidCreate failed.");
+    if (!::StringFromGUID2(guid, wzGuid, GUID_STRING_LENGTH))
+    {
+        hr = E_OUTOFMEMORY;
+        GuidExitOnRootFailure(hr, "Failed to convert guid into string.");
+    }
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI GuidCreate(
+    __deref_out_z LPWSTR* psczGuid
+    )
+{
+    HRESULT hr = S_OK;
+    hr = StrAlloc(psczGuid, GUID_STRING_LENGTH);
+    GuidExitOnFailure(hr, "Failed to allocate space for guid");
+    hr = GuidFixedCreate(*psczGuid);
+    GuidExitOnFailure(hr, "Failed to create new guid.");
+LExit:
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/iis7util.cpp b/src/libs/dutil/WixToolset.DUtil/iis7util.cpp
new file mode 100644
index 00000000..d0a0b000
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/iis7util.cpp
@@ -0,0 +1,535 @@
+// 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.
+#include "precomp.h"
+#include "iis7util.h"
+// Exit macros
+#define IisExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_IIS7UTIL, x, s, __VA_ARGS__)
+#define IisExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_IIS7UTIL, x, s, __VA_ARGS__)
+#define IisExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_IIS7UTIL, x, s, __VA_ARGS__)
+#define IisExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_IIS7UTIL, x, s, __VA_ARGS__)
+#define IisExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_IIS7UTIL, x, s, __VA_ARGS__)
+#define IisExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_IIS7UTIL, x, s, __VA_ARGS__)
+#define IisExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_IIS7UTIL, p, x, e, s, __VA_ARGS__)
+#define IisExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_IIS7UTIL, p, x, s, __VA_ARGS__)
+#define IisExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_IIS7UTIL, p, x, e, s, __VA_ARGS__)
+#define IisExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_IIS7UTIL, p, x, s, __VA_ARGS__)
+#define IisExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_IIS7UTIL, e, x, s, __VA_ARGS__)
+#define IisExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_IIS7UTIL, g, x, s, __VA_ARGS__)
+#define ISSTRINGVARIANT(vt) (VT_BSTR == vt || VT_LPWSTR == vt)
+extern "C" HRESULT DAPI Iis7PutPropertyVariant(
+    __in IAppHostElement *pElement,
+    __in LPCWSTR wzPropName,
+    __in VARIANT vtPut
+    )
+{
+    HRESULT hr = S_OK;
+    IAppHostProperty *pProperty = NULL;
+    BSTR bstrPropName = NULL;
+    bstrPropName = ::SysAllocString(wzPropName);
+    IisExitOnNull(bstrPropName, hr, E_OUTOFMEMORY, "failed SysAllocString");
+    hr = pElement->GetPropertyByName(bstrPropName, &pProperty);
+    IisExitOnFailure(hr, "Failed to get property object for %ls", wzPropName);
+    hr = pProperty->put_Value(vtPut);
+    IisExitOnFailure(hr, "Failed to set property value for %ls", wzPropName);
+LExit:
+    ReleaseBSTR(bstrPropName);
+    // caller responsible for cleaning up variant vtPut
+    ReleaseObject(pProperty);
+    return hr;
+}
+extern "C" HRESULT DAPI Iis7PutPropertyString(
+    __in IAppHostElement *pElement,
+    __in LPCWSTR wzPropName,
+    __in LPCWSTR wzString
+    )
+{
+    HRESULT hr = S_OK;
+    VARIANT vtPut;
+    ::VariantInit(&vtPut);
+    vtPut.vt = VT_BSTR;
+    vtPut.bstrVal = ::SysAllocString(wzString);
+    IisExitOnNull(vtPut.bstrVal, hr, E_OUTOFMEMORY, "failed SysAllocString");
+    hr = Iis7PutPropertyVariant(pElement, wzPropName, vtPut);
+LExit:
+    ReleaseVariant(vtPut);
+    return hr;
+}
+extern "C" HRESULT DAPI Iis7PutPropertyInteger(
+    __in IAppHostElement *pElement,
+    __in LPCWSTR wzPropName,
+    __in DWORD dValue
+    )
+{
+    VARIANT vtPut;
+    ::VariantInit(&vtPut);
+    vtPut.vt = VT_I4;
+    vtPut.lVal = dValue;
+    return Iis7PutPropertyVariant(pElement, wzPropName, vtPut);
+}
+extern "C" HRESULT DAPI Iis7PutPropertyBool(
+    __in IAppHostElement *pElement,
+    __in LPCWSTR wzPropName,
+    __in BOOL fValue)
+{
+    VARIANT vtPut;
+    ::VariantInit(&vtPut);
+    vtPut.vt = VT_BOOL;
+    vtPut.boolVal = (fValue == FALSE) ? VARIANT_FALSE : VARIANT_TRUE;
+    return Iis7PutPropertyVariant(pElement, wzPropName, vtPut);
+}
+extern "C" HRESULT DAPI Iis7GetPropertyVariant(
+    __in IAppHostElement *pElement,
+    __in LPCWSTR wzPropName,
+    __in VARIANT* vtGet
+    )
+{
+    HRESULT hr = S_OK;
+    IAppHostProperty *pProperty = NULL;
+    BSTR bstrPropName = NULL;
+    bstrPropName = ::SysAllocString(wzPropName);
+    IisExitOnNull(bstrPropName, hr, E_OUTOFMEMORY, "failed SysAllocString");
+    hr = pElement->GetPropertyByName(bstrPropName, &pProperty);
+    IisExitOnFailure(hr, "Failed to get property object for %ls", wzPropName);
+    hr = pProperty->get_Value(vtGet);
+    IisExitOnFailure(hr, "Failed to get property value for %ls", wzPropName);
+LExit:
+    ReleaseBSTR(bstrPropName);
+    // caller responsible for cleaning up variant vtGet
+    ReleaseObject(pProperty);
+    return hr;
+}
+extern "C" HRESULT DAPI Iis7GetPropertyString(
+    __in IAppHostElement *pElement,
+    __in LPCWSTR wzPropName,
+    __in LPWSTR* psczGet
+    )
+{
+    HRESULT hr = S_OK;
+    VARIANT vtGet;
+    ::VariantInit(&vtGet);
+    hr = Iis7GetPropertyVariant(pElement, wzPropName, &vtGet);
+    IisExitOnFailure(hr, "Failed to get iis7 property variant with name: %ls", wzPropName);
+    if (!ISSTRINGVARIANT(vtGet.vt))
+    {
+        hr = E_UNEXPECTED;
+        IisExitOnFailure(hr, "Tried to get property as a string, but type was %d instead.", vtGet.vt);
+    }
+    hr = StrAllocString(psczGet, vtGet.bstrVal, 0);
+LExit:
+    ReleaseVariant(vtGet);
+    return hr;
+}
+BOOL DAPI CompareVariantDefault(
+    __in VARIANT* pVariant1,
+    __in VARIANT* pVariant2
+    )
+{
+    BOOL fEqual = FALSE;
+    switch (pVariant1->vt)
+    {
+        // VarCmp doesn't work for unsigned ints
+        // We'd like to allow signed/unsigned comparison as well since
+        // IIS doesn't document variant type for integer fields
+    case VT_I1:
+    case VT_UI1:
+        if (VT_I1 == pVariant2->vt || VT_UI1 == pVariant2->vt)
+        {
+            fEqual = pVariant1->bVal == pVariant2->bVal;
+        }
+        break;
+    case VT_I2:
+    case VT_UI2:
+        if (VT_I2 == pVariant2->vt || VT_UI2 == pVariant2->vt)
+        {
+            fEqual = pVariant1->uiVal == pVariant2->uiVal;
+        }
+        break;
+    case VT_UI4:
+    case VT_I4:
+        if (VT_I4 == pVariant2->vt || VT_UI4 == pVariant2->vt)
+        {
+            fEqual = pVariant1->ulVal == pVariant2->ulVal;
+        }
+        break;
+    case VT_UI8:
+    case VT_I8:
+        if (VT_I8 == pVariant2->vt || VT_UI8 == pVariant2->vt)
+        {
+            fEqual = pVariant1->ullVal == pVariant2->ullVal;
+        }
+        break;
+    default:
+        fEqual = VARCMP_EQ == ::VarCmp(pVariant1,
+                                       pVariant2,
+                                       LOCALE_INVARIANT,
+                                       NORM_IGNORECASE);
+    }
+    return fEqual;
+}
+BOOL DAPI CompareVariantPath(
+    __in VARIANT* pVariant1,
+    __in VARIANT* pVariant2
+    )
+{
+    HRESULT hr = S_OK;
+    BOOL fEqual = FALSE;
+    LPWSTR wzValue1 = NULL;
+    LPWSTR wzValue2 = NULL;
+    if (ISSTRINGVARIANT(pVariant1->vt))
+    {
+        hr = PathExpand(&wzValue1, pVariant1->bstrVal, PATH_EXPAND_ENVIRONMENT | PATH_EXPAND_FULLPATH);
+        IisExitOnFailure(hr, "Failed to expand path %ls", pVariant1->bstrVal);
+    }
+    if (ISSTRINGVARIANT(pVariant2->vt))
+    {
+        hr = PathExpand(&wzValue2, pVariant2->bstrVal, PATH_EXPAND_ENVIRONMENT | PATH_EXPAND_FULLPATH);
+        IisExitOnFailure(hr, "Failed to expand path %ls", pVariant2->bstrVal);
+    }
+    fEqual = CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, wzValue1, -1, wzValue2, -1);
+LExit:
+    ReleaseNullStr(wzValue1);
+    ReleaseNullStr(wzValue2);
+    return fEqual;
+}
+BOOL DAPI IsMatchingAppHostElementCallback(
+    __in IAppHostElement *pElement,
+    __in_bcount(sizeof(IIS7_APPHOSTELEMENTCOMPARISON)) LPVOID pContext
+    )
+{
+    IIS7_APPHOSTELEMENTCOMPARISON* pComparison = (IIS7_APPHOSTELEMENTCOMPARISON*) pContext;
+    return Iis7IsMatchingAppHostElement(pElement, pComparison);
+}
+extern "C" BOOL DAPI Iis7IsMatchingAppHostElement(
+    __in IAppHostElement *pElement,
+    __in IIS7_APPHOSTELEMENTCOMPARISON* pComparison
+    )
+{
+    HRESULT hr = S_OK;
+    BOOL fResult = FALSE;
+    IAppHostProperty *pProperty = NULL;
+    BSTR bstrElementName = NULL;
+    VARIANT vPropValue;
+    ::VariantInit(&vPropValue);
+    // Use the default comparator if a comparator is not specified
+    VARIANTCOMPARATORPROC pComparator = pComparison->pComparator ? pComparison->pComparator : CompareVariantDefault;
+    hr = pElement->get_Name(&bstrElementName);
+    IisExitOnFailure(hr, "Failed to get name of element");
+    if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pComparison->sczElementName, -1, bstrElementName, -1))
+    {
+        ExitFunction();
+    }
+    hr = Iis7GetPropertyVariant(pElement, pComparison->sczAttributeName, &vPropValue);
+    IisExitOnFailure(hr, "Failed to get value of %ls attribute of %ls element", pComparison->sczAttributeName, pComparison->sczElementName);
+    if (TRUE == pComparator(pComparison->pvAttributeValue, &vPropValue))
+    {
+        fResult = TRUE;
+    }
+LExit:
+    ReleaseBSTR(bstrElementName);
+    ReleaseVariant(vPropValue);
+    ReleaseObject(pProperty);
+    return fResult;
+}
+BOOL DAPI IsMatchingAppHostMethod(
+    __in IAppHostMethod *pMethod,
+    __in LPCWSTR wzMethodName
+   )
+{
+    HRESULT hr = S_OK;
+    BOOL fResult = FALSE;
+    BSTR bstrName = NULL;
+    hr = pMethod->get_Name(&bstrName);
+    IisExitOnFailure(hr, "Failed to get name of element");
+    Assert(bstrName);
+    if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, wzMethodName, -1, bstrName, -1))
+    {
+        fResult = TRUE;
+    }
+LExit:
+    ReleaseBSTR(bstrName);
+    return fResult;
+}
+extern "C" HRESULT DAPI Iis7FindAppHostElementPath(
+    __in IAppHostElementCollection *pCollection,
+    __in LPCWSTR wzElementName,
+    __in LPCWSTR wzAttributeName,
+    __in LPCWSTR wzAttributeValue,
+    __out IAppHostElement** ppElement,
+    __out DWORD* pdwIndex
+    )
+{
+    HRESULT hr = S_OK;
+    IIS7_APPHOSTELEMENTCOMPARISON comparison = { };
+    VARIANT vtValue = { };
+    ::VariantInit(&vtValue);
+    vtValue.vt = VT_BSTR;
+    vtValue.bstrVal = ::SysAllocString(wzAttributeValue);
+    IisExitOnNull(vtValue.bstrVal, hr, E_OUTOFMEMORY, "failed SysAllocString");
+    comparison.sczElementName = wzElementName;
+    comparison.sczAttributeName = wzAttributeName;
+    comparison.pvAttributeValue = &vtValue;
+    comparison.pComparator = CompareVariantPath;
+    hr = Iis7EnumAppHostElements(pCollection,
+                                 IsMatchingAppHostElementCallback,
+                                 &comparison,
+                                 ppElement,
+                                 pdwIndex);
+LExit:
+    ReleaseVariant(vtValue);
+    return hr;
+}
+extern "C" HRESULT DAPI Iis7FindAppHostElementString(
+    __in IAppHostElementCollection *pCollection,
+    __in LPCWSTR wzElementName,
+    __in LPCWSTR wzAttributeName,
+    __in LPCWSTR wzAttributeValue,
+    __out IAppHostElement** ppElement,
+    __out DWORD* pdwIndex
+    )
+{
+    HRESULT hr = S_OK;
+    VARIANT vtValue;
+    ::VariantInit(&vtValue);
+    vtValue.vt = VT_BSTR;
+    vtValue.bstrVal = ::SysAllocString(wzAttributeValue);
+    IisExitOnNull(vtValue.bstrVal, hr, E_OUTOFMEMORY, "failed SysAllocString");
+    hr = Iis7FindAppHostElementVariant(pCollection,
+                                       wzElementName,
+                                       wzAttributeName,
+                                       &vtValue,
+                                       ppElement,
+                                       pdwIndex);
+LExit:
+    ReleaseVariant(vtValue);
+    return hr;
+}
+extern "C" HRESULT DAPI Iis7FindAppHostElementInteger(
+    __in IAppHostElementCollection *pCollection,
+    __in LPCWSTR wzElementName,
+    __in LPCWSTR wzAttributeName,
+    __in DWORD dwAttributeValue,
+    __out IAppHostElement** ppElement,
+    __out DWORD* pdwIndex
+    )
+{
+    HRESULT hr = S_OK;
+    VARIANT vtValue;
+    ::VariantInit(&vtValue);
+    vtValue.vt = VT_UI4;
+    vtValue.ulVal = dwAttributeValue;
+    hr = Iis7FindAppHostElementVariant(pCollection,
+                                       wzElementName,
+                                       wzAttributeName,
+                                       &vtValue,
+                                       ppElement,
+                                       pdwIndex);
+    ReleaseVariant(vtValue);
+    return hr;
+}
+extern "C" HRESULT DAPI Iis7FindAppHostElementVariant(
+    __in IAppHostElementCollection *pCollection,
+    __in LPCWSTR wzElementName,
+    __in LPCWSTR wzAttributeName,
+    __in VARIANT* pvAttributeValue,
+    __out IAppHostElement** ppElement,
+    __out DWORD* pdwIndex
+    )
+{
+    IIS7_APPHOSTELEMENTCOMPARISON comparison = { };
+    comparison.sczElementName = wzElementName;
+    comparison.sczAttributeName = wzAttributeName;
+    comparison.pvAttributeValue = pvAttributeValue;
+    comparison.pComparator = CompareVariantDefault;
+    return Iis7EnumAppHostElements(pCollection,
+                                   IsMatchingAppHostElementCallback,
+                                   &comparison,
+                                   ppElement,
+                                   pdwIndex);
+}
+extern "C" HRESULT DAPI Iis7EnumAppHostElements(
+    __in IAppHostElementCollection *pCollection,
+    __in ENUMAPHOSTELEMENTPROC pCallback,
+    __in LPVOID pContext,
+    __out IAppHostElement** ppElement,
+    __out DWORD* pdwIndex
+    )
+{
+    HRESULT hr = S_OK;
+    IAppHostElement *pElement = NULL;
+    DWORD dwElements = 0;
+    VARIANT vtIndex;
+    ::VariantInit(&vtIndex);
+    if (NULL != ppElement)
+    {
+        *ppElement = NULL;
+    }
+    if (NULL != pdwIndex)
+    {
+        *pdwIndex = MAXDWORD;
+    }
+    hr = pCollection->get_Count(&dwElements);
+    IisExitOnFailure(hr, "Failed get application IAppHostElementCollection count");
+    vtIndex.vt = VT_UI4;
+    for (DWORD i = 0; i < dwElements; ++i)
+    {
+        vtIndex.ulVal = i;
+        hr = pCollection->get_Item(vtIndex , &pElement);
+        IisExitOnFailure(hr, "Failed get IAppHostElement element");
+        if (pCallback(pElement, pContext))
+        {
+            if (NULL != ppElement)
+            {
+                *ppElement = pElement;
+                pElement = NULL;
+            }
+            if (NULL != pdwIndex)
+            {
+                *pdwIndex = i;
+            }
+            break;
+        }
+        ReleaseNullObject(pElement);
+    }
+LExit:
+    ReleaseObject(pElement);
+    ReleaseVariant(vtIndex);
+    return hr;
+}
+extern "C" HRESULT DAPI Iis7FindAppHostMethod(
+    __in IAppHostMethodCollection *pCollection,
+    __in LPCWSTR wzMethodName,
+    __out IAppHostMethod** ppMethod,
+    __out DWORD* pdwIndex
+    )
+{
+    HRESULT hr = S_OK;
+    IAppHostMethod *pMethod = NULL;
+    DWORD dwMethods = 0;
+    VARIANT vtIndex;
+    ::VariantInit(&vtIndex);
+    if (NULL != ppMethod)
+    {
+        *ppMethod = NULL;
+    }
+    if (NULL != pdwIndex)
+    {
+        *pdwIndex = MAXDWORD;
+    }
+    hr = pCollection->get_Count(&dwMethods);
+    IisExitOnFailure(hr, "Failed get application IAppHostMethodCollection count");
+    vtIndex.vt = VT_UI4;
+    for (DWORD i = 0; i < dwMethods; ++i)
+    {
+        vtIndex.ulVal = i;
+        hr = pCollection->get_Item(vtIndex , &pMethod);
+        IisExitOnFailure(hr, "Failed get IAppHostMethod element");
+        if (IsMatchingAppHostMethod(pMethod, wzMethodName))
+        {
+            if (NULL != ppMethod)
+            {
+                *ppMethod = pMethod;
+                pMethod = NULL;
+            }
+            if (NULL != pdwIndex)
+            {
+                *pdwIndex = i;
+            }
+            break;
+        }
+        ReleaseNullObject(pMethod);
+    }
+LExit:
+    ReleaseObject(pMethod);
+    ReleaseVariant(vtIndex);
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/aclutil.h b/src/libs/dutil/WixToolset.DUtil/inc/aclutil.h
new file mode 100644
index 00000000..ac03f9a8
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/aclutil.h
@@ -0,0 +1,154 @@
+#pragma once
+// 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.
+#include <aclapi.h>
+#include <sddl.h>
+#define ReleaseSid(x) if (x) { AclFreeSid(x); }
+#define ReleaseNullSid(x) if (x) { AclFreeSid(x); x = NULL; }
+#ifdef __cplusplus
+extern "C" {
+#endif
+// structs
+struct ACL_ACCESS
+{
+    BOOL fDenyAccess;
+    DWORD dwAccessMask;
+    // TODO: consider using a union
+    LPCWSTR pwzAccountName;   // NOTE: the last three items in this structure are ignored if this is not NULL
+    SID_IDENTIFIER_AUTHORITY sia;  // used if pwzAccountName is NULL
+    BYTE nSubAuthorityCount;
+    DWORD nSubAuthority[8];
+};
+struct ACL_ACE
+{
+    DWORD dwFlags;
+    DWORD dwMask;
+    PSID psid;
+};
+// functions
+HRESULT DAPI AclCheckAccess(
+    __in HANDLE hToken, 
+    __in ACL_ACCESS* paa
+    );
+HRESULT DAPI AclCheckAdministratorAccess(
+    __in HANDLE hToken
+    );
+HRESULT DAPI AclCheckLocalSystemAccess(
+    __in HANDLE hToken
+    );
+HRESULT DAPI AclGetWellKnownSid(
+    __in WELL_KNOWN_SID_TYPE wkst,
+    __deref_out PSID* ppsid
+    );
+HRESULT DAPI AclGetAccountSid(
+    __in_opt LPCWSTR wzSystem,
+    __in_z LPCWSTR wzAccount,
+    __deref_out PSID* ppsid
+    );
+HRESULT DAPI AclGetAccountSidString(
+    __in_z LPCWSTR wzSystem,
+    __in_z LPCWSTR wzAccount,
+    __deref_out_z LPWSTR* ppwzSid
+    );
+HRESULT DAPI AclCreateDacl(
+    __in_ecount(cDeny) ACL_ACE rgaaDeny[],
+    __in DWORD cDeny,
+    __in_ecount(cAllow) ACL_ACE rgaaAllow[],
+    __in DWORD cAllow,
+    __deref_out ACL** ppAcl
+    );
+HRESULT DAPI AclAddToDacl(
+    __in ACL* pAcl,
+    __in_ecount_opt(cDeny) const ACL_ACE rgaaDeny[],
+    __in DWORD cDeny,
+    __in_ecount_opt(cAllow) const ACL_ACE rgaaAllow[],
+    __in DWORD cAllow,
+    __deref_out ACL** ppAclNew
+    );
+HRESULT DAPI AclMergeDacls(
+    __in const ACL* pAcl1,
+    __in const ACL* pAcl2,
+    __deref_out ACL** ppAclNew
+    );
+HRESULT DAPI AclCreateDaclOld(
+    __in_ecount(cAclAccesses) ACL_ACCESS* paa,
+    __in DWORD cAclAccesses,
+    __deref_out ACL** ppAcl
+    );
+HRESULT DAPI AclCreateSecurityDescriptor(
+    __in_ecount(cAclAccesses) ACL_ACCESS* paa,
+    __in DWORD cAclAccesses,
+    __deref_out SECURITY_DESCRIPTOR** ppsd
+    );
+HRESULT DAPI AclCreateSecurityDescriptorFromDacl(
+    __in ACL* pACL,
+    __deref_out SECURITY_DESCRIPTOR** ppsd
+    );
+HRESULT __cdecl AclCreateSecurityDescriptorFromString(
+    __deref_out SECURITY_DESCRIPTOR** ppsd,
+    __in_z __format_string LPCWSTR wzSddlFormat,
+    ...
+    );
+HRESULT DAPI AclDuplicateSecurityDescriptor(
+    __in SECURITY_DESCRIPTOR* psd,
+    __deref_out SECURITY_DESCRIPTOR** ppsd
+    );
+HRESULT DAPI AclGetSecurityDescriptor(
+    __in_z LPCWSTR wzObject,
+    __in SE_OBJECT_TYPE sot,
+    __in SECURITY_INFORMATION securityInformation,
+    __deref_out SECURITY_DESCRIPTOR** ppsd
+    );
+HRESULT DAPI AclSetSecurityWithRetry(
+    __in_z LPCWSTR wzObject,
+    __in SE_OBJECT_TYPE sot,
+    __in SECURITY_INFORMATION securityInformation,
+    __in_opt PSID psidOwner,
+    __in_opt PSID psidGroup,
+    __in_opt PACL pDacl,
+    __in_opt PACL pSacl,
+    __in DWORD cRetry,
+    __in DWORD dwWaitMilliseconds
+    );
+HRESULT DAPI AclFreeSid(
+    __in PSID psid
+    );
+HRESULT DAPI AclFreeDacl(
+    __in ACL* pACL
+    );
+HRESULT DAPI AclFreeSecurityDescriptor(
+    __in SECURITY_DESCRIPTOR* psd
+    );
+HRESULT DAPI AclAddAdminToSecurityDescriptor(
+    __in SECURITY_DESCRIPTOR* pSecurity,
+    __deref_out SECURITY_DESCRIPTOR** ppSecurityNew
+    );
+// Following code in acl2util.cpp due to dependency on crypt32.dll.
+HRESULT DAPI AclCalculateServiceSidString(
+    __in LPCWSTR wzServiceName,
+    __in SIZE_T cchServiceName,
+    __deref_out_z LPWSTR* psczSid
+    );
+HRESULT DAPI AclGetAccountSidStringEx(
+    __in_z LPCWSTR wzSystem,
+    __in_z LPCWSTR wzAccount,
+    __deref_out_z LPWSTR* psczSid
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/apputil.h b/src/libs/dutil/WixToolset.DUtil/inc/apputil.h
new file mode 100644
index 00000000..1a1e14f7
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/apputil.h
@@ -0,0 +1,45 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+// functions
+/********************************************************************
+AppFreeCommandLineArgs - frees argv from AppParseCommandLine.
+********************************************************************/
+void DAPI AppFreeCommandLineArgs(
+    __in LPWSTR* argv
+    );
+void DAPI AppInitialize(
+    __in_ecount(cSafelyLoadSystemDlls) LPCWSTR rgsczSafelyLoadSystemDlls[],
+    __in DWORD cSafelyLoadSystemDlls
+    );
+/********************************************************************
+AppInitializeUnsafe - initializes without the full standard safety
+                      precautions for an application.
+********************************************************************/
+void DAPI AppInitializeUnsafe();
+/********************************************************************
+AppParseCommandLine - parses the command line using CommandLineToArgvW.
+                      The caller must free the value of pArgv on success
+                      by calling AppFreeCommandLineArgs.
+********************************************************************/
+DAPI_(HRESULT) AppParseCommandLine(
+    __in LPCWSTR wzCommandLine,
+    __in int* argc,
+    __in LPWSTR** pArgv
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/apuputil.h b/src/libs/dutil/WixToolset.DUtil/inc/apuputil.h
new file mode 100644
index 00000000..f26a12b7
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/apuputil.h
@@ -0,0 +1,87 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define ReleaseApupChain(p) if (p) { ApupFreeChain(p); p = NULL; }
+#define ReleaseNullApupChain(p) if (p) { ApupFreeChain(p); p = NULL; }
+const LPCWSTR APPLICATION_SYNDICATION_NAMESPACE = L"http://appsyndication.org/2006/appsyn";
+typedef enum APUP_HASH_ALGORITHM
+{
+    APUP_HASH_ALGORITHM_UNKNOWN,
+    APUP_HASH_ALGORITHM_MD5,
+    APUP_HASH_ALGORITHM_SHA1,
+    APUP_HASH_ALGORITHM_SHA256,
+    APUP_HASH_ALGORITHM_SHA512,
+} APUP_HASH_ALGORITHM;
+struct APPLICATION_UPDATE_ENCLOSURE
+{
+    LPWSTR wzUrl;
+    LPWSTR wzLocalName;
+    DWORD64 dw64Size;
+    BYTE* rgbDigest;
+    DWORD cbDigest;
+    APUP_HASH_ALGORITHM digestAlgorithm;
+    BOOL fInstaller;
+};
+struct APPLICATION_UPDATE_ENTRY
+{
+    LPWSTR wzApplicationId;
+    LPWSTR wzApplicationType;
+    LPWSTR wzTitle;
+    LPWSTR wzSummary;
+    LPWSTR wzContentType;
+    LPWSTR wzContent;
+    LPWSTR wzUpgradeId;
+    BOOL fUpgradeExclusive;
+    VERUTIL_VERSION* pVersion;
+    VERUTIL_VERSION* pUpgradeVersion;
+    DWORD64 dw64TotalSize;
+    DWORD cEnclosures;
+    APPLICATION_UPDATE_ENCLOSURE* rgEnclosures;
+};
+struct APPLICATION_UPDATE_CHAIN
+{
+    LPWSTR wzDefaultApplicationId;
+    LPWSTR wzDefaultApplicationType;
+    DWORD cEntries;
+    APPLICATION_UPDATE_ENTRY* rgEntries;
+};
+HRESULT DAPI ApupAllocChainFromAtom(
+    __in ATOM_FEED* pFeed,
+    __out APPLICATION_UPDATE_CHAIN** ppChain
+    );
+HRESULT DAPI ApupFilterChain(
+    __in APPLICATION_UPDATE_CHAIN* pChain,
+    __in VERUTIL_VERSION* pVersion,
+    __out APPLICATION_UPDATE_CHAIN** ppFilteredChain
+    );
+void DAPI ApupFreeChain(
+    __in APPLICATION_UPDATE_CHAIN* pChain
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/atomutil.h b/src/libs/dutil/WixToolset.DUtil/inc/atomutil.h
new file mode 100644
index 00000000..9acfc1d5
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/atomutil.h
@@ -0,0 +1,146 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define ReleaseAtomFeed(p) if (p) { AtomFreeFeed(p); }
+#define ReleaseNullAtomFeed(p) if (p) { AtomFreeFeed(p); p = NULL; }
+struct ATOM_UNKNOWN_ATTRIBUTE
+{
+    LPWSTR wzNamespace;
+    LPWSTR wzAttribute;
+    LPWSTR wzValue;
+    ATOM_UNKNOWN_ATTRIBUTE* pNext;
+};
+struct ATOM_UNKNOWN_ELEMENT
+{
+    LPWSTR wzNamespace;
+    LPWSTR wzElement;
+    LPWSTR wzValue;
+    ATOM_UNKNOWN_ATTRIBUTE* pAttributes;
+    ATOM_UNKNOWN_ELEMENT* pNext;
+};
+struct ATOM_LINK
+{
+    LPWSTR wzRel;
+    LPWSTR wzTitle;
+    LPWSTR wzType;
+    LPWSTR wzUrl;
+    LPWSTR wzValue;
+    DWORD64 dw64Length;
+    ATOM_UNKNOWN_ATTRIBUTE* pUnknownAttributes;
+    ATOM_UNKNOWN_ELEMENT* pUnknownElements;
+};
+struct ATOM_CONTENT
+{
+    LPWSTR wzType;
+    LPWSTR wzUrl;
+    LPWSTR wzValue;
+    ATOM_UNKNOWN_ELEMENT* pUnknownElements;
+};
+struct ATOM_AUTHOR
+{
+    LPWSTR wzName;
+    LPWSTR wzEmail;
+    LPWSTR wzUrl;
+};
+struct ATOM_CATEGORY
+{
+    LPWSTR wzLabel;
+    LPWSTR wzScheme;
+    LPWSTR wzTerm;
+    ATOM_UNKNOWN_ELEMENT* pUnknownElements;
+};
+struct ATOM_ENTRY
+{
+    LPWSTR wzId;
+    LPWSTR wzSummary;
+    LPWSTR wzTitle;
+    FILETIME ftPublished;
+    FILETIME ftUpdated;
+    ATOM_CONTENT* pContent;
+    DWORD cAuthors;
+    ATOM_AUTHOR* rgAuthors;
+    DWORD cCategories;
+    ATOM_CATEGORY* rgCategories;
+    DWORD cLinks;
+    ATOM_LINK* rgLinks;
+    IXMLDOMNode* pixn;
+    ATOM_UNKNOWN_ELEMENT* pUnknownElements;
+};
+struct ATOM_FEED
+{
+    LPWSTR wzGenerator;
+    LPWSTR wzIcon;
+    LPWSTR wzId;
+    LPWSTR wzLogo;
+    LPWSTR wzSubtitle;
+    LPWSTR wzTitle;
+    FILETIME ftUpdated;
+    DWORD cAuthors;
+    ATOM_AUTHOR* rgAuthors;
+    DWORD cCategories;
+    ATOM_CATEGORY* rgCategories;
+    DWORD cEntries;
+    ATOM_ENTRY* rgEntries;
+    DWORD cLinks;
+    ATOM_LINK* rgLinks;
+    IXMLDOMNode* pixn;
+    ATOM_UNKNOWN_ELEMENT* pUnknownElements;
+};
+HRESULT DAPI AtomInitialize(
+    );
+void DAPI AtomUninitialize(
+    );
+HRESULT DAPI AtomParseFromString(
+    __in_z LPCWSTR wzAtomString,
+    __out ATOM_FEED **ppFeed
+    );
+HRESULT DAPI AtomParseFromFile(
+    __in_z LPCWSTR wzAtomFile,
+    __out ATOM_FEED **ppFeed
+    );
+HRESULT DAPI AtomParseFromDocument(
+    __in IXMLDOMDocument* pixdDocument,
+    __out ATOM_FEED **ppFeed
+    );
+void DAPI AtomFreeFeed(
+    __in_xcount(pFeed->cItems) ATOM_FEED* pFeed
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/buffutil.h b/src/libs/dutil/WixToolset.DUtil/inc/buffutil.h
new file mode 100644
index 00000000..322209e6
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/buffutil.h
@@ -0,0 +1,91 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+// macro definitions
+#define ReleaseBuffer ReleaseMem
+#define ReleaseNullBuffer ReleaseNullMem
+#define BuffFree MemFree
+// function declarations
+HRESULT BuffReadNumber(
+    __in_bcount(cbBuffer) const BYTE* pbBuffer,
+    __in SIZE_T cbBuffer,
+    __inout SIZE_T* piBuffer,
+    __out DWORD* pdw
+    );
+HRESULT BuffReadNumber64(
+    __in_bcount(cbBuffer) const BYTE* pbBuffer,
+    __in SIZE_T cbBuffer,
+    __inout SIZE_T* piBuffer,
+    __out DWORD64* pdw64
+    );
+HRESULT BuffReadPointer(
+    __in_bcount(cbBuffer) const BYTE* pbBuffer,
+    __in SIZE_T cbBuffer,
+    __inout SIZE_T* piBuffer,
+    __out DWORD_PTR* pdw
+);
+HRESULT BuffReadString(
+    __in_bcount(cbBuffer) const BYTE* pbBuffer,
+    __in SIZE_T cbBuffer,
+    __inout SIZE_T* piBuffer,
+    __deref_out_z LPWSTR* pscz
+    );
+HRESULT BuffReadStringAnsi(
+    __in_bcount(cbBuffer) const BYTE* pbBuffer,
+    __in SIZE_T cbBuffer,
+    __inout SIZE_T* piBuffer,
+    __deref_out_z LPSTR* pscz
+    );
+HRESULT BuffReadStream(
+    __in_bcount(cbBuffer) const BYTE* pbBuffer,
+    __in SIZE_T cbBuffer,
+    __inout SIZE_T* piBuffer,
+    __deref_inout_bcount(*pcbStream) BYTE** ppbStream,
+    __out SIZE_T* pcbStream
+    );
+HRESULT BuffWriteNumber(
+    __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
+    __inout SIZE_T* piBuffer,
+    __in DWORD dw
+    );
+HRESULT BuffWriteNumber64(
+    __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
+    __inout SIZE_T* piBuffer,
+    __in DWORD64 dw64
+    );
+HRESULT BuffWritePointer(
+    __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
+    __inout SIZE_T* piBuffer,
+    __in DWORD_PTR dw
+);
+HRESULT BuffWriteString(
+    __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
+    __inout SIZE_T* piBuffer,
+    __in_z_opt LPCWSTR scz
+    );
+HRESULT BuffWriteStringAnsi(
+    __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
+    __inout SIZE_T* piBuffer,
+    __in_z_opt LPCSTR scz
+    );
+HRESULT BuffWriteStream(
+    __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
+    __inout SIZE_T* piBuffer,
+    __in_bcount(cbStream) const BYTE* pbStream,
+    __in SIZE_T cbStream
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/butil.h b/src/libs/dutil/WixToolset.DUtil/inc/butil.h
new file mode 100644
index 00000000..d1ec73bc
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/butil.h
@@ -0,0 +1,60 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+enum BUNDLE_INSTALL_CONTEXT
+{
+    BUNDLE_INSTALL_CONTEXT_MACHINE,
+    BUNDLE_INSTALL_CONTEXT_USER,
+};
+/********************************************************************
+BundleGetBundleInfo - Queries the bundle installation metadata for a given property
+RETURNS:
+    E_INVALIDARG
+        An invalid parameter was passed to the function.
+    HRESULT_FROM_WIN32(ERROR_UNKNOWN_PRODUCT)
+        The bundle is not installed
+    HRESULT_FROM_WIN32(ERROR_UNKNOWN_PROPERTY)
+        The property is unrecognized
+    HRESULT_FROM_WIN32(ERROR_MORE_DATA)
+        A buffer is too small to hold the requested data.
+    E_NOTIMPL:
+        Tried to read a bundle attribute for a type which has not been implemented
+    All other returns are unexpected returns from other dutil methods.
+********************************************************************/
+HRESULT DAPI BundleGetBundleInfo(
+  __in_z LPCWSTR szBundleId,                             // Bundle code
+  __in_z LPCWSTR szAttribute,                            // attribute name
+  __out_ecount_opt(*pcchValueBuf) LPWSTR lpValueBuf,     // returned value, NULL if not desired
+  __inout_opt                     LPDWORD pcchValueBuf   // in/out buffer character count
+    );
+/********************************************************************
+BundleEnumRelatedBundle - Queries the bundle installation metadata for installs with the given upgrade code
+NOTE: lpBundleIdBuff is a buffer to receive the bundle GUID. This buffer must be 39 characters long. 
+        The first 38 characters are for the GUID, and the last character is for the terminating null character.
+RETURNS:
+    E_INVALIDARG
+        An invalid parameter was passed to the function.
+    All other returns are unexpected returns from other dutil methods.
+********************************************************************/
+HRESULT DAPI BundleEnumRelatedBundle(
+  __in_z   LPCWSTR lpUpgradeCode,
+  __in     BUNDLE_INSTALL_CONTEXT context,
+  __inout  PDWORD pdwStartIndex,
+  __out_ecount(MAX_GUID_CHARS+1)  LPWSTR lpBundleIdBuf
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/cabcutil.h b/src/libs/dutil/WixToolset.DUtil/inc/cabcutil.h
new file mode 100644
index 00000000..4f0c7b13
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/cabcutil.h
@@ -0,0 +1,62 @@
+#pragma once
+// 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.
+#include <fci.h>
+#include <fcntl.h>
+#include <msi.h>
+// Callback from PFNFCIGETNEXTCABINET CabCGetNextCabinet method
+// First argument is the name of splitting cabinet without extension e.g. "cab1"
+// Second argument is name of the new cabinet that would be formed by splitting e.g. "cab1b.cab"
+// Third argument is the file token of the first file present in the splitting cabinet
+typedef void (__stdcall * FileSplitCabNamesCallback)(LPWSTR, LPWSTR, LPWSTR);
+#define CAB_MAX_SIZE 0x7FFFFFFF   // (see KB: Q174866)
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern const int CABC_HANDLE_BYTES;
+// time vs. space trade-off
+typedef enum COMPRESSION_TYPE
+{
+    COMPRESSION_TYPE_NONE, // fastest
+    COMPRESSION_TYPE_LOW,
+    COMPRESSION_TYPE_MEDIUM,
+    COMPRESSION_TYPE_HIGH, // smallest
+    COMPRESSION_TYPE_MSZIP
+} COMPRESSION_TYPE;
+// functions
+HRESULT DAPI CabCBegin(
+    __in_z LPCWSTR wzCab,
+    __in_z LPCWSTR wzCabDir,
+    __in DWORD dwMaxFiles,
+    __in DWORD dwMaxSize,
+    __in DWORD dwMaxThresh,
+    __in COMPRESSION_TYPE ct,
+    __out_bcount(CABC_HANDLE_BYTES) HANDLE *phContext
+    );
+HRESULT DAPI CabCNextCab(
+    __in_bcount(CABC_HANDLE_BYTES) HANDLE hContext
+    );
+HRESULT DAPI CabCAddFile(
+    __in_z LPCWSTR wzFile,
+    __in_z_opt LPCWSTR wzToken,
+    __in_opt PMSIFILEHASHINFO pmfHash,
+    __in_bcount(CABC_HANDLE_BYTES) HANDLE hContext
+    );
+HRESULT DAPI CabCFinish(
+    __in_bcount(CABC_HANDLE_BYTES) HANDLE hContext,
+    __in_opt FileSplitCabNamesCallback fileSplitCabNamesCallback
+    );
+void DAPI CabCCancel(
+    __in_bcount(CABC_HANDLE_BYTES) HANDLE hContext
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/cabutil.h b/src/libs/dutil/WixToolset.DUtil/inc/cabutil.h
new file mode 100644
index 00000000..0bedba80
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/cabutil.h
@@ -0,0 +1,56 @@
+#pragma once
+// 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.
+#include <fdi.h>
+#include <sys\stat.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+// structs
+// callback function prototypes
+typedef HRESULT (*CAB_CALLBACK_OPEN_FILE)(LPCWSTR wzFile, INT_PTR* ppFile);
+typedef HRESULT (*CAB_CALLBACK_READ_FILE)(INT_PTR pFile, LPVOID pvData, DWORD cbData, DWORD* pcbRead);
+typedef HRESULT (*CAB_CALLBACK_WRITE_FILE)(INT_PTR pFile, LPVOID pvData, DWORD cbData, DWORD* pcbRead);
+typedef LONG (*CAB_CALLBACK_SEEK_FILE)(INT_PTR pFile, DWORD dwMove, DWORD dwMoveMethod);
+typedef HRESULT (*CAB_CALLBACK_CLOSE_FILE)(INT_PTR pFile);
+typedef HRESULT (*CAB_CALLBACK_BEGIN_FILE)(LPCWSTR wzFileId, FILETIME* pftFileTime, DWORD cbFileSize, LPVOID pvContext, INT_PTR* ppFile);
+typedef HRESULT (*CAB_CALLBACK_END_FILE)(LPCWSTR wzFileId, LPVOID pvContext, INT_PTR pFile);
+typedef HRESULT (*CAB_CALLBACK_PROGRESS)(BOOL fBeginFile, LPCWSTR wzFileId, LPVOID pvContext);
+// function type with calling convention of __stdcall that .NET 1.1 understands only
+// .NET 2.0 will not need this
+typedef INT_PTR (FAR __stdcall *STDCALL_PFNFDINOTIFY)(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin);
+// functions
+HRESULT DAPI CabInitialize(
+    __in BOOL fDelayLoad
+    );
+void DAPI CabUninitialize(
+    );
+HRESULT DAPI CabExtract(
+    __in_z LPCWSTR wzCabinet,
+    __in_z LPCWSTR wzExtractFile,
+    __in_z LPCWSTR wzExtractDir,
+    __in_opt CAB_CALLBACK_PROGRESS pfnProgress,
+    __in_opt LPVOID pvContext,
+    __in DWORD64 dw64EmbeddedOffset
+    );
+HRESULT DAPI CabEnumerate(
+    __in_z LPCWSTR wzCabinet,
+    __in_z LPCWSTR wzEnumerateFile,
+    __in STDCALL_PFNFDINOTIFY pfnNotify,
+    __in DWORD64 dw64EmbeddedOffset
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/certutil.h b/src/libs/dutil/WixToolset.DUtil/inc/certutil.h
new file mode 100644
index 00000000..8565c1cf
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/certutil.h
@@ -0,0 +1,66 @@
+#pragma once
+// 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.
+#define ReleaseCertStore(p) if (p) { ::CertCloseStore(p, 0); p = NULL; }
+#define ReleaseCertContext(p) if (p) { ::CertFreeCertificateContext(p); p = NULL; }
+#define ReleaseCertChain(p) if (p) { ::CertFreeCertificateChain(p); p = NULL; }
+#ifdef __cplusplus
+extern "C" {
+#endif
+HRESULT DAPI CertReadProperty(
+    __in PCCERT_CONTEXT pCertContext,
+    __in DWORD dwProperty,
+    __out_bcount(*pcbValue) LPVOID pvValue,
+    __out_opt DWORD* pcbValue
+    );
+HRESULT DAPI CertGetAuthenticodeSigningTimestamp(
+    __in CMSG_SIGNER_INFO* pSignerInfo,
+    __out FILETIME* pft
+    );
+HRESULT DAPI GetCryptProvFromCert(
+      __in_opt HWND hwnd,
+      __in PCCERT_CONTEXT pCert,
+      __out HCRYPTPROV *phCryptProv,
+      __out DWORD *pdwKeySpec,
+      __in BOOL *pfDidCryptAcquire,
+      __deref_opt_out LPWSTR *ppwszTmpContainer,
+      __deref_opt_out LPWSTR *ppwszProviderName,
+      __out DWORD *pdwProviderType
+      );
+HRESULT DAPI FreeCryptProvFromCert(
+    __in BOOL fAcquired,
+    __in HCRYPTPROV hProv,
+    __in_opt LPWSTR pwszCapiProvider,
+    __in DWORD dwProviderType,
+    __in_opt LPWSTR pwszTmpContainer
+    );
+HRESULT DAPI GetProvSecurityDesc(
+      __in HCRYPTPROV hProv,
+      __deref_out SECURITY_DESCRIPTOR** pSecurity
+      );
+HRESULT DAPI SetProvSecurityDesc(
+    __in HCRYPTPROV hProv,
+    __in SECURITY_DESCRIPTOR* pSecurity
+    );
+BOOL DAPI CertHasPrivateKey(
+    __in PCCERT_CONTEXT pCertContext,
+    __out_opt DWORD* pdwKeySpec
+    );
+HRESULT DAPI CertInstallSingleCertificate(
+    __in HCERTSTORE hStore,
+    __in PCCERT_CONTEXT pCertContext,
+    __in LPCWSTR wzName
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/conutil.h b/src/libs/dutil/WixToolset.DUtil/inc/conutil.h
new file mode 100644
index 00000000..38aaea84
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/conutil.h
@@ -0,0 +1,80 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define ConsoleExitOnFailureSource(d, x, c, f, ...) if (FAILED(x)) { ConsoleWriteError(x, c, f, __VA_ARGS__); ExitTraceSource(d, x, f, __VA_ARGS__); goto LExit; }
+#define ConsoleExitOnLastErrorSource(d, x, c, f, ...) { x = ::GetLastError(); x = HRESULT_FROM_WIN32(x); if (FAILED(x)) { ConsoleWriteError(x, c, f, __VA_ARGS__); ExitTraceSource(d, x, f, __VA_ARGS__); goto LExit; } }
+#define ConsoleExitOnNullSource(d, p, x, e, c, f, ...) if (NULL == p) { x = e; ConsoleWriteError(x, c, f, __VA_ARGS__); ExitTraceSource(d, x, f, __VA_ARGS__); goto LExit; }
+#define ConsoleExitOnNullWithLastErrorSource(d, p, x, c, f, ...) if (NULL == p) { DWORD Dutil_er = ::GetLastError(); x = HRESULT_FROM_WIN32(Dutil_er); if (!FAILED(x)) { x = E_FAIL; } ConsoleWriteError(x, c, f, __VA_ARGS__); ExitTraceSource(d, x, f, __VA_ARGS__); goto LExit; }
+#define ConsoleExitWithLastErrorSource(d, x, c, f, ...) { DWORD Dutil_er = ::GetLastError(); x = HRESULT_FROM_WIN32(Dutil_er); if (!FAILED(x)) { x = E_FAIL; } ConsoleWriteError(x, c, f, __VA_ARGS__); ExitTraceSource(d, x, f, __VA_ARGS__); goto LExit; }
+#define ConsoleExitOnFailure(x, c, f, ...) ConsoleExitOnFailureSource(DUTIL_SOURCE_DEFAULT, x, c, f, __VA_ARGS__)
+#define ConsoleExitOnLastError(x, c, f, ...) ConsoleExitOnLastErrorSource(DUTIL_SOURCE_DEFAULT, x, c, f, __VA_ARGS__)
+#define ConsoleExitOnNull(p, x, e, c, f, ...) ConsoleExitOnNullSource(DUTIL_SOURCE_DEFAULT, p, x, e, c, f, __VA_ARGS__)
+#define ConsoleExitOnNullWithLastError(p, x, c, f, ...) ConsoleExitOnNullWithLastErrorSource(DUTIL_SOURCE_DEFAULT, p, x, c, f, __VA_ARGS__)
+#define ConsoleExitWithLastError(x, c, f, ...) ConsoleExitWithLastErrorSource(DUTIL_SOURCE_DEFAULT, x, c, f, __VA_ARGS__)
+// enums
+typedef enum CONSOLE_COLOR { CONSOLE_COLOR_NORMAL, CONSOLE_COLOR_RED, CONSOLE_COLOR_YELLOW, CONSOLE_COLOR_GREEN } CONSOLE_COLOR;
+// structs
+// functions
+HRESULT DAPI ConsoleInitialize();
+void DAPI ConsoleUninitialize();
+void DAPI ConsoleGreen();
+void DAPI ConsoleRed();
+void DAPI ConsoleYellow();
+void DAPI ConsoleNormal();
+HRESULT DAPI ConsoleWrite(
+    CONSOLE_COLOR cc,
+    __in_z __format_string LPCSTR szFormat,
+    ...
+    );
+HRESULT DAPI ConsoleWriteLine(
+    CONSOLE_COLOR cc,
+    __in_z __format_string LPCSTR szFormat,
+    ...
+    );
+HRESULT DAPI ConsoleWriteError(
+    HRESULT hrError,
+    CONSOLE_COLOR cc,
+    __in_z __format_string LPCSTR szFormat,
+    ...
+    );
+HRESULT DAPI ConsoleReadW(
+    __deref_out_z LPWSTR* ppwzBuffer
+    );
+HRESULT DAPI ConsoleReadStringA(
+    __deref_inout_ecount_part(cchCharBuffer,*pcchNumCharReturn) LPSTR* szCharBuffer,
+    CONST DWORD cchCharBuffer,
+    __out DWORD* pcchNumCharReturn
+    );
+HRESULT DAPI ConsoleReadStringW(
+    __deref_inout_ecount_part(cchCharBuffer,*pcchNumCharReturn) LPWSTR* szCharBuffer,
+    CONST DWORD cchCharBuffer,
+    __out DWORD* pcchNumCharReturn
+    );
+HRESULT DAPI ConsoleReadNonBlockingW(
+    __deref_out_ecount_opt(*pcchSize) LPWSTR* ppwzBuffer,
+    __out DWORD* pcchSize,
+    BOOL fReadLine
+    );
+HRESULT DAPI ConsoleSetReadHidden(void);
+HRESULT DAPI ConsoleSetReadNormal(void);
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/cryputil.h b/src/libs/dutil/WixToolset.DUtil/inc/cryputil.h
new file mode 100644
index 00000000..02492d8a
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/cryputil.h
@@ -0,0 +1,106 @@
+#pragma once
+// 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.
+#define ReleaseCryptMsg(p) if (p) { ::CryptMsgClose(p); p = NULL; }
+#ifdef __cplusplus
+extern "C" {
+#endif
+// Use CRYPTPROTECTMEMORY_BLOCK_SIZE, because it's larger and thus more restrictive than RTL_ENCRYPT_MEMORY_SIZE.
+#define CRYP_ENCRYPT_MEMORY_SIZE CRYPTPROTECTMEMORY_BLOCK_SIZE
+#define MD5_HASH_LEN 16
+#define SHA1_HASH_LEN 20
+#define SHA256_HASH_LEN 32
+#define SHA512_HASH_LEN 64
+typedef NTSTATUS (APIENTRY *PFN_RTLENCRYPTMEMORY)(
+    __inout PVOID Memory,
+    __in ULONG MemoryLength,
+    __in ULONG OptionFlags
+    );
+typedef NTSTATUS (APIENTRY *PFN_RTLDECRYPTMEMORY)(
+    __inout PVOID Memory,
+    __in ULONG MemoryLength,
+    __in ULONG OptionFlags
+    );
+typedef BOOL (APIENTRY *PFN_CRYPTPROTECTMEMORY)(
+    __inout LPVOID pData,
+    __in DWORD cbData,
+    __in DWORD dwFlags
+    );
+typedef BOOL (APIENTRY *PFN_CRYPTUNPROTECTMEMORY)(
+    __inout LPVOID pData,
+    __in DWORD cbData,
+    __in DWORD dwFlags
+    );
+// function declarations
+HRESULT DAPI CrypInitialize();
+void DAPI CrypUninitialize();
+HRESULT DAPI CrypDecodeObject(
+    __in_z LPCSTR szStructType,
+    __in_ecount(cbData) const BYTE* pbData,
+    __in DWORD cbData,
+    __in DWORD dwFlags,
+    __out LPVOID* ppvObject,
+    __out_opt DWORD* pcbObject
+    );
+HRESULT DAPI CrypMsgGetParam(
+    __in HCRYPTMSG hCryptMsg,
+    __in DWORD dwType,
+    __in DWORD dwIndex,
+    __out LPVOID* ppvData,
+    __out_opt DWORD* pcbData
+    );
+HRESULT DAPI CrypHashFile(
+    __in_z LPCWSTR wzFilePath,
+    __in DWORD dwProvType,
+    __in ALG_ID algid,
+    __out_bcount(cbHash) BYTE* pbHash,
+    __in DWORD cbHash,
+    __out_opt DWORD64* pqwBytesHashed
+    );
+HRESULT DAPI CrypHashFileHandle(
+    __in HANDLE hFile,
+    __in DWORD dwProvType,
+    __in ALG_ID algid,
+    __out_bcount(cbHash) BYTE* pbHash,
+    __in DWORD cbHash,
+    __out_opt DWORD64* pqwBytesHashed
+    );
+HRESULT DAPI CrypHashBuffer(
+    __in_bcount(cbBuffer) const BYTE* pbBuffer,
+    __in SIZE_T cbBuffer,
+    __in DWORD dwProvType,
+    __in ALG_ID algid,
+    __out_bcount(cbHash) BYTE* pbHash,
+    __in DWORD cbHash
+    );
+HRESULT DAPI CrypEncryptMemory(
+    __inout LPVOID pData,
+    __in DWORD cbData,
+    __in DWORD dwFlags
+    );
+HRESULT DAPI CrypDecryptMemory(
+    __inout LPVOID pData,
+    __in DWORD cbData,
+    __in DWORD dwFlags
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/deputil.h b/src/libs/dutil/WixToolset.DUtil/inc/deputil.h
new file mode 100644
index 00000000..bfe235f3
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/deputil.h
@@ -0,0 +1,147 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define ReleaseDependencyArray(rg, c) if (rg) { DepDependencyArrayFree(rg, c); }
+#define ReleaseNullDependencyArray(rg, c) if (rg) { DepDependencyArrayFree(rg, c); rg = NULL; }
+typedef struct _DEPENDENCY
+{
+    LPWSTR sczKey;
+    LPWSTR sczName;
+} DEPENDENCY;
+/***************************************************************************
+ DepGetProviderInformation - gets the various pieces of data registered
+  with a dependency.
+ Note: Returns E_NOTFOUND if the dependency was not found.
+***************************************************************************/
+DAPI_(HRESULT) DepGetProviderInformation(
+    __in HKEY hkHive,
+    __in_z LPCWSTR wzProviderKey,
+    __deref_out_z_opt LPWSTR* psczId,
+    __deref_out_z_opt LPWSTR* psczName,
+    __deref_out_z_opt LPWSTR* psczVersion
+    );
+/***************************************************************************
+ DepCheckDependency - Checks that the dependency is registered and within
+                      the proper version range.
+ Note: Returns E_NOTFOUND if the dependency was not found.
+***************************************************************************/
+DAPI_(HRESULT) DepCheckDependency(
+    __in HKEY hkHive,
+    __in_z LPCWSTR wzProviderKey,
+    __in_z_opt LPCWSTR wzMinVersion,
+    __in_z_opt LPCWSTR wzMaxVersion,
+    __in int iAttributes,
+    __in STRINGDICT_HANDLE sdDependencies,
+    __deref_inout_ecount_opt(*pcDependencies) DEPENDENCY** prgDependencies,
+    __inout LPUINT pcDependencies
+    );
+/***************************************************************************
+ DepCheckDependents - Checks if any dependents are still installed for the
+                      given provider key.
+***************************************************************************/
+DAPI_(HRESULT) DepCheckDependents(
+    __in HKEY hkHive,
+    __in_z LPCWSTR wzProviderKey,
+    __reserved int iAttributes,
+    __in C_STRINGDICT_HANDLE sdIgnoredDependents,
+    __deref_inout_ecount_opt(*pcDependents) DEPENDENCY** prgDependents,
+    __inout LPUINT pcDependents
+    );
+/***************************************************************************
+ DepRegisterDependency - Registers the dependency provider.
+***************************************************************************/
+DAPI_(HRESULT) DepRegisterDependency(
+    __in HKEY hkHive,
+    __in_z LPCWSTR wzProviderKey,
+    __in_z LPCWSTR wzVersion,
+    __in_z LPCWSTR wzDisplayName,
+    __in_z_opt LPCWSTR wzId,
+    __in int iAttributes
+    );
+/***************************************************************************
+ DepDependentExists - Determines if a dependent is registered.
+ Note: Returns S_OK if dependent is registered.
+       Returns E_FILENOTFOUND if dependent is not registered
+***************************************************************************/
+DAPI_(HRESULT) DepDependentExists(
+    __in HKEY hkHive,
+    __in_z LPCWSTR wzDependencyProviderKey,
+    __in_z LPCWSTR wzProviderKey
+    );
+/***************************************************************************
+ DepRegisterDependent - Registers a dependent under the dependency provider.
+***************************************************************************/
+DAPI_(HRESULT) DepRegisterDependent(
+    __in HKEY hkHive,
+    __in_z LPCWSTR wzDependencyProviderKey,
+    __in_z LPCWSTR wzProviderKey,
+    __in_z_opt LPCWSTR wzMinVersion,
+    __in_z_opt LPCWSTR wzMaxVersion,
+    __in int iAttributes
+    );
+/***************************************************************************
+ DepUnregisterDependency - Removes the dependency provider.
+ Note: Caller should call CheckDependents prior to remove a dependency.
+       Returns E_FILENOTFOUND if the dependency is not registered.
+***************************************************************************/
+DAPI_(HRESULT) DepUnregisterDependency(
+    __in HKEY hkHive,
+    __in_z LPCWSTR wzProviderKey
+    );
+/***************************************************************************
+ DepUnregisterDependent - Removes a dependent under the dependency provider.
+ Note: Returns E_FILENOTFOUND if neither the dependency or dependent are
+       registered.
+ ***************************************************************************/
+DAPI_(HRESULT) DepUnregisterDependent(
+    __in HKEY hkHive,
+    __in_z LPCWSTR wzDependencyProviderKey,
+    __in_z LPCWSTR wzProviderKey
+    );
+/***************************************************************************
+ DependencyArrayAlloc - Allocates or expands an array of DEPENDENCY structs.
+***************************************************************************/
+DAPI_(HRESULT) DepDependencyArrayAlloc(
+    __deref_inout_ecount_opt(*pcDependencies) DEPENDENCY** prgDependencies,
+    __inout LPUINT pcDependencies,
+    __in_z LPCWSTR wzKey,
+    __in_z_opt LPCWSTR wzName
+    );
+/***************************************************************************
+ DepDependencyArrayFree - Frees an array of DEPENDENCY structs.
+***************************************************************************/
+DAPI_(void) DepDependencyArrayFree(
+    __in_ecount(cDependencies) DEPENDENCY* rgDependencies,
+    __in UINT cDependencies
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/dictutil.h b/src/libs/dutil/WixToolset.DUtil/inc/dictutil.h
new file mode 100644
index 00000000..f0a3bb5a
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/dictutil.h
@@ -0,0 +1,69 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define ReleaseDict(sdh) if (sdh) { DictDestroy(sdh); }
+#define ReleaseNullDict(sdh) if (sdh) { DictDestroy(sdh); sdh = NULL; }
+typedef void* STRINGDICT_HANDLE;
+typedef const void* C_STRINGDICT_HANDLE;
+extern const int STRINGDICT_HANDLE_BYTES;
+typedef enum DICT_FLAG
+{
+    DICT_FLAG_NONE = 0,
+    DICT_FLAG_CASEINSENSITIVE = 1
+} DICT_FLAG;
+HRESULT DAPI DictCreateWithEmbeddedKey(
+    __out_bcount(STRINGDICT_HANDLE_BYTES) STRINGDICT_HANDLE* psdHandle,
+    __in DWORD dwNumExpectedItems,
+    __in_opt void **ppvArray,
+    __in size_t cByteOffset,
+    __in DICT_FLAG dfFlags
+    );
+HRESULT DAPI DictCreateStringList(
+    __out_bcount(STRINGDICT_HANDLE_BYTES) STRINGDICT_HANDLE* psdHandle,
+    __in DWORD dwNumExpectedItems,
+    __in DICT_FLAG dfFlags
+    );
+HRESULT DAPI DictCreateStringListFromArray(
+    __out_bcount(STRINGDICT_HANDLE_BYTES) STRINGDICT_HANDLE* psdHandle,
+    __in_ecount(cStringArray) const LPCWSTR* rgwzStringArray,
+    __in const DWORD cStringArray,
+    __in DICT_FLAG dfFlags
+    );
+HRESULT DAPI DictCompareStringListToArray(
+    __in_bcount(STRINGDICT_HANDLE_BYTES) STRINGDICT_HANDLE sdStringList,
+    __in_ecount(cStringArray) const LPCWSTR* rgwzStringArray,
+    __in const DWORD cStringArray
+    );
+HRESULT DAPI DictAddKey(
+    __in_bcount(STRINGDICT_HANDLE_BYTES) STRINGDICT_HANDLE sdHandle,
+    __in_z LPCWSTR szString
+    );
+HRESULT DAPI DictAddValue(
+    __in_bcount(STRINGDICT_HANDLE_BYTES) STRINGDICT_HANDLE sdHandle,
+    __in void *pvValue
+    );
+HRESULT DAPI DictKeyExists(
+    __in_bcount(STRINGDICT_HANDLE_BYTES) C_STRINGDICT_HANDLE sdHandle,
+    __in_z LPCWSTR szString
+    );
+HRESULT DAPI DictGetValue(
+    __in_bcount(STRINGDICT_HANDLE_BYTES) C_STRINGDICT_HANDLE sdHandle,
+    __in_z LPCWSTR szString,
+    __out void **ppvValue
+    );
+void DAPI DictDestroy(
+    __in_bcount(STRINGDICT_HANDLE_BYTES) STRINGDICT_HANDLE sdHandle
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/dirutil.h b/src/libs/dutil/WixToolset.DUtil/inc/dirutil.h
new file mode 100644
index 00000000..539b3a73
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/dirutil.h
@@ -0,0 +1,59 @@
+#pragma once
+// 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.
+typedef enum DIR_DELETE
+{
+    DIR_DELETE_FILES = 1,
+    DIR_DELETE_RECURSE = 2,
+    DIR_DELETE_SCHEDULE = 4,
+} DIR_DELETE;
+#ifdef __cplusplus
+extern "C" {
+#endif
+BOOL DAPI DirExists(
+    __in_z LPCWSTR wzPath, 
+    __out_opt DWORD *pdwAttributes
+    );
+HRESULT DAPI DirCreateTempPath(
+    __in_z LPCWSTR wzPrefix,
+    __out_ecount_z(cchPath) LPWSTR wzPath,
+    __in DWORD cchPath
+    );
+HRESULT DAPI DirEnsureExists(
+    __in_z LPCWSTR wzPath, 
+    __in_opt LPSECURITY_ATTRIBUTES psa
+    );
+HRESULT DAPI DirEnsureDelete(
+    __in_z LPCWSTR wzPath,
+    __in BOOL fDeleteFiles,
+    __in BOOL fRecurse
+    );
+HRESULT DAPI DirEnsureDeleteEx(
+    __in_z LPCWSTR wzPath,
+    __in DWORD dwFlags
+    );
+DWORD DAPI DirDeleteEmptyDirectoriesToRoot(
+    __in_z LPCWSTR wzPath,
+    __in DWORD dwFlags
+    );
+HRESULT DAPI DirGetCurrent(
+    __deref_out_z LPWSTR* psczCurrentDirectory
+    );
+HRESULT DAPI DirSetCurrent(
+    __in_z LPCWSTR wzDirectory
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/dlutil.h b/src/libs/dutil/WixToolset.DUtil/inc/dlutil.h
new file mode 100644
index 00000000..3e95103a
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/dlutil.h
@@ -0,0 +1,59 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+typedef HRESULT (WINAPI *LPAUTHENTICATION_ROUTINE)(
+    __in LPVOID pVoid,
+    __in HINTERNET hUrl,
+    __in long lHttpCode,
+    __out BOOL* pfRetrySend,
+    __out BOOL* pfRetry
+    );
+typedef int (WINAPI *LPCANCEL_ROUTINE)(
+    __in HRESULT hrError,
+    __in_z_opt LPCWSTR wzError,
+    __in BOOL fAllowRetry,
+    __in_opt LPVOID pvContext
+    );
+// structs
+typedef struct _DOWNLOAD_SOURCE
+{
+    LPWSTR sczUrl;
+    LPWSTR sczUser;
+    LPWSTR sczPassword;
+} DOWNLOAD_SOURCE;
+typedef struct _DOWNLOAD_CACHE_CALLBACK
+{
+    LPPROGRESS_ROUTINE pfnProgress;
+    LPCANCEL_ROUTINE pfnCancel;
+    LPVOID pv;
+} DOWNLOAD_CACHE_CALLBACK;
+typedef struct _DOWNLOAD_AUTHENTICATION_CALLBACK
+{
+    LPAUTHENTICATION_ROUTINE pfnAuthenticate;
+    LPVOID pv;
+} DOWNLOAD_AUTHENTICATION_CALLBACK;
+// functions
+HRESULT DAPI DownloadUrl(
+    __in DOWNLOAD_SOURCE* pDownloadSource,
+    __in DWORD64 dw64AuthoredDownloadSize,
+    __in LPCWSTR wzDestinationPath,
+    __in_opt DOWNLOAD_CACHE_CALLBACK* pCache,
+    __in_opt DOWNLOAD_AUTHENTICATION_CALLBACK* pAuthenticate
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/dpiutil.h b/src/libs/dutil/WixToolset.DUtil/inc/dpiutil.h
new file mode 100644
index 00000000..b30e2332
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/dpiutil.h
@@ -0,0 +1,120 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+// from WinUser.h
+#ifndef WM_DPICHANGED
+#define WM_DPICHANGED       0x02E0
+#endif
+#ifndef USER_DEFAULT_SCREEN_DPI
+#define USER_DEFAULT_SCREEN_DPI 96
+#endif
+typedef enum DPIU_AWARENESS
+{
+    DPIU_AWARENESS_NONE = 0x0,
+    DPIU_AWARENESS_SYSTEM = 0x1,
+    DPIU_AWARENESS_PERMONITOR = 0x2,
+    DPIU_AWARENESS_PERMONITORV2 = 0x4,
+    DPIU_AWARENESS_GDISCALED = 0x8,
+} DPIU_PROCESS_AWARENESS;
+typedef struct _DPIU_MONITOR_CONTEXT
+{
+    UINT nDpi;
+    MONITORINFOEXW mi;
+} DPIU_MONITOR_CONTEXT;
+typedef struct _DPIU_WINDOW_CONTEXT
+{
+    UINT nDpi;
+} DPIU_WINDOW_CONTEXT;
+typedef BOOL (APIENTRY* PFN_ADJUSTWINDOWRECTEXFORDPI)(
+    __in LPRECT lpRect,
+    __in DWORD dwStyle,
+    __in BOOL bMenu,
+    __in DWORD dwExStyle,
+    __in UINT dpi
+    );
+typedef UINT (APIENTRY *PFN_GETDPIFORWINDOW)(
+    __in HWND hwnd
+    );
+typedef BOOL (APIENTRY* PFN_SETPROCESSDPIAWARE)();
+typedef BOOL (APIENTRY* PFN_SETPROCESSDPIAWARENESSCONTEXT)(
+    __in DPI_AWARENESS_CONTEXT value
+    );
+#ifdef DPI_ENUMS_DECLARED
+typedef HRESULT(APIENTRY* PFN_GETDPIFORMONITOR)(
+    __in HMONITOR hmonitor,
+    __in MONITOR_DPI_TYPE dpiType,
+    __in UINT* dpiX,
+    __in UINT* dpiY
+    );
+typedef HRESULT(APIENTRY* PFN_SETPROCESSDPIAWARENESS)(
+    __in PROCESS_DPI_AWARENESS value
+    );
+#endif
+void DAPI DpiuInitialize();
+void DAPI DpiuUninitialize();
+/********************************************************************
+ DpiuAdjustWindowRect - calculate the required size of the window rectangle,
+                        based on the desired size of the client rectangle
+                        and the provided DPI.
+*******************************************************************/
+void DAPI DpiuAdjustWindowRect(
+    __in RECT* pWindowRect,
+    __in DWORD dwStyle,
+    __in BOOL fMenu,
+    __in DWORD dwExStyle,
+    __in UINT nDpi
+    );
+/********************************************************************
+ DpiuGetMonitorContextFromPoint - get the DPI context of the monitor from the given point.
+*******************************************************************/
+HRESULT DAPI DpiuGetMonitorContextFromPoint(
+    __in const POINT* pt,
+    __out DPIU_MONITOR_CONTEXT** ppMonitorContext
+    );
+/********************************************************************
+ DpiuGetWindowContext - get the DPI context of the given window.
+*******************************************************************/
+void DAPI DpiuGetWindowContext(
+    __in HWND hWnd,
+    __in DPIU_WINDOW_CONTEXT* pWindowContext
+    );
+/********************************************************************
+ DpiuScaleValue - scale the value to the target DPI.
+*******************************************************************/
+int DAPI DpiuScaleValue(
+    __in int nDefaultDpiValue,
+    __in UINT nTargetDpi
+    );
+/********************************************************************
+ DpiuSetProcessDpiAwareness - set the process DPI awareness. The ranking is
+     PERMONITORV2 > PERMONITOR > SYSTEM > GDISCALED > NONE.
+*******************************************************************/
+HRESULT DAPI DpiuSetProcessDpiAwareness(
+    __in DPIU_AWARENESS supportedAwareness,
+    __in_opt DPIU_AWARENESS* pSelectedAwareness
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/dutil.h b/src/libs/dutil/WixToolset.DUtil/inc/dutil.h
new file mode 100644
index 00000000..fc9ec0f4
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/dutil.h
@@ -0,0 +1,190 @@
+#pragma once
+// 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.
+#include "dutilsources.h"
+#define DAPI __stdcall
+#define DAPIV __cdecl // used only for functions taking variable length arguments
+#define DAPI_(type) EXTERN_C type DAPI
+#define DAPIV_(type) EXTERN_C type DAPIV
+// asserts and traces
+typedef BOOL (DAPI *DUTIL_ASSERTDISPLAYFUNCTION)(__in_z LPCSTR sz);
+typedef void (CALLBACK *DUTIL_CALLBACK_TRACEERROR)(
+    __in_z LPCSTR szFile,
+    __in int iLine,
+    __in REPORT_LEVEL rl,
+    __in UINT source,
+    __in HRESULT hrError,
+    __in_z __format_string LPCSTR szFormat,
+    __in va_list args
+    );
+#ifdef __cplusplus
+extern "C" {
+#endif
+/********************************************************************
+ DutilInitialize - initialize dutil.
+*******************************************************************/
+HRESULT DAPI DutilInitialize(
+    __in_opt DUTIL_CALLBACK_TRACEERROR pfnTraceErrorCallback
+    );
+/********************************************************************
+ DutilUninitialize - uninitialize dutil.
+*******************************************************************/
+void DAPI DutilUninitialize();
+void DAPI Dutil_SetAssertModule(__in HMODULE hAssertModule);
+void DAPI Dutil_SetAssertDisplayFunction(__in DUTIL_ASSERTDISPLAYFUNCTION pfn);
+void DAPI Dutil_Assert(__in_z LPCSTR szFile, __in int iLine);
+void DAPI Dutil_AssertSz(__in_z LPCSTR szFile, __in int iLine, __in_z __format_string LPCSTR szMessage);
+void DAPI Dutil_TraceSetLevel(__in REPORT_LEVEL ll, __in BOOL fTraceFilenames);
+REPORT_LEVEL DAPI Dutil_TraceGetLevel();
+void DAPIV Dutil_Trace(__in_z LPCSTR szFile, __in int iLine, __in REPORT_LEVEL rl, __in_z __format_string LPCSTR szMessage, ...);
+void DAPIV Dutil_TraceError(__in_z LPCSTR szFile, __in int iLine, __in REPORT_LEVEL rl, __in HRESULT hr, __in_z __format_string LPCSTR szMessage, ...);
+void DAPIV Dutil_TraceErrorSource(__in_z LPCSTR szFile, __in int iLine, __in REPORT_LEVEL rl, __in UINT source, __in HRESULT hr, __in_z __format_string LPCSTR szMessage, ...);
+void DAPI Dutil_RootFailure(__in_z LPCSTR szFile, __in int iLine, __in HRESULT hrError);
+#ifdef __cplusplus
+}
+#endif
+#ifdef DEBUG
+#define AssertSetModule(m) (void)Dutil_SetAssertModule(m)
+#define AssertSetDisplayFunction(pfn) (void)Dutil_SetAssertDisplayFunction(pfn)
+#define Assert(f)          ((f)    ? (void)0 : (void)Dutil_Assert(__FILE__, __LINE__))
+#define AssertSz(f, sz)    ((f)    ? (void)0 : (void)Dutil_AssertSz(__FILE__, __LINE__, sz))
+#define TraceSetLevel(l, f) (void)Dutil_TraceSetLevel(l, f)
+#define TraceGetLevel() (REPORT_LEVEL)Dutil_TraceGetLevel()
+#define Trace(l, f, ...) (void)Dutil_Trace(__FILE__, __LINE__, l, f, __VA_ARGS__)
+#define TraceError(x, f, ...) (void)Dutil_TraceError(__FILE__, __LINE__, REPORT_ERROR, x, f, __VA_ARGS__)
+#define TraceErrorDebug(x, f, ...) (void)Dutil_TraceError(__FILE__, __LINE__, REPORT_DEBUG, x, f, __VA_ARGS__)
+#else // !DEBUG
+#define AssertSetModule(m)
+#define AssertSetDisplayFunction(pfn)
+#define Assert(f)
+#define AssertSz(f, sz)
+#define TraceSetLevel(l, f)
+#define Trace(l, f, ...)
+#define TraceError(x, f, ...)
+#define TraceErrorDebug(x, f, ...)
+#endif // DEBUG
+// DUTIL_SOURCE_DEFAULT can be overriden
+#ifndef DUTIL_SOURCE_DEFAULT
+#define DUTIL_SOURCE_DEFAULT DUTIL_SOURCE_UNKNOWN
+#endif
+// Exit macros
+#define ExitFunction() { goto LExit; }
+#define ExitFunction1(x) { x; goto LExit; }
+#define ExitFunctionWithLastError(x) { x = HRESULT_FROM_WIN32(::GetLastError()); goto LExit; }
+#define ExitTraceSource(d, x, s, ...) { TraceError(x, s, __VA_ARGS__); (void)Dutil_TraceErrorSource(__FILE__, __LINE__, REPORT_ERROR, d, x, s, __VA_ARGS__); }
+#define ExitTraceDebugSource(d, x, s, ...) { TraceErrorDebug(x, s, __VA_ARGS__); (void)Dutil_TraceErrorSource(__FILE__, __LINE__, REPORT_DEBUG, d, x, s, __VA_ARGS__); }
+#define ExitOnLastErrorSource(d, x, s, ...) { DWORD Dutil_er = ::GetLastError(); x = HRESULT_FROM_WIN32(Dutil_er); if (FAILED(x)) { Dutil_RootFailure(__FILE__, __LINE__, x); ExitTraceSource(d, x, s, __VA_ARGS__); goto LExit; } }
+#define ExitOnLastErrorDebugTraceSource(d, x, s, ...) { DWORD Dutil_er = ::GetLastError(); x = HRESULT_FROM_WIN32(Dutil_er); if (FAILED(x)) { Dutil_RootFailure(__FILE__, __LINE__, x); ExitTraceDebugSource(d, x, s, __VA_ARGS__); goto LExit; } }
+#define ExitWithLastErrorSource(d, x, s, ...) { DWORD Dutil_er = ::GetLastError(); x = HRESULT_FROM_WIN32(Dutil_er); if (!FAILED(x)) { x = E_FAIL; } Dutil_RootFailure(__FILE__, __LINE__, x); ExitTraceSource(d, x, s, __VA_ARGS__); goto LExit; }
+#define ExitOnFailureSource(d, x, s, ...) if (FAILED(x)) { ExitTraceSource(d, x, s, __VA_ARGS__);  goto LExit; }
+#define ExitOnRootFailureSource(d, x, s, ...) if (FAILED(x)) { Dutil_RootFailure(__FILE__, __LINE__, x); ExitTraceSource(d, x, s, __VA_ARGS__);  goto LExit; }
+#define ExitOnFailureDebugTraceSource(d, x, s, ...) if (FAILED(x)) { ExitTraceDebugSource(d, x, s, __VA_ARGS__);  goto LExit; }
+#define ExitOnNullSource(d, p, x, e, s, ...) if (NULL == p) { x = e; Dutil_RootFailure(__FILE__, __LINE__, x); ExitTraceSource(d, x, s, __VA_ARGS__);  goto LExit; }
+#define ExitOnNullWithLastErrorSource(d, p, x, s, ...) if (NULL == p) { DWORD Dutil_er = ::GetLastError(); x = HRESULT_FROM_WIN32(Dutil_er); if (!FAILED(x)) { x = E_FAIL; } Dutil_RootFailure(__FILE__, __LINE__, x); ExitTraceSource(d, x, s, __VA_ARGS__); goto LExit; }
+#define ExitOnNullDebugTraceSource(d, p, x, e, s, ...) if (NULL == p) { x = e; Dutil_RootFailure(__FILE__, __LINE__, x); ExitTraceDebugSource(d, x, s, __VA_ARGS__);  goto LExit; }
+#define ExitOnInvalidHandleWithLastErrorSource(d, p, x, s, ...) if (INVALID_HANDLE_VALUE == p) { DWORD Dutil_er = ::GetLastError(); x = HRESULT_FROM_WIN32(Dutil_er); if (!FAILED(x)) { x = E_FAIL; } Dutil_RootFailure(__FILE__, __LINE__, x); ExitTraceSource(d, x, s, __VA_ARGS__); goto LExit; }
+#define ExitOnWin32ErrorSource(d, e, x, s, ...) if (ERROR_SUCCESS != e) { x = HRESULT_FROM_WIN32(e); if (!FAILED(x)) { x = E_FAIL; } Dutil_RootFailure(__FILE__, __LINE__, x); ExitTraceSource(d, x, s, __VA_ARGS__); goto LExit; }
+#define ExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_DEFAULT, x, s, __VA_ARGS__)
+#define ExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_DEFAULT, x, s, __VA_ARGS__)
+#define ExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_DEFAULT, x, s, __VA_ARGS__)
+#define ExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_DEFAULT, x, s, __VA_ARGS__)
+#define ExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_DEFAULT, x, s, __VA_ARGS__)
+#define ExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_DEFAULT, x, s, __VA_ARGS__)
+#define ExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_DEFAULT, p, x, e, s, __VA_ARGS__)
+#define ExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_DEFAULT, p, x, s, __VA_ARGS__)
+#define ExitOnNullDebugTrace(p, x, e, s, ...) ExitOnNullDebugTraceSource(DUTIL_SOURCE_DEFAULT, p, x, e, s, __VA_ARGS__)
+#define ExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_DEFAULT, p, x, s, __VA_ARGS__)
+#define ExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_DEFAULT, e, x, s, __VA_ARGS__)
+// release macros
+#define ReleaseObject(x) if (x) { x->Release(); }
+#define ReleaseObjectArray(prg, cel) if (prg) { for (DWORD Dutil_ReleaseObjectArrayIndex = 0; Dutil_ReleaseObjectArrayIndex < cel; ++Dutil_ReleaseObjectArrayIndex) { ReleaseObject(prg[Dutil_ReleaseObjectArrayIndex]); } ReleaseMem(prg); }
+#define ReleaseVariant(x) { ::VariantClear(&x); }
+#define ReleaseNullObject(x) if (x) { (x)->Release(); x = NULL; }
+#define ReleaseCertificate(x) if (x) { ::CertFreeCertificateContext(x); x=NULL; }
+#define ReleaseHandle(x) if (x) { ::CloseHandle(x); x = NULL; }
+// useful defines and macros
+#define Unused(x) ((void)x)
+#ifndef countof
+#if 1
+#define countof(ary) (sizeof(ary) / sizeof(ary[0]))
+#else
+#ifndef __cplusplus
+#define countof(ary) (sizeof(ary) / sizeof(ary[0]))
+#else
+template<typename T> static char countofVerify(void const *, T) throw() { return 0; }
+template<typename T> static void countofVerify(T *const, T *const *) throw() {};
+#define countof(arr) (sizeof(countofVerify(arr,&(arr))) * sizeof(arr)/sizeof(*(arr)))
+#endif
+#endif
+#endif
+#define roundup(x, n) roundup_typed(x, n, DWORD)
+#define roundup_typed(x, n, t) (((t)(x) + ((t)(n) - 1)) & ~((t)(n) - 1))
+#define HRESULT_FROM_RPC(x) ((HRESULT) ((x) | FACILITY_RPC))
+#ifndef MAXSIZE_T
+#define MAXSIZE_T ((SIZE_T)~((SIZE_T)0))
+#endif
+typedef const BYTE* LPCBYTE;
+#define E_FILENOTFOUND HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)
+#define E_PATHNOTFOUND HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND)
+#define E_INVALIDDATA HRESULT_FROM_WIN32(ERROR_INVALID_DATA)
+#define E_INVALIDSTATE HRESULT_FROM_WIN32(ERROR_INVALID_STATE)
+#define E_INSUFFICIENT_BUFFER HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)
+#define E_MOREDATA HRESULT_FROM_WIN32(ERROR_MORE_DATA)
+#define E_NOMOREITEMS HRESULT_FROM_WIN32(ERROR_NO_MORE_ITEMS)
+#define E_NOTFOUND HRESULT_FROM_WIN32(ERROR_NOT_FOUND)
+#define E_MODNOTFOUND HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)
+#define E_BADCONFIGURATION HRESULT_FROM_WIN32(ERROR_BAD_CONFIGURATION)
+#define AddRefAndRelease(x) { x->AddRef(); x->Release(); }
+#define MAKEDWORD(lo, hi) ((DWORD)MAKELONG(lo, hi))
+#define MAKEQWORDVERSION(mj, mi, b, r) (((DWORD64)MAKELONG(r, b)) | (((DWORD64)MAKELONG(mi, mj)) << 32))
+#ifdef __cplusplus
+extern "C" {
+#endif
+// other functions
+HRESULT DAPI LoadSystemLibrary(__in_z LPCWSTR wzModuleName, __out HMODULE *phModule);
+HRESULT DAPI LoadSystemLibraryWithPath(__in_z LPCWSTR wzModuleName, __out HMODULE *phModule, __deref_out_z_opt LPWSTR* psczPath);
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/dutilsources.h b/src/libs/dutil/WixToolset.DUtil/inc/dutilsources.h
new file mode 100644
index 00000000..7d512cb3
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/dutilsources.h
@@ -0,0 +1,76 @@
+#pragma once
+// 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.
+typedef enum DUTIL_SOURCE
+{
+    DUTIL_SOURCE_UNKNOWN,
+    DUTIL_SOURCE_ACLUTIL,
+    DUTIL_SOURCE_APPUTIL,
+    DUTIL_SOURCE_APUPUTIL,
+    DUTIL_SOURCE_ATOMUTIL,
+    DUTIL_SOURCE_BUFFUTIL,
+    DUTIL_SOURCE_BUTIL,
+    DUTIL_SOURCE_CABCUTIL,
+    DUTIL_SOURCE_CABUTIL,
+    DUTIL_SOURCE_CERTUTIL,
+    DUTIL_SOURCE_CONUTIL,
+    DUTIL_SOURCE_CRYPUTIL,
+    DUTIL_SOURCE_DEPUTIL,
+    DUTIL_SOURCE_DICTUTIL,
+    DUTIL_SOURCE_DIRUTIL,
+    DUTIL_SOURCE_DLUTIL,
+    DUTIL_SOURCE_DPIUTIL,
+    DUTIL_SOURCE_DUTIL,
+    DUTIL_SOURCE_ESEUTIL,
+    DUTIL_SOURCE_FILEUTIL,
+    DUTIL_SOURCE_GDIPUTIL,
+    DUTIL_SOURCE_GUIDUTIL,
+    DUTIL_SOURCE_IIS7UTIL,
+    DUTIL_SOURCE_INETUTIL,
+    DUTIL_SOURCE_INIUTIL,
+    DUTIL_SOURCE_JSONUTIL,
+    DUTIL_SOURCE_LOCUTIL,
+    DUTIL_SOURCE_LOGUTIL,
+    DUTIL_SOURCE_MEMUTIL,
+    DUTIL_SOURCE_METAUTIL,
+    DUTIL_SOURCE_MONUTIL,
+    DUTIL_SOURCE_OSUTIL,
+    DUTIL_SOURCE_PATHUTIL,
+    DUTIL_SOURCE_PERFUTIL,
+    DUTIL_SOURCE_POLCUTIL,
+    DUTIL_SOURCE_PROCUTIL,
+    DUTIL_SOURCE_REGUTIL,
+    DUTIL_SOURCE_RESRUTIL,
+    DUTIL_SOURCE_RESWUTIL,
+    DUTIL_SOURCE_REXUTIL,
+    DUTIL_SOURCE_RMUTIL,
+    DUTIL_SOURCE_RSSUTIL,
+    DUTIL_SOURCE_SCEUTIL,
+    DUTIL_SOURCE_SCZUTIL,
+    DUTIL_SOURCE_SHELUTIL,
+    DUTIL_SOURCE_SQLUTIL,
+    DUTIL_SOURCE_SRPUTIL,
+    DUTIL_SOURCE_STRUTIL,
+    DUTIL_SOURCE_SVCUTIL,
+    DUTIL_SOURCE_THMUTIL,
+    DUTIL_SOURCE_TIMEUTIL,
+    DUTIL_SOURCE_UNCUTIL,
+    DUTIL_SOURCE_URIUTIL,
+    DUTIL_SOURCE_USERUTIL,
+    DUTIL_SOURCE_WIUTIL,
+    DUTIL_SOURCE_WUAUTIL,
+    DUTIL_SOURCE_XMLUTIL,
+    DUTIL_SOURCE_VERUTIL,
+    DUTIL_SOURCE_EXTERNAL = 256,
+} DUTIL_SOURCE;
+typedef enum REPORT_LEVEL
+{
+    REPORT_NONE,      // turns off report (only valid for XXXSetLevel())
+    REPORT_WARNING,   // written if want only warnings or reporting is on in general
+    REPORT_STANDARD,  // written if reporting is on
+    REPORT_VERBOSE,   // written only if verbose reporting is on
+    REPORT_DEBUG,     // reporting useful when debugging code
+    REPORT_ERROR,     // always gets reported, but can never be specified
+} REPORT_LEVEL;
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/eseutil.h b/src/libs/dutil/WixToolset.DUtil/inc/eseutil.h
new file mode 100644
index 00000000..bea47b2b
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/eseutil.h
@@ -0,0 +1,223 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define ReleaseEseQuery(pqh) if (pqh) { EseFinishQuery(pqh); }
+#define ReleaseNullEseQuery(pqh) if (pqh) { EseFinishQuery(pqh); pqh = NULL; }
+struct ESE_COLUMN_SCHEMA
+{
+    JET_COLUMNID jcColumn;
+    LPCWSTR pszName;
+    JET_COLTYP jcColumnType;
+    BOOL fKey; // If this column is part of the key of the table
+    BOOL fFixed;
+    BOOL fNullable;
+    BOOL fAutoIncrement;
+};
+struct ESE_TABLE_SCHEMA
+{
+    JET_TABLEID jtTable;
+    LPCWSTR pszName;
+    DWORD dwColumns;
+    ESE_COLUMN_SCHEMA *pcsColumns;
+};
+struct ESE_DATABASE_SCHEMA
+{
+    DWORD dwTables;
+    ESE_TABLE_SCHEMA *ptsTables;
+};
+typedef enum ESE_QUERY_TYPE
+{
+    ESE_QUERY_EXACT,
+    ESE_QUERY_FROM_TOP,
+    ESE_QUERY_FROM_BOTTOM
+} ESE_QUERY_TYPE;
+typedef void* ESE_QUERY_HANDLE;
+HRESULT DAPI EseBeginSession(
+    __out JET_INSTANCE *pjiInstance,
+    __out JET_SESID *pjsSession,
+    __in_z LPCWSTR pszInstance,
+    __in_z LPCWSTR pszPath
+    );
+HRESULT DAPI EseEndSession(
+    __in JET_INSTANCE jiInstance,
+    __in JET_SESID jsSession
+    );
+HRESULT DAPI EseEnsureDatabase(
+    __in JET_SESID jsSession,
+    __in_z LPCWSTR pszFile,
+    __in ESE_DATABASE_SCHEMA *pdsSchema,
+    __out JET_DBID* pjdbDb,
+    __in BOOL fExclusive,
+    __in BOOL fReadonly
+    );
+HRESULT DAPI EseCloseDatabase(
+    __in JET_SESID jsSession,
+    __in JET_DBID jdbDb
+    );
+HRESULT DAPI EseCreateTable(
+    __in JET_SESID jsSession,
+    __in JET_DBID jdbDb,
+    __in_z LPCWSTR pszTable,
+    __out JET_TABLEID *pjtTable
+    );
+HRESULT DAPI EseOpenTable(
+    __in JET_SESID jsSession,
+    __in JET_DBID jdbDb,
+    __in_z LPCWSTR pszTable,
+    __out JET_TABLEID *pjtTable
+    );
+HRESULT DAPI EseCloseTable(
+    __in JET_SESID jsSession,
+    __in JET_TABLEID jtTable
+    );
+HRESULT DAPI EseEnsureColumn(
+    __in JET_SESID jsSession,
+    __in JET_TABLEID jtTable,
+    __in_z LPCWSTR pszColumnName,
+    __in JET_COLTYP jcColumnType,
+    __in ULONG ulColumnSize,
+    __in BOOL fFixed,
+    __in BOOL fNullable,
+    __out_opt JET_COLUMNID *pjcColumn
+    );
+HRESULT DAPI EseGetColumn(
+    __in JET_SESID jsSession,
+    __in JET_TABLEID jtTable,
+    __in_z LPCWSTR pszColumnName,
+    __out JET_COLUMNID *pjcColumn
+    );
+HRESULT DAPI EseMoveCursor(
+    __in JET_SESID jsSession,
+    __in JET_TABLEID jtTable,
+    __in LONG lRow
+    );
+HRESULT DAPI EseDeleteRow(
+    __in JET_SESID jsSession,
+    __in JET_TABLEID jtTable
+    );
+HRESULT DAPI EseBeginTransaction(
+    __in JET_SESID jsSession
+    );
+HRESULT DAPI EseRollbackTransaction(
+    __in JET_SESID jsSession,
+    __in BOOL fAll
+    );
+HRESULT DAPI EseCommitTransaction(
+    __in JET_SESID jsSession
+    );
+HRESULT DAPI EsePrepareUpdate(
+    __in JET_SESID jsSession,
+    __in JET_TABLEID jtTable,
+    __in ULONG ulPrep
+    );
+HRESULT DAPI EseFinishUpdate(
+    __in JET_SESID jsSession,
+    __in JET_TABLEID jtTable,
+    __in BOOL fSeekToInsertedRecord
+    );
+HRESULT DAPI EseSetColumnBinary(
+    __in JET_SESID jsSession,
+    __in ESE_TABLE_SCHEMA tsTable,
+    __in DWORD dwColumn,
+    __in_bcount(cbBuffer) const BYTE* pbBuffer,
+    __in SIZE_T cbBuffer
+    );
+HRESULT DAPI EseSetColumnDword(
+    __in JET_SESID jsSession,
+    __in ESE_TABLE_SCHEMA tsTable,
+    __in DWORD dwColumn,
+    __in DWORD dwValue
+    );
+HRESULT DAPI EseSetColumnBool(
+    __in JET_SESID jsSession,
+    __in ESE_TABLE_SCHEMA tsTable,
+    __in DWORD dwColumn,
+    __in BOOL fValue
+    );
+HRESULT DAPI EseSetColumnString(
+    __in JET_SESID jsSession,
+    __in ESE_TABLE_SCHEMA tsTable,
+    __in DWORD dwColumn,
+    __in_z LPCWSTR pszValue
+    );
+HRESULT DAPI EseSetColumnEmpty(
+    __in JET_SESID jsSession,
+    __in ESE_TABLE_SCHEMA tsTable,
+    __in DWORD dwColumn
+    );
+HRESULT DAPI EseGetColumnBinary(
+    __in JET_SESID jsSession,
+    __in ESE_TABLE_SCHEMA tsTable,
+    __in DWORD dwColumn,
+    __deref_inout_bcount(*piBuffer) BYTE** ppbBuffer,
+    __inout SIZE_T* piBuffer
+    );
+HRESULT DAPI EseGetColumnDword(
+    __in JET_SESID jsSession,
+    __in ESE_TABLE_SCHEMA tsTable,
+    __in DWORD dwColumn,
+    __out DWORD *pdwValue
+    );
+HRESULT DAPI EseGetColumnBool(
+    __in JET_SESID jsSession,
+    __in ESE_TABLE_SCHEMA tsTable,
+    __in DWORD dwColumn,
+    __out BOOL *pfValue
+    );
+HRESULT DAPI EseGetColumnString(
+    __in JET_SESID jsSession,
+    __in ESE_TABLE_SCHEMA tsTable,
+    __in DWORD dwColumn,
+    __out LPWSTR *ppszValue
+    );
+// Call this once for each key column in the table
+HRESULT DAPI EseBeginQuery(
+    __in JET_SESID jsSession,
+    __in JET_TABLEID jtTable,
+    __in ESE_QUERY_TYPE qtQueryType,
+    __out ESE_QUERY_HANDLE *peqhHandle
+    );
+HRESULT DAPI EseSetQueryColumnBinary(
+    __in ESE_QUERY_HANDLE eqhHandle,
+    __in_bcount(cbBuffer) const BYTE* pbBuffer,
+    __in SIZE_T cbBuffer,
+    __in BOOL fFinal // If this is true, all other key columns in the query will be set to "*"
+    );
+HRESULT DAPI EseSetQueryColumnDword(
+    __in ESE_QUERY_HANDLE eqhHandle,
+    __in DWORD dwData,
+    __in BOOL fFinal // If this is true, all other key columns in the query will be set to "*"
+    );
+HRESULT DAPI EseSetQueryColumnBool(
+    __in ESE_QUERY_HANDLE eqhHandle,
+    __in BOOL fValue,
+    __in BOOL fFinal // If this is true, all other key columns in the query will be set to "*"
+    );
+HRESULT DAPI EseSetQueryColumnString(
+    __in ESE_QUERY_HANDLE eqhHandle,
+    __in_z LPCWSTR pszString,
+    __in BOOL fFinal // If this is true, all other key columns in the query will be set to "*"
+    );
+HRESULT DAPI EseFinishQuery(
+    __in ESE_QUERY_HANDLE eqhHandle
+    );
+// Once all columns have been set up, call this and read the result
+HRESULT DAPI EseRunQuery(
+    __in ESE_QUERY_HANDLE eqhHandle
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/fileutil.h b/src/libs/dutil/WixToolset.DUtil/inc/fileutil.h
new file mode 100644
index 00000000..d3e326f7
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/fileutil.h
@@ -0,0 +1,247 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define ReleaseFile(h) if (INVALID_HANDLE_VALUE != h) { ::CloseHandle(h); h = INVALID_HANDLE_VALUE; }
+#define ReleaseFileHandle(h) if (INVALID_HANDLE_VALUE != h) { ::CloseHandle(h); h = INVALID_HANDLE_VALUE; }
+#define ReleaseFileFindHandle(h) if (INVALID_HANDLE_VALUE != h) { ::FindClose(h); h = INVALID_HANDLE_VALUE; }
+#define FILEMAKEVERSION(major, minor, build, revision) static_cast<DWORD64>((static_cast<DWORD64>(major & 0xFFFF) << 48) \
+                                                                          | (static_cast<DWORD64>(minor & 0xFFFF) << 32) \
+                                                                          | (static_cast<DWORD64>(build & 0xFFFF) << 16) \
+                                                                          | (static_cast<DWORD64>(revision & 0xFFFF)))
+typedef enum FILE_ARCHITECTURE
+{
+    FILE_ARCHITECTURE_UNKNOWN,
+    FILE_ARCHITECTURE_X86,
+    FILE_ARCHITECTURE_X64,
+    FILE_ARCHITECTURE_IA64,
+} FILE_ARCHITECTURE;
+typedef enum FILE_ENCODING
+{
+    FILE_ENCODING_UNSPECIFIED = 0,
+    // TODO: distinguish between non-BOM utf-8 and ANSI in the future?
+    FILE_ENCODING_UTF8,
+    FILE_ENCODING_UTF8_WITH_BOM,
+    FILE_ENCODING_UTF16,
+    FILE_ENCODING_UTF16_WITH_BOM,
+} FILE_ENCODING;
+LPWSTR DAPI FileFromPath(
+    __in_z LPCWSTR wzPath
+    );
+HRESULT DAPI FileResolvePath(
+    __in_z LPCWSTR wzRelativePath,
+    __out LPWSTR *ppwzFullPath
+    );
+HRESULT DAPI FileStripExtension(
+    __in_z LPCWSTR wzFileName,
+    __out LPWSTR *ppwzFileNameNoExtension
+    );
+HRESULT DAPI FileChangeExtension(
+    __in_z LPCWSTR wzFileName,
+    __in_z LPCWSTR wzNewExtension,
+    __out LPWSTR *ppwzFileNameNewExtension
+    );
+HRESULT DAPI FileAddSuffixToBaseName(
+    __in_z LPCWSTR wzFileName,
+    __in_z LPCWSTR wzSuffix,
+    __out_z LPWSTR* psczNewFileName
+    );
+HRESULT DAPI FileVersionFromString(
+    __in_z LPCWSTR wzVersion, 
+    __out DWORD *pdwVerMajor, 
+    __out DWORD* pdwVerMinor
+    );
+HRESULT DAPI FileVersionFromStringEx(
+    __in_z LPCWSTR wzVersion,
+    __in SIZE_T cchVersion,
+    __out DWORD64* pqwVersion
+    );
+HRESULT DAPI FileVersionToStringEx(
+    __in DWORD64 qwVersion,
+    __out LPWSTR* psczVersion
+    );
+HRESULT DAPI FileSetPointer(
+    __in HANDLE hFile,
+    __in DWORD64 dw64Move,
+    __out_opt DWORD64* pdw64NewPosition,
+    __in DWORD dwMoveMethod
+    );
+HRESULT DAPI FileSize(
+    __in_z LPCWSTR pwzFileName,
+    __out LONGLONG* pllSize
+    );
+HRESULT DAPI FileSizeByHandle(
+    __in HANDLE hFile, 
+    __out LONGLONG* pllSize
+    );
+BOOL DAPI FileExistsEx(
+    __in_z LPCWSTR wzPath, 
+    __out_opt DWORD *pdwAttributes
+    );
+BOOL DAPI FileExistsAfterRestart(
+    __in_z LPCWSTR wzPath,
+    __out_opt DWORD *pdwAttributes
+    );
+HRESULT DAPI FileRemoveFromPendingRename(
+    __in_z LPCWSTR wzPath
+    );
+HRESULT DAPI FileRead(
+    __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest,
+    __out SIZE_T* pcbDest,
+    __in_z LPCWSTR wzSrcPath
+    );
+HRESULT DAPI FileReadEx(
+    __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest,
+    __out SIZE_T* pcbDest,
+    __in_z LPCWSTR wzSrcPath,
+    __in DWORD dwShareMode
+    );
+HRESULT DAPI FileReadUntil(
+    __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest,
+    __out_range(<=, cbMaxRead) SIZE_T* pcbDest,
+    __in_z LPCWSTR wzSrcPath,
+    __in DWORD cbMaxRead
+    );
+HRESULT DAPI FileReadPartial(
+    __deref_out_bcount_full(*pcbDest) LPBYTE* ppbDest,
+    __out_range(<=, cbMaxRead) SIZE_T* pcbDest,
+    __in_z LPCWSTR wzSrcPath,
+    __in BOOL fSeek,
+    __in DWORD cbStartPosition,
+    __in DWORD cbMaxRead,
+    __in BOOL fPartialOK
+    );
+HRESULT DAPI FileReadPartialEx(
+    __deref_inout_bcount_full(*pcbDest) LPBYTE* ppbDest,
+    __out_range(<=, cbMaxRead) SIZE_T* pcbDest,
+    __in_z LPCWSTR wzSrcPath,
+    __in BOOL fSeek,
+    __in DWORD cbStartPosition,
+    __in DWORD cbMaxRead,
+    __in BOOL fPartialOK,
+    __in DWORD dwShareMode
+    );
+HRESULT DAPI FileReadHandle(
+    __in HANDLE hFile,
+    __in_bcount(cbDest) LPBYTE pbDest,
+    __in SIZE_T cbDest
+    );
+HRESULT DAPI FileWrite(
+    __in_z LPCWSTR pwzFileName,
+    __in DWORD dwFlagsAndAttributes,
+    __in_bcount_opt(cbData) LPCBYTE pbData,
+    __in SIZE_T cbData,
+    __out_opt HANDLE* pHandle
+    );
+HRESULT DAPI FileWriteHandle(
+    __in HANDLE hFile,
+    __in_bcount_opt(cbData) LPCBYTE pbData,
+    __in SIZE_T cbData
+    );
+HRESULT DAPI FileCopyUsingHandles(
+    __in HANDLE hSource,
+    __in HANDLE hTarget,
+    __in DWORD64 cbCopy,
+    __out_opt DWORD64* pcbCopied
+    );
+HRESULT DAPI FileCopyUsingHandlesWithProgress(
+    __in HANDLE hSource,
+    __in HANDLE hTarget,
+    __in DWORD64 cbCopy,
+    __in_opt LPPROGRESS_ROUTINE lpProgressRoutine,
+    __in_opt LPVOID lpData
+    );
+HRESULT DAPI FileEnsureCopy(
+    __in_z LPCWSTR wzSource,
+    __in_z LPCWSTR wzTarget,
+    __in BOOL fOverwrite
+    );
+HRESULT DAPI FileEnsureCopyWithRetry(
+    __in LPCWSTR wzSource,
+    __in LPCWSTR wzTarget,
+    __in BOOL fOverwrite,
+    __in DWORD cRetry,
+    __in DWORD dwWaitMilliseconds
+    );
+HRESULT DAPI FileEnsureMove(
+    __in_z LPCWSTR wzSource, 
+    __in_z LPCWSTR wzTarget, 
+    __in BOOL fOverwrite,
+    __in BOOL fAllowCopy
+    );
+HRESULT DAPI FileEnsureMoveWithRetry(
+    __in LPCWSTR wzSource,
+    __in LPCWSTR wzTarget,
+    __in BOOL fOverwrite,
+    __in BOOL fAllowCopy,
+    __in DWORD cRetry,
+    __in DWORD dwWaitMilliseconds
+    );
+HRESULT DAPI FileCreateTemp(
+    __in_z LPCWSTR wzPrefix,
+    __in_z LPCWSTR wzExtension,
+    __deref_opt_out_z LPWSTR* ppwzTempFile,
+    __out_opt HANDLE* phTempFile
+    );
+HRESULT DAPI FileCreateTempW(
+    __in_z LPCWSTR wzPrefix,
+    __in_z LPCWSTR wzExtension,
+    __deref_opt_out_z LPWSTR* ppwzTempFile,
+    __out_opt HANDLE* phTempFile
+    );
+HRESULT DAPI FileVersion(
+    __in_z LPCWSTR wzFilename, 
+    __out DWORD *pdwVerMajor, 
+    __out DWORD* pdwVerMinor
+    );
+HRESULT DAPI FileIsSame(
+    __in_z LPCWSTR wzFile1,
+    __in_z LPCWSTR wzFile2,
+    __out LPBOOL lpfSameFile
+    );
+HRESULT DAPI FileEnsureDelete(
+    __in_z LPCWSTR wzFile
+    );
+HRESULT DAPI FileGetTime(
+    __in_z LPCWSTR wzFile,  
+    __out_opt  LPFILETIME lpCreationTime,
+    __out_opt  LPFILETIME lpLastAccessTime,
+    __out_opt  LPFILETIME lpLastWriteTime
+    );
+HRESULT DAPI FileSetTime(
+    __in_z LPCWSTR wzFile,
+    __in_opt  const FILETIME *lpCreationTime,
+    __in_opt  const FILETIME *lpLastAccessTime,
+    __in_opt  const FILETIME *lpLastWriteTime
+    );
+HRESULT DAPI FileResetTime(
+    __in_z LPCWSTR wzFile
+    );
+HRESULT DAPI FileExecutableArchitecture(
+    __in_z LPCWSTR wzFile,
+    __out FILE_ARCHITECTURE *pArchitecture
+    );
+HRESULT DAPI FileToString(
+    __in_z LPCWSTR wzFile,
+    __out LPWSTR *psczString,
+    __out_opt FILE_ENCODING *pfeEncoding
+    );
+HRESULT DAPI FileFromString(
+    __in_z LPCWSTR wzFile,
+    __in DWORD dwFlagsAndAttributes,
+    __in_z LPCWSTR sczString,
+    __in FILE_ENCODING feEncoding
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/gdiputil.h b/src/libs/dutil/WixToolset.DUtil/inc/gdiputil.h
new file mode 100644
index 00000000..f2145828
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/gdiputil.h
@@ -0,0 +1,39 @@
+#pragma once
+// 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.
+#define ExitOnGdipFailureSource(d, g, x, s, ...) { x = GdipHresultFromStatus(g); if (FAILED(x)) { Dutil_RootFailure(__FILE__, __LINE__, x); ExitTraceSource(d, x, s, __VA_ARGS__); goto LExit; } }
+#define ExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_DEFAULT, g, x, s, __VA_ARGS__)
+#ifdef __cplusplus
+extern "C" {
+#endif
+HRESULT DAPI GdipInitialize(
+    __in const Gdiplus::GdiplusStartupInput* pInput,
+    __out ULONG_PTR* pToken,
+    __out_opt Gdiplus::GdiplusStartupOutput *pOutput
+    );
+void DAPI GdipUninitialize(
+    __in ULONG_PTR token
+    );
+HRESULT DAPI GdipBitmapFromResource(
+    __in_opt HINSTANCE hinst,
+    __in_z LPCSTR szId,
+    __out Gdiplus::Bitmap **ppBitmap
+    );
+HRESULT DAPI GdipBitmapFromFile(
+    __in_z LPCWSTR wzFileName,
+    __out Gdiplus::Bitmap **ppBitmap
+    );
+HRESULT DAPI GdipHresultFromStatus(
+    __in Gdiplus::Status gs
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/guidutil.h b/src/libs/dutil/WixToolset.DUtil/inc/guidutil.h
new file mode 100644
index 00000000..478a464f
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/guidutil.h
@@ -0,0 +1,21 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define GUID_STRING_LENGTH 39
+HRESULT DAPI GuidFixedCreate(
+    _Out_z_cap_c_(GUID_STRING_LENGTH) WCHAR* wzGuid
+    );
+HRESULT DAPI GuidCreate(
+    __deref_out_z LPWSTR* psczGuid
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/iis7util.h b/src/libs/dutil/WixToolset.DUtil/inc/iis7util.h
new file mode 100644
index 00000000..3572b4e9
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/iis7util.h
@@ -0,0 +1,222 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+// IIS Config schema names
+#define IIS_CONFIG_ADD                      L"add"
+#define IIS_CONFIG_ALLOWED                  L"allowed"
+#define IIS_CONFIG_APPHOST_ROOT             L"MACHINE/WEBROOT/APPHOST"
+#define IIS_CONFIG_APPLICATION              L"application"
+#define IIS_CONFIG_APPPOOL                  L"applicationPool"
+#define IIS_CONFIG_APPPOOL_AUTO             L"autoStart"
+#define IIS_CONFIG_APPPOOL_SECTION          L"system.applicationHost/applicationPools"
+#define IIS_CONFIG_AUTOSTART                L"serverAutoStart"
+#define IIS_CONFIG_BINDING                  L"binding"
+#define IIS_CONFIG_BINDINGINFO              L"bindingInformation"
+#define IIS_CONFIG_BINDINGS                 L"bindings"
+#define IIS_CONFIG_DESC                     L"description"
+#define IIS_CONFIG_EXECUTABLE               L"scriptProcessor"
+#define IIS_CONFIG_ENABLED                  L"enabled"
+#define IIS_CONFIG_ENABLE32                 L"enable32BitAppOnWin64"
+#define IIS_CONFIG_FILEEXT                  L"fileExtension"
+#define IIS_CONFIG_FILTER                   L"filter"
+#define IIS_CONFIG_GROUPID                  L"groupId"
+#define IIS_CONFIG_HEADERS                  L"customHeaders"
+#define IIS_CONFIG_HTTPERRORS_SECTION       L"system.webServer/httpErrors"
+#define IIS_CONFIG_ID                       L"id"
+#define IIS_CONFIG_ISAPI_SECTION            L"system.webServer/isapiFilters"
+#define IIS_CONFIG_HTTPPROTO_SECTION        L"system.webServer/httpProtocol"
+#define IIS_CONFIG_LOG_SECTION              L"system.applicationHost/log"
+#define IIS_CONFIG_LOG_UTF8                 L"logInUTF8"
+#define IIS_CONFIG_LIMITS                   L"limits"
+#define IIS_CONFIG_PIPELINEMODE             L"managedPipelineMode"
+#define IIS_CONFIG_MANAGEDRUNTIMEVERSION    L"managedRuntimeVersion"
+#define IIS_CONFIG_WEBLOG                   L"logFile"
+#define IIS_CONFIG_LOGFORMAT                L"logFormat"
+#define IIS_CONFIG_MIMEMAP                  L"mimeMap"
+#define IIS_CONFIG_MIMETYPE                 L"mimeType"
+#define IIS_CONFIG_MODULES                  L"modules"
+#define IIS_CONFIG_NAME                     L"name"
+#define IIS_CONFIG_PATH                     L"path"
+#define IIS_CONFIG_PHYSPATH                 L"physicalPath"
+#define IIS_CONFIG_PROTOCOL                 L"protocol"
+#define IIS_CONFIG_RESTRICTION_SECTION      L"system.webServer/security/isapiCgiRestriction"
+#define IIS_CONFIG_SITE                     L"site"
+#define IIS_CONFIG_SITE_ID                  L"id"
+#define IIS_CONFIG_SITES_SECTION            L"system.applicationHost/sites"
+#define IIS_CONFIG_CONNECTTIMEOUT           L"connectionTimeout"
+#define IIS_CONFIG_VDIR                     L"virtualDirectory"
+#define IIS_CONFIG_VALUE                    L"value"
+#define IIS_CONFIG_VERBS                    L"verb"
+#define IIS_CONFIG_WEBLIMITS_SECTION        L"system.applicationHost/webLimits"
+#define IIS_CONFIG_WEBLIMITS_MAXBAND        L"maxGlobalBandwidth"
+#define IIS_CONFIG_TRUE                     L"true"
+#define IIS_CONFIG_FALSE                    L"false"
+#define IIS_CONFIG_ERROR                    L"error"
+#define IIS_CONFIG_STATUSCODE               L"statusCode"
+#define IIS_CONFIG_SUBSTATUS                L"subStatusCode"
+#define IIS_CONFIG_LANGPATH                 L"prefixLanguageFilePath"
+#define IIS_CONFIG_RESPMODE                 L"responseMode"
+#define IIS_CONFIG_CLEAR                    L"clear"
+#define IIS_CONFIG_RECYCLING                L"recycling"
+#define IIS_CONFIG_PEROIDRESTART            L"periodicRestart"
+#define IIS_CONFIG_TIME                     L"time"
+#define IIS_CONFIG_REQUESTS                 L"requests"
+#define IIS_CONFIG_SCHEDULE                 L"schedule"
+#define IIS_CONFIG_MEMORY                   L"memory"
+#define IIS_CONFIG_PRIVMEMORY               L"privateMemory"
+#define IIS_CONFIG_PROCESSMODEL             L"processModel"
+#define IIS_CONFIG_IDLETIMEOUT              L"idleTimeout"
+#define IIS_CONFIG_QUEUELENGTH              L"queueLength"
+#define IIS_CONFIG_IDENITITYTYPE            L"identityType"
+#define IIS_CONFIG_LOCALSYSTEM              L"LocalSystem"
+#define IIS_CONFIG_LOCALSERVICE             L"LocalService"
+#define IIS_CONFIG_NETWORKSERVICE           L"NetworkService"
+#define IIS_CONFIG_SPECIFICUSER             L"SpecificUser"
+#define IIS_CONFIG_APPLICATIONPOOLIDENTITY  L"ApplicationPoolIdentity"
+#define IIS_CONFIG_USERNAME                 L"userName"
+#define IIS_CONFIG_PASSWORD                 L"password"
+#define IIS_CONFIG_CPU                      L"cpu"
+#define IIS_CONFIG_LIMIT                    L"limit"
+#define IIS_CONFIG_CPU_ACTION               L"action"
+#define IIS_CONFIG_KILLW3WP                 L"KillW3wp"
+#define IIS_CONFIG_NOACTION                 L"NoAction"
+#define IIS_CONFIG_RESETINTERVAL            L"resetInterval"
+#define IIS_CONFIG_MAXWRKPROCESSES          L"maxProcesses"
+#define IIS_CONFIG_HANDLERS_SECTION         L"system.webServer/handlers"
+#define IIS_CONFIG_DEFAULTDOC_SECTION       L"system.webServer/defaultDocument"
+#define IIS_CONFIG_ASP_SECTION              L"system.webServer/asp"
+#define IIS_CONFIG_SCRIPTERROR              L"scriptErrorSentToBrowser"
+#define IIS_CONFIG_STATICCONTENT_SECTION    L"system.webServer/staticContent"
+#define IIS_CONFIG_HTTPEXPIRES              L"httpExpires"
+#define IIS_CONFIG_MAXAGE                   L"cacheControlMaxAge"
+#define IIS_CONFIG_CLIENTCACHE              L"clientCache"
+#define IIS_CONFIG_CACHECONTROLMODE         L"cacheControlMode"
+#define IIS_CONFIG_USEMAXAGE                L"UseMaxAge"
+#define IIS_CONFIG_USEEXPIRES               L"UseExpires"
+#define IIS_CONFIG_CACHECUST                L"cacheControlCustom"
+#define IIS_CONFIG_ASP_SECTION              L"system.webServer/asp"
+#define IIS_CONFIG_SESSION                  L"session"
+#define IIS_CONFIG_ALLOWSTATE               L"allowSessionState"
+#define IIS_CONFIG_TIMEOUT                  L"timeout"
+#define IIS_CONFIG_BUFFERING                L"bufferingOn"
+#define IIS_CONFIG_PARENTPATHS              L"enableParentPaths"
+#define IIS_CONFIG_SCRIPTLANG               L"scriptLanguage"
+#define IIS_CONFIG_SCRIPTTIMEOUT            L"scriptTimeout"
+#define IIS_CONFIG_LIMITS                   L"limits"
+#define IIS_CONFIG_ALLOWDEBUG               L"appAllowDebugging"
+#define IIS_CONFIG_ALLOWCLIENTDEBUG         L"appAllowClientDebug"
+#define IIS_CONFIG_CERTIFICATEHASH          L"certificateHash"
+#define IIS_CONFIG_CERTIFICATESTORENAME     L"certificateStoreName"
+#define IIS_CONFIG_HTTPLOGGING_SECTION      L"system.webServer/httpLogging"
+#define IIS_CONFIG_DONTLOG                  L"dontLog"
+typedef BOOL (CALLBACK* ENUMAPHOSTELEMENTPROC)(IAppHostElement*, LPVOID);
+typedef BOOL (CALLBACK* VARIANTCOMPARATORPROC)(VARIANT*, VARIANT*);
+HRESULT DAPI Iis7PutPropertyVariant(
+    __in IAppHostElement *pElement,
+    __in LPCWSTR wzPropName,
+    __in VARIANT vtPut
+    );
+HRESULT DAPI Iis7PutPropertyInteger(
+    __in IAppHostElement *pElement,
+    __in LPCWSTR wzPropName,
+    __in DWORD dValue
+    );
+HRESULT DAPI Iis7PutPropertyString(
+    __in IAppHostElement *pElement,
+    __in LPCWSTR wzPropName,
+    __in LPCWSTR wzString
+    );
+HRESULT DAPI Iis7PutPropertyBool(
+    __in IAppHostElement *pElement,
+    __in LPCWSTR wzPropName,
+    __in BOOL fValue);
+HRESULT DAPI Iis7GetPropertyVariant(
+    __in IAppHostElement *pElement,
+    __in LPCWSTR wzPropName,
+    __in VARIANT* vtGet
+    );
+HRESULT DAPI Iis7GetPropertyString(
+    __in IAppHostElement *pElement,
+    __in LPCWSTR wzPropName,
+    __in LPWSTR* psczGet
+    );
+struct IIS7_APPHOSTELEMENTCOMPARISON
+{
+    LPCWSTR sczElementName;
+    LPCWSTR sczAttributeName;
+    VARIANT* pvAttributeValue;
+    VARIANTCOMPARATORPROC pComparator;
+};
+BOOL DAPI Iis7IsMatchingAppHostElement( 
+    __in IAppHostElement *pElement,
+    __in IIS7_APPHOSTELEMENTCOMPARISON* pComparison
+    );
+HRESULT DAPI Iis7FindAppHostElementString( 
+    __in IAppHostElementCollection *pCollection,
+    __in LPCWSTR wzElementName,
+    __in LPCWSTR wzAttributeName,
+    __in LPCWSTR wzAttributeValue,
+    __out IAppHostElement** ppElement,
+    __out DWORD* pdwIndex
+    );
+HRESULT DAPI Iis7FindAppHostElementPath( 
+    __in IAppHostElementCollection *pCollection,
+    __in LPCWSTR wzElementName,
+    __in LPCWSTR wzAttributeName,
+    __in LPCWSTR wzAttributeValue,
+    __out IAppHostElement** ppElement,
+    __out DWORD* pdwIndex
+    );
+HRESULT DAPI Iis7FindAppHostElementInteger( 
+    __in IAppHostElementCollection *pCollection,
+    __in LPCWSTR wzElementName,
+    __in LPCWSTR wzAttributeName,
+    __in DWORD dwAttributeValue,
+    __out IAppHostElement** ppElement,
+    __out DWORD* pdwIndex
+    );
+HRESULT DAPI Iis7FindAppHostElementVariant( 
+    __in IAppHostElementCollection *pCollection,
+    __in LPCWSTR wzElementName,
+    __in LPCWSTR wzAttributeName,
+    __in VARIANT* pvAttributeValue,
+    __out IAppHostElement** ppElement,
+    __out DWORD* pdwIndex
+    );
+HRESULT DAPI Iis7EnumAppHostElements( 
+    __in IAppHostElementCollection *pCollection,
+    __in ENUMAPHOSTELEMENTPROC pCallback,
+    __in LPVOID pContext,
+    __out IAppHostElement** ppElement,
+    __out DWORD* pdwIndex
+    );
+HRESULT DAPI Iis7FindAppHostMethod(
+    __in IAppHostMethodCollection *pCollection,
+    __in LPCWSTR wzMethodName,
+    __out IAppHostMethod** ppMethod,
+    __out DWORD* pdwIndex
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/inetutil.h b/src/libs/dutil/WixToolset.DUtil/inc/inetutil.h
new file mode 100644
index 00000000..19ace88b
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/inetutil.h
@@ -0,0 +1,39 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define ReleaseInternet(h) if (h) { ::InternetCloseHandle(h); h = NULL; }
+#define ReleaseNullInternet(h) if (h) { ::InternetCloseHandle(h); h = NULL; }
+// functions
+HRESULT DAPI InternetGetSizeByHandle(
+    __in HINTERNET hiFile,
+    __out LONGLONG* pllSize
+    );
+HRESULT DAPI InternetGetCreateTimeByHandle(
+    __in HINTERNET hiFile,
+    __out LPFILETIME pft
+    );
+HRESULT DAPI InternetQueryInfoString(
+    __in HINTERNET h,
+    __in DWORD dwInfo,
+    __deref_out_z LPWSTR* psczValue
+    );
+HRESULT DAPI InternetQueryInfoNumber(
+    __in HINTERNET h,
+    __in DWORD dwInfo,
+    __inout LONG* plInfo
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/iniutil.h b/src/libs/dutil/WixToolset.DUtil/inc/iniutil.h
new file mode 100644
index 00000000..c8503155
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/iniutil.h
@@ -0,0 +1,79 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define ReleaseIni(ih) if (ih) { IniUninitialize(ih); }
+#define ReleaseNullIni(ih) if (ih) { IniUninitialize(ih); ih = NULL; }
+typedef void* INI_HANDLE;
+typedef const void* C_INI_HANDLE;
+extern const int INI_HANDLE_BYTES;
+struct INI_VALUE
+{
+    LPCWSTR wzName;
+    LPCWSTR wzValue;
+    DWORD dwLineNumber;
+};
+HRESULT DAPI IniInitialize(
+    __out_bcount(INI_HANDLE_BYTES) INI_HANDLE* piHandle
+    );
+void DAPI IniUninitialize(
+    __in_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle
+    );
+HRESULT DAPI IniSetOpenTag(
+    __inout_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle,
+    __in_z_opt LPCWSTR wzOpenTagPrefix,
+    __in_z_opt LPCWSTR wzOpenTagPostfix
+    );
+HRESULT DAPI IniSetValueStyle(
+    __inout_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle,
+    __in_z_opt LPCWSTR wzValuePrefix,
+    __in_z_opt LPCWSTR wzValueSeparator
+    );
+HRESULT DAPI IniSetValueSeparatorException(
+    __inout_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle,
+    __in_z LPCWSTR wzValueNamePrefix
+    );
+HRESULT DAPI IniSetCommentStyle(
+    __inout_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle,
+    __in_z_opt LPCWSTR wzLinePrefix
+    );
+HRESULT DAPI IniParse(
+    __inout_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle,
+    __in LPCWSTR wzPath,
+    __out_opt FILE_ENCODING *pfeEncodingFound
+    );
+// Gets the full value array, this includes values that may have been deleted
+// (their value will be NULL)
+HRESULT DAPI IniGetValueList(
+    __in_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle,
+    __deref_out_ecount_opt(*pcValues) INI_VALUE** prgivValues,
+    __out DWORD *pcValues
+    );
+HRESULT DAPI IniGetValue(
+    __in_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle,
+    __in LPCWSTR wzValueName,
+    __deref_out_z LPWSTR* psczValue
+    );
+HRESULT DAPI IniSetValue(
+    __in_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle,
+    __in LPCWSTR wzValueName,
+    __in_z_opt LPCWSTR wzValue
+    );
+HRESULT DAPI IniWriteFile(
+    __in_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle,
+    __in_z_opt LPCWSTR wzPath,
+    __in FILE_ENCODING feOverrideEncoding
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/jsonutil.h b/src/libs/dutil/WixToolset.DUtil/inc/jsonutil.h
new file mode 100644
index 00000000..b05e9970
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/jsonutil.h
@@ -0,0 +1,112 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+typedef enum JSON_TOKEN
+{
+    JSON_TOKEN_NONE,
+    JSON_TOKEN_ARRAY_START,
+    JSON_TOKEN_ARRAY_VALUE,
+    JSON_TOKEN_ARRAY_END,
+    JSON_TOKEN_OBJECT_START,
+    JSON_TOKEN_OBJECT_KEY,
+    JSON_TOKEN_OBJECT_VALUE,
+    JSON_TOKEN_OBJECT_END,
+    JSON_TOKEN_VALUE,
+} JSON_TOKEN;
+typedef struct _JSON_VALUE
+{
+} JSON_VALUE;
+typedef struct _JSON_READER
+{
+    CRITICAL_SECTION cs;
+    LPWSTR sczJson;
+    LPWSTR pwz;
+    JSON_TOKEN token;
+} JSON_READER;
+typedef struct _JSON_WRITER
+{
+    CRITICAL_SECTION cs;
+    LPWSTR sczJson;
+    JSON_TOKEN* rgTokenStack;
+    DWORD cTokens;
+    DWORD cMaxTokens;
+} JSON_WRITER;
+DAPI_(HRESULT) JsonInitializeReader(
+    __in_z LPCWSTR wzJson,
+    __in JSON_READER* pReader
+    );
+DAPI_(void) JsonUninitializeReader(
+    __in JSON_READER* pReader
+    );
+DAPI_(HRESULT) JsonReadNext(
+    __in JSON_READER* pReader,
+    __out JSON_TOKEN* pToken,
+    __out JSON_VALUE* pValue
+    );
+DAPI_(HRESULT) JsonReadValue(
+    __in JSON_READER* pReader,
+    __in JSON_VALUE* pValue
+    );
+DAPI_(HRESULT) JsonInitializeWriter(
+    __in JSON_WRITER* pWriter
+    );
+DAPI_(void) JsonUninitializeWriter(
+    __in JSON_WRITER* pWriter
+    );
+DAPI_(HRESULT) JsonWriteBool(
+    __in JSON_WRITER* pWriter,
+    __in BOOL fValue
+    );
+DAPI_(HRESULT) JsonWriteNumber(
+    __in JSON_WRITER* pWriter,
+    __in DWORD dwValue
+    );
+DAPI_(HRESULT) JsonWriteString(
+    __in JSON_WRITER* pWriter,
+    __in_z LPCWSTR wzValue
+    );
+DAPI_(HRESULT) JsonWriteArrayStart(
+    __in JSON_WRITER* pWriter
+    );
+DAPI_(HRESULT) JsonWriteArrayEnd(
+    __in JSON_WRITER* pWriter
+    );
+DAPI_(HRESULT) JsonWriteObjectStart(
+    __in JSON_WRITER* pWriter
+    );
+DAPI_(HRESULT) JsonWriteObjectKey(
+    __in JSON_WRITER* pWriter,
+    __in_z LPCWSTR wzKey
+    );
+DAPI_(HRESULT) JsonWriteObjectEnd(
+    __in JSON_WRITER* pWriter
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/locutil.h b/src/libs/dutil/WixToolset.DUtil/inc/locutil.h
new file mode 100644
index 00000000..38ddda20
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/locutil.h
@@ -0,0 +1,120 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+struct LOC_STRING
+{
+    LPWSTR wzId;
+    LPWSTR wzText;
+    BOOL bOverridable;
+};
+const int LOC_CONTROL_NOT_SET = INT_MAX;
+struct LOC_CONTROL
+{
+    LPWSTR wzControl;
+    int nX;
+    int nY;
+    int nWidth;
+    int nHeight;
+    LPWSTR wzText;
+};
+const int WIX_LOCALIZATION_LANGUAGE_NOT_SET = INT_MAX;
+struct WIX_LOCALIZATION
+{
+    DWORD dwLangId;
+    DWORD cLocStrings;
+    LOC_STRING* rgLocStrings;
+    DWORD cLocControls;
+    LOC_CONTROL* rgLocControls;
+};
+/********************************************************************
+ LocProbeForFile - Searches for a localization file on disk.
+*******************************************************************/
+HRESULT DAPI LocProbeForFile(
+    __in_z LPCWSTR wzBasePath,
+    __in_z LPCWSTR wzLocFileName,
+    __in_z_opt LPCWSTR wzLanguage,
+    __inout LPWSTR* psczPath
+    );
+/********************************************************************
+ LocLoadFromFile - Loads a localization file
+*******************************************************************/
+HRESULT DAPI LocLoadFromFile(
+    __in_z LPCWSTR wzWxlFile,
+    __out WIX_LOCALIZATION** ppWixLoc
+    );
+/********************************************************************
+ LocLoadFromResource - loads a localization file from a module's data
+                       resource.
+ NOTE: The resource data must be UTF-8 encoded.
+*******************************************************************/
+HRESULT DAPI LocLoadFromResource(
+    __in HMODULE hModule,
+    __in_z LPCSTR szResource,
+    __out WIX_LOCALIZATION** ppWixLoc
+    );
+/********************************************************************
+ LocFree - free memory allocated when loading a localization file
+*******************************************************************/
+void DAPI LocFree(
+    __in_opt WIX_LOCALIZATION* pWixLoc
+    );
+/********************************************************************
+ LocLocalizeString - replace any #(loc.id) in a string with the
+                    correct sub string
+*******************************************************************/
+HRESULT DAPI LocLocalizeString(
+    __in const WIX_LOCALIZATION* pWixLoc,
+    __inout LPWSTR* psczInput
+    );
+/********************************************************************
+ LocGetControl - returns a control's localization information
+*******************************************************************/
+HRESULT DAPI LocGetControl(
+    __in const WIX_LOCALIZATION* pWixLoc,
+    __in_z LPCWSTR wzId,
+    __out LOC_CONTROL** ppLocControl
+    );
+/********************************************************************
+LocGetString - returns a string's localization information
+*******************************************************************/
+extern "C" HRESULT DAPI LocGetString(
+    __in const WIX_LOCALIZATION* pWixLoc,
+    __in_z LPCWSTR wzId,
+    __out LOC_STRING** ppLocString
+    );
+/********************************************************************
+LocAddString - adds a localization string
+*******************************************************************/
+extern "C" HRESULT DAPI LocAddString(
+    __in WIX_LOCALIZATION* pWixLoc,
+    __in_z LPCWSTR wzId,
+    __in_z LPCWSTR wzLocString,
+    __in BOOL bOverridable
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/logutil.h b/src/libs/dutil/WixToolset.DUtil/inc/logutil.h
new file mode 100644
index 00000000..426506ee
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/logutil.h
@@ -0,0 +1,192 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define LogExitOnFailureSource(d, x, i, f, ...) if (FAILED(x)) { LogErrorId(x, i, __VA_ARGS__); ExitTraceSource(d, x, f, __VA_ARGS__); goto LExit; }
+#define LogExitOnRootFailureSource(d, x, i, f, ...) if (FAILED(x)) { LogErrorId(x, i, __VA_ARGS__); Dutil_RootFailure(__FILE__, __LINE__, x); ExitTraceSource(d, x, f, __VA_ARGS__); goto LExit; }
+#define LogExitOnFailure(x, i, f, ...) LogExitOnFailureSource(DUTIL_SOURCE_DEFAULT, x, i, f, __VA_ARGS__)
+#define LogExitOnRootFailure(x, i, f, ...) LogExitOnRootFailureSource(DUTIL_SOURCE_DEFAULT, x, i, f, __VA_ARGS__)
+typedef HRESULT (DAPI *PFN_LOGSTRINGWORKRAW)(
+    __in_z LPCSTR szString,
+    __in_opt LPVOID pvContext
+    );
+// enums
+// structs
+// functions
+BOOL DAPI IsLogInitialized();
+BOOL DAPI IsLogOpen();
+void DAPI LogInitialize(
+    __in HMODULE hModule
+    );
+HRESULT DAPI LogOpen(
+    __in_z_opt LPCWSTR wzDirectory,
+    __in_z LPCWSTR wzLog,
+    __in_z_opt LPCWSTR wzPostfix,
+    __in_z_opt LPCWSTR wzExt,
+    __in BOOL fAppend,
+    __in BOOL fHeader,
+    __out_z_opt LPWSTR* psczLogPath
+    );
+void DAPI LogDisable();
+void DAPI LogRedirect(
+    __in_opt PFN_LOGSTRINGWORKRAW vpfLogStringWorkRaw,
+    __in_opt LPVOID pvContext
+    );
+HRESULT DAPI LogRename(
+    __in_z LPCWSTR wzNewPath
+    );
+void DAPI LogClose(
+    __in BOOL fFooter
+    );
+void DAPI LogUninitialize(
+    __in BOOL fFooter
+    );
+BOOL DAPI LogIsOpen();
+HRESULT DAPI LogSetSpecialParams(
+    __in_z_opt LPCWSTR wzSpecialBeginLine,
+    __in_z_opt LPCWSTR wzSpecialAfterTimeStamp,
+    __in_z_opt LPCWSTR wzSpecialEndLine
+    );
+REPORT_LEVEL DAPI LogSetLevel(
+    __in REPORT_LEVEL rl,
+    __in BOOL fLogChange
+    );
+REPORT_LEVEL DAPI LogGetLevel();
+HRESULT DAPI LogGetPath(
+    __out_ecount_z(cchLogPath) LPWSTR pwzLogPath, 
+    __in DWORD cchLogPath
+    );
+HANDLE DAPI LogGetHandle();
+HRESULT DAPIV LogString(
+    __in REPORT_LEVEL rl,
+    __in_z __format_string LPCSTR szFormat,
+    ...
+    );
+HRESULT DAPI LogStringArgs(
+    __in REPORT_LEVEL rl,
+    __in_z __format_string LPCSTR szFormat,
+    __in va_list args
+    );
+HRESULT DAPIV LogStringLine(
+    __in REPORT_LEVEL rl,
+    __in_z __format_string LPCSTR szFormat,
+    ...
+    );
+HRESULT DAPI LogStringLineArgs(
+    __in REPORT_LEVEL rl,
+    __in_z __format_string LPCSTR szFormat,
+    __in va_list args
+    );
+HRESULT DAPI LogIdModuleArgs(
+    __in REPORT_LEVEL rl,
+    __in DWORD dwLogId,
+    __in_opt HMODULE hModule,
+    __in va_list args
+    );
+/* 
+ * Wraps LogIdModuleArgs, so inline to save the function call
+ */
+inline HRESULT LogId(
+    __in REPORT_LEVEL rl,
+    __in DWORD dwLogId,
+    ...
+    )
+{
+    HRESULT hr = S_OK;
+    va_list args;
+    va_start(args, dwLogId);
+    hr = LogIdModuleArgs(rl, dwLogId, NULL, args);
+    va_end(args);
+    return hr;
+}
+/* 
+ * Wraps LogIdModuleArgs, so inline to save the function call
+ */
+ 
+inline HRESULT LogIdArgs(
+    __in REPORT_LEVEL rl,
+    __in DWORD dwLogId,
+    __in va_list args
+    )
+{
+    return LogIdModuleArgs(rl, dwLogId, NULL, args);
+}
+HRESULT DAPIV LogErrorString(
+    __in HRESULT hrError,
+    __in_z __format_string LPCSTR szFormat,
+    ...
+    );
+HRESULT DAPI LogErrorStringArgs(
+    __in HRESULT hrError,
+    __in_z __format_string LPCSTR szFormat,
+    __in va_list args
+    );
+HRESULT DAPI LogErrorIdModule(
+    __in HRESULT hrError,
+    __in DWORD dwLogId,
+    __in_opt HMODULE hModule,
+    __in_z_opt LPCWSTR wzString1,
+    __in_z_opt LPCWSTR wzString2,
+    __in_z_opt LPCWSTR wzString3
+    );
+inline HRESULT LogErrorId(
+    __in HRESULT hrError,
+    __in DWORD dwLogId,
+    __in_z_opt LPCWSTR wzString1 = NULL,
+    __in_z_opt LPCWSTR wzString2 = NULL,
+    __in_z_opt LPCWSTR wzString3 = NULL
+    )
+{
+    return LogErrorIdModule(hrError, dwLogId, NULL, wzString1, wzString2, wzString3);
+}
+HRESULT DAPI LogHeader();
+HRESULT DAPI LogFooter();
+HRESULT LogStringWorkRaw(
+    __in_z LPCSTR szLogData
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/memutil.h b/src/libs/dutil/WixToolset.DUtil/inc/memutil.h
new file mode 100644
index 00000000..49f86e0a
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/memutil.h
@@ -0,0 +1,80 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define ReleaseMem(p) if (p) { MemFree(p); }
+#define ReleaseNullMem(p) if (p) { MemFree(p); p = NULL; }
+HRESULT DAPI MemInitialize();
+void DAPI MemUninitialize();
+LPVOID DAPI MemAlloc(
+    __in SIZE_T cbSize,
+    __in BOOL fZero
+    );
+LPVOID DAPI MemReAlloc(
+    __in LPVOID pv,
+    __in SIZE_T cbSize,
+    __in BOOL fZero
+    );
+HRESULT DAPI MemReAllocSecure(
+    __in LPVOID pv,
+    __in SIZE_T cbSize,
+    __in BOOL fZero,
+    __deref_out LPVOID* ppvNew
+    );
+HRESULT DAPI MemAllocArray(
+    __inout LPVOID* ppvArray,
+    __in SIZE_T cbArrayType,
+    __in DWORD dwItemCount
+    );
+HRESULT DAPI MemReAllocArray(
+    __inout LPVOID* ppvArray,
+    __in DWORD cArray,
+    __in SIZE_T cbArrayType,
+    __in DWORD dwNewItemCount
+    );
+HRESULT DAPI MemEnsureArraySize(
+    __deref_inout_bcount(cArray * cbArrayType) LPVOID* ppvArray,
+    __in DWORD cArray,
+    __in SIZE_T cbArrayType,
+    __in DWORD dwGrowthCount
+    );
+HRESULT DAPI MemInsertIntoArray(
+    __deref_inout_bcount((cExistingArray + cInsertItems) * cbArrayType) LPVOID* ppvArray,
+    __in DWORD dwInsertIndex,
+    __in DWORD cInsertItems,
+    __in DWORD cExistingArray,
+    __in SIZE_T cbArrayType,
+    __in DWORD dwGrowthCount
+    );
+void DAPI MemRemoveFromArray(
+    __inout_bcount((cExistingArray) * cbArrayType) LPVOID pvArray,
+    __in DWORD dwRemoveIndex,
+    __in DWORD cRemoveItems,
+    __in DWORD cExistingArray,
+    __in SIZE_T cbArrayType,
+    __in BOOL fPreserveOrder
+    );
+void DAPI MemArraySwapItems(
+    __inout_bcount(cbArrayType) LPVOID pvArray,
+    __in DWORD dwIndex1,
+    __in DWORD dwIndex2,
+    __in SIZE_T cbArrayType
+    );
+HRESULT DAPI MemFree(
+    __in LPVOID pv
+    );
+SIZE_T DAPI MemSize(
+    __in LPCVOID pv
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/metautil.h b/src/libs/dutil/WixToolset.DUtil/inc/metautil.h
new file mode 100644
index 00000000..31f9ff5c
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/metautil.h
@@ -0,0 +1,52 @@
+#pragma once
+// 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.
+#include <iadmw.h>
+#include <iiscnfg.h>
+#include <iwamreg.h>
+#include <mddefw.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+// structs
+// prototypes
+HRESULT DAPI MetaFindWebBase(
+    __in IMSAdminBaseW* piMetabase, 
+    __in_z LPCWSTR wzIP, 
+    __in int iPort, 
+    __in_z LPCWSTR wzHeader,
+    __in BOOL fSecure,
+    __out_ecount(cchWebBase) LPWSTR wzWebBase, 
+    __in DWORD cchWebBase
+    );
+HRESULT DAPI MetaFindFreeWebBase(
+    __in IMSAdminBaseW* piMetabase, 
+    __out_ecount(cchWebBase) LPWSTR wzWebBase, 
+    __in DWORD cchWebBase
+    );
+HRESULT DAPI MetaOpenKey(
+    __in IMSAdminBaseW* piMetabase, 
+    __in METADATA_HANDLE mhKey, 
+    __in_z LPCWSTR wzKey,
+    __in DWORD dwAccess,
+    __in DWORD cRetries,
+    __out METADATA_HANDLE* pmh
+    );
+HRESULT DAPI MetaGetValue(
+    __in IMSAdminBaseW* piMetabase, 
+    __in METADATA_HANDLE mhKey, 
+    __in_z LPCWSTR wzKey, 
+    __inout METADATA_RECORD* pmr
+    );
+void DAPI MetaFreeValue(
+    __in METADATA_RECORD* pmr
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/monutil.h b/src/libs/dutil/WixToolset.DUtil/inc/monutil.h
new file mode 100644
index 00000000..f644e205
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/monutil.h
@@ -0,0 +1,108 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define ReleaseMon(mh) if (mh) { MonDestroy(mh); }
+#define ReleaseNullMon(mh) if (mh) { MonDestroy(mh); mh = NULL; }
+typedef void* MON_HANDLE;
+typedef const void* C_MON_HANDLE;
+// Defined in regutil.h
+enum REG_KEY_BITNESS;
+extern const int MON_HANDLE_BYTES;
+// Note: callbacks must be implemented in a thread-safe manner. They will be called asynchronously by a MonUtil-spawned thread.
+// They must also be written to return as soon as possible - they are called from the waiter thread
+typedef void (*PFN_MONGENERAL)(
+    __in HRESULT hr,
+    __in_opt LPVOID pvContext
+    );
+// This callback is not specific to any wait - it will notify client of any drive status changes, such as removable drive insertion / removal
+typedef void (*PFN_MONDRIVESTATUS)(
+    __in WCHAR chDrive,
+    __in BOOL fArriving,
+    __in_opt LPVOID pvContext
+    );
+// Note if these fire  with a failed result it means an error has occurred with the wait, and so the wait will stay in the list and be retried. When waits start succeeding again,
+// MonUtil will notify of changes, because it may have not noticed changes during the interval for which the wait had failed. This behavior can result in false positive notifications,
+// so all consumers of MonUtil should be designed with this in mind.
+typedef void (*PFN_MONDIRECTORY)(
+    __in HRESULT hr,
+    __in_z LPCWSTR wzPath,
+    __in BOOL fRecursive,
+    __in_opt LPVOID pvContext,
+    __in_opt LPVOID pvDirectoryContext
+    );
+typedef void (*PFN_MONREGKEY)(
+    __in HRESULT hr,
+    __in HKEY hkRoot,
+    __in_z LPCWSTR wzSubKey,
+    __in REG_KEY_BITNESS kbKeyBitness,
+    __in BOOL fRecursive,
+    __in_opt LPVOID pvContext,
+    __in_opt LPVOID pvRegKeyContext
+    );
+// Silence period allows you to avoid lots of notifications when a lot of writes are going on in a directory
+// MonUtil will wait until the directory has been "silent" for at least dwSilencePeriodInMs milliseconds
+// The drawback to setting this to a value higher than zero is that even single write notifications
+// are delayed by this amount
+HRESULT DAPI MonCreate(
+    __out_bcount(MON_HANDLE_BYTES) MON_HANDLE *pHandle,
+    __in PFN_MONGENERAL vpfMonGeneral,
+    __in_opt PFN_MONDRIVESTATUS vpfMonDriveStatus,
+    __in_opt PFN_MONDIRECTORY vpfMonDirectory,
+    __in_opt PFN_MONREGKEY vpfMonRegKey,
+    __in_opt LPVOID pvContext
+    );
+// Don't add multiple identical waits! Not only is it wasteful and will cause multiple fires for the exact same change, it will also
+// result in slightly odd behavior when you remove a duplicated wait (removing a wait may or may not remove multiple waits)
+// This is due to the way coordinator thread and waiter threads handle removing, and while it is possible to solve, doing so would complicate the code.
+// So instead, de-dupe your wait requests before sending them to MonUtil.
+// Special notes for network waits: MonUtil can send false positive notifications (i.e. notifications when nothing had changed) if connection
+// to the share is lost and reconnected, because MonUtil can't know for sure whether changes occurred while the connection was lost.
+// Also, MonUtil will very every 20 minutes retry even successful network waits, because the underlying Win32 API cannot notify us if a remote server
+// had its network cable unplugged or similar sudden failure. When we retry the successful network waits, we will also send a false positive notification,
+// because it's impossible for MonUtil to detect if we're reconnecting to a server that had died and come back to life, or if we're reconnecting to a server that had
+// been up all along. For both of the above reasons, clients of MonUtil must be written to do very, very little work in the case of false positive network waits.
+HRESULT DAPI MonAddDirectory(
+    __in_bcount(MON_HANDLE_BYTES) MON_HANDLE handle,
+    __in_z LPCWSTR wzPath,
+    __in BOOL fRecursive,
+    __in DWORD dwSilencePeriodInMs,
+    __in_opt LPVOID pvDirectoryContext
+    );
+HRESULT DAPI MonAddRegKey(
+    __in_bcount(MON_HANDLE_BYTES) MON_HANDLE handle,
+    __in HKEY hkRoot,
+    __in_z LPCWSTR wzSubKey,
+    __in REG_KEY_BITNESS kbKeyBitness,
+    __in BOOL fRecursive,
+    __in DWORD dwSilencePeriodInMs,
+    __in_opt LPVOID pvRegKeyContext
+    );
+HRESULT DAPI MonRemoveDirectory(
+    __in_bcount(MON_HANDLE_BYTES) MON_HANDLE handle,
+    __in_z LPCWSTR wzPath,
+    __in BOOL fRecursive
+    );
+HRESULT DAPI MonRemoveRegKey(
+    __in_bcount(MON_HANDLE_BYTES) MON_HANDLE handle,
+    __in HKEY hkRoot,
+    __in_z LPCWSTR wzSubKey,
+    __in REG_KEY_BITNESS kbKeyBitness,
+    __in BOOL fRecursive
+    );
+void DAPI MonDestroy(
+    __in_bcount(MON_HANDLE_BYTES) MON_HANDLE handle
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/osutil.h b/src/libs/dutil/WixToolset.DUtil/inc/osutil.h
new file mode 100644
index 00000000..2cce6f63
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/osutil.h
@@ -0,0 +1,42 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+typedef enum OS_VERSION
+{
+    OS_VERSION_UNKNOWN,
+    OS_VERSION_WINNT,
+    OS_VERSION_WIN2000,
+    OS_VERSION_WINXP,
+    OS_VERSION_WIN2003,
+    OS_VERSION_VISTA,
+    OS_VERSION_WIN2008,
+    OS_VERSION_WIN7,
+    OS_VERSION_WIN2008_R2,
+    OS_VERSION_FUTURE
+} OS_VERSION;
+void DAPI OsGetVersion(
+    __out OS_VERSION* pVersion,
+    __out DWORD* pdwServicePack
+    );
+HRESULT DAPI OsCouldRunPrivileged(
+    __out BOOL* pfPrivileged
+    );
+HRESULT DAPI OsIsRunningPrivileged(
+    __out BOOL* pfPrivileged
+    );
+HRESULT DAPI OsIsUacEnabled(
+    __out BOOL* pfUacEnabled
+    );
+HRESULT DAPI OsRtlGetVersion(
+    __inout RTL_OSVERSIONINFOEXW* pOvix
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h b/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h
new file mode 100644
index 00000000..579b8454
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h
@@ -0,0 +1,252 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+typedef enum PATH_EXPAND
+{
+    PATH_EXPAND_ENVIRONMENT = 0x0001,
+    PATH_EXPAND_FULLPATH    = 0x0002,
+} PATH_EXPAND;
+/*******************************************************************
+ PathCommandLineAppend - appends a command line argument on to a
+    string such that ::CommandLineToArgv() will shred them correctly
+    (i.e. quote arguments with spaces in them).
+********************************************************************/
+DAPI_(HRESULT) PathCommandLineAppend(
+    __deref_inout_z LPWSTR* psczCommandLine,
+    __in_z LPCWSTR wzArgument
+    );
+/*******************************************************************
+ PathFile -  returns a pointer to the file part of the path.
+********************************************************************/
+DAPI_(LPWSTR) PathFile(
+    __in_z LPCWSTR wzPath
+    );
+/*******************************************************************
+ PathExtension -  returns a pointer to the extension part of the path
+                  (including the dot).
+********************************************************************/
+DAPI_(LPCWSTR) PathExtension(
+    __in_z LPCWSTR wzPath
+    );
+/*******************************************************************
+ PathGetDirectory - extracts the directory from a path.
+********************************************************************/
+DAPI_(HRESULT) PathGetDirectory(
+    __in_z LPCWSTR wzPath,
+    __out_z LPWSTR *psczDirectory
+    );
+/*******************************************************************
+PathGetParentPath - extracts the parent directory from a full path.
+********************************************************************/
+DAPI_(HRESULT) PathGetParentPath(
+    __in_z LPCWSTR wzPath,
+    __out_z LPWSTR *psczDirectory
+    );
+/*******************************************************************
+ PathExpand - gets the full path to a file resolving environment
+              variables along the way.
+********************************************************************/
+DAPI_(HRESULT) PathExpand(
+    __out LPWSTR *psczFullPath,
+    __in_z LPCWSTR wzRelativePath,
+    __in DWORD dwResolveFlags
+    );
+/*******************************************************************
+ PathPrefix - prefixes a full path with \\?\ or \\?\UNC as
+              appropriate.
+********************************************************************/
+DAPI_(HRESULT) PathPrefix(
+    __inout LPWSTR *psczFullPath
+    );
+/*******************************************************************
+ PathFixedBackslashTerminate - appends a \ if path does not have it
+                                 already, but fails if the buffer is
+                                 insufficient.
+********************************************************************/
+DAPI_(HRESULT) PathFixedBackslashTerminate(
+    __inout_ecount_z(cchPath) LPWSTR wzPath,
+    __in SIZE_T cchPath
+    );
+/*******************************************************************
+ PathBackslashTerminate - appends a \ if path does not have it
+                                 already.
+********************************************************************/
+DAPI_(HRESULT) PathBackslashTerminate(
+    __inout LPWSTR* psczPath
+    );
+/*******************************************************************
+ PathForCurrentProcess - gets the full path to the currently executing
+                         process or (optionally) a module inside the process.
+********************************************************************/
+DAPI_(HRESULT) PathForCurrentProcess(
+    __inout LPWSTR *psczFullPath,
+    __in_opt HMODULE hModule
+    );
+/*******************************************************************
+ PathRelativeToModule - gets the name of a file in the same 
+    directory as the current process or (optionally) a module inside 
+    the process
+********************************************************************/
+DAPI_(HRESULT) PathRelativeToModule(
+    __inout LPWSTR *psczFullPath,
+    __in_opt LPCWSTR wzFileName,
+    __in_opt HMODULE hModule
+    );
+/*******************************************************************
+ PathCreateTempFile
+ Note: if wzDirectory is null, ::GetTempPath() will be used instead.
+       if wzFileNameTemplate is null, GetTempFileName() will be used instead.
+*******************************************************************/
+DAPI_(HRESULT) PathCreateTempFile(
+    __in_opt LPCWSTR wzDirectory,
+    __in_opt __format_string LPCWSTR wzFileNameTemplate,
+    __in DWORD dwUniqueCount,
+    __in DWORD dwFileAttributes,
+    __out_opt LPWSTR* psczTempFile,
+    __out_opt HANDLE* phTempFile
+    );
+/*******************************************************************
+ PathCreateTimeBasedTempFile - creates an empty temp file based on current
+                           system time
+********************************************************************/
+DAPI_(HRESULT) PathCreateTimeBasedTempFile(
+    __in_z_opt LPCWSTR wzDirectory,
+    __in_z LPCWSTR wzPrefix,
+    __in_z_opt LPCWSTR wzPostfix,
+    __in_z LPCWSTR wzExtension,
+    __deref_opt_out_z LPWSTR* psczTempFile,
+    __out_opt HANDLE* phTempFile
+    );
+/*******************************************************************
+ PathCreateTempDirectory
+ Note: if wzDirectory is null, ::GetTempPath() will be used instead.
+*******************************************************************/
+DAPI_(HRESULT) PathCreateTempDirectory(
+    __in_opt LPCWSTR wzDirectory,
+    __in __format_string LPCWSTR wzDirectoryNameTemplate,
+    __in DWORD dwUniqueCount,
+    __out LPWSTR* psczTempDirectory
+    );
+/*******************************************************************
+ PathGetKnownFolder - returns the path to a well-known shell folder
+*******************************************************************/
+DAPI_(HRESULT) PathGetKnownFolder(
+    __in int csidl,
+    __out LPWSTR* psczKnownFolder
+    );
+/*******************************************************************
+ PathIsAbsolute - returns true if the path is absolute; false 
+    otherwise.
+*******************************************************************/
+DAPI_(BOOL) PathIsAbsolute(
+    __in_z LPCWSTR wzPath
+    );
+/*******************************************************************
+ PathConcat - like .NET's Path.Combine, lets you build up a path
+    one piece -- file or directory -- at a time.
+*******************************************************************/
+DAPI_(HRESULT) PathConcat(
+    __in_opt LPCWSTR wzPath1,
+    __in_opt LPCWSTR wzPath2,
+    __deref_out_z LPWSTR* psczCombined
+    );
+/*******************************************************************
+ PathConcatCch - like .NET's Path.Combine, lets you build up a path
+    one piece -- file or directory -- at a time.
+*******************************************************************/
+DAPI_(HRESULT) PathConcatCch(
+    __in_opt LPCWSTR wzPath1,
+    __in SIZE_T cchPath1,
+    __in_opt LPCWSTR wzPath2,
+    __in SIZE_T cchPath2,
+    __deref_out_z LPWSTR* psczCombined
+    );
+/*******************************************************************
+ PathEnsureQuoted - ensures that a path is quoted; optionally,
+     this function also terminates a directory with a backslash
+     if it is not already.
+*******************************************************************/
+DAPI_(HRESULT) PathEnsureQuoted(
+    __inout LPWSTR* ppszPath,
+    __in BOOL fDirectory
+    );
+/*******************************************************************
+ PathCompare - compares the fully expanded path of the two paths using
+               ::CompareStringW().
+*******************************************************************/
+DAPI_(HRESULT) PathCompare(
+    __in_z LPCWSTR wzPath1,
+    __in_z LPCWSTR wzPath2,
+    __out int* pnResult
+    );
+/*******************************************************************
+ PathCompress - sets the compression state on an existing file or 
+                directory. A no-op on file systems that don't 
+                support compression.
+*******************************************************************/
+DAPI_(HRESULT) PathCompress(
+    __in_z LPCWSTR wzPath
+    );
+/*******************************************************************
+ PathGetHierarchyArray - allocates an array containing,
+                in order, every parent directory of the specified path,
+                ending with the actual input path
+                This function also works with registry subkeys
+*******************************************************************/
+DAPI_(HRESULT) PathGetHierarchyArray(
+    __in_z LPCWSTR wzPath,
+    __deref_inout_ecount_opt(*pcPathArray) LPWSTR **prgsczPathArray,
+    __inout LPUINT pcPathArray
+    );
+/*******************************************************************
+  PathCanonicalizePath - wrapper around PathCanonicalizeW.
+*******************************************************************/
+DAPI_(HRESULT) PathCanonicalizePath(
+    __in_z LPCWSTR wzPath,
+    __deref_out_z LPWSTR* psczCanonicalized
+    );
+/*******************************************************************
+PathDirectoryContainsPath - checks if wzPath is located inside
+                            wzDirectory.
+*******************************************************************/
+DAPI_(HRESULT) PathDirectoryContainsPath(
+    __in_z LPCWSTR wzDirectory,
+    __in_z LPCWSTR wzPath
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/perfutil.h b/src/libs/dutil/WixToolset.DUtil/inc/perfutil.h
new file mode 100644
index 00000000..7557511d
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/perfutil.h
@@ -0,0 +1,24 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+// structs
+// functions
+void DAPI PerfInitialize(
+    );
+void DAPI PerfClickTime(
+    __out_opt LARGE_INTEGER* pliElapsed
+    );
+double DAPI PerfConvertToSeconds(
+    __in const LARGE_INTEGER* pli
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/polcutil.h b/src/libs/dutil/WixToolset.DUtil/inc/polcutil.h
new file mode 100644
index 00000000..13618043
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/polcutil.h
@@ -0,0 +1,39 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+const LPCWSTR POLICY_BURN_REGISTRY_PATH = L"WiX\\Burn";
+/********************************************************************
+PolcReadNumber - reads a number from policy.
+NOTE: S_FALSE returned if policy not set.
+NOTE: out is set to default on S_FALSE or any error.
+********************************************************************/
+HRESULT DAPI PolcReadNumber(
+    __in_z LPCWSTR wzPolicyPath,
+    __in_z LPCWSTR wzPolicyName,
+    __in DWORD dwDefault,
+    __out DWORD* pdw
+    );
+/********************************************************************
+PolcReadString - reads a string from policy.
+NOTE: S_FALSE returned if policy not set.
+NOTE: out is set to default on S_FALSE or any error.
+********************************************************************/
+HRESULT DAPI PolcReadString(
+    __in_z LPCWSTR wzPolicyPath,
+    __in_z LPCWSTR wzPolicyName,
+    __in_z_opt LPCWSTR wzDefault,
+    __deref_out_z LPWSTR* pscz
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/procutil.h b/src/libs/dutil/WixToolset.DUtil/inc/procutil.h
new file mode 100644
index 00000000..00f3f358
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/procutil.h
@@ -0,0 +1,75 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+// structs
+typedef struct _PROC_FILESYSTEMREDIRECTION
+{
+    BOOL fDisabled;
+    LPVOID pvRevertState;
+} PROC_FILESYSTEMREDIRECTION;
+HRESULT DAPI ProcElevated(
+    __in HANDLE hProcess,
+    __out BOOL* pfElevated
+    );
+HRESULT DAPI ProcWow64(
+    __in HANDLE hProcess,
+    __out BOOL* pfWow64
+    );
+HRESULT DAPI ProcDisableWowFileSystemRedirection(
+    __in PROC_FILESYSTEMREDIRECTION* pfsr
+    );
+HRESULT DAPI ProcRevertWowFileSystemRedirection(
+    __in PROC_FILESYSTEMREDIRECTION* pfsr
+    );
+HRESULT DAPI ProcExec(
+    __in_z LPCWSTR wzExecutablePath,
+    __in_z_opt LPCWSTR wzCommandLine,
+    __in int nCmdShow,
+    __out HANDLE *phProcess
+    );
+HRESULT DAPI ProcExecute(
+    __in_z LPWSTR wzCommand,
+    __out HANDLE *phProcess,
+    __out_opt HANDLE *phChildStdIn,
+    __out_opt HANDLE *phChildStdOutErr
+    );
+HRESULT DAPI ProcWaitForCompletion(
+    __in HANDLE hProcess,
+    __in DWORD dwTimeout,
+    __out DWORD *pReturnCode
+    );
+HRESULT DAPI ProcWaitForIds(
+    __in_ecount(cProcessIds) const DWORD* pdwProcessIds,
+    __in DWORD cProcessIds,
+    __in DWORD dwMilliseconds
+    );
+HRESULT DAPI ProcCloseIds(
+    __in_ecount(cProcessIds) const DWORD* pdwProcessIds,
+    __in DWORD cProcessIds
+    );
+// following code in proc2utl.cpp due to dependency on PSAPI.DLL.
+HRESULT DAPI ProcFindAllIdsFromExeName(
+    __in_z LPCWSTR wzExeName,
+    __out DWORD** ppdwProcessIds,
+    __out DWORD* pcProcessIds
+    );
+// following code in proc3utl.cpp due to dependency on Wtsapi32.DLL.
+HRESULT DAPI ProcExecuteAsInteractiveUser(
+    __in_z LPCWSTR wzExecutablePath,
+    __in_z LPCWSTR wzCommand,
+    __out HANDLE *phProcess
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/regutil.h b/src/libs/dutil/WixToolset.DUtil/inc/regutil.h
new file mode 100644
index 00000000..75284940
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/regutil.h
@@ -0,0 +1,246 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define ReleaseRegKey(h) if (h) { ::RegCloseKey(h); h = NULL; }
+typedef enum REG_KEY_BITNESS
+{
+    REG_KEY_DEFAULT = 0,
+    REG_KEY_32BIT = 1,
+    REG_KEY_64BIT = 2
+} REG_KEY_BITNESS;
+typedef LSTATUS (APIENTRY *PFN_REGCREATEKEYEXW)(
+    __in HKEY hKey,
+    __in LPCWSTR lpSubKey,
+    __reserved DWORD Reserved,
+    __in_opt LPWSTR lpClass,
+    __in DWORD dwOptions,
+    __in REGSAM samDesired,
+    __in_opt CONST LPSECURITY_ATTRIBUTES lpSecurityAttributes,
+    __out PHKEY phkResult,
+    __out_opt LPDWORD lpdwDisposition
+    );
+typedef LSTATUS (APIENTRY *PFN_REGOPENKEYEXW)(
+    __in HKEY hKey,
+    __in_opt LPCWSTR lpSubKey,
+    __reserved DWORD ulOptions,
+    __in REGSAM samDesired,
+    __out PHKEY phkResult
+    );
+typedef LSTATUS (APIENTRY *PFN_REGDELETEKEYEXW)(
+    __in HKEY hKey,
+    __in LPCWSTR lpSubKey,
+    __in REGSAM samDesired,
+    __reserved DWORD Reserved
+    );
+typedef LSTATUS (APIENTRY *PFN_REGDELETEKEYW)(
+    __in HKEY hKey,
+    __in LPCWSTR lpSubKey
+    );
+typedef LSTATUS (APIENTRY *PFN_REGENUMKEYEXW)(
+    __in         HKEY hKey,
+    __in         DWORD dwIndex,
+    __out        LPWSTR lpName,
+    __inout      LPDWORD lpcName,
+    __reserved   LPDWORD lpReserved,
+    __inout_opt  LPWSTR lpClass,
+    __inout_opt  LPDWORD lpcClass,
+    __out_opt    PFILETIME lpftLastWriteTime
+    );
+typedef LSTATUS (APIENTRY *PFN_REGENUMVALUEW)(
+    __in         HKEY hKey,
+    __in         DWORD dwIndex,
+    __out        LPWSTR lpValueName,
+    __inout      LPDWORD lpcchValueName,
+    __reserved   LPDWORD lpReserved,
+    __out_opt    LPDWORD lpType,
+    __out_opt    LPBYTE lpData,
+    __out_opt    LPDWORD lpcbData
+    );
+typedef LSTATUS (APIENTRY *PFN_REGQUERYINFOKEYW)(
+    __in         HKEY hKey,
+    __out_opt    LPWSTR lpClass,
+    __inout_opt  LPDWORD lpcClass,
+    __reserved   LPDWORD lpReserved,
+    __out_opt    LPDWORD lpcSubKeys,
+    __out_opt    LPDWORD lpcMaxSubKeyLen,
+    __out_opt    LPDWORD lpcMaxClassLen,
+    __out_opt    LPDWORD lpcValues,
+    __out_opt    LPDWORD lpcMaxValueNameLen,
+    __out_opt    LPDWORD lpcMaxValueLen,
+    __out_opt    LPDWORD lpcbSecurityDescriptor,
+    __out_opt    PFILETIME lpftLastWriteTime
+    );
+typedef LSTATUS (APIENTRY *PFN_REGQUERYVALUEEXW)(
+    __in HKEY hKey,
+    __in_opt LPCWSTR lpValueName,
+    __reserved LPDWORD lpReserved,
+    __out_opt LPDWORD lpType,
+    __out_bcount_part_opt(*lpcbData, *lpcbData) __out_data_source(REGISTRY) LPBYTE lpData,
+    __inout_opt LPDWORD lpcbData
+    );
+typedef LSTATUS (APIENTRY *PFN_REGSETVALUEEXW)(
+    __in HKEY hKey,
+    __in_opt LPCWSTR lpValueName,
+    __reserved DWORD Reserved,
+    __in DWORD dwType,
+    __in_bcount_opt(cbData) CONST BYTE* lpData,
+    __in DWORD cbData
+    );
+typedef LSTATUS (APIENTRY *PFN_REGDELETEVALUEW)(
+    __in HKEY hKey,
+    __in_opt LPCWSTR lpValueName
+    );
+HRESULT DAPI RegInitialize();
+void DAPI RegUninitialize();
+void DAPI RegFunctionOverride(
+    __in_opt PFN_REGCREATEKEYEXW pfnRegCreateKeyExW,
+    __in_opt PFN_REGOPENKEYEXW pfnRegOpenKeyExW,
+    __in_opt PFN_REGDELETEKEYEXW pfnRegDeleteKeyExW,
+    __in_opt PFN_REGENUMKEYEXW pfnRegEnumKeyExW,
+    __in_opt PFN_REGENUMVALUEW pfnRegEnumValueW,
+    __in_opt PFN_REGQUERYINFOKEYW pfnRegQueryInfoKeyW,
+    __in_opt PFN_REGQUERYVALUEEXW pfnRegQueryValueExW,
+    __in_opt PFN_REGSETVALUEEXW pfnRegSetValueExW,
+    __in_opt PFN_REGDELETEVALUEW pfnRegDeleteValueW
+    );
+HRESULT DAPI RegCreate(
+    __in HKEY hkRoot,
+    __in_z LPCWSTR wzSubKey,
+    __in DWORD dwAccess,
+    __out HKEY* phk
+    );
+HRESULT DAPI RegCreateEx(
+    __in HKEY hkRoot,
+    __in_z LPCWSTR wzSubKey,
+    __in DWORD dwAccess,
+    __in BOOL fVolatile,
+    __in_opt SECURITY_ATTRIBUTES* pSecurityAttributes,
+    __out HKEY* phk,
+    __out_opt BOOL* pfCreated
+    );
+HRESULT DAPI RegOpen(
+    __in HKEY hkRoot,
+    __in_z LPCWSTR wzSubKey,
+    __in DWORD dwAccess,
+    __out HKEY* phk
+    );
+HRESULT DAPI RegDelete(
+    __in HKEY hkRoot,
+    __in_z LPCWSTR wzSubKey,
+    __in REG_KEY_BITNESS kbKeyBitness,
+    __in BOOL fDeleteTree
+    );
+HRESULT DAPI RegKeyEnum(
+    __in HKEY hk,
+    __in DWORD dwIndex,
+    __deref_out_z LPWSTR* psczKey
+    );
+HRESULT DAPI RegValueEnum(
+    __in HKEY hk,
+    __in DWORD dwIndex,
+    __deref_out_z LPWSTR* psczName,
+    __out_opt DWORD *pdwType
+    );
+HRESULT DAPI RegGetType(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __out DWORD *pdwType
+     );
+HRESULT DAPI RegReadBinary(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __deref_out_bcount_opt(*pcbBuffer) BYTE** ppbBuffer,
+    __out SIZE_T *pcbBuffer
+     );
+HRESULT DAPI RegReadString(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __deref_out_z LPWSTR* psczValue
+    );
+HRESULT DAPI RegReadStringArray(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __deref_out_ecount_opt(*pcStrings) LPWSTR** prgsczStrings,
+    __out DWORD *pcStrings
+    );
+HRESULT DAPI RegReadVersion(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __out DWORD64* pdw64Version
+    );
+HRESULT DAPI RegReadNumber(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __out DWORD* pdwValue
+    );
+HRESULT DAPI RegReadQword(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __out DWORD64* pqwValue
+    );
+HRESULT DAPI RegWriteBinary(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __in_bcount(cbBuffer) const BYTE *pbBuffer,
+    __in DWORD cbBuffer
+    );
+HRESULT DAPI RegWriteString(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __in_z_opt LPCWSTR wzValue
+    );
+HRESULT DAPI RegWriteStringArray(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __in_ecount(cStrings) LPWSTR *rgwzStrings,
+    __in DWORD cStrings
+    );
+HRESULT DAPI RegWriteStringFormatted(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __in __format_string LPCWSTR szFormat,
+    ...
+    );
+HRESULT DAPI RegWriteNumber(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __in DWORD dwValue
+    );
+HRESULT DAPI RegWriteQword(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __in DWORD64 qwValue
+    );
+HRESULT DAPI RegQueryKey(
+    __in HKEY hk,
+    __out_opt DWORD* pcSubKeys,
+    __out_opt DWORD* pcValues
+    );
+HRESULT DAPI RegKeyReadNumber(
+    __in HKEY hk,
+    __in_z LPCWSTR wzSubKey,
+    __in_z_opt LPCWSTR wzName,
+    __in BOOL f64Bit,
+    __out DWORD* pdwValue
+    );
+BOOL DAPI RegValueExists(
+    __in HKEY hk,
+    __in_z LPCWSTR wzSubKey,
+    __in_z_opt LPCWSTR wzName,
+    __in BOOL f64Bit
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/resrutil.h b/src/libs/dutil/WixToolset.DUtil/inc/resrutil.h
new file mode 100644
index 00000000..1f4d8e17
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/resrutil.h
@@ -0,0 +1,43 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+HRESULT DAPI ResGetStringLangId(
+    __in_opt LPCWSTR wzPath,
+    __in UINT uID,
+    __out WORD *pwLangId
+    );
+HRESULT DAPI ResReadString(
+    __in HINSTANCE hinst,
+    __in UINT uID,
+    __deref_out_z LPWSTR* ppwzString
+    );
+HRESULT DAPI ResReadStringAnsi(
+    __in HINSTANCE hinst,
+    __in UINT uID,
+    __deref_out_z LPSTR* ppszString
+    );
+HRESULT DAPI ResReadData(
+    __in_opt HINSTANCE hinst,
+    __in_z LPCSTR szDataName,
+    __deref_out_bcount(*pcb) PVOID *ppv,
+    __out DWORD *pcb
+    );
+HRESULT DAPI ResExportDataToFile(
+    __in_z LPCSTR szDataName,
+    __in_z LPCWSTR wzTargetFile,
+    __in DWORD dwCreationDisposition
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/reswutil.h b/src/libs/dutil/WixToolset.DUtil/inc/reswutil.h
new file mode 100644
index 00000000..31435ae2
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/reswutil.h
@@ -0,0 +1,31 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+HRESULT DAPI ResWriteString(
+    __in_z LPCWSTR wzResourceFile,
+    __in DWORD dwDataId,
+    __in_z LPCWSTR wzData,
+    __in WORD wLangId
+    );
+HRESULT DAPI ResWriteData(
+    __in_z LPCWSTR wzResourceFile,
+    __in_z LPCSTR szDataName,
+    __in PVOID pData,
+    __in DWORD cbData
+    );
+HRESULT DAPI ResImportDataFromFile(
+    __in_z LPCWSTR wzTargetFile,
+    __in_z LPCWSTR wzSourceFile,
+    __in_z LPCSTR szDataName
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/rexutil.h b/src/libs/dutil/WixToolset.DUtil/inc/rexutil.h
new file mode 100644
index 00000000..77f5604a
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/rexutil.h
@@ -0,0 +1,54 @@
+#pragma once
+// 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.
+#include <sys\stat.h>
+#include <fdi.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+// defines
+#define FILETABLESIZE 40
+// structs
+struct MEM_FILE 
+{
+    LPCBYTE vpStart;
+    UINT  uiCurrent;
+    UINT  uiLength;
+};
+typedef enum FAKE_FILE_TYPE { NORMAL_FILE, MEMORY_FILE } FAKE_FILE_TYPE;
+typedef HRESULT (*REX_CALLBACK_PROGRESS)(BOOL fBeginFile, LPCWSTR wzFileId, LPVOID pvContext);
+typedef VOID (*REX_CALLBACK_WRITE)(UINT cb);
+struct FAKE_FILE // used __in internal file table
+{
+    BOOL fUsed;
+    FAKE_FILE_TYPE fftType;
+    MEM_FILE mfFile; // State for memory file
+    HANDLE hFile; // Handle for disk  file
+};
+// functions
+HRESULT RexInitialize();
+void RexUninitialize();
+HRESULT RexExtract(
+    __in_z LPCSTR szResource,
+    __in_z LPCWSTR wzExtractId,
+    __in_z LPCWSTR wzExtractDir,
+    __in_z LPCWSTR wzExtractName,
+    __in REX_CALLBACK_PROGRESS pfnProgress,
+    __in REX_CALLBACK_WRITE pfnWrite,
+    __in LPVOID pvContext
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/rmutil.h b/src/libs/dutil/WixToolset.DUtil/inc/rmutil.h
new file mode 100644
index 00000000..ce7bf254
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/rmutil.h
@@ -0,0 +1,46 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+typedef struct _RMU_SESSION *PRMU_SESSION;
+HRESULT DAPI RmuJoinSession(
+    __out PRMU_SESSION *ppSession,
+    __in_z LPCWSTR wzSessionKey
+    );
+HRESULT DAPI RmuAddFile(
+    __in PRMU_SESSION pSession,
+    __in_z LPCWSTR wzPath
+    );
+HRESULT DAPI RmuAddProcessById(
+    __in PRMU_SESSION pSession,
+    __in DWORD dwProcessId
+    );
+HRESULT DAPI RmuAddProcessesByName(
+    __in PRMU_SESSION pSession,
+    __in_z LPCWSTR wzProcessName
+    );
+HRESULT DAPI RmuAddService(
+    __in PRMU_SESSION pSession,
+    __in_z LPCWSTR wzServiceName
+    );
+HRESULT DAPI RmuRegisterResources(
+    __in PRMU_SESSION pSession
+    );
+HRESULT DAPI RmuEndSession(
+    __in PRMU_SESSION pSession
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/rssutil.h b/src/libs/dutil/WixToolset.DUtil/inc/rssutil.h
new file mode 100644
index 00000000..064ab147
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/rssutil.h
@@ -0,0 +1,89 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define ReleaseRssChannel(p) if (p) { RssFreeChannel(p); }
+#define ReleaseNullRssChannel(p) if (p) { RssFreeChannel(p); p = NULL; }
+struct RSS_UNKNOWN_ATTRIBUTE
+{
+    LPWSTR wzNamespace;
+    LPWSTR wzAttribute;
+    LPWSTR wzValue;
+    RSS_UNKNOWN_ATTRIBUTE* pNext;
+};
+struct RSS_UNKNOWN_ELEMENT
+{
+    LPWSTR wzNamespace;
+    LPWSTR wzElement;
+    LPWSTR wzValue;
+    RSS_UNKNOWN_ATTRIBUTE* pAttributes;
+    RSS_UNKNOWN_ELEMENT* pNext;
+};
+struct RSS_ITEM
+{
+    LPWSTR wzTitle;
+    LPWSTR wzLink;
+    LPWSTR wzDescription;
+    LPWSTR wzGuid;
+    FILETIME ftPublished;
+    LPWSTR wzEnclosureUrl;
+    DWORD dwEnclosureSize;
+    LPWSTR wzEnclosureType;
+    RSS_UNKNOWN_ELEMENT* pUnknownElements;
+};
+struct RSS_CHANNEL
+{
+    LPWSTR wzTitle;
+    LPWSTR wzLink;
+    LPWSTR wzDescription;
+    DWORD dwTimeToLive;
+    RSS_UNKNOWN_ELEMENT* pUnknownElements;
+    DWORD cItems;
+    RSS_ITEM rgItems[1];
+};
+HRESULT DAPI RssInitialize(
+    );
+void DAPI RssUninitialize(
+    );
+HRESULT DAPI RssParseFromString(
+    __in_z LPCWSTR wzRssString,
+    __out RSS_CHANNEL **ppChannel
+    );
+HRESULT DAPI RssParseFromFile(
+    __in_z LPCWSTR wzRssFile,
+    __out RSS_CHANNEL **ppChannel
+    );
+// Adding this until we have the updated specstrings.h
+#ifndef __in_xcount
+#define __in_xcount(size) 
+#endif
+void DAPI RssFreeChannel(
+    __in_xcount(pChannel->cItems) RSS_CHANNEL *pChannel
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/sceutil.h b/src/libs/dutil/WixToolset.DUtil/inc/sceutil.h
new file mode 100644
index 00000000..9d14eecf
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/sceutil.h
@@ -0,0 +1,273 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <sqlce_oledb.h>
+#include <sqlce_sync.h>
+#include <sqlce_err.h>
+typedef void* SCE_DATABASE_HANDLE;
+typedef void* SCE_ROW_HANDLE;
+typedef void* SCE_QUERY_HANDLE;
+typedef void* SCE_QUERY_RESULTS_HANDLE;
+extern const int SCE_ROW_HANDLE_BYTES;
+extern const int SCE_QUERY_HANDLE_BYTES;
+extern const int SCE_QUERY_RESULTS_HANDLE_BYTES;
+#define ReleaseSceRow(prrh) if (prrh) { SceFreeRow(prrh); }
+#define ReleaseNullSceRow(prrh) if (prrh) { SceFreeRow(prrh); prrh = NULL; }
+#define ReleaseSceQuery(pqh) if (pqh) { SceFreeQuery(pqh); }
+#define ReleaseNullSceQuery(pqh) if (pqh) { SceFreeQuery(pqh); pqh = NULL; }
+#define ReleaseSceQueryResults(pqh) if (pqh) { SceFreeQueryResults(pqh); }
+#define ReleaseNullSceQueryResults(pqh) if (pqh) { SceFreeQueryResults(pqh); pqh = NULL; }
+struct SCE_COLUMN_SCHEMA
+{
+    LPCWSTR wzName;
+    DBTYPE dbtColumnType;
+    DWORD dwLength;
+    BOOL fPrimaryKey; // If this column is the primary key
+    BOOL fNullable;
+    BOOL fAutoIncrement;
+    BOOL fDescending; // If this column should be descending when used in an index (default is ascending)
+    LPWSTR wzRelationName;
+    DWORD dwForeignKeyTable;
+    DWORD dwForeignKeyColumn;
+};
+struct SCE_INDEX_SCHEMA
+{
+    LPWSTR wzName;
+    DWORD *rgColumns;
+    DWORD cColumns;
+};
+struct SCE_TABLE_SCHEMA
+{
+    LPCWSTR wzName;
+    DWORD cColumns;
+    SCE_COLUMN_SCHEMA *rgColumns;
+    DWORD cIndexes;
+    SCE_INDEX_SCHEMA *rgIndexes;
+    // Internal to SCEUtil - consumers shouldn't access or modify
+    // TODO: enforce / hide in a handle of some sort?
+    IRowset *pIRowset;
+    IRowsetChange *pIRowsetChange;
+};
+struct SCE_DATABASE_SCHEMA
+{
+    DWORD cTables;
+    SCE_TABLE_SCHEMA *rgTables;
+};
+struct SCE_DATABASE
+{
+    SCE_DATABASE_HANDLE sdbHandle;
+    SCE_DATABASE_SCHEMA *pdsSchema;
+};
+HRESULT DAPI SceCreateDatabase(
+    __in_z LPCWSTR sczFile,
+    __in_z_opt LPCWSTR wzSqlCeDllPath,
+    __deref_out SCE_DATABASE **ppDatabase
+    );
+HRESULT DAPI SceOpenDatabase(
+    __in_z LPCWSTR sczFile,
+    __in_z_opt LPCWSTR wzSqlCeDllPath,
+    __in LPCWSTR wzSchemaType,
+    __in DWORD dwExpectedVersion,
+    __deref_out SCE_DATABASE **ppDatabase,
+    __in BOOL fReadOnly
+    );
+HRESULT DAPI SceEnsureDatabase(
+    __in_z LPCWSTR sczFile,
+    __in_z_opt LPCWSTR wzSqlCeDllPath,
+    __in LPCWSTR wzSchemaType,
+    __in DWORD dwExpectedVersion,
+    __in SCE_DATABASE_SCHEMA *pdsSchema,
+    __deref_out SCE_DATABASE **ppDatabase
+    );
+HRESULT DAPI SceIsTableEmpty(
+    __in SCE_DATABASE *pDatabase,
+    __in DWORD dwTableIndex,
+    __out BOOL *pfEmpty
+    );
+HRESULT DAPI SceGetFirstRow(
+    __in SCE_DATABASE *pDatabase,
+    __in DWORD dwTableIndex,
+    __deref_out_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE *pRowHandle
+    );
+HRESULT DAPI SceGetNextRow(
+    __in SCE_DATABASE *pDatabase,
+    __in DWORD dwTableIndex,
+    __deref_out_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE *pRowHandle
+    );
+HRESULT DAPI SceBeginTransaction(
+    __in SCE_DATABASE *pDatabase
+    );
+HRESULT DAPI SceCommitTransaction(
+    __in SCE_DATABASE *pDatabase
+    );
+HRESULT DAPI SceRollbackTransaction(
+    __in SCE_DATABASE *pDatabase
+    );
+HRESULT DAPI SceDeleteRow(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE *pRowHandle
+    );
+HRESULT DAPI ScePrepareInsert(
+    __in SCE_DATABASE *pDatabase,
+    __in DWORD dwTableIndex,
+    __deref_out_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE *pRowHandle
+    );
+HRESULT DAPI SceFinishUpdate(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowHandle
+    );
+HRESULT DAPI SceSetColumnBinary(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowHandle,
+    __in DWORD dwColumnIndex,
+    __in_bcount(cbBuffer) const BYTE* pbBuffer,
+    __in SIZE_T cbBuffer
+    );
+HRESULT DAPI SceSetColumnDword(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowHandle,
+    __in DWORD dwColumnIndex,
+    __in const DWORD dwValue
+    );
+HRESULT DAPI SceSetColumnQword(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowHandle,
+    __in DWORD dwColumnIndex,
+    __in const DWORD64 qwValue
+    );
+HRESULT DAPI SceSetColumnBool(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowHandle,
+    __in DWORD dwColumnIndex,
+    __in const BOOL fValue
+    );
+HRESULT DAPI SceSetColumnString(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowHandle,
+    __in DWORD dwColumnIndex,
+    __in_z_opt LPCWSTR wzValue
+    );
+HRESULT DAPI SceSetColumnSystemTime(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowHandle,
+    __in DWORD dwColumnIndex,
+    __in const SYSTEMTIME *pst
+    );
+HRESULT DAPI SceSetColumnNull(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowHandle,
+    __in DWORD dwColumnIndex
+    );
+HRESULT DAPI SceGetColumnBinary(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowReadHandle,
+    __in DWORD dwColumnIndex,
+    __out_opt BYTE **ppbBuffer,
+    __inout SIZE_T *pcbBuffer
+    );
+HRESULT DAPI SceGetColumnDword(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowReadHandle,
+    __in DWORD dwColumnIndex,
+    __out DWORD *pdwValue
+    );
+HRESULT DAPI SceGetColumnQword(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowReadHandle,
+    __in DWORD dwColumnIndex,
+    __out DWORD64 *pqwValue
+    );
+HRESULT DAPI SceGetColumnBool(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowReadHandle,
+    __in DWORD dwColumnIndex,
+    __out BOOL *pfValue
+    );
+HRESULT DAPI SceGetColumnString(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowReadHandle,
+    __in DWORD dwColumnIndex,
+    __out_z LPWSTR *psczValue
+    );
+HRESULT DAPI SceGetColumnSystemTime(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowReadHandle,
+    __in DWORD dwColumnIndex,
+    __out SYSTEMTIME *pst
+    );
+HRESULT DAPI SceBeginQuery(
+    __in SCE_DATABASE *pDatabase,
+    __in DWORD dwTableIndex,
+    __in DWORD dwIndex,
+    __deref_out_bcount(SCE_QUERY_HANDLE_BYTES) SCE_QUERY_HANDLE *psqhHandle
+    );
+HRESULT DAPI SceSetQueryColumnBinary(
+    __in_bcount(SCE_QUERY_BYTES) SCE_QUERY_HANDLE sqhHandle,
+    __in_bcount(cbBuffer) const BYTE* pbBuffer,
+    __in SIZE_T cbBuffer
+    );
+HRESULT DAPI SceSetQueryColumnDword(
+    __in_bcount(SCE_QUERY_BYTES) SCE_QUERY_HANDLE sqhHandle,
+    __in const DWORD dwValue
+    );
+HRESULT DAPI SceSetQueryColumnQword(
+    __in_bcount(SCE_QUERY_BYTES) SCE_QUERY_HANDLE sqhHandle,
+    __in const DWORD64 qwValue
+    );
+HRESULT DAPI SceSetQueryColumnBool(
+    __in_bcount(SCE_QUERY_BYTES) SCE_QUERY_HANDLE sqhHandle,
+    __in const BOOL fValue
+    );
+HRESULT DAPI SceSetQueryColumnString(
+    __in_bcount(SCE_QUERY_BYTES) SCE_QUERY_HANDLE sqhHandle,
+    __in_z_opt LPCWSTR wzString
+    );
+HRESULT DAPI SceSetQueryColumnSystemTime(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowHandle,
+    __in const SYSTEMTIME *pst
+    );
+HRESULT DAPI SceSetQueryColumnEmpty(
+    __in_bcount(SCE_QUERY_BYTES) SCE_QUERY_HANDLE sqhHandle
+    );
+HRESULT DAPI SceRunQueryExact(
+    __in_bcount(SCE_QUERY_BYTES) SCE_QUERY_HANDLE *psqhHandle,
+    __deref_out_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE *pRowHandle
+    );
+HRESULT DAPI SceRunQueryRange(
+    __in_bcount(SCE_QUERY_BYTES) SCE_QUERY_HANDLE *psqhHandle,
+    __deref_out_bcount(SCE_QUERY_RESULTS_BYTES) SCE_QUERY_RESULTS_HANDLE *psqrhHandle
+    );
+HRESULT DAPI SceGetNextResultRow(
+    __in_bcount(SCE_QUERY_RESULTS_BYTES) SCE_QUERY_RESULTS_HANDLE sqrhHandle,
+    __deref_out_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE *pRowHandle
+    );
+void DAPI SceCloseTable(
+    __in SCE_TABLE_SCHEMA *pTable
+    );
+// Returns whether the data in the database changed. Ignores schema changes.
+BOOL DAPI SceDatabaseChanged(
+    __in SCE_DATABASE *pDatabase
+    );
+// Resets the database changed flag
+void DAPI SceResetDatabaseChanged(
+    __in SCE_DATABASE *pDatabase
+    );
+HRESULT DAPI SceCloseDatabase(
+    __in SCE_DATABASE *pDatabase
+    );
+void DAPI SceFreeRow(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowReadHandle
+    );
+void DAPI SceFreeQuery(
+    __in_bcount(SCE_QUERY_BYTES) SCE_QUERY_HANDLE sqhHandle
+    );
+void DAPI SceFreeQueryResults(
+    __in_bcount(SCE_QUERY_RESULTS_BYTES) SCE_QUERY_RESULTS_HANDLE sqrhHandle
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/sczutil.h b/src/libs/dutil/WixToolset.DUtil/inc/sczutil.h
new file mode 100644
index 00000000..fcfbd13a
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/sczutil.h
@@ -0,0 +1,30 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+class PSCZ
+{
+public:
+    PSCZ() : m_scz(NULL) { }
+    ~PSCZ() { ReleaseNullStr(m_scz); }
+    operator LPWSTR() { return m_scz; }
+    operator LPCWSTR() { return m_scz; }
+    operator bool() { return NULL != m_scz; }
+    LPWSTR* operator &() { return &m_scz; }
+    bool operator !() { return !m_scz; }
+    WCHAR operator *() { return *m_scz; }
+    LPWSTR Detach() { LPWSTR scz = m_scz; m_scz = NULL; return scz; }
+private:
+    LPWSTR m_scz;
+};
+#endif  //__cplusplus
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/shelutil.h b/src/libs/dutil/WixToolset.DUtil/inc/shelutil.h
new file mode 100644
index 00000000..0b9f539d
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/shelutil.h
@@ -0,0 +1,47 @@
+#pragma once
+// 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.
+#ifndef REFKNOWNFOLDERID
+#define REFKNOWNFOLDERID REFGUID
+#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+typedef BOOL (STDAPICALLTYPE *PFN_SHELLEXECUTEEXW)(
+    __inout LPSHELLEXECUTEINFOW lpExecInfo
+    );
+void DAPI ShelFunctionOverride(
+    __in_opt PFN_SHELLEXECUTEEXW pfnShellExecuteExW
+    );
+HRESULT DAPI ShelExec(
+    __in_z LPCWSTR wzTargetPath,
+    __in_z_opt LPCWSTR wzParameters,
+    __in_z_opt LPCWSTR wzVerb,
+    __in_z_opt LPCWSTR wzWorkingDirectory,
+    __in int nShowCmd,
+    __in_opt HWND hwndParent,
+    __out_opt HANDLE* phProcess
+    );
+HRESULT DAPI ShelExecUnelevated(
+    __in_z LPCWSTR wzTargetPath,
+    __in_z_opt LPCWSTR wzParameters,
+    __in_z_opt LPCWSTR wzVerb,
+    __in_z_opt LPCWSTR wzWorkingDirectory,
+    __in int nShowCmd
+    );
+HRESULT DAPI ShelGetFolder(
+    __out_z LPWSTR* psczFolderPath,
+    __in int csidlFolder
+    );
+HRESULT DAPI ShelGetKnownFolder(
+    __out_z LPWSTR* psczFolderPath,
+    __in REFKNOWNFOLDERID rfidFolder
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/sqlutil.h b/src/libs/dutil/WixToolset.DUtil/inc/sqlutil.h
new file mode 100644
index 00000000..ddf09323
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/sqlutil.h
@@ -0,0 +1,136 @@
+#pragma once
+// 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.
+#include <cguid.h>
+#include <oledberr.h>
+#include <sqloledb.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+// Adding this until the SQL annotations are published to specstrings.h
+#ifndef __sql_command
+#define __sql_command
+#endif
+// structs
+struct SQL_FILESPEC
+{
+    WCHAR wzName[MAX_PATH];
+    WCHAR wzFilename[MAX_PATH];
+    WCHAR wzSize[MAX_PATH];
+    WCHAR wzMaxSize[MAX_PATH];
+    WCHAR wzGrow[MAX_PATH];
+};
+// functions
+HRESULT DAPI SqlConnectDatabase(
+    __in_z LPCWSTR wzServer, 
+    __in_z LPCWSTR wzInstance,
+    __in_z LPCWSTR wzDatabase, 
+    __in BOOL fIntegratedAuth, 
+    __in_z LPCWSTR wzUser, 
+    __in_z LPCWSTR wzPassword, 
+    __out IDBCreateSession** ppidbSession
+    );
+HRESULT DAPI SqlStartTransaction(
+    __in IDBCreateSession* pidbSession,
+    __out IDBCreateCommand** ppidbCommand,
+    __out ITransaction** ppit
+    );
+HRESULT DAPI SqlEndTransaction(
+    __in ITransaction* pit,
+    __in BOOL fCommit
+    );
+HRESULT DAPI SqlDatabaseExists(
+    __in_z LPCWSTR wzServer,
+    __in_z LPCWSTR wzInstance,
+    __in_z LPCWSTR wzDatabase,
+    __in BOOL fIntegratedAuth,
+    __in_z LPCWSTR wzUser,
+    __in_z LPCWSTR wzPassword,
+    __out_opt BSTR* pbstrErrorDescription
+    );
+HRESULT DAPI SqlSessionDatabaseExists(
+    __in IDBCreateSession* pidbSession,
+    __in_z LPCWSTR wzDatabase,
+    __out_opt BSTR* pbstrErrorDescription
+    );
+HRESULT DAPI SqlDatabaseEnsureExists(
+    __in_z LPCWSTR wzServer,
+    __in_z LPCWSTR wzInstance,
+    __in_z LPCWSTR wzDatabase,
+    __in BOOL fIntegratedAuth,
+    __in_z LPCWSTR wzUser,
+    __in_z LPCWSTR wzPassword,
+    __in_opt const SQL_FILESPEC* psfDatabase,
+    __in_opt const SQL_FILESPEC* psfLog,
+    __out_opt BSTR* pbstrErrorDescription
+    );
+HRESULT DAPI SqlSessionDatabaseEnsureExists(
+    __in IDBCreateSession* pidbSession,
+    __in_z LPCWSTR wzDatabase,
+    __in_opt const SQL_FILESPEC* psfDatabase,
+    __in_opt const SQL_FILESPEC* psfLog,
+    __out_opt BSTR* pbstrErrorDescription
+    );
+HRESULT DAPI SqlCreateDatabase(
+    __in_z LPCWSTR wzServer,
+    __in_z LPCWSTR wzInstance,
+    __in_z LPCWSTR wzDatabase,
+    __in BOOL fIntegratedAuth,
+    __in_z LPCWSTR wzUser,
+    __in_z LPCWSTR wzPassword,
+    __in_opt const SQL_FILESPEC* psfDatabase,
+    __in_opt const SQL_FILESPEC* psfLog,
+    __out_opt BSTR* pbstrErrorDescription
+    );
+HRESULT DAPI SqlSessionCreateDatabase(
+    __in IDBCreateSession* pidbSession,
+    __in_z LPCWSTR wzDatabase,
+    __in_opt const SQL_FILESPEC* psfDatabase,
+    __in_opt const SQL_FILESPEC* psfLog,
+    __out_opt BSTR* pbstrErrorDescription
+    );
+HRESULT DAPI SqlDropDatabase(
+    __in_z LPCWSTR wzServer,
+    __in_z LPCWSTR wzInstance,
+    __in_z LPCWSTR wzDatabase,
+    __in BOOL fIntegratedAuth,
+    __in_z LPCWSTR wzUser,
+    __in_z LPCWSTR wzPassword,
+    __out_opt BSTR* pbstrErrorDescription
+    );
+HRESULT DAPI SqlSessionDropDatabase(
+    __in IDBCreateSession* pidbSession,
+    __in_z LPCWSTR wzDatabase,
+    __out_opt BSTR* pbstrErrorDescription
+    );
+HRESULT DAPI SqlSessionExecuteQuery(
+    __in IDBCreateSession* pidbSession, 
+    __in __sql_command LPCWSTR wzSql, 
+    __out_opt IRowset** ppirs,
+    __out_opt DBROWCOUNT* pcRows,
+    __out_opt BSTR* pbstrErrorDescription
+    );
+HRESULT DAPI SqlCommandExecuteQuery(
+    __in IDBCreateCommand* pidbCommand, 
+    __in __sql_command LPCWSTR wzSql, 
+    __out IRowset** ppirs,
+    __out DBROWCOUNT* pcRows
+    );
+HRESULT DAPI SqlGetErrorInfo(
+    __in IUnknown* pObjectWithError,
+    __in REFIID IID_InterfaceWithError,
+    __in DWORD dwLocaleId,
+    __out_opt BSTR* pbstrErrorSource,
+    __out_opt BSTR* pbstrErrorDescription
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/srputil.h b/src/libs/dutil/WixToolset.DUtil/inc/srputil.h
new file mode 100644
index 00000000..95e96231
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/srputil.h
@@ -0,0 +1,45 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+typedef enum SRP_ACTION
+{
+    SRP_ACTION_UNKNOWN,
+    SRP_ACTION_UNINSTALL,
+    SRP_ACTION_INSTALL,
+    SRP_ACTION_MODIFY,
+} SRP_ACTION;
+/********************************************************************
+ SrpInitialize - initializes system restore point functionality.
+*******************************************************************/
+DAPI_(HRESULT) SrpInitialize(
+    __in BOOL fInitializeComSecurity
+    );
+/********************************************************************
+ SrpUninitialize - uninitializes system restore point functionality.
+*******************************************************************/
+DAPI_(void) SrpUninitialize();
+/********************************************************************
+ SrpCreateRestorePoint - creates a system restore point.
+*******************************************************************/
+DAPI_(HRESULT) SrpCreateRestorePoint(
+    __in_z LPCWSTR wzApplicationName,
+    __in SRP_ACTION action
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/strutil.h b/src/libs/dutil/WixToolset.DUtil/inc/strutil.h
new file mode 100644
index 00000000..1cff9ab8
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/strutil.h
@@ -0,0 +1,316 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define ReleaseStr(pwz) if (pwz) { StrFree(pwz); }
+#define ReleaseNullStr(pwz) if (pwz) { StrFree(pwz); pwz = NULL; }
+#define ReleaseBSTR(bstr) if (bstr) { ::SysFreeString(bstr); }
+#define ReleaseNullBSTR(bstr) if (bstr) { ::SysFreeString(bstr); bstr = NULL; }
+#define ReleaseStrArray(rg, c) { if (rg) { StrArrayFree(rg, c); } }
+#define ReleaseNullStrArray(rg, c) { if (rg) { StrArrayFree(rg, c); c = 0; rg = NULL; } }
+#define ReleaseNullStrSecure(pwz) if (pwz) { StrSecureZeroFreeString(pwz); pwz = NULL; }
+#define DeclareConstBSTR(bstr_const, wz) const WCHAR bstr_const[] = { 0x00, 0x00, sizeof(wz)-sizeof(WCHAR), 0x00, wz }
+#define UseConstBSTR(bstr_const) const_cast<BSTR>(bstr_const + 4)
+HRESULT DAPI StrAlloc(
+    __deref_out_ecount_part(cch, 0) LPWSTR* ppwz,
+    __in SIZE_T cch
+    );
+HRESULT DAPI StrAllocSecure(
+    __deref_out_ecount_part(cch, 0) LPWSTR* ppwz,
+    __in SIZE_T cch
+    );
+HRESULT DAPI StrTrimCapacity(
+    __deref_out_z LPWSTR* ppwz
+    );
+HRESULT DAPI StrTrimWhitespace(
+    __deref_out_z LPWSTR* ppwz,
+    __in_z LPCWSTR wzSource
+    );
+HRESULT DAPI StrAnsiAlloc(
+    __deref_out_ecount_part(cch, 0) LPSTR* ppz,
+    __in SIZE_T cch
+    );
+HRESULT DAPI StrAnsiTrimCapacity(
+    __deref_out_z LPSTR* ppz
+    );
+HRESULT DAPI StrAnsiTrimWhitespace(
+    __deref_out_z LPSTR* ppz,
+    __in_z LPCSTR szSource
+    );
+HRESULT DAPI StrAllocString(
+    __deref_out_ecount_z(cchSource+1) LPWSTR* ppwz,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource
+    );
+HRESULT DAPI StrAllocStringSecure(
+    __deref_out_ecount_z(cchSource + 1) LPWSTR* ppwz,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource
+    );
+HRESULT DAPI StrAnsiAllocString(
+    __deref_out_ecount_z(cchSource+1) LPSTR* ppsz,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource,
+    __in UINT uiCodepage
+    );
+HRESULT DAPI StrAllocStringAnsi(
+    __deref_out_ecount_z(cchSource+1) LPWSTR* ppwz,
+    __in_z LPCSTR szSource,
+    __in SIZE_T cchSource,
+    __in UINT uiCodepage
+    );
+HRESULT DAPI StrAnsiAllocStringAnsi(
+    __deref_out_ecount_z(cchSource+1) LPSTR* ppsz,
+    __in_z LPCSTR szSource,
+    __in SIZE_T cchSource
+    );
+HRESULT DAPI StrAllocPrefix(
+    __deref_out_z LPWSTR* ppwz,
+    __in_z LPCWSTR wzPrefix,
+    __in SIZE_T cchPrefix
+    );
+HRESULT DAPI StrAllocConcat(
+    __deref_out_z LPWSTR* ppwz,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource
+    );
+HRESULT DAPI StrAllocConcatSecure(
+    __deref_out_z LPWSTR* ppwz,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource
+    );
+HRESULT DAPI StrAnsiAllocConcat(
+    __deref_out_z LPSTR* ppz,
+    __in_z LPCSTR pzSource,
+    __in SIZE_T cchSource
+    );
+HRESULT __cdecl StrAllocFormatted(
+    __deref_out_z LPWSTR* ppwz,
+    __in __format_string LPCWSTR wzFormat,
+    ...
+    );
+HRESULT __cdecl StrAllocConcatFormatted(
+    __deref_out_z LPWSTR* ppwz,
+    __in __format_string LPCWSTR wzFormat,
+    ...
+    );
+HRESULT __cdecl StrAllocConcatFormattedSecure(
+    __deref_out_z LPWSTR* ppwz,
+    __in __format_string LPCWSTR wzFormat,
+    ...
+    );
+HRESULT __cdecl StrAllocFormattedSecure(
+    __deref_out_z LPWSTR* ppwz,
+    __in __format_string LPCWSTR wzFormat,
+    ...
+    );
+HRESULT __cdecl StrAnsiAllocFormatted(
+    __deref_out_z LPSTR* ppsz,
+    __in __format_string LPCSTR szFormat,
+    ...
+    );
+HRESULT DAPI StrAllocFormattedArgs(
+    __deref_out_z LPWSTR* ppwz,
+    __in __format_string LPCWSTR wzFormat,
+    __in va_list args
+    );
+HRESULT DAPI StrAllocFormattedArgsSecure(
+    __deref_out_z LPWSTR* ppwz,
+    __in __format_string LPCWSTR wzFormat,
+    __in va_list args
+    );
+HRESULT DAPI StrAnsiAllocFormattedArgs(
+    __deref_out_z LPSTR* ppsz,
+    __in __format_string LPCSTR szFormat,
+    __in va_list args
+    );
+HRESULT DAPI StrAllocFromError(
+    __inout LPWSTR *ppwzMessage,
+    __in HRESULT hrError,
+    __in_opt HMODULE hModule,
+    ...
+    );
+HRESULT DAPI StrMaxLength(
+    __in LPCVOID p,
+    __out SIZE_T* pcbch
+    );
+HRESULT DAPI StrSize(
+    __in LPCVOID p,
+    __out SIZE_T* pcbb
+    );
+HRESULT DAPI StrFree(
+    __in LPVOID p
+    );
+HRESULT DAPI StrReplaceStringAll(
+    __inout LPWSTR* ppwzOriginal,
+    __in_z LPCWSTR wzOldSubString,
+    __in_z LPCWSTR wzNewSubString
+    );
+HRESULT DAPI StrReplaceString(
+    __inout LPWSTR* ppwzOriginal,
+    __inout DWORD* pdwStartIndex,
+    __in_z LPCWSTR wzOldSubString,
+    __in_z LPCWSTR wzNewSubString
+    );
+HRESULT DAPI StrHexEncode(
+    __in_ecount(cbSource) const BYTE* pbSource,
+    __in SIZE_T cbSource,
+    __out_ecount(cchDest) LPWSTR wzDest,
+    __in SIZE_T cchDest
+    );
+HRESULT DAPI StrAllocHexEncode(
+    __in_ecount(cbSource) const BYTE* pbSource,
+    __in SIZE_T cbSource,
+    __deref_out_ecount_z(2*(cbSource+1)) LPWSTR* ppwzDest
+    );
+HRESULT DAPI StrHexDecode(
+    __in_z LPCWSTR wzSource,
+    __out_bcount(cbDest) BYTE* pbDest,
+    __in SIZE_T cbDest
+    );
+HRESULT DAPI StrAllocHexDecode(
+    __in_z LPCWSTR wzSource,
+    __out_bcount(*pcbDest) BYTE** ppbDest,
+    __out_opt DWORD* pcbDest
+    );
+HRESULT DAPI StrAllocBase85Encode(
+    __in_bcount_opt(cbSource) const BYTE* pbSource,
+    __in SIZE_T cbSource,
+    __deref_out_z LPWSTR* pwzDest
+    );
+HRESULT DAPI StrAllocBase85Decode(
+    __in_z LPCWSTR wzSource,
+    __deref_out_bcount(*pcbDest) BYTE** ppbDest,
+    __out SIZE_T* pcbDest
+);
+HRESULT DAPI MultiSzLen(
+    __in_ecount(*pcch) __nullnullterminated LPCWSTR pwzMultiSz,
+    __out SIZE_T* pcch
+    );
+HRESULT DAPI MultiSzPrepend(
+    __deref_inout_ecount(*pcchMultiSz) __nullnullterminated LPWSTR* ppwzMultiSz,
+    __inout_opt SIZE_T* pcchMultiSz,
+    __in __nullnullterminated LPCWSTR pwzInsert
+    );
+HRESULT DAPI MultiSzFindSubstring(
+    __in __nullnullterminated LPCWSTR pwzMultiSz,
+    __in __nullnullterminated LPCWSTR pwzSubstring,
+    __out_opt DWORD_PTR* pdwIndex,
+    __deref_opt_out __nullnullterminated LPCWSTR* ppwzFoundIn
+    );
+HRESULT DAPI MultiSzFindString(
+    __in __nullnullterminated LPCWSTR pwzMultiSz,
+    __in __nullnullterminated LPCWSTR pwzString,
+    __out_opt DWORD_PTR* pdwIndex,
+    __deref_opt_out __nullnullterminated LPCWSTR* ppwzFound
+    );
+HRESULT DAPI MultiSzRemoveString(
+    __deref_inout __nullnullterminated LPWSTR* ppwzMultiSz,
+    __in DWORD_PTR dwIndex
+    );
+HRESULT DAPI MultiSzInsertString(
+    __deref_inout __nullnullterminated LPWSTR* ppwzMultiSz,
+    __inout_opt SIZE_T* pcchMultiSz,
+    __in DWORD_PTR dwIndex,
+    __in_z LPCWSTR pwzInsert
+    );
+HRESULT DAPI MultiSzReplaceString(
+    __deref_inout __nullnullterminated LPWSTR* ppwzMultiSz,
+    __in DWORD_PTR dwIndex,
+    __in_z LPCWSTR pwzString
+    );
+LPCWSTR DAPI wcsistr(
+    __in_z LPCWSTR wzString,
+    __in_z LPCWSTR wzCharSet
+    );
+HRESULT DAPI StrStringToInt16(
+    __in_z LPCWSTR wzIn,
+    __in DWORD cchIn,
+    __out SHORT* psOut
+    );
+HRESULT DAPI StrStringToUInt16(
+    __in_z LPCWSTR wzIn,
+    __in DWORD cchIn,
+    __out USHORT* pusOut
+    );
+HRESULT DAPI StrStringToInt32(
+    __in_z LPCWSTR wzIn,
+    __in DWORD cchIn,
+    __out INT* piOut
+    );
+HRESULT DAPI StrStringToUInt32(
+    __in_z LPCWSTR wzIn,
+    __in DWORD cchIn,
+    __out UINT* puiOut
+    );
+HRESULT DAPI StrStringToInt64(
+    __in_z LPCWSTR wzIn,
+    __in DWORD cchIn,
+    __out LONGLONG* pllOut
+    );
+HRESULT DAPI StrStringToUInt64(
+    __in_z LPCWSTR wzIn,
+    __in DWORD cchIn,
+    __out ULONGLONG* pullOut
+    );
+void DAPI StrStringToUpper(
+    __inout_z LPWSTR wzIn
+    );
+void DAPI StrStringToLower(
+    __inout_z LPWSTR wzIn
+    );
+HRESULT DAPI StrAllocStringToUpperInvariant(
+    __deref_out_z LPWSTR* pscz,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource
+    );
+HRESULT DAPI StrAllocStringToLowerInvariant(
+    __deref_out_z LPWSTR* pscz,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource
+    );
+HRESULT DAPI StrArrayAllocString(
+    __deref_inout_ecount_opt(*pcStrArray) LPWSTR **prgsczStrArray,
+    __inout LPUINT pcStrArray,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource
+    );
+HRESULT DAPI StrArrayFree(
+    __in_ecount(cStrArray) LPWSTR *rgsczStrArray,
+    __in UINT cStrArray
+    );
+HRESULT DAPI StrSplitAllocArray(
+    __deref_inout_ecount_opt(*pcStrArray) LPWSTR **prgsczStrArray,
+    __inout LPUINT pcStrArray,
+    __in_z LPCWSTR wzSource,
+    __in_z LPCWSTR wzDelim
+    );
+HRESULT DAPI StrSecureZeroString(
+    __in LPWSTR pwz
+    );
+HRESULT DAPI StrSecureZeroFreeString(
+    __in LPWSTR pwz
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/svcutil.h b/src/libs/dutil/WixToolset.DUtil/inc/svcutil.h
new file mode 100644
index 00000000..80d6326c
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/svcutil.h
@@ -0,0 +1,21 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define ReleaseServiceHandle(h) if (h) { ::CloseServiceHandle(h); h = NULL; }
+HRESULT DAPI SvcQueryConfig(
+    __in SC_HANDLE sch,
+    __out QUERY_SERVICE_CONFIGW** ppConfig
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h b/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h
new file mode 100644
index 00000000..d3dd6d21
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/thmutil.h
@@ -0,0 +1,765 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define ReleaseTheme(p) if (p) { ThemeFree(p); p = NULL; }
+typedef HRESULT(CALLBACK *PFNTHM_EVALUATE_VARIABLE_CONDITION)(
+    __in_z LPCWSTR wzCondition,
+    __out BOOL* pf,
+    __in_opt LPVOID pvContext
+    );
+typedef HRESULT(CALLBACK *PFNTHM_FORMAT_VARIABLE_STRING)(
+    __in_z LPCWSTR wzFormat,
+    __inout LPWSTR* psczOut,
+    __in_opt LPVOID pvContext
+    );
+typedef HRESULT(CALLBACK *PFNTHM_GET_VARIABLE_NUMERIC)(
+    __in_z LPCWSTR wzVariable,
+    __out LONGLONG* pllValue,
+    __in_opt LPVOID pvContext
+    );
+typedef HRESULT(CALLBACK *PFNTHM_SET_VARIABLE_NUMERIC)(
+    __in_z LPCWSTR wzVariable,
+    __in LONGLONG llValue,
+    __in_opt LPVOID pvContext
+    );
+typedef HRESULT(CALLBACK *PFNTHM_GET_VARIABLE_STRING)(
+    __in_z LPCWSTR wzVariable,
+    __inout LPWSTR* psczValue,
+    __in_opt LPVOID pvContext
+    );
+typedef HRESULT(CALLBACK *PFNTHM_SET_VARIABLE_STRING)(
+    __in_z LPCWSTR wzVariable,
+    __in_z_opt LPCWSTR wzValue,
+    __in BOOL fFormatted,
+    __in_opt LPVOID pvContext
+    );
+typedef enum THEME_ACTION_TYPE
+{
+    THEME_ACTION_TYPE_BROWSE_DIRECTORY,
+    THEME_ACTION_TYPE_CHANGE_PAGE,
+    THEME_ACTION_TYPE_CLOSE_WINDOW,
+} THEME_ACTION_TYPE;
+typedef enum THEME_CONTROL_DATA
+{
+    THEME_CONTROL_DATA_HOVER = 1,
+} THEME_CONTROL_DATA;
+typedef enum THEME_CONTROL_TYPE
+{
+    THEME_CONTROL_TYPE_UNKNOWN,
+    THEME_CONTROL_TYPE_BILLBOARD,
+    THEME_CONTROL_TYPE_BUTTON,
+    THEME_CONTROL_TYPE_CHECKBOX,
+    THEME_CONTROL_TYPE_COMBOBOX,
+    THEME_CONTROL_TYPE_COMMANDLINK,
+    THEME_CONTROL_TYPE_EDITBOX,
+    THEME_CONTROL_TYPE_HYPERLINK,
+    THEME_CONTROL_TYPE_HYPERTEXT,
+    THEME_CONTROL_TYPE_IMAGE,
+    THEME_CONTROL_TYPE_LABEL,
+    THEME_CONTROL_TYPE_PANEL,
+    THEME_CONTROL_TYPE_PROGRESSBAR,
+    THEME_CONTROL_TYPE_RADIOBUTTON,
+    THEME_CONTROL_TYPE_RICHEDIT,
+    THEME_CONTROL_TYPE_STATIC,
+    THEME_CONTROL_TYPE_LISTVIEW,
+    THEME_CONTROL_TYPE_TREEVIEW,
+    THEME_CONTROL_TYPE_TAB,
+} THEME_CONTROL_TYPE;
+typedef enum THEME_SHOW_PAGE_REASON
+{
+    THEME_SHOW_PAGE_REASON_DEFAULT,
+    THEME_SHOW_PAGE_REASON_CANCEL,
+    THEME_SHOW_PAGE_REASON_REFRESH,
+} THEME_SHOW_PAGE_REASON;
+typedef enum THEME_WINDOW_INITIAL_POSITION
+{
+    THEME_WINDOW_INITIAL_POSITION_DEFAULT,
+    THEME_WINDOW_INITIAL_POSITION_CENTER_MONITOR_FROM_COORDINATES,
+} THEME_WINDOW_INITIAL_POSITION;
+struct THEME_COLUMN
+{
+    LPWSTR pszName;
+    UINT uStringId;
+    int nDefaultDpiBaseWidth;
+    int nBaseWidth;
+    int nWidth;
+    BOOL fExpands;
+};
+struct THEME_TAB
+{
+    LPWSTR pszName;
+    UINT uStringId;
+};
+struct THEME_ACTION
+{
+    LPWSTR sczCondition;
+    THEME_ACTION_TYPE type;
+    union
+    {
+        struct
+        {
+            LPWSTR sczVariableName;
+        } BrowseDirectory;
+        struct
+        {
+            LPWSTR sczPageName;
+            BOOL fCancel;
+        } ChangePage;
+    };
+};
+struct THEME_CONDITIONAL_TEXT
+{
+    LPWSTR sczCondition;
+    LPWSTR sczText;
+};
+// THEME_ASSIGN_CONTROL_ID - Used to apply a specific id to a named control (usually
+//                           to set the WM_COMMAND).
+struct THEME_ASSIGN_CONTROL_ID
+{
+    WORD wId;       // id to apply to control
+    LPCWSTR wzName; // name of control to match
+};
+const DWORD THEME_FIRST_ASSIGN_CONTROL_ID = 1024; // Recommended first control id to be assigned.
+struct THEME_CONTROL
+{
+    THEME_CONTROL_TYPE type;
+    WORD wId;
+    WORD wPageId;
+    LPWSTR sczName; // optional name for control, used to apply control id and link the control to a variable.
+    LPWSTR sczText;
+    LPWSTR sczTooltip;
+    LPWSTR sczNote; // optional text for command link
+    int nDefaultDpiX;
+    int nDefaultDpiY;
+    int nDefaultDpiHeight;
+    int nDefaultDpiWidth;
+    int nX;
+    int nY;
+    int nHeight;
+    int nWidth;
+    int nSourceX;
+    int nSourceY;
+    UINT uStringId;
+    LPWSTR sczEnableCondition;
+    LPWSTR sczVisibleCondition;
+    BOOL fDisableVariableFunctionality;
+    HBITMAP hImage;
+    HICON hIcon;
+    // Don't free these; it's just a handle to the central image lists stored in THEME. The handle is freed once, there.
+    HIMAGELIST rghImageList[4];
+    DWORD dwStyle;
+    DWORD dwExtendedStyle;
+    DWORD dwInternalStyle;
+    DWORD dwFontId;
+    // child controls
+    DWORD cControls;
+    THEME_CONTROL* rgControls;
+    // Used by billboard controls
+    WORD wBillboardInterval;
+    BOOL fBillboardLoops;
+    // Used by button and command link controls
+    THEME_ACTION* rgActions;
+    DWORD cActions;
+    THEME_ACTION* pDefaultAction;
+    // Used by hyperlink and owner-drawn button controls
+    DWORD dwFontHoverId;
+    DWORD dwFontSelectedId;
+    // Used by listview controls
+    THEME_COLUMN *ptcColumns;
+    DWORD cColumns;
+    // Used by radio button controls
+    BOOL fLastRadioButton;
+    LPWSTR sczValue;
+    LPWSTR sczVariable;
+    // Used by tab controls
+    THEME_TAB *pttTabs;
+    DWORD cTabs;
+    // Used by controls that have text
+    DWORD cConditionalText;
+    THEME_CONDITIONAL_TEXT* rgConditionalText;
+    // Used by command link controls
+    DWORD cConditionalNotes;
+    THEME_CONDITIONAL_TEXT* rgConditionalNotes;
+    // state variables that should be ignored
+    HWND hWnd;
+    DWORD dwData; // type specific data
+};
+struct THEME_IMAGELIST
+{
+    LPWSTR sczName;
+    HIMAGELIST hImageList;
+};
+struct THEME_SAVEDVARIABLE
+{
+    LPWSTR wzName;
+    LPWSTR sczValue;
+};
+struct THEME_PAGE
+{
+    WORD wId;
+    LPWSTR sczName;
+    DWORD cControlIndices;
+    DWORD cSavedVariables;
+    THEME_SAVEDVARIABLE* rgSavedVariables;
+};
+struct THEME_FONT_INSTANCE
+{
+    UINT nDpi;
+    HFONT hFont;
+};
+struct THEME_FONT
+{
+    LONG lfHeight;
+    LONG lfWeight;
+    BYTE lfUnderline;
+    BYTE lfQuality;
+    LPWSTR sczFaceName;
+    COLORREF crForeground;
+    HBRUSH hForeground;
+    COLORREF crBackground;
+    HBRUSH hBackground;
+    DWORD cFontInstances;
+    THEME_FONT_INSTANCE* rgFontInstances;
+};
+struct THEME
+{
+    WORD wId;
+    BOOL fAutoResize;
+    BOOL fForceResize;
+    DWORD dwStyle;
+    DWORD dwFontId;
+    HANDLE hIcon;
+    LPWSTR sczCaption;
+    int nDefaultDpiHeight;
+    int nDefaultDpiMinimumHeight;
+    int nDefaultDpiWidth;
+    int nDefaultDpiMinimumWidth;
+    int nHeight;
+    int nMinimumHeight;
+    int nWidth;
+    int nMinimumWidth;
+    int nWindowHeight;
+    int nWindowWidth;
+    int nSourceX;
+    int nSourceY;
+    UINT uStringId;
+    HBITMAP hImage;
+    DWORD cFonts;
+    THEME_FONT* rgFonts;
+    DWORD cPages;
+    THEME_PAGE* rgPages;
+    DWORD cImageLists;
+    THEME_IMAGELIST* rgImageLists;
+    DWORD cControls;
+    THEME_CONTROL* rgControls;
+    // internal state variables -- do not use outside ThmUtil.cpp
+    HWND hwndParent; // parent for loaded controls
+    HWND hwndHover; // current hwnd hovered over
+    DWORD dwCurrentPageId;
+    HWND hwndTooltip;
+    UINT nDpi;
+    // callback functions
+    PFNTHM_EVALUATE_VARIABLE_CONDITION pfnEvaluateCondition;
+    PFNTHM_FORMAT_VARIABLE_STRING pfnFormatString;
+    PFNTHM_GET_VARIABLE_NUMERIC pfnGetNumericVariable;
+    PFNTHM_SET_VARIABLE_NUMERIC pfnSetNumericVariable;
+    PFNTHM_GET_VARIABLE_STRING pfnGetStringVariable;
+    PFNTHM_SET_VARIABLE_STRING pfnSetStringVariable;
+    LPVOID pvVariableContext;
+};
+/********************************************************************
+ ThemeInitialize - initialized theme management.
+*******************************************************************/
+HRESULT DAPI ThemeInitialize(
+    __in_opt HMODULE hModule
+    );
+/********************************************************************
+ ThemeUninitialize - uninitialize theme management.
+*******************************************************************/
+void DAPI ThemeUninitialize();
+/********************************************************************
+ ThemeLoadFromFile - loads a theme from a loose file.
+ *******************************************************************/
+HRESULT DAPI ThemeLoadFromFile(
+    __in_z LPCWSTR wzThemeFile,
+    __out THEME** ppTheme
+    );
+/********************************************************************
+ ThemeLoadFromResource - loads a theme from a module's data resource.
+ NOTE: The resource data must be UTF-8 encoded.
+*******************************************************************/
+HRESULT DAPI ThemeLoadFromResource(
+    __in_opt HMODULE hModule,
+    __in_z LPCSTR szResource,
+    __out THEME** ppTheme
+    );
+/********************************************************************
+ ThemeFree - frees any memory associated with a theme.
+*******************************************************************/
+void DAPI ThemeFree(
+    __in THEME* pTheme
+    );
+/********************************************************************
+ThemeRegisterVariableCallbacks - registers a context and callbacks
+                                 for working with variables.
+*******************************************************************/
+HRESULT DAPI ThemeRegisterVariableCallbacks(
+    __in THEME* pTheme,
+    __in_opt PFNTHM_EVALUATE_VARIABLE_CONDITION pfnEvaluateCondition,
+    __in_opt PFNTHM_FORMAT_VARIABLE_STRING pfnFormatString,
+    __in_opt PFNTHM_GET_VARIABLE_NUMERIC pfnGetNumericVariable,
+    __in_opt PFNTHM_SET_VARIABLE_NUMERIC pfnSetNumericVariable,
+    __in_opt PFNTHM_GET_VARIABLE_STRING pfnGetStringVariable,
+    __in_opt PFNTHM_SET_VARIABLE_STRING pfnSetStringVariable,
+    __in_opt LPVOID pvContext
+    );
+/********************************************************************
+ ThemeCreateParentWindow - creates a parent window for the theme.
+*******************************************************************/
+HRESULT DAPI ThemeCreateParentWindow(
+    __in THEME* pTheme,
+    __in DWORD dwExStyle,
+    __in LPCWSTR szClassName,
+    __in LPCWSTR szWindowName,
+    __in DWORD dwStyle,
+    __in int x,
+    __in int y,
+    __in_opt HWND hwndParent,
+    __in_opt HINSTANCE hInstance,
+    __in_opt LPVOID lpParam,
+    __in THEME_WINDOW_INITIAL_POSITION initialPosition,
+    __out_opt HWND* phWnd
+    );
+/********************************************************************
+ ThemeLoadControls - creates the windows for all the theme controls
+                     using the window created in ThemeCreateParentWindow.
+*******************************************************************/
+HRESULT DAPI ThemeLoadControls(
+    __in THEME* pTheme,
+    __in_ecount_opt(cAssignControlIds) const THEME_ASSIGN_CONTROL_ID* rgAssignControlIds,
+    __in DWORD cAssignControlIds
+    );
+/********************************************************************
+ ThemeUnloadControls - resets all the theme control windows so the theme
+                       controls can be reloaded.
+*******************************************************************/
+void DAPI ThemeUnloadControls(
+    __in THEME* pTheme
+    );
+/********************************************************************
+ ThemeLocalize - Localizes all of the strings in the theme.
+*******************************************************************/
+HRESULT DAPI ThemeLocalize(
+    __in THEME *pTheme,
+    __in const WIX_LOCALIZATION *pLocStringSet
+    );
+HRESULT DAPI ThemeLoadStrings(
+    __in THEME* pTheme,
+    __in HMODULE hResModule
+    );
+/********************************************************************
+ ThemeLoadRichEditFromFile - Attach a richedit control to a RTF file.
+ *******************************************************************/
+HRESULT DAPI ThemeLoadRichEditFromFile(
+    __in THEME* pTheme,
+    __in DWORD dwControl,
+    __in_z LPCWSTR wzFileName,
+    __in HMODULE hModule
+    );
+/********************************************************************
+ ThemeLoadRichEditFromResource - Attach a richedit control to resource data.
+ *******************************************************************/
+HRESULT DAPI ThemeLoadRichEditFromResource(
+    __in THEME* pTheme,
+    __in DWORD dwControl,
+    __in_z LPCSTR szResourceName,
+    __in HMODULE hModule
+    );
+/********************************************************************
+ ThemeLoadRichEditFromResourceToHWnd - Attach a richedit control (by 
+                                       HWND) to resource data.
+ *******************************************************************/
+HRESULT DAPI ThemeLoadRichEditFromResourceToHWnd(
+    __in HWND hWnd,
+    __in_z LPCSTR szResourceName,
+    __in HMODULE hModule
+    );
+/********************************************************************
+ ThemeHandleKeyboardMessage - will translate the message using the active
+                             accelerator table.
+*******************************************************************/
+BOOL DAPI ThemeHandleKeyboardMessage(
+    __in_opt THEME* pTheme,
+    __in HWND hWnd,
+    __in MSG* pMsg
+    );
+/********************************************************************
+ ThemeDefWindowProc - replacement for DefWindowProc() when using theme.
+*******************************************************************/
+LRESULT CALLBACK ThemeDefWindowProc(
+    __in_opt THEME* pTheme,
+    __in HWND hWnd,
+    __in UINT uMsg,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    );
+/********************************************************************
+ ThemeGetPageIds - gets the page ids for the theme via page names.
+*******************************************************************/
+void DAPI ThemeGetPageIds(
+    __in const THEME* pTheme,
+    __in_ecount(cGetPages) LPCWSTR* rgwzFindNames,
+    __inout_ecount(cGetPages) DWORD* rgdwPageIds,
+    __in DWORD cGetPages
+    );
+/********************************************************************
+ ThemeGetPage - gets a theme page by id.
+ *******************************************************************/
+THEME_PAGE* DAPI ThemeGetPage(
+    __in const THEME* pTheme,
+    __in DWORD dwPage
+    );
+/********************************************************************
+ ThemeShowPage - shows or hides all of the controls in the page at one time.
+ *******************************************************************/
+HRESULT DAPI ThemeShowPage(
+    __in THEME* pTheme,
+    __in DWORD dwPage,
+    __in int nCmdShow
+    );
+/********************************************************************
+ThemeShowPageEx - shows or hides all of the controls in the page at one time.
+                  When using variables, TSPR_CANCEL reverts any changes made.
+                  TSPR_REFRESH forces reevaluation of conditions.
+                  It is expected that the current page is hidden before 
+                  showing a new page.
+*******************************************************************/
+HRESULT DAPI ThemeShowPageEx(
+    __in THEME* pTheme,
+    __in DWORD dwPage,
+    __in int nCmdShow,
+    __in THEME_SHOW_PAGE_REASON reason
+    );
+/********************************************************************
+ThemeShowChild - shows a control's specified child control, hiding the rest.
+*******************************************************************/
+void DAPI ThemeShowChild(
+    __in THEME* pTheme,
+    __in THEME_CONTROL* pParentControl,
+    __in DWORD dwIndex
+    );
+/********************************************************************
+ ThemeControlExists - check if a control with the specified id exists.
+ *******************************************************************/
+BOOL DAPI ThemeControlExists(
+    __in const THEME* pTheme,
+    __in DWORD dwControl
+    );
+/********************************************************************
+ ThemeControlEnable - enables/disables a control.
+ *******************************************************************/
+void DAPI ThemeControlEnable(
+    __in THEME* pTheme,
+    __in DWORD dwControl,
+    __in BOOL fEnable
+    );
+/********************************************************************
+ ThemeControlEnabled - returns whether a control is enabled/disabled.
+ *******************************************************************/
+BOOL DAPI ThemeControlEnabled(
+    __in THEME* pTheme,
+    __in DWORD dwControl
+    );
+/********************************************************************
+ ThemeControlElevates - sets/removes the shield icon on a control.
+ *******************************************************************/
+void DAPI ThemeControlElevates(
+    __in THEME* pTheme,
+    __in DWORD dwControl,
+    __in BOOL fElevates
+    );
+/********************************************************************
+ ThemeShowControl - shows/hides a control.
+ *******************************************************************/
+void DAPI ThemeShowControl(
+    __in THEME* pTheme,
+    __in DWORD dwControl,
+    __in int nCmdShow
+    );
+/********************************************************************
+ThemeShowControlEx - shows/hides a control with support for 
+conditional text and notes.
+*******************************************************************/
+void DAPI ThemeShowControlEx(
+    __in THEME* pTheme,
+    __in DWORD dwControl,
+    __in int nCmdShow
+    );
+/********************************************************************
+ ThemeControlVisible - returns whether a control is visible.
+ *******************************************************************/
+BOOL DAPI ThemeControlVisible(
+    __in THEME* pTheme,
+    __in DWORD dwControl
+    );
+BOOL DAPI ThemePostControlMessage(
+    __in THEME* pTheme,
+    __in DWORD dwControl,
+    __in UINT Msg,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    );
+LRESULT DAPI ThemeSendControlMessage(
+    __in const THEME* pTheme,
+    __in DWORD dwControl,
+    __in UINT Msg,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    );
+/********************************************************************
+ ThemeDrawBackground - draws the theme background.
+*******************************************************************/
+HRESULT DAPI ThemeDrawBackground(
+    __in THEME* pTheme,
+    __in PAINTSTRUCT* pps
+    );
+/********************************************************************
+ ThemeDrawControl - draw an owner drawn control.
+*******************************************************************/
+HRESULT DAPI ThemeDrawControl(
+    __in THEME* pTheme,
+    __in DRAWITEMSTRUCT* pdis
+    );
+/********************************************************************
+ ThemeHoverControl - mark a control as hover.
+*******************************************************************/
+BOOL DAPI ThemeHoverControl(
+    __in THEME* pTheme,
+    __in HWND hwndParent,
+    __in HWND hwndControl
+    );
+/********************************************************************
+ ThemeIsControlChecked - gets whether a control is checked. Only
+                         really useful for checkbox controls.
+*******************************************************************/
+BOOL DAPI ThemeIsControlChecked(
+    __in THEME* pTheme,
+    __in DWORD dwControl
+    );
+/********************************************************************
+ ThemeSetControlColor - sets the color of text for a control.
+*******************************************************************/
+BOOL DAPI ThemeSetControlColor(
+    __in THEME* pTheme,
+    __in HDC hdc,
+    __in HWND hWnd,
+    __out HBRUSH* phBackgroundBrush
+    );
+/********************************************************************
+ ThemeSetProgressControl - sets the current percentage complete in a
+                           progress bar control.
+*******************************************************************/
+HRESULT DAPI ThemeSetProgressControl(
+    __in THEME* pTheme,
+    __in DWORD dwControl,
+    __in DWORD dwProgressPercentage
+    );
+/********************************************************************
+ ThemeSetProgressControlColor - sets the current color of a
+                                progress bar control.
+*******************************************************************/
+HRESULT DAPI ThemeSetProgressControlColor(
+    __in THEME* pTheme,
+    __in DWORD dwControl,
+    __in DWORD dwColorIndex
+    );
+/********************************************************************
+ ThemeSetTextControl - sets the text of a control.
+*******************************************************************/
+HRESULT DAPI ThemeSetTextControl(
+    __in const THEME* pTheme,
+    __in DWORD dwControl,
+    __in_z_opt LPCWSTR wzText
+    );
+/********************************************************************
+ThemeSetTextControl - sets the text of a control and optionally
+                      invalidates the control.
+*******************************************************************/
+HRESULT DAPI ThemeSetTextControlEx(
+    __in const THEME* pTheme,
+    __in DWORD dwControl,
+    __in BOOL fUpdate,
+    __in_z_opt LPCWSTR wzText
+    );
+/********************************************************************
+ ThemeGetTextControl - gets the text of a control.
+*******************************************************************/
+HRESULT DAPI ThemeGetTextControl(
+    __in const THEME* pTheme,
+    __in DWORD dwControl,
+    __inout_z LPWSTR* psczText
+    );
+/********************************************************************
+ ThemeUpdateCaption - updates the caption in the theme.
+*******************************************************************/
+HRESULT DAPI ThemeUpdateCaption(
+    __in THEME* pTheme,
+    __in_z LPCWSTR wzCaption
+    );
+/********************************************************************
+ ThemeSetFocus - set the focus to the control supplied or the next 
+                 enabled control if it is disabled.
+*******************************************************************/
+void DAPI ThemeSetFocus(
+    __in THEME* pTheme,
+    __in DWORD dwControl
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/timeutil.h b/src/libs/dutil/WixToolset.DUtil/inc/timeutil.h
new file mode 100644
index 00000000..3655c00a
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/timeutil.h
@@ -0,0 +1,38 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+HRESULT DAPI TimeFromString(
+    __in_z LPCWSTR wzTime,
+    __out FILETIME* pFileTime
+    );
+HRESULT DAPI TimeFromString3339(
+    __in_z LPCWSTR wzTime,
+    __out FILETIME* pFileTime
+    );
+HRESULT DAPI TimeCurrentTime(
+    __deref_out_z LPWSTR* ppwz,
+    __in BOOL fGMT
+    );
+HRESULT DAPI TimeCurrentDateTime(
+    __deref_out_z LPWSTR* ppwz,
+    __in BOOL fGMT
+    );
+HRESULT DAPI TimeSystemDateTime(
+    __deref_out_z LPWSTR* ppwz,
+    __in const SYSTEMTIME *pst,
+    __in BOOL fGMT
+    );
+HRESULT DAPI TimeSystemToDateTimeString(
+    __deref_out_z LPWSTR* ppwz,
+    __in const SYSTEMTIME *pst,
+    __in LCID locale
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/uncutil.h b/src/libs/dutil/WixToolset.DUtil/inc/uncutil.h
new file mode 100644
index 00000000..6516a801
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/uncutil.h
@@ -0,0 +1,20 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*******************************************************************
+ UncConvertFromMountedDrive - Converts the string in-place from a
+                mounted drive path to a UNC path
+*******************************************************************/
+DAPI_(HRESULT) UncConvertFromMountedDrive(
+    __inout LPWSTR *psczUNCPath,
+    __in LPCWSTR sczMountedDrivePath
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/uriutil.h b/src/libs/dutil/WixToolset.DUtil/inc/uriutil.h
new file mode 100644
index 00000000..d6dfdd6b
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/uriutil.h
@@ -0,0 +1,100 @@
+#pragma once
+// 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.
+#include "wininet.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+typedef enum URI_PROTOCOL
+{
+    URI_PROTOCOL_UNKNOWN,
+    URI_PROTOCOL_FILE,
+    URI_PROTOCOL_FTP,
+    URI_PROTOCOL_HTTP,
+    URI_PROTOCOL_HTTPS,
+    URI_PROTOCOL_LOCAL,
+    URI_PROTOCOL_UNC
+} URI_PROTOCOL;
+typedef struct _URI_INFO
+{
+    INTERNET_SCHEME scheme;
+    LPWSTR sczHostName;
+    INTERNET_PORT port;
+    LPWSTR sczUser;
+    LPWSTR sczPassword;
+    LPWSTR sczPath;
+    LPWSTR sczQueryString;
+} URI_INFO;
+HRESULT DAPI UriCanonicalize(
+    __inout_z LPWSTR* psczUri
+    );
+HRESULT DAPI UriCrack(
+    __in_z LPCWSTR wzUri,
+    __out_opt INTERNET_SCHEME* pScheme,
+    __deref_opt_out_z LPWSTR* psczHostName,
+    __out_opt INTERNET_PORT* pPort,
+    __deref_opt_out_z LPWSTR* psczUser,
+    __deref_opt_out_z LPWSTR* psczPassword,
+    __deref_opt_out_z LPWSTR* psczPath,
+    __deref_opt_out_z LPWSTR* psczQueryString
+    );
+HRESULT DAPI UriCrackEx(
+    __in_z LPCWSTR wzUri,
+    __in URI_INFO* pUriInfo
+    );
+void DAPI UriInfoUninitialize(
+    __in URI_INFO* pUriInfo
+    );
+HRESULT DAPI UriCreate(
+    __inout_z LPWSTR* psczUri,
+    __in INTERNET_SCHEME scheme,
+    __in_z_opt LPWSTR wzHostName,
+    __in INTERNET_PORT port,
+    __in_z_opt LPWSTR wzUser,
+    __in_z_opt LPWSTR wzPassword,
+    __in_z_opt LPWSTR wzPath,
+    __in_z_opt LPWSTR wzQueryString
+    );
+HRESULT DAPI UriCanonicalize(
+    __inout_z LPWSTR* psczUri
+    );
+HRESULT DAPI UriFile(
+    __deref_out_z LPWSTR* psczFile,
+    __in_z LPCWSTR wzUri
+    );
+HRESULT DAPI UriProtocol(
+    __in_z LPCWSTR wzUri,
+    __out URI_PROTOCOL* pProtocol
+    );
+HRESULT DAPI UriRoot(
+    __in_z LPCWSTR wzUri,
+    __out LPWSTR* ppwzRoot,
+    __out_opt URI_PROTOCOL* pProtocol
+    );
+HRESULT DAPI UriResolve(
+    __in_z LPCWSTR wzUri,
+    __in_opt LPCWSTR wzBaseUri,
+    __out LPWSTR* ppwzResolvedUri,
+    __out_opt URI_PROTOCOL* pResolvedProtocol
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/userutil.h b/src/libs/dutil/WixToolset.DUtil/inc/userutil.h
new file mode 100644
index 00000000..2c86d229
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/userutil.h
@@ -0,0 +1,32 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+HRESULT DAPI UserBuildDomainUserName(
+    __out_ecount_z(cchDest) LPWSTR wzDest,
+    __in int cchDest,
+    __in_z LPCWSTR pwzName,
+    __in_z LPCWSTR pwzDomain
+    );
+HRESULT DAPI UserCheckIsMember(
+    __in_z LPCWSTR pwzName,
+    __in_z LPCWSTR pwzDomain,
+    __in_z LPCWSTR pwzGroupName,
+    __in_z LPCWSTR pwzGroupDomain,
+    __out LPBOOL lpfMember
+    );
+HRESULT DAPI UserCreateADsPath(
+    __in_z LPCWSTR wzObjectDomain, 
+    __in_z LPCWSTR wzObjectName,
+    __out BSTR *pbstrAdsPath
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/verutil.h b/src/libs/dutil/WixToolset.DUtil/inc/verutil.h
new file mode 100644
index 00000000..5247bb61
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/verutil.h
@@ -0,0 +1,93 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define ReleaseVerutilVersion(p) if (p) { VerFreeVersion(p); p = NULL; }
+typedef struct _VERUTIL_VERSION_RELEASE_LABEL
+{
+    BOOL fNumeric;
+    DWORD dwValue;
+    SIZE_T cchLabelOffset;
+    int cchLabel;
+} VERUTIL_VERSION_RELEASE_LABEL;
+typedef struct _VERUTIL_VERSION
+{
+    LPWSTR sczVersion;
+    DWORD dwMajor;
+    DWORD dwMinor;
+    DWORD dwPatch;
+    DWORD dwRevision;
+    DWORD cReleaseLabels;
+    VERUTIL_VERSION_RELEASE_LABEL* rgReleaseLabels;
+    SIZE_T cchMetadataOffset;
+    BOOL fInvalid;
+} VERUTIL_VERSION;
+/*******************************************************************
+ VerCompareParsedVersions - compares the Verutil versions.
+*******************************************************************/
+HRESULT DAPI VerCompareParsedVersions(
+    __in_opt VERUTIL_VERSION* pVersion1,
+    __in_opt VERUTIL_VERSION* pVersion2,
+    __out int* pnResult
+    );
+/*******************************************************************
+ VerCompareStringVersions - parses the strings with VerParseVersion and then
+                            compares the Verutil versions with VerCompareParsedVersions.
+*******************************************************************/
+HRESULT DAPI VerCompareStringVersions(
+    __in_z LPCWSTR wzVersion1,
+    __in_z LPCWSTR wzVersion2,
+    __in BOOL fStrict,
+    __out int* pnResult
+    );
+/********************************************************************
+ VerCopyVersion - copies the given Verutil version.
+*******************************************************************/
+HRESULT DAPI VerCopyVersion(
+    __in VERUTIL_VERSION* pSource,
+    __out VERUTIL_VERSION** ppVersion
+    );
+/********************************************************************
+ VerFreeVersion - frees any memory associated with a Verutil version.
+*******************************************************************/
+void DAPI VerFreeVersion(
+    __in VERUTIL_VERSION* pVersion
+    );
+/*******************************************************************
+ VerParseVersion - parses the string into a Verutil version.
+*******************************************************************/
+HRESULT DAPI VerParseVersion(
+    __in_z LPCWSTR wzVersion,
+    __in SIZE_T cchVersion,
+    __in BOOL fStrict,
+    __out VERUTIL_VERSION** ppVersion
+    );
+/*******************************************************************
+ VerParseVersion - parses the QWORD into a Verutil version.
+*******************************************************************/
+HRESULT DAPI VerVersionFromQword(
+    __in DWORD64 qwVersion,
+    __out VERUTIL_VERSION** ppVersion
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/wiutil.h b/src/libs/dutil/WixToolset.DUtil/inc/wiutil.h
new file mode 100644
index 00000000..9c2de209
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/wiutil.h
@@ -0,0 +1,402 @@
+#pragma once
+// 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.
+#ifdef __cplusplus
+extern "C" {
+#endif
+// constants
+#define IDNOACTION 0
+#define WIU_MB_OKIGNORECANCELRETRY 0xE
+#define MAX_DARWIN_KEY 73
+#define MAX_DARWIN_COLUMN 255
+#define WIU_LOG_DEFAULT INSTALLLOGMODE_FATALEXIT | INSTALLLOGMODE_ERROR | INSTALLLOGMODE_WARNING | \
+                        INSTALLLOGMODE_USER | INSTALLLOGMODE_INFO | INSTALLLOGMODE_RESOLVESOURCE | \
+                        INSTALLLOGMODE_OUTOFDISKSPACE | INSTALLLOGMODE_ACTIONSTART | \
+                        INSTALLLOGMODE_ACTIONDATA | INSTALLLOGMODE_COMMONDATA | INSTALLLOGMODE_PROPERTYDUMP
+#define ReleaseMsi(h) if (h) { ::MsiCloseHandle(h); }
+#define ReleaseNullMsi(h) if (h) { ::MsiCloseHandle(h); h = NULL; }
+typedef enum WIU_RESTART
+{
+    WIU_RESTART_NONE,
+    WIU_RESTART_REQUIRED,
+    WIU_RESTART_INITIATED,
+} WIU_RESTART;
+typedef enum WIU_MSI_EXECUTE_MESSAGE_TYPE
+{
+    WIU_MSI_EXECUTE_MESSAGE_NONE,
+    WIU_MSI_EXECUTE_MESSAGE_PROGRESS,
+    WIU_MSI_EXECUTE_MESSAGE_ERROR,
+    WIU_MSI_EXECUTE_MESSAGE_MSI_MESSAGE,
+    WIU_MSI_EXECUTE_MESSAGE_MSI_FILES_IN_USE,
+} WIU_MSI_EXECUTE_MESSAGE_TYPE;
+// structures
+typedef struct _WIU_MSI_EXECUTE_MESSAGE
+{
+    WIU_MSI_EXECUTE_MESSAGE_TYPE type;
+    DWORD dwAllowedResults;
+    DWORD cData;
+    LPCWSTR* rgwzData;
+    INT nResultRecommendation; // recommended return result for this message based on analysis of real world installs.
+    union
+    {
+        struct
+        {
+            DWORD dwPercentage;
+        } progress;
+        struct
+        {
+            DWORD dwErrorCode;
+            LPCWSTR wzMessage;
+        } error;
+        struct
+        {
+            INSTALLMESSAGE mt;
+            LPCWSTR wzMessage;
+        } msiMessage;
+        struct
+        {
+            DWORD cFiles;
+            LPCWSTR* rgwzFiles;
+        } msiFilesInUse;
+    };
+} WIU_MSI_EXECUTE_MESSAGE;
+typedef struct _WIU_MSI_PROGRESS
+{
+    DWORD dwTotal;
+    DWORD dwCompleted;
+    DWORD dwStep;
+    BOOL fMoveForward;
+    BOOL fEnableActionData;
+    BOOL fScriptInProgress;
+} WIU_MSI_PROGRESS;
+typedef int (*PFN_MSIEXECUTEMESSAGEHANDLER)(
+    __in WIU_MSI_EXECUTE_MESSAGE* pMessage,
+    __in_opt LPVOID pvContext
+    );
+typedef struct _WIU_MSI_EXECUTE_CONTEXT
+{
+    BOOL fRollback;
+    PFN_MSIEXECUTEMESSAGEHANDLER pfnMessageHandler;
+    LPVOID pvContext;
+    WIU_MSI_PROGRESS rgMsiProgress[64];
+    DWORD dwCurrentProgressIndex;
+    INSTALLUILEVEL previousInstallUILevel;
+    HWND hwndPreviousParentWindow;
+    INSTALLUI_HANDLERW pfnPreviousExternalUI;
+    INSTALLUI_HANDLER_RECORD pfnPreviousExternalUIRecord;
+    BOOL fSetPreviousExternalUIRecord;
+    BOOL fSetPreviousExternalUI;
+} WIU_MSI_EXECUTE_CONTEXT;
+// typedefs
+typedef UINT (WINAPI *PFN_MSIENABLELOGW)(
+    __in DWORD dwLogMode,
+    __in_z LPCWSTR szLogFile,
+    __in DWORD dwLogAttributes
+    );
+typedef UINT (WINAPI *PFN_MSIGETPRODUCTINFOW)(
+    __in LPCWSTR szProductCode,
+    __in LPCWSTR szProperty,
+    __out_ecount_opt(*pcchValue) LPWSTR szValue,
+    __inout LPDWORD pcchValue
+    );
+typedef INSTALLSTATE (WINAPI *PFN_MSIGETCOMPONENTPATHW)(
+    __in LPCWSTR szProduct,
+    __in LPCWSTR szComponent,
+    __out_ecount_opt(*pcchBuf) LPWSTR lpPathBuf,
+    __inout_opt LPDWORD pcchBuf
+    );
+typedef INSTALLSTATE (WINAPI *PFN_MSILOCATECOMPONENTW)(
+    __in LPCWSTR szComponent,
+    __out_ecount_opt(*pcchBuf) LPWSTR lpPathBuf,
+    __inout_opt LPDWORD pcchBuf
+    );
+typedef UINT (WINAPI *PFN_MSIGETPRODUCTINFOEXW)(
+    __in LPCWSTR szProductCode,
+    __in_opt LPCWSTR szUserSid,
+    __in MSIINSTALLCONTEXT dwContext,
+    __in LPCWSTR szProperty,
+    __out_ecount_opt(*pcchValue) LPWSTR szValue,
+    __inout_opt LPDWORD pcchValue
+    );
+typedef INSTALLSTATE (WINAPI *PFN_MSIQUERYFEATURESTATEW)(
+    __in LPCWSTR szProduct,
+    __in LPCWSTR szFeature
+    );
+typedef UINT (WINAPI *PFN_MSIGETPATCHINFOEXW)(
+    __in_z LPCWSTR wzPatchCode,
+    __in_z LPCWSTR wzProductCode,
+    __in_z_opt LPCWSTR wzUserSid,
+    __in MSIINSTALLCONTEXT dwContext,
+    __in_z LPCWSTR wzProperty,
+    __out_opt LPWSTR wzValue,
+    __inout DWORD* pcchValue
+    );
+typedef UINT (WINAPI *PFN_MSIDETERMINEPATCHSEQUENCEW)(
+    __in_z LPCWSTR wzProductCode,
+    __in_z_opt LPCWSTR wzUserSid,
+    __in MSIINSTALLCONTEXT context,
+    __in DWORD cPatchInfo,
+    __in PMSIPATCHSEQUENCEINFOW pPatchInfo
+    );
+typedef UINT (WINAPI *PFN_MSIDETERMINEAPPLICABLEPATCHESW)(
+    __in_z LPCWSTR wzProductPackagePath,
+    __in DWORD cPatchInfo,
+    __in PMSIPATCHSEQUENCEINFOW pPatchInfo
+    );
+typedef UINT (WINAPI *PFN_MSIINSTALLPRODUCTW)(
+    __in LPCWSTR szPackagePath,
+    __in_opt LPCWSTR szCommandLine
+    );
+typedef UINT (WINAPI *PFN_MSICONFIGUREPRODUCTEXW)(
+    __in LPCWSTR szProduct,
+    __in int iInstallLevel,
+    __in INSTALLSTATE eInstallState,
+    __in_opt LPCWSTR szCommandLine
+    );
+typedef UINT (WINAPI *PFN_MSIREMOVEPATCHESW)(
+    __in_z LPCWSTR wzPatchList,
+    __in_z LPCWSTR wzProductCode,
+    __in INSTALLTYPE eUninstallType,
+    __in_z_opt LPCWSTR szPropertyList
+    );
+typedef INSTALLUILEVEL (WINAPI *PFN_MSISETINTERNALUI)(
+    __in INSTALLUILEVEL dwUILevel,
+    __inout_opt HWND *phWnd
+    );
+typedef UINT (WINAPI *PFN_MSISETEXTERNALUIRECORD)(
+    __in_opt INSTALLUI_HANDLER_RECORD puiHandler,
+    __in DWORD dwMessageFilter,
+    __in_opt LPVOID pvContext,
+    __out_opt PINSTALLUI_HANDLER_RECORD ppuiPrevHandler
+    );
+typedef INSTALLUI_HANDLERW (WINAPI *PFN_MSISETEXTERNALUIW)(
+    __in_opt INSTALLUI_HANDLERW puiHandler,
+    __in DWORD dwMessageFilter,
+    __in_opt LPVOID pvContext
+    );
+typedef UINT (WINAPI *PFN_MSIENUMPRODUCTSW)(
+    __in DWORD iProductIndex,
+    __out_ecount(MAX_GUID_CHARS + 1) LPWSTR lpProductBuf
+    );
+typedef UINT (WINAPI *PFN_MSIENUMPRODUCTSEXW)(
+    __in_z_opt LPCWSTR wzProductCode,
+    __in_z_opt LPCWSTR wzUserSid,
+    __in DWORD dwContext,
+    __in DWORD dwIndex,
+    __out_opt WCHAR wzInstalledProductCode[39],
+    __out_opt MSIINSTALLCONTEXT *pdwInstalledContext,
+    __out_opt LPWSTR wzSid,
+    __inout_opt LPDWORD pcchSid
+    );
+typedef UINT (WINAPI *PFN_MSIENUMRELATEDPRODUCTSW)(
+    __in LPCWSTR lpUpgradeCode,
+    __reserved DWORD dwReserved,
+    __in DWORD iProductIndex,
+    __out_ecount(MAX_GUID_CHARS + 1) LPWSTR lpProductBuf
+    );
+typedef UINT (WINAPI *PFN_MSISOURCELISTADDSOURCEEXW)(
+    __in LPCWSTR szProductCodeOrPatchCode,
+    __in_opt LPCWSTR szUserSid,
+    __in MSIINSTALLCONTEXT dwContext,
+    __in DWORD dwOptions,
+    __in LPCWSTR szSource,
+    __in_opt DWORD dwIndex
+    );
+typedef UINT(WINAPI* PFN_MSIBEGINTRANSACTIONW)(
+    __in LPCWSTR   szName,
+    __in DWORD     dwTransactionAttributes,
+    __out MSIHANDLE* phTransactionHandle,
+    __out HANDLE* phChangeOfOwnerEvent
+    );
+typedef UINT(WINAPI* PFN_MSIENDTRANSACTION)(
+    __in DWORD dwTransactionState
+    );
+HRESULT DAPI WiuInitialize(
+    );
+void DAPI WiuUninitialize(
+    );
+void DAPI WiuFunctionOverride(
+    __in_opt PFN_MSIENABLELOGW pfnMsiEnableLogW,
+    __in_opt PFN_MSIGETCOMPONENTPATHW pfnMsiGetComponentPathW,
+    __in_opt PFN_MSILOCATECOMPONENTW pfnMsiLocateComponentW,
+    __in_opt PFN_MSIQUERYFEATURESTATEW pfnMsiQueryFeatureStateW,
+    __in_opt PFN_MSIGETPRODUCTINFOW pfnMsiGetProductInfoW,
+    __in_opt PFN_MSIGETPRODUCTINFOEXW pfnMsiGetProductInfoExW,
+    __in_opt PFN_MSIINSTALLPRODUCTW pfnMsiInstallProductW,
+    __in_opt PFN_MSICONFIGUREPRODUCTEXW pfnMsiConfigureProductExW,
+    __in_opt PFN_MSISETINTERNALUI pfnMsiSetInternalUI,
+    __in_opt PFN_MSISETEXTERNALUIW pfnMsiSetExternalUIW,
+    __in_opt PFN_MSIENUMRELATEDPRODUCTSW pfnMsiEnumRelatedProductsW,
+    __in_opt PFN_MSISETEXTERNALUIRECORD pfnMsiSetExternalUIRecord,
+    __in_opt PFN_MSISOURCELISTADDSOURCEEXW pfnMsiSourceListAddSourceExW
+    );
+HRESULT DAPI WiuGetComponentPath(
+    __in_z LPCWSTR wzProductCode,
+    __in_z LPCWSTR wzComponentId,
+    __out INSTALLSTATE* pInstallState,
+    __out_z LPWSTR* psczValue
+    );
+HRESULT DAPI WiuLocateComponent(
+    __in_z LPCWSTR wzComponentId,
+    __out INSTALLSTATE* pInstallState,
+    __out_z LPWSTR* psczValue
+    );
+HRESULT DAPI WiuQueryFeatureState(
+    __in_z LPCWSTR wzProduct,
+    __in_z LPCWSTR wzFeature,
+    __out INSTALLSTATE* pInstallState
+    );
+HRESULT DAPI WiuGetProductInfo(
+    __in_z LPCWSTR wzProductCode,
+    __in_z LPCWSTR wzProperty,
+    __out LPWSTR* psczValue
+    );
+HRESULT DAPI WiuGetProductInfoEx(
+    __in_z LPCWSTR wzProductCode,
+    __in_z_opt LPCWSTR wzUserSid,
+    __in MSIINSTALLCONTEXT dwContext,
+    __in_z LPCWSTR wzProperty,
+    __out LPWSTR* psczValue
+    );
+HRESULT DAPI WiuGetProductProperty(
+    __in MSIHANDLE hProduct,
+    __in_z LPCWSTR wzProperty,
+    __out LPWSTR* psczValue
+    );
+HRESULT DAPI WiuGetPatchInfoEx(
+    __in_z LPCWSTR wzPatchCode,
+    __in_z LPCWSTR wzProductCode,
+    __in_z_opt LPCWSTR wzUserSid,
+    __in MSIINSTALLCONTEXT dwContext,
+    __in_z LPCWSTR wzProperty,
+    __out LPWSTR* psczValue
+    );
+HRESULT DAPI WiuDeterminePatchSequence(
+    __in_z LPCWSTR wzProductCode,
+    __in_z_opt LPCWSTR wzUserSid,
+    __in MSIINSTALLCONTEXT context,
+    __in PMSIPATCHSEQUENCEINFOW pPatchInfo,
+    __in DWORD cPatchInfo
+    );
+HRESULT DAPI WiuDetermineApplicablePatches(
+    __in_z LPCWSTR wzProductPackagePath,
+    __in PMSIPATCHSEQUENCEINFOW pPatchInfo,
+    __in DWORD cPatchInfo
+    );
+HRESULT DAPI WiuEnumProducts(
+    __in DWORD iProductIndex,
+    __out_ecount(MAX_GUID_CHARS + 1) LPWSTR wzProductCode
+    );
+HRESULT DAPI WiuEnumProductsEx(
+    __in_z_opt LPCWSTR wzProductCode,
+    __in_z_opt LPCWSTR wzUserSid,
+    __in DWORD dwContext,
+    __in DWORD dwIndex,
+    __out_opt WCHAR wzInstalledProductCode[39],
+    __out_opt MSIINSTALLCONTEXT *pdwInstalledContext,
+    __out_opt LPWSTR wzSid,
+    __inout_opt LPDWORD pcchSid
+    );
+HRESULT DAPI WiuEnumRelatedProducts(
+    __in_z LPCWSTR wzUpgradeCode,
+    __in DWORD iProductIndex,
+    __out_ecount(MAX_GUID_CHARS + 1) LPWSTR wzProductCode
+    );
+HRESULT DAPI WiuEnumRelatedProductCodes(
+    __in_z LPCWSTR wzUpgradeCode,
+    __deref_out_ecount_opt(*pcRelatedProducts) LPWSTR** prgsczProductCodes,
+    __out DWORD* pcRelatedProducts,
+    __in BOOL fReturnHighestVersionOnly
+    );
+HRESULT DAPI WiuEnableLog(
+    __in DWORD dwLogMode,
+    __in_z LPCWSTR wzLogFile,
+    __in DWORD dwLogAttributes
+    );
+HRESULT DAPI WiuInitializeInternalUI(
+    __in INSTALLUILEVEL internalUILevel,
+    __in_opt HWND hwndParent,
+    __in WIU_MSI_EXECUTE_CONTEXT* pExecuteContext
+    );
+HRESULT DAPI WiuInitializeExternalUI(
+    __in PFN_MSIEXECUTEMESSAGEHANDLER pfnMessageHandler,
+    __in INSTALLUILEVEL internalUILevel,
+    __in_opt HWND hwndParent,
+    __in LPVOID pvContext,
+    __in BOOL fRollback,
+    __in WIU_MSI_EXECUTE_CONTEXT* pExecuteContext
+    );
+void DAPI WiuUninitializeExternalUI(
+    __in WIU_MSI_EXECUTE_CONTEXT* pExecuteContext
+    );
+HRESULT DAPI WiuConfigureProductEx(
+    __in_z LPCWSTR wzProduct,
+    __in int iInstallLevel,
+    __in INSTALLSTATE eInstallState,
+    __in_z LPCWSTR wzCommandLine,
+    __out WIU_RESTART* pRestart
+    );
+HRESULT DAPI WiuInstallProduct(
+    __in_z LPCWSTR wzPackagPath,
+    __in_z LPCWSTR wzCommandLine,
+    __out WIU_RESTART* pRestart
+    );
+HRESULT DAPI WiuRemovePatches(
+    __in_z LPCWSTR wzPatchList,
+    __in_z LPCWSTR wzProductCode,
+    __in_z LPCWSTR wzPropertyList,
+    __out WIU_RESTART* pRestart
+    );
+HRESULT DAPI WiuSourceListAddSourceEx(
+    __in_z LPCWSTR wzProductCodeOrPatchCode,
+    __in_z_opt LPCWSTR wzUserSid,
+    __in MSIINSTALLCONTEXT dwContext,
+    __in DWORD dwCode,
+    __in_z LPCWSTR wzSource,
+    __in_opt DWORD dwIndex
+    );
+HRESULT DAPI WiuBeginTransaction(
+    __in_z LPCWSTR szName,
+    __in DWORD dwTransactionAttributes,
+    __out MSIHANDLE* phTransactionHandle,
+    __out HANDLE* phChangeOfOwnerEvent,
+    __in DWORD dwLogMode,
+    __in_z LPCWSTR szLogPath
+    );
+HRESULT DAPI WiuEndTransaction(
+    __in DWORD dwTransactionState,
+    __in DWORD dwLogMode,
+    __in_z LPCWSTR szLogPath
+    );
+BOOL DAPI WiuIsMsiTransactionSupported(
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/wuautil.h b/src/libs/dutil/WixToolset.DUtil/inc/wuautil.h
new file mode 100644
index 00000000..b239c4e6
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/wuautil.h
@@ -0,0 +1,19 @@
+#pragma once
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+#if defined(__cplusplus)
+extern "C" {
+#endif
+HRESULT DAPI WuaPauseAutomaticUpdates();
+HRESULT DAPI WuaResumeAutomaticUpdates();
+HRESULT DAPI WuaRestartRequired(
+    __out BOOL* pfRestartRequired
+    );
+#if defined(__cplusplus)
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/xmlutil.h b/src/libs/dutil/WixToolset.DUtil/inc/xmlutil.h
new file mode 100644
index 00000000..ba92ada9
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inc/xmlutil.h
@@ -0,0 +1,167 @@
+#pragma once
+// 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.
+extern __declspec(selectany) const CLSID XmlUtil_CLSID_DOMDocument   = {0x2933BF90, 0x7B36, 0x11d2, {0xB2, 0x0E, 0x00, 0xC0, 0x4F, 0x98, 0x3E, 0x60}};
+extern __declspec(selectany) const CLSID XmlUtil_CLSID_DOMDocument20  = {0xF6D90F11, 0x9C73, 0x11D3, {0xB3, 0x2E, 0x00, 0xC0, 0x4F, 0x99, 0x0B, 0xB4}};
+extern __declspec(selectany) const CLSID XmlUtil_CLSID_DOMDocument26 = {0xf5078f1b, 0xc551, 0x11d3, {0x89, 0xb9, 0x00, 0x00, 0xf8, 0x1f, 0xe2, 0x21}};
+extern __declspec(selectany) const CLSID XmlUtil_CLSID_DOMDocument30 = {0xf5078f32, 0xc551, 0x11d3, {0x89, 0xb9, 0x00, 0x00, 0xf8, 0x1f, 0xe2, 0x21}};
+extern __declspec(selectany) const CLSID XmlUtil_CLSID_DOMDocument40 = {0x88d969c0, 0xf192, 0x11d4, {0xa6, 0x5f, 0x00, 0x40, 0x96, 0x32, 0x51, 0xe5}};
+extern __declspec(selectany) const CLSID XmlUtil_CLSID_DOMDocument50 = {0x88d969e5, 0xf192, 0x11d4, {0xa6, 0x5f, 0x00, 0x40, 0x96, 0x32, 0x51, 0xe5}};
+extern __declspec(selectany) const CLSID XmlUtil_CLSID_DOMDocument60 = {0x88d96a05, 0xf192, 0x11d4, {0xa6, 0x5f, 0x00, 0x40, 0x96, 0x32, 0x51, 0xe5}};
+extern __declspec(selectany) const CLSID XmlUtil_CLSID_XMLSchemaCache = {0x88d969c2, 0xf192, 0x11d4, {0xa6, 0x5f, 0x00, 0x40, 0x96, 0x32, 0x51, 0xe5}};
+extern __declspec(selectany) const IID XmlUtil_IID_IXMLDOMDocument =  {0x2933BF81, 0x7B36, 0x11D2, {0xB2, 0x0E, 0x00, 0xC0, 0x4F, 0x98, 0x3E, 0x60}};
+extern __declspec(selectany) const IID XmlUtil_IID_IXMLDOMDocument2 = {0x2933BF95, 0x7B36, 0x11D2, {0xB2, 0x0E, 0x00, 0xC0, 0x4F, 0x98, 0x3E, 0x60}};
+extern __declspec(selectany) const IID XmlUtil_IID_IXMLDOMSchemaCollection = {0x373984C8, 0xB845, 0x449B, {0x91, 0xE7, 0x45, 0xAC, 0x83, 0x03, 0x6A, 0xDE}};
+typedef enum XML_LOAD_ATTRIBUTE
+{
+    XML_LOAD_PRESERVE_WHITESPACE = 1,
+} XML_LOAD_ATTRIBUTE;
+#ifdef __cplusplus
+extern "C" {
+#endif
+HRESULT DAPI XmlInitialize();
+void DAPI XmlUninitialize();
+HRESULT DAPI XmlCreateElement(
+    __in IXMLDOMDocument *pixdDocument,
+    __in_z LPCWSTR wzElementName,
+    __out IXMLDOMElement **ppixnElement
+    );
+HRESULT DAPI XmlCreateDocument(
+    __in_opt LPCWSTR pwzElementName, 
+    __out IXMLDOMDocument** ppixdDocument,
+    __out_opt IXMLDOMElement** ppixeRootElement = NULL
+    );
+HRESULT DAPI XmlLoadDocument(
+    __in_z LPCWSTR wzDocument,
+    __out IXMLDOMDocument** ppixdDocument
+    );
+HRESULT DAPI XmlLoadDocumentEx(
+    __in_z LPCWSTR wzDocument,
+    __in DWORD dwAttributes,
+    __out IXMLDOMDocument** ppixdDocument
+    );
+HRESULT DAPI XmlLoadDocumentFromFile(
+    __in_z LPCWSTR wzPath,
+    __out IXMLDOMDocument** ppixdDocument
+    );
+HRESULT DAPI XmlLoadDocumentFromBuffer(
+    __in_bcount(cbSource) const BYTE* pbSource,
+    __in SIZE_T cbSource,
+    __out IXMLDOMDocument** ppixdDocument
+    );
+HRESULT DAPI XmlLoadDocumentFromFileEx(
+    __in_z LPCWSTR wzPath,
+    __in DWORD dwAttributes,
+    __out IXMLDOMDocument** ppixdDocument
+    );
+HRESULT DAPI XmlSelectSingleNode(
+    __in IXMLDOMNode* pixnParent,
+    __in_z LPCWSTR wzXPath,
+    __out IXMLDOMNode **ppixnChild
+    );
+HRESULT DAPI XmlSetAttribute(
+    __in IXMLDOMNode* pixnNode,
+    __in_z LPCWSTR pwzAttribute,
+    __in_z LPCWSTR pwzAttributeValue
+    );
+HRESULT DAPI XmlCreateTextNode(
+    __in IXMLDOMDocument *pixdDocument,
+    __in_z LPCWSTR wzText,
+    __out IXMLDOMText **ppixnTextNode
+    );
+HRESULT DAPI XmlGetText(
+    __in IXMLDOMNode* pixnNode,
+    __deref_out_z BSTR* pbstrText
+    );
+HRESULT DAPI XmlGetAttribute(
+    __in IXMLDOMNode* pixnNode,
+    __in_z LPCWSTR pwzAttribute,
+    __deref_out_z BSTR* pbstrAttributeValue
+    );
+HRESULT DAPI XmlGetAttributeEx(
+    __in IXMLDOMNode* pixnNode,
+    __in_z LPCWSTR wzAttribute,
+    __deref_out_z LPWSTR* psczAttributeValue
+    );
+HRESULT DAPI XmlGetYesNoAttribute(
+    __in IXMLDOMNode* pixnNode,
+    __in_z LPCWSTR wzAttribute,
+    __out BOOL* pfYes
+    );
+HRESULT DAPI XmlGetAttributeNumber(
+    __in IXMLDOMNode* pixnNode,
+    __in_z LPCWSTR pwzAttribute,
+    __out DWORD* pdwValue
+    );
+HRESULT DAPI XmlGetAttributeNumberBase(
+    __in IXMLDOMNode* pixnNode,
+    __in_z LPCWSTR pwzAttribute,
+    __in int nBase,
+    __out DWORD* pdwValue
+    );
+HRESULT DAPI XmlGetAttributeLargeNumber(
+    __in IXMLDOMNode* pixnNode,
+    __in_z LPCWSTR pwzAttribute,
+    __out DWORD64* pdw64Value
+    );
+HRESULT DAPI XmlGetNamedItem(
+    __in IXMLDOMNamedNodeMap *pixnmAttributes, 
+    __in_opt LPCWSTR wzName, 
+    __out IXMLDOMNode **ppixnNamedItem
+    );
+HRESULT DAPI XmlSetText(
+    __in IXMLDOMNode* pixnNode,
+    __in_z LPCWSTR pwzText
+    );
+HRESULT DAPI XmlSetTextNumber(
+    __in IXMLDOMNode *pixnNode,
+    __in DWORD dwValue
+    );
+HRESULT DAPI XmlCreateChild(
+    __in IXMLDOMNode* pixnParent,
+    __in_z LPCWSTR pwzElementType,
+    __out IXMLDOMNode** ppixnChild
+    );
+HRESULT DAPI XmlRemoveAttribute(
+    __in IXMLDOMNode* pixnNode,
+    __in_z LPCWSTR pwzAttribute
+    );
+HRESULT DAPI XmlSelectNodes(
+    __in IXMLDOMNode* pixnParent,
+    __in_z LPCWSTR wzXPath,
+    __out IXMLDOMNodeList **ppixnChild
+    );
+HRESULT DAPI XmlNextAttribute(
+    __in IXMLDOMNamedNodeMap* pixnnm,
+    __out IXMLDOMNode** pixnAttribute,
+    __deref_opt_out_z_opt BSTR* pbstrAttribute
+    );
+HRESULT DAPI XmlNextElement(
+    __in IXMLDOMNodeList* pixnl,
+    __out IXMLDOMNode** pixnElement,
+    __deref_opt_out_z_opt BSTR* pbstrElement
+    );
+HRESULT DAPI XmlRemoveChildren(
+    __in IXMLDOMNode* pixnSource,
+    __in_z LPCWSTR pwzXPath
+    );
+HRESULT DAPI XmlSaveDocument(
+    __in IXMLDOMDocument* pixdDocument, 
+    __inout LPCWSTR wzPath
+    );
+HRESULT DAPI XmlSaveDocumentToBuffer(
+    __in IXMLDOMDocument* pixdDocument,
+    __deref_out_bcount(*pcbDest) BYTE** ppbDest,
+    __out DWORD* pcbDest
+    );
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/libs/dutil/WixToolset.DUtil/inetutil.cpp b/src/libs/dutil/WixToolset.DUtil/inetutil.cpp
new file mode 100644
index 00000000..8dace55f
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/inetutil.cpp
@@ -0,0 +1,155 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define InetExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_INETUTIL, x, s, __VA_ARGS__)
+#define InetExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_INETUTIL, x, s, __VA_ARGS__)
+#define InetExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_INETUTIL, x, s, __VA_ARGS__)
+#define InetExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_INETUTIL, x, s, __VA_ARGS__)
+#define InetExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_INETUTIL, x, s, __VA_ARGS__)
+#define InetExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_INETUTIL, x, s, __VA_ARGS__)
+#define InetExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_INETUTIL, p, x, e, s, __VA_ARGS__)
+#define InetExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_INETUTIL, p, x, s, __VA_ARGS__)
+#define InetExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_INETUTIL, p, x, e, s, __VA_ARGS__)
+#define InetExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_INETUTIL, p, x, s, __VA_ARGS__)
+#define InetExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_INETUTIL, e, x, s, __VA_ARGS__)
+#define InetExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_INETUTIL, g, x, s, __VA_ARGS__)
+/*******************************************************************
+ InternetGetSizeByHandle - returns size of file by url handle
+*******************************************************************/
+extern "C" HRESULT DAPI InternetGetSizeByHandle(
+    __in HINTERNET hiFile,
+    __out LONGLONG* pllSize
+    )
+{
+    Assert(pllSize);
+    HRESULT hr = S_OK;
+    DWORD dwSize = 0;
+    DWORD cb = 0;
+    cb = sizeof(dwSize);
+    if (!::HttpQueryInfoW(hiFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, reinterpret_cast<LPVOID>(&dwSize), &cb, NULL))
+    {
+        InetExitOnLastError(hr, "Failed to get size for internet file handle");
+    }
+    *pllSize = dwSize;
+LExit:
+    return hr;
+}
+/*******************************************************************
+ InetGetCreateTimeByHandle - returns url creation time
+******************************************************************/
+extern "C" HRESULT DAPI InternetGetCreateTimeByHandle(
+    __in HINTERNET hiFile,
+    __out LPFILETIME pft
+    )
+{
+    Assert(pft);
+    HRESULT hr = S_OK;
+    SYSTEMTIME st = {0 };
+    DWORD cb = sizeof(SYSTEMTIME);
+    if (!::HttpQueryInfoW(hiFile, HTTP_QUERY_LAST_MODIFIED | HTTP_QUERY_FLAG_SYSTEMTIME, reinterpret_cast<LPVOID>(&st), &cb, NULL))
+    {
+        InetExitWithLastError(hr, "failed to get create time for internet file handle");
+    }
+    if (!::SystemTimeToFileTime(&st, pft))
+    {
+        InetExitWithLastError(hr, "failed to convert system time to file time");
+    }
+LExit:
+    return hr;
+}
+/*******************************************************************
+ InternetQueryInfoString - query info string
+*******************************************************************/
+extern "C" HRESULT DAPI InternetQueryInfoString(
+    __in HINTERNET hRequest,
+    __in DWORD dwInfo,
+    __deref_out_z LPWSTR* psczValue
+    )
+{
+    HRESULT hr = S_OK;
+    SIZE_T cbOriginal = 0;
+    DWORD cbValue = 0;
+    DWORD dwIndex = 0;
+    // If nothing was provided start off with some arbitrary size.
+    if (!*psczValue)
+    {
+        hr = StrAlloc(psczValue, 64);
+        InetExitOnFailure(hr, "Failed to allocate memory for value.");
+    }
+    hr = StrSize(*psczValue, &cbOriginal);
+    InetExitOnFailure(hr, "Failed to get size of value.");
+    cbValue = (DWORD)min(DWORD_MAX, cbOriginal);
+    if (!::HttpQueryInfoW(hRequest, dwInfo, static_cast<void*>(*psczValue), &cbValue, &dwIndex))
+    {
+        DWORD er = ::GetLastError();
+        if (ERROR_INSUFFICIENT_BUFFER == er)
+        {
+            cbValue += sizeof(WCHAR); // add one character for the null terminator.
+            hr = StrAlloc(psczValue, cbValue / sizeof(WCHAR));
+            InetExitOnFailure(hr, "Failed to allocate value.");
+            if (!::HttpQueryInfoW(hRequest, dwInfo, static_cast<void*>(*psczValue), &cbValue, &dwIndex))
+            {
+                er = ::GetLastError();
+            }
+            else
+            {
+                er = ERROR_SUCCESS;
+            }
+        }
+        hr = HRESULT_FROM_WIN32(er);
+        InetExitOnRootFailure(hr, "Failed to get query information.");
+    }
+LExit:
+    return hr;
+}
+/*******************************************************************
+ InternetQueryInfoNumber - query info number
+*******************************************************************/
+extern "C" HRESULT DAPI InternetQueryInfoNumber(
+    __in HINTERNET hRequest,
+    __in DWORD dwInfo,
+    __inout LONG* plInfo
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD cbCode = sizeof(LONG);
+    DWORD dwIndex = 0;
+    if (!::HttpQueryInfoW(hRequest, dwInfo | HTTP_QUERY_FLAG_NUMBER, static_cast<void*>(plInfo), &cbCode, &dwIndex))
+    {
+        InetExitWithLastError(hr, "Failed to get query information.");
+    }
+LExit:
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/iniutil.cpp b/src/libs/dutil/WixToolset.DUtil/iniutil.cpp
new file mode 100644
index 00000000..70b62995
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/iniutil.cpp
@@ -0,0 +1,768 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define IniExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_INIUTIL, x, s, __VA_ARGS__)
+#define IniExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_INIUTIL, x, s, __VA_ARGS__)
+#define IniExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_INIUTIL, x, s, __VA_ARGS__)
+#define IniExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_INIUTIL, x, s, __VA_ARGS__)
+#define IniExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_INIUTIL, x, s, __VA_ARGS__)
+#define IniExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_INIUTIL, x, s, __VA_ARGS__)
+#define IniExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_INIUTIL, p, x, e, s, __VA_ARGS__)
+#define IniExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_INIUTIL, p, x, s, __VA_ARGS__)
+#define IniExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_INIUTIL, p, x, e, s, __VA_ARGS__)
+#define IniExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_INIUTIL, p, x, s, __VA_ARGS__)
+#define IniExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_INIUTIL, e, x, s, __VA_ARGS__)
+#define IniExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_INIUTIL, g, x, s, __VA_ARGS__)
+const LPCWSTR wzSectionSeparator = L"\\";
+struct INI_STRUCT
+{
+    LPWSTR sczPath; // the path to the INI file to be parsed
+    LPWSTR sczOpenTagPrefix; // For regular ini, this would be '['
+    LPWSTR sczOpenTagPostfix; // For regular ini, this would be ']'
+    LPWSTR sczValuePrefix; // for regular ini, this would be NULL
+    LPWSTR sczValueSeparator; // for regular ini, this would be '='
+    LPWSTR *rgsczValueSeparatorExceptions;
+    DWORD cValueSeparatorExceptions;
+    LPWSTR sczCommentLinePrefix; // for regular ini, this would be ';'
+    INI_VALUE *rgivValues;
+    DWORD cValues;
+    LPWSTR *rgsczLines;
+    DWORD cLines;
+    FILE_ENCODING feEncoding;
+    BOOL fModified;
+};
+const int INI_HANDLE_BYTES = sizeof(INI_STRUCT);
+static HRESULT GetSectionPrefixFromName(
+    __in_z LPCWSTR wzName,
+    __deref_inout_z LPWSTR* psczOutput
+    );
+static void UninitializeIniValue(
+    INI_VALUE *pivValue
+    );
+extern "C" HRESULT DAPI IniInitialize(
+    __out_bcount(INI_HANDLE_BYTES) INI_HANDLE* piHandle
+    )
+{
+    HRESULT hr = S_OK;
+    // Allocate the handle
+    *piHandle = static_cast<INI_HANDLE>(MemAlloc(sizeof(INI_STRUCT), TRUE));
+    IniExitOnNull(*piHandle, hr, E_OUTOFMEMORY, "Failed to allocate ini object");
+LExit:
+    return hr;
+}
+extern "C" void DAPI IniUninitialize(
+    __in_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle
+    )
+{
+    INI_STRUCT *pi = static_cast<INI_STRUCT *>(piHandle);
+    ReleaseStr(pi->sczPath);
+    ReleaseStr(pi->sczOpenTagPrefix);
+    ReleaseStr(pi->sczOpenTagPostfix);
+    ReleaseStr(pi->sczValuePrefix);
+    ReleaseStr(pi->sczValueSeparator);
+    for (DWORD i = 0; i < pi->cValueSeparatorExceptions; ++i)
+    {
+        ReleaseStr(pi->rgsczValueSeparatorExceptions + i);
+    }
+    ReleaseStr(pi->sczCommentLinePrefix);
+    for (DWORD i = 0; i < pi->cValues; ++i)
+    {
+        UninitializeIniValue(pi->rgivValues + i);
+    }
+    ReleaseMem(pi->rgivValues);
+    ReleaseStrArray(pi->rgsczLines, pi->cLines);
+    ReleaseMem(pi);
+}
+extern "C" HRESULT DAPI IniSetOpenTag(
+    __inout_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle,
+    __in_z_opt LPCWSTR wzOpenTagPrefix,
+    __in_z_opt LPCWSTR wzOpenTagPostfix
+    )
+{
+    HRESULT hr = S_OK;
+    INI_STRUCT *pi = static_cast<INI_STRUCT *>(piHandle);
+    if (wzOpenTagPrefix)
+    {
+        hr = StrAllocString(&pi->sczOpenTagPrefix, wzOpenTagPrefix, 0);
+        IniExitOnFailure(hr, "Failed to copy open tag prefix to ini struct: %ls", wzOpenTagPrefix);
+    }
+    else
+    {
+        ReleaseNullStr(pi->sczOpenTagPrefix);
+    }
+    if (wzOpenTagPostfix)
+    {
+        hr = StrAllocString(&pi->sczOpenTagPostfix, wzOpenTagPostfix, 0);
+        IniExitOnFailure(hr, "Failed to copy open tag postfix to ini struct: %ls", wzOpenTagPostfix);
+    }
+    else
+    {
+        ReleaseNullStr(pi->sczOpenTagPrefix);
+    }
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI IniSetValueStyle(
+    __inout_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle,
+    __in_z_opt LPCWSTR wzValuePrefix,
+    __in_z_opt LPCWSTR wzValueSeparator
+    )
+{
+    HRESULT hr = S_OK;
+    INI_STRUCT *pi = static_cast<INI_STRUCT *>(piHandle);
+    if (wzValuePrefix)
+    {
+        hr = StrAllocString(&pi->sczValuePrefix, wzValuePrefix, 0);
+        IniExitOnFailure(hr, "Failed to copy value prefix to ini struct: %ls", wzValuePrefix);
+    }
+    else
+    {
+        ReleaseNullStr(pi->sczValuePrefix);
+    }
+    if (wzValueSeparator)
+    {
+        hr = StrAllocString(&pi->sczValueSeparator, wzValueSeparator, 0);
+        IniExitOnFailure(hr, "Failed to copy value separator to ini struct: %ls", wzValueSeparator);
+    }
+    else
+    {
+        ReleaseNullStr(pi->sczValueSeparator);
+    }
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI IniSetValueSeparatorException(
+    __inout_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle,
+    __in_z LPCWSTR wzValueNamePrefix
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD dwInsertedIndex = 0;
+    INI_STRUCT *pi = static_cast<INI_STRUCT *>(piHandle);
+    hr = MemEnsureArraySize(reinterpret_cast<void **>(&pi->rgsczValueSeparatorExceptions), pi->cValueSeparatorExceptions + 1, sizeof(LPWSTR), 5);
+    IniExitOnFailure(hr, "Failed to increase array size for value separator exceptions");
+    dwInsertedIndex = pi->cValueSeparatorExceptions;
+    ++pi->cValueSeparatorExceptions;
+    hr = StrAllocString(&pi->rgsczValueSeparatorExceptions[dwInsertedIndex], wzValueNamePrefix, 0);
+    IniExitOnFailure(hr, "Failed to copy value separator exception");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI IniSetCommentStyle(
+    __inout_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle,
+    __in_z_opt LPCWSTR wzLinePrefix
+    )
+{
+    HRESULT hr = S_OK;
+    INI_STRUCT *pi = static_cast<INI_STRUCT *>(piHandle);
+    if (wzLinePrefix)
+    {
+        hr = StrAllocString(&pi->sczCommentLinePrefix, wzLinePrefix, 0);
+        IniExitOnFailure(hr, "Failed to copy comment line prefix to ini struct: %ls", wzLinePrefix);
+    }
+    else
+    {
+        ReleaseNullStr(pi->sczCommentLinePrefix);
+    }
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI IniParse(
+    __inout_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle,
+    __in LPCWSTR wzPath,
+    __out_opt FILE_ENCODING *pfeEncodingFound
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD dwValuePrefixLength = 0;
+    DWORD dwValueSeparatorExceptionLength = 0;
+    LPWSTR sczContents = NULL;
+    LPWSTR sczCurrentSection = NULL;
+    LPWSTR sczName = NULL;
+    LPWSTR sczNameTrimmed = NULL;
+    LPWSTR sczValue = NULL;
+    LPWSTR sczValueTrimmed = NULL;
+    LPWSTR wzOpenTagPrefix = NULL;
+    LPWSTR wzOpenTagPostfix = NULL;
+    LPWSTR wzValuePrefix = NULL;
+    LPWSTR wzValueNameStart = NULL;
+    LPWSTR wzValueSeparator = NULL;
+    LPWSTR wzCommentLinePrefix = NULL;
+    LPWSTR wzValueBegin = NULL;
+    LPCWSTR wzTemp = NULL;
+    INI_STRUCT *pi = static_cast<INI_STRUCT *>(piHandle);
+    BOOL fSections = (NULL != pi->sczOpenTagPrefix) && (NULL != pi->sczOpenTagPostfix);
+    BOOL fValuePrefix = (NULL != pi->sczValuePrefix);
+    hr = StrAllocString(&pi->sczPath, wzPath, 0);
+    IniExitOnFailure(hr, "Failed to copy path to ini struct: %ls", wzPath);
+    hr = FileToString(pi->sczPath, &sczContents, &pi->feEncoding);
+    IniExitOnFailure(hr, "Failed to convert file to string: %ls", pi->sczPath);
+    if (pfeEncodingFound)
+    {
+        *pfeEncodingFound = pi->feEncoding;
+    }
+    if (!sczContents || !*sczContents)
+    {
+        // Empty string, nothing to parse
+        ExitFunction1(hr = S_OK);
+    }
+    dwValuePrefixLength = lstrlenW(pi->sczValuePrefix);
+    hr = StrSplitAllocArray(&pi->rgsczLines, reinterpret_cast<UINT *>(&pi->cLines), sczContents, L"\n");
+    IniExitOnFailure(hr, "Failed to split INI file into lines");
+    for (DWORD i = 0; i < pi->cLines; ++i)
+    {
+        if (!*pi->rgsczLines[i] || '\r' == *pi->rgsczLines[i])
+        {
+            continue;
+        }
+        if (pi->sczCommentLinePrefix)
+        {
+            wzCommentLinePrefix = wcsstr(pi->rgsczLines[i], pi->sczCommentLinePrefix);
+            if (wzCommentLinePrefix && wzCommentLinePrefix <= pi->rgsczLines[i] + 1)
+            {
+                continue;
+            }
+        }
+        if (pi->sczOpenTagPrefix)
+        {
+            wzOpenTagPrefix = wcsstr(pi->rgsczLines[i], pi->sczOpenTagPrefix);
+            if (wzOpenTagPrefix)
+            {
+                // If there is an open tag prefix but there is anything but whitespace before it, then it's NOT an open tag prefix
+                // This is important, for example, to support values with names like "Array[0]=blah" in INI format
+                for (wzTemp = pi->rgsczLines[i]; wzTemp < wzOpenTagPrefix; ++wzTemp)
+                {
+                    if (*wzTemp != L' ' && *wzTemp != L'\t')
+                    {
+                        wzOpenTagPrefix = NULL;
+                        break;
+                    }
+                }
+            }
+        }
+        if (pi->sczOpenTagPostfix)
+        {
+            wzOpenTagPostfix = wcsstr(pi->rgsczLines[i], pi->sczOpenTagPostfix);
+        }
+        if (pi->sczValuePrefix)
+        {
+            wzValuePrefix = wcsstr(pi->rgsczLines[i], pi->sczValuePrefix);
+            if (wzValuePrefix != NULL)
+            {
+                wzValueNameStart = wzValuePrefix + dwValuePrefixLength;
+            }
+        }
+        else
+        {
+            wzValueNameStart = pi->rgsczLines[i];
+        }
+        if (pi->sczValueSeparator && NULL != wzValueNameStart && *wzValueNameStart != L'\0')
+        {
+            dwValueSeparatorExceptionLength = 0;
+            for (DWORD j = 0; j < pi->cValueSeparatorExceptions; ++j)
+            {
+                if (pi->rgsczLines[i] == wcsstr(pi->rgsczLines[i], pi->rgsczValueSeparatorExceptions[j]))
+                {
+                    dwValueSeparatorExceptionLength = lstrlenW(pi->rgsczValueSeparatorExceptions[j]);
+                    break;
+                }
+            }
+            wzValueSeparator = wcsstr(wzValueNameStart + dwValueSeparatorExceptionLength, pi->sczValueSeparator);
+        }
+        // Don't keep the endline
+        if (pi->rgsczLines[i][lstrlenW(pi->rgsczLines[i])-1] == L'\r')
+        {
+            pi->rgsczLines[i][lstrlenW(pi->rgsczLines[i])-1] = L'\0';
+        }
+        if (fSections && wzOpenTagPrefix && wzOpenTagPostfix && wzOpenTagPrefix < wzOpenTagPostfix && (NULL == wzCommentLinePrefix || wzOpenTagPrefix < wzCommentLinePrefix))
+        {
+            // There is an section starting here, let's keep track of it and move on
+            hr = StrAllocString(&sczCurrentSection, wzOpenTagPrefix + lstrlenW(pi->sczOpenTagPrefix), wzOpenTagPostfix - (wzOpenTagPrefix + lstrlenW(pi->sczOpenTagPrefix)));
+            IniExitOnFailure(hr, "Failed to record section name for line: %ls of INI file: %ls", pi->rgsczLines[i], pi->sczPath);
+            // Sections will be calculated dynamically after any set operations, so don't include this in the list of lines to remember for output
+            ReleaseNullStr(pi->rgsczLines[i]);
+        }
+        else if (wzValueSeparator && (NULL == wzCommentLinePrefix || wzValueSeparator < wzCommentLinePrefix)
+            && (!fValuePrefix || wzValuePrefix))
+        {
+            if (fValuePrefix)
+            {
+                wzValueBegin = wzValuePrefix + lstrlenW(pi->sczValuePrefix);
+            }
+            else
+            {
+                wzValueBegin = pi->rgsczLines[i];
+            }
+            hr = MemEnsureArraySize(reinterpret_cast<void **>(&pi->rgivValues), pi->cValues + 1, sizeof(INI_VALUE), 100);
+            IniExitOnFailure(hr, "Failed to increase array size for value array");
+            if (sczCurrentSection)
+            {
+                hr = StrAllocString(&sczName, sczCurrentSection, 0);
+                IniExitOnFailure(hr, "Failed to copy current section name");
+                hr = StrAllocConcat(&sczName, wzSectionSeparator, 0);
+                IniExitOnFailure(hr, "Failed to copy current section name");
+            }
+            hr = StrAllocConcat(&sczName, wzValueBegin, wzValueSeparator - wzValueBegin);
+            IniExitOnFailure(hr, "Failed to copy name");
+            hr = StrAllocString(&sczValue, wzValueSeparator + lstrlenW(pi->sczValueSeparator), 0);
+            IniExitOnFailure(hr, "Failed to copy value");
+            hr = StrTrimWhitespace(&sczNameTrimmed, sczName);
+            IniExitOnFailure(hr, "Failed to trim whitespace from name");
+            hr = StrTrimWhitespace(&sczValueTrimmed, sczValue);
+            IniExitOnFailure(hr, "Failed to trim whitespace from value");
+            pi->rgivValues[pi->cValues].wzName = const_cast<LPCWSTR>(sczNameTrimmed);
+            sczNameTrimmed = NULL;
+            pi->rgivValues[pi->cValues].wzValue = const_cast<LPCWSTR>(sczValueTrimmed);
+            sczValueTrimmed = NULL;
+            pi->rgivValues[pi->cValues].dwLineNumber = i + 1;
+            ++pi->cValues;
+            // Values will be calculated dynamically after any set operations, so don't include this in the list of lines to remember for output
+            ReleaseNullStr(pi->rgsczLines[i]);
+        }
+        else
+        {
+            // Must be a comment, so ignore it and keep it in the list to output
+        }
+        ReleaseNullStr(sczName);
+    }
+LExit:
+    ReleaseStr(sczCurrentSection);
+    ReleaseStr(sczContents);
+    ReleaseStr(sczName);
+    ReleaseStr(sczNameTrimmed);
+    ReleaseStr(sczValue);
+    ReleaseStr(sczValueTrimmed);
+    return hr;
+}
+extern "C" HRESULT DAPI IniGetValueList(
+    __in_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle,
+    __deref_out_ecount_opt(*pcValues) INI_VALUE** prgivValues,
+    __out DWORD *pcValues
+    )
+{
+    HRESULT hr = S_OK;
+    INI_STRUCT *pi = static_cast<INI_STRUCT *>(piHandle);
+    *prgivValues = pi->rgivValues;
+    *pcValues = pi->cValues;
+    return hr;
+}
+extern "C" HRESULT DAPI IniGetValue(
+    __in_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle,
+    __in LPCWSTR wzValueName,
+    __deref_out_z LPWSTR* psczValue
+    )
+{
+    HRESULT hr = S_OK;
+    INI_STRUCT *pi = static_cast<INI_STRUCT *>(piHandle);
+    INI_VALUE *pValue = NULL;
+    for (DWORD i = 0; i < pi->cValues; ++i)
+    {
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pi->rgivValues[i].wzName, -1, wzValueName, -1))
+        {
+            pValue = pi->rgivValues + i;
+            break;
+        }
+    }
+    if (NULL == pValue)
+    {
+        hr = E_NOTFOUND;
+        IniExitOnFailure(hr, "Failed to check for INI value: %ls", wzValueName);
+    }
+    if (NULL == pValue->wzValue)
+    {
+        ExitFunction1(hr = E_NOTFOUND);
+    }
+    hr = StrAllocString(psczValue, pValue->wzValue, 0);
+    IniExitOnFailure(hr, "Failed to make copy of value while looking up INI value named: %ls", wzValueName);
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI IniSetValue(
+    __in_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle,
+    __in LPCWSTR wzValueName,
+    __in_z_opt LPCWSTR wzValue
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczSectionPrefix = NULL; // includes section name and backslash
+    LPWSTR sczName = NULL;
+    LPWSTR sczValue = NULL;
+    DWORD dwInsertIndex = DWORD_MAX;
+    INI_STRUCT *pi = static_cast<INI_STRUCT *>(piHandle);
+    INI_VALUE *pValue = NULL;
+    for (DWORD i = 0; i < pi->cValues; ++i)
+    {
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pi->rgivValues[i].wzName, -1, wzValueName, -1))
+        {
+            pValue = pi->rgivValues + i;
+            break;
+        }
+    }
+    // We're killing the value
+    if (NULL == wzValue)
+    {
+        if (pValue && pValue->wzValue)
+        {
+            pi->fModified = TRUE;
+            sczValue = const_cast<LPWSTR>(pValue->wzValue);
+            pValue->wzValue = NULL;
+            ReleaseNullStr(sczValue);
+        }
+        ExitFunction();
+    }
+    else
+    {
+        if (pValue)
+        {
+            if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, 0, pValue->wzValue, -1, wzValue, -1))
+            {
+                pi->fModified = TRUE;
+                hr = StrAllocString(const_cast<LPWSTR *>(&pValue->wzValue), wzValue, 0);
+                IniExitOnFailure(hr, "Failed to update value INI value named: %ls", wzValueName);
+            }
+            ExitFunction1(hr = S_OK);
+        }
+        else
+        {
+            if (wzValueName)
+            {
+                hr = GetSectionPrefixFromName(wzValueName, &sczSectionPrefix);
+                IniExitOnFailure(hr, "Failed to get section prefix from value name: %ls", wzValueName);
+            }
+            // If we have a section prefix, figure out the index to insert it (at the end of the section it belongs in)
+            if (sczSectionPrefix)
+            {
+                for (DWORD i = 0; i < pi->cValues; ++i)
+                {
+                    if (0 == wcsncmp(pi->rgivValues[i].wzName, sczSectionPrefix, lstrlenW(sczSectionPrefix)))
+                    {
+                        dwInsertIndex = i;
+                    }
+                    else if (DWORD_MAX != dwInsertIndex)
+                    {
+                        break;
+                    }
+                }
+            }
+            else
+            {
+                for (DWORD i = 0; i < pi->cValues; ++i)
+                {
+                    if (NULL == wcsstr(pi->rgivValues[i].wzName, wzSectionSeparator))
+                    {
+                        dwInsertIndex = i;
+                    }
+                    else if (DWORD_MAX != dwInsertIndex)
+                    {
+                        break;
+                    }
+                }
+            }
+            // Otherwise, just add it to the end
+            if (DWORD_MAX == dwInsertIndex)
+            {
+                dwInsertIndex = pi->cValues;
+            }
+            pi->fModified = TRUE;
+            hr = MemInsertIntoArray(reinterpret_cast<void **>(&pi->rgivValues), dwInsertIndex, 1, pi->cValues + 1, sizeof(INI_VALUE), 100);
+            IniExitOnFailure(hr, "Failed to insert value into array");
+            hr = StrAllocString(&sczName, wzValueName, 0);
+            IniExitOnFailure(hr, "Failed to copy name");
+            hr = StrAllocString(&sczValue, wzValue, 0);
+            IniExitOnFailure(hr, "Failed to copy value");
+            pi->rgivValues[dwInsertIndex].wzName = const_cast<LPCWSTR>(sczName);
+            sczName = NULL;
+            pi->rgivValues[dwInsertIndex].wzValue = const_cast<LPCWSTR>(sczValue);
+            sczValue = NULL;
+            ++pi->cValues;
+        }
+    }
+LExit:
+    ReleaseStr(sczName);
+    ReleaseStr(sczValue);
+    return hr;
+}
+extern "C" HRESULT DAPI IniWriteFile(
+    __in_bcount(INI_HANDLE_BYTES) INI_HANDLE piHandle,
+    __in_z_opt LPCWSTR wzPath,
+    __in FILE_ENCODING feOverrideEncoding
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczCurrentSectionPrefix = NULL;
+    LPWSTR sczNewSectionPrefix = NULL;
+    LPWSTR sczContents = NULL;
+    LPCWSTR wzName = NULL;
+    DWORD dwLineArrayIndex = 1;
+    FILE_ENCODING feEncoding;
+    INI_STRUCT *pi = static_cast<INI_STRUCT *>(piHandle);
+    if (FILE_ENCODING_UNSPECIFIED == feOverrideEncoding)
+    {
+        feEncoding = pi->feEncoding;
+    }
+    else
+    {
+        feEncoding = feOverrideEncoding;
+    }
+    if (FILE_ENCODING_UNSPECIFIED == feEncoding)
+    {
+        feEncoding = FILE_ENCODING_UTF16_WITH_BOM;
+    }
+    if (!pi->fModified)
+    {
+        ExitFunction1(hr = S_OK);
+    }
+    if (NULL == wzPath && NULL == pi->sczPath)
+    {
+        ExitFunction1(hr = E_NOTFOUND);
+    }
+    BOOL fSections = (pi->sczOpenTagPrefix) && (pi->sczOpenTagPostfix);
+    hr = StrAllocString(&sczContents, L"", 0);
+    IniExitOnFailure(hr, "Failed to begin contents string as empty string");
+    // Insert any beginning lines we didn't understand like comments
+    if (0 < pi->cLines)
+    {
+        while (pi->rgsczLines[dwLineArrayIndex])
+        {
+            hr = StrAllocConcat(&sczContents, pi->rgsczLines[dwLineArrayIndex], 0);
+            IniExitOnFailure(hr, "Failed to add previous line to ini output buffer in-memory");
+            hr = StrAllocConcat(&sczContents, L"\r\n", 2);
+            IniExitOnFailure(hr, "Failed to add endline to ini output buffer in-memory");
+            ++dwLineArrayIndex;
+        }
+    }
+    for (DWORD i = 0; i < pi->cValues; ++i)
+    {
+        // Skip if this value was killed off
+        if (NULL == pi->rgivValues[i].wzValue)
+        {
+            continue;
+        }
+        // Now generate any lines for the current value like value line and maybe also a new section line before it
+        // First see if we need to write a section line
+        hr = GetSectionPrefixFromName(pi->rgivValues[i].wzName, &sczNewSectionPrefix);
+        IniExitOnFailure(hr, "Failed to get section prefix from name: %ls", pi->rgivValues[i].wzName);
+        // If the new section prefix is different, write a section out for it
+        if (fSections && sczNewSectionPrefix && (NULL == sczCurrentSectionPrefix || CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, 0, sczNewSectionPrefix, -1, sczCurrentSectionPrefix, -1)))
+        {
+            hr = StrAllocConcat(&sczContents, pi->sczOpenTagPrefix, 0);
+            IniExitOnFailure(hr, "Failed to concat open tag prefix to string");
+            // Exclude section separator (i.e. backslash) from new section prefix
+            hr = StrAllocConcat(&sczContents, sczNewSectionPrefix, lstrlenW(sczNewSectionPrefix)-lstrlenW(wzSectionSeparator));
+            IniExitOnFailure(hr, "Failed to concat section name to string");
+            hr = StrAllocConcat(&sczContents, pi->sczOpenTagPostfix, 0);
+            IniExitOnFailure(hr, "Failed to concat open tag postfix to string");
+            hr = StrAllocConcat(&sczContents, L"\r\n", 2);
+            IniExitOnFailure(hr, "Failed to add endline to ini output buffer in-memory");
+            
+            ReleaseNullStr(sczCurrentSectionPrefix);
+            sczCurrentSectionPrefix = sczNewSectionPrefix;
+            sczNewSectionPrefix = NULL;
+        }
+        // Inserting lines we read before the current value if appropriate
+        while (pi->rgivValues[i].dwLineNumber > dwLineArrayIndex)
+        {
+            // Skip any lines were purposely forgot
+            if (NULL == pi->rgsczLines[dwLineArrayIndex])
+            {
+                ++dwLineArrayIndex;
+                continue;
+            }
+            hr = StrAllocConcat(&sczContents, pi->rgsczLines[dwLineArrayIndex++], 0);
+            IniExitOnFailure(hr, "Failed to add previous line to ini output buffer in-memory");
+            hr = StrAllocConcat(&sczContents, L"\r\n", 2);
+            IniExitOnFailure(hr, "Failed to add endline to ini output buffer in-memory");
+        }
+        wzName = pi->rgivValues[i].wzName;
+        if (fSections)
+        {
+            wzName += lstrlenW(sczCurrentSectionPrefix);
+        }
+        // OK, now just write the name/value pair, if it isn't deleted
+        if (pi->sczValuePrefix)
+        {
+            hr = StrAllocConcat(&sczContents, pi->sczValuePrefix, 0);
+            IniExitOnFailure(hr, "Failed to concat value prefix to ini output buffer");
+        }
+        hr = StrAllocConcat(&sczContents, wzName, 0);
+        IniExitOnFailure(hr, "Failed to concat value name to ini output buffer");
+        hr = StrAllocConcat(&sczContents, pi->sczValueSeparator, 0);
+        IniExitOnFailure(hr, "Failed to concat value separator to ini output buffer");
+        hr = StrAllocConcat(&sczContents, pi->rgivValues[i].wzValue, 0);
+        IniExitOnFailure(hr, "Failed to concat value to ini output buffer");
+        hr = StrAllocConcat(&sczContents, L"\r\n", 2);
+        IniExitOnFailure(hr, "Failed to add endline to ini output buffer in-memory");
+    }
+    // If no path was specified, use the path to the file we parsed
+    if (NULL == wzPath)
+    {
+        wzPath = pi->sczPath;
+    }
+    hr = FileFromString(wzPath, 0, sczContents, feEncoding);
+    IniExitOnFailure(hr, "Failed to write INI contents out to file: %ls", wzPath);
+LExit:
+    ReleaseStr(sczContents);
+    ReleaseStr(sczCurrentSectionPrefix);
+    ReleaseStr(sczNewSectionPrefix);
+    return hr;
+}
+static void UninitializeIniValue(
+    INI_VALUE *pivValue
+    )
+{
+    ReleaseStr(const_cast<LPWSTR>(pivValue->wzName));
+    ReleaseStr(const_cast<LPWSTR>(pivValue->wzValue));
+}
+static HRESULT GetSectionPrefixFromName(
+    __in_z LPCWSTR wzName,
+    __deref_inout_z LPWSTR* psczOutput
+    )
+{
+    HRESULT hr = S_OK;
+    LPCWSTR wzSectionDelimiter = NULL;
+    ReleaseNullStr(*psczOutput);
+    wzSectionDelimiter = wcsstr(wzName, wzSectionSeparator);
+    if (wzSectionDelimiter && wzSectionDelimiter != wzName)
+    {
+        hr = StrAllocString(psczOutput, wzName, wzSectionDelimiter - wzName + 1);
+        IniExitOnFailure(hr, "Failed to copy section prefix");
+    }
+LExit:
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/jsonutil.cpp b/src/libs/dutil/WixToolset.DUtil/jsonutil.cpp
new file mode 100644
index 00000000..3450ba59
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/jsonutil.cpp
@@ -0,0 +1,687 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define JsonExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_JSONUTIL, x, s, __VA_ARGS__)
+#define JsonExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_JSONUTIL, x, s, __VA_ARGS__)
+#define JsonExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_JSONUTIL, x, s, __VA_ARGS__)
+#define JsonExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_JSONUTIL, x, s, __VA_ARGS__)
+#define JsonExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_JSONUTIL, x, s, __VA_ARGS__)
+#define JsonExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_JSONUTIL, x, s, __VA_ARGS__)
+#define JsonExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_JSONUTIL, p, x, e, s, __VA_ARGS__)
+#define JsonExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_JSONUTIL, p, x, s, __VA_ARGS__)
+#define JsonExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_JSONUTIL, p, x, e, s, __VA_ARGS__)
+#define JsonExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_JSONUTIL, p, x, s, __VA_ARGS__)
+#define JsonExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_JSONUTIL, e, x, s, __VA_ARGS__)
+#define JsonExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_JSONUTIL, g, x, s, __VA_ARGS__)
+const DWORD JSON_STACK_INCREMENT = 5;
+// Prototypes
+static HRESULT DoStart(
+    __in JSON_WRITER* pWriter,
+    __in JSON_TOKEN tokenStart,
+    __in_z LPCWSTR wzStartString
+    );
+static HRESULT DoEnd(
+    __in JSON_WRITER* pWriter,
+    __in JSON_TOKEN tokenEnd,
+    __in_z LPCWSTR wzEndString
+    );
+static HRESULT DoKey(
+    __in JSON_WRITER* pWriter,
+    __in_z LPCWSTR wzKey
+    );
+static HRESULT DoValue(
+    __in JSON_WRITER* pWriter,
+    __in_z_opt LPCWSTR wzValue
+    );
+static HRESULT EnsureTokenStack(
+    __in JSON_WRITER* pWriter
+    );
+static HRESULT SerializeJsonString(
+    __out_z LPWSTR* psczJsonString,
+    __in_z LPCWSTR wzString
+    );
+DAPI_(HRESULT) JsonInitializeReader(
+    __in_z LPCWSTR wzJson,
+    __in JSON_READER* pReader
+    )
+{
+    HRESULT hr = S_OK;
+    memset(pReader, 0, sizeof(JSON_READER));
+    ::InitializeCriticalSection(&pReader->cs);
+    hr = StrAllocString(&pReader->sczJson, wzJson, 0);
+    JsonExitOnFailure(hr, "Failed to allocate json string.");
+    pReader->pwz = pReader->sczJson;
+LExit:
+    return hr;
+}
+DAPI_(void) JsonUninitializeReader(
+    __in JSON_READER* pReader
+    )
+{
+    ReleaseStr(pReader->sczJson);
+    ::DeleteCriticalSection(&pReader->cs);
+    memset(pReader, 0, sizeof(JSON_READER));
+}
+static HRESULT NextToken(
+    __in JSON_READER* pReader,
+    __out JSON_TOKEN* pToken
+    )
+{
+    HRESULT hr = S_OK;
+    // Skip whitespace.
+    while (L' ' == *pReader->pwz ||
+        L'\t' == *pReader->pwz ||
+        L'\r' == *pReader->pwz ||
+        L'\n' == *pReader->pwz ||
+        L',' == *pReader->pwz)
+    {
+        ++pReader->pwz;
+    }
+    switch (*pReader->pwz)
+    {
+    case L'{':
+        *pToken = JSON_TOKEN_OBJECT_START;
+        break;
+    case L':': // begin object value
+        *pToken = JSON_TOKEN_OBJECT_VALUE;
+        break;
+    case L'}': // end object
+        *pToken = JSON_TOKEN_OBJECT_END;
+        break;
+    case L'[': // begin array
+        *pToken = JSON_TOKEN_ARRAY_START;
+        break;
+    case L']': // end array
+        *pToken = JSON_TOKEN_ARRAY_END;
+        break;
+    case L'"': // string
+        *pToken = JSON_TOKEN_OBJECT_START == *pToken ? JSON_TOKEN_VALUE : JSON_TOKEN_OBJECT_KEY;
+        break;
+    case L't': // true
+    case L'f': // false
+    case L'n': // null
+    case L'-': // number
+    case L'0':
+    case L'1':
+    case L'2':
+    case L'3':
+    case L'4':
+    case L'5':
+    case L'6':
+    case L'7':
+    case L'8':
+    case L'9':
+        *pToken = JSON_TOKEN_VALUE;
+        break;
+    case L'\0':
+        hr = E_NOMOREITEMS;
+        break;
+    default:
+        hr = E_INVALIDSTATE;
+    }
+    return hr;
+}
+DAPI_(HRESULT) JsonReadNext(
+    __in JSON_READER* pReader,
+    __out JSON_TOKEN* pToken,
+    __out JSON_VALUE* pValue
+    )
+{
+    HRESULT hr = S_OK;
+    //WCHAR wz;
+    //JSON_TOKEN token = JSON_TOKEN_NONE;
+    ::EnterCriticalSection(&pReader->cs);
+    hr = NextToken(pReader, pToken);
+    if (E_NOMOREITEMS == hr)
+    {
+        ExitFunction();
+    }
+    JsonExitOnFailure(hr, "Failed to get next token.");
+    if (JSON_TOKEN_VALUE == *pToken)
+    {
+        hr = JsonReadValue(pReader, pValue);
+    }
+    else
+    {
+        ++pReader->pwz;
+    }
+LExit:
+    ::LeaveCriticalSection(&pReader->cs);
+    return hr;
+}
+DAPI_(HRESULT) JsonReadValue(
+    __in JSON_READER* /*pReader*/,
+    __in JSON_VALUE* /*pValue*/
+    )
+{
+    HRESULT hr = S_OK;
+//LExit:
+    return hr;
+}
+DAPI_(HRESULT) JsonInitializeWriter(
+    __in JSON_WRITER* pWriter
+    )
+{
+    memset(pWriter, 0, sizeof(JSON_WRITER));
+    ::InitializeCriticalSection(&pWriter->cs);
+    return S_OK;
+}
+DAPI_(void) JsonUninitializeWriter(
+    __in JSON_WRITER* pWriter
+    )
+{
+    ReleaseMem(pWriter->rgTokenStack);
+    ReleaseStr(pWriter->sczJson);
+    ::DeleteCriticalSection(&pWriter->cs);
+    memset(pWriter, 0, sizeof(JSON_WRITER));
+}
+DAPI_(HRESULT) JsonWriteBool(
+    __in JSON_WRITER* pWriter,
+    __in BOOL fValue
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczValue = NULL;
+    hr = StrAllocString(&sczValue, fValue ? L"true" : L"false", 0);
+    JsonExitOnFailure(hr, "Failed to convert boolean to string.");
+    hr = DoValue(pWriter, sczValue);
+    JsonExitOnFailure(hr, "Failed to add boolean to JSON.");
+LExit:
+    ReleaseStr(sczValue);
+    return hr;
+}
+DAPI_(HRESULT) JsonWriteNumber(
+    __in JSON_WRITER* pWriter,
+    __in DWORD dwValue
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczValue = NULL;
+    hr = StrAllocFormatted(&sczValue, L"%u", dwValue);
+    JsonExitOnFailure(hr, "Failed to convert number to string.");
+    hr = DoValue(pWriter, sczValue);
+    JsonExitOnFailure(hr, "Failed to add number to JSON.");
+LExit:
+    ReleaseStr(sczValue);
+    return hr;
+}
+DAPI_(HRESULT) JsonWriteString(
+    __in JSON_WRITER* pWriter,
+    __in_z LPCWSTR wzValue
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczJsonString = NULL;
+    hr = SerializeJsonString(&sczJsonString, wzValue);
+    JsonExitOnFailure(hr, "Failed to allocate string JSON.");
+    hr = DoValue(pWriter, sczJsonString);
+    JsonExitOnFailure(hr, "Failed to add string to JSON.");
+LExit:
+    ReleaseStr(sczJsonString);
+    return hr;
+}
+DAPI_(HRESULT) JsonWriteArrayStart(
+    __in JSON_WRITER* pWriter
+    )
+{
+    HRESULT hr = S_OK;
+    hr = DoStart(pWriter, JSON_TOKEN_ARRAY_START, L"[");
+    JsonExitOnFailure(hr, "Failed to start JSON array.");
+LExit:
+    return hr;
+}
+DAPI_(HRESULT) JsonWriteArrayEnd(
+    __in JSON_WRITER* pWriter
+    )
+{
+    HRESULT hr = S_OK;
+    hr = DoEnd(pWriter, JSON_TOKEN_ARRAY_END, L"]");
+    JsonExitOnFailure(hr, "Failed to end JSON array.");
+LExit:
+    return hr;
+}
+DAPI_(HRESULT) JsonWriteObjectStart(
+    __in JSON_WRITER* pWriter
+    )
+{
+    HRESULT hr = S_OK;
+    hr = DoStart(pWriter, JSON_TOKEN_OBJECT_START, L"{");
+    JsonExitOnFailure(hr, "Failed to start JSON object.");
+LExit:
+    return hr;
+}
+DAPI_(HRESULT) JsonWriteObjectKey(
+    __in JSON_WRITER* pWriter,
+    __in_z LPCWSTR wzKey
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczObjectKey = NULL;
+    hr = StrAllocFormatted(&sczObjectKey, L"\"%ls\":", wzKey);
+    JsonExitOnFailure(hr, "Failed to allocate JSON object key.");
+    hr = DoKey(pWriter, sczObjectKey);
+    JsonExitOnFailure(hr, "Failed to add object key to JSON.");
+LExit:
+    ReleaseStr(sczObjectKey);
+    return hr;
+}
+DAPI_(HRESULT) JsonWriteObjectEnd(
+    __in JSON_WRITER* pWriter
+    )
+{
+    HRESULT hr = S_OK;
+    hr = DoEnd(pWriter, JSON_TOKEN_OBJECT_END, L"}");
+    JsonExitOnFailure(hr, "Failed to end JSON object.");
+LExit:
+    return hr;
+}
+static HRESULT DoStart(
+    __in JSON_WRITER* pWriter,
+    __in JSON_TOKEN tokenStart,
+    __in_z LPCWSTR wzStartString
+    )
+{
+    Assert(JSON_TOKEN_ARRAY_START == tokenStart || JSON_TOKEN_OBJECT_START == tokenStart);
+    HRESULT hr = S_OK;
+    JSON_TOKEN token = JSON_TOKEN_NONE;
+    BOOL fNeedComma = FALSE;
+    BOOL fPushToken = TRUE;
+    ::EnterCriticalSection(&pWriter->cs);
+    hr = EnsureTokenStack(pWriter);
+    JsonExitOnFailure(hr, "Failed to ensure token stack for start.");
+    token = pWriter->rgTokenStack[pWriter->cTokens - 1];
+    switch (token)
+    {
+    case JSON_TOKEN_NONE:
+        token = tokenStart;
+        fPushToken = FALSE;
+        break;
+    case JSON_TOKEN_ARRAY_START: // array start changes to array value.
+        token = JSON_TOKEN_ARRAY_VALUE;
+        break;
+    case JSON_TOKEN_ARRAY_VALUE:
+    case JSON_TOKEN_ARRAY_END:
+    case JSON_TOKEN_OBJECT_END:
+        fNeedComma = TRUE;
+        break;
+    default: // everything else is not allowed.
+        hr = E_UNEXPECTED;
+        break;
+    }
+    JsonExitOnRootFailure(hr, "Cannot start array or object to JSON serializer now.");
+    if (fNeedComma)
+    {
+        hr = StrAllocConcat(&pWriter->sczJson, L",", 0);
+        JsonExitOnFailure(hr, "Failed to add comma for start array or object to JSON.");
+    }
+    hr = StrAllocConcat(&pWriter->sczJson, wzStartString, 0);
+    JsonExitOnFailure(hr, "Failed to start JSON array or object.");
+    pWriter->rgTokenStack[pWriter->cTokens - 1] = token;
+    if (fPushToken)
+    {
+        pWriter->rgTokenStack[pWriter->cTokens] = tokenStart;
+        ++pWriter->cTokens;
+    }
+LExit:
+    ::LeaveCriticalSection(&pWriter->cs);
+    return hr;
+}
+static HRESULT DoEnd(
+    __in JSON_WRITER* pWriter,
+    __in JSON_TOKEN tokenEnd,
+    __in_z LPCWSTR wzEndString
+    )
+{
+    HRESULT hr = S_OK;
+    ::EnterCriticalSection(&pWriter->cs);
+    if (!pWriter->rgTokenStack || 0 == pWriter->cTokens)
+    {
+        hr = E_UNEXPECTED;
+        JsonExitOnRootFailure(hr, "Failure to pop token because the stack is empty.");
+    }
+    else
+    {
+        JSON_TOKEN token = pWriter->rgTokenStack[pWriter->cTokens - 1];
+        if ((JSON_TOKEN_ARRAY_END == tokenEnd && JSON_TOKEN_ARRAY_START != token && JSON_TOKEN_ARRAY_VALUE != token) ||
+            (JSON_TOKEN_OBJECT_END == tokenEnd && JSON_TOKEN_OBJECT_START != token && JSON_TOKEN_OBJECT_VALUE != token))
+        {
+            hr = E_UNEXPECTED;
+            JsonExitOnRootFailure(hr, "Failure to pop token because the stack did not match the expected token: %d", tokenEnd);
+        }
+    }
+    hr = StrAllocConcat(&pWriter->sczJson, wzEndString, 0);
+    JsonExitOnFailure(hr, "Failed to end JSON array or object.");
+    --pWriter->cTokens;
+LExit:
+    ::LeaveCriticalSection(&pWriter->cs);
+    return hr;
+}
+static HRESULT DoKey(
+    __in JSON_WRITER* pWriter,
+    __in_z LPCWSTR wzKey
+    )
+{
+    HRESULT hr = S_OK;
+    JSON_TOKEN token = JSON_TOKEN_NONE;
+    BOOL fNeedComma = FALSE;
+    ::EnterCriticalSection(&pWriter->cs);
+    hr = EnsureTokenStack(pWriter);
+    JsonExitOnFailure(hr, "Failed to ensure token stack for key.");
+    token = pWriter->rgTokenStack[pWriter->cTokens - 1];
+    switch (token)
+    {
+    case JSON_TOKEN_OBJECT_START:
+        token = JSON_TOKEN_OBJECT_KEY;
+        break;
+    case JSON_TOKEN_OBJECT_VALUE:
+        token = JSON_TOKEN_OBJECT_KEY;
+        fNeedComma = TRUE;
+        break;
+    default: // everything else is not allowed.
+        hr = E_UNEXPECTED;
+        break;
+    }
+    JsonExitOnRootFailure(hr, "Cannot add key to JSON serializer now.");
+    if (fNeedComma)
+    {
+        hr = StrAllocConcat(&pWriter->sczJson, L",", 0);
+        JsonExitOnFailure(hr, "Failed to add comma for key to JSON.");
+    }
+    hr = StrAllocConcat(&pWriter->sczJson, wzKey, 0);
+    JsonExitOnFailure(hr, "Failed to add key to JSON.");
+    pWriter->rgTokenStack[pWriter->cTokens - 1] = token;
+LExit:
+    ::LeaveCriticalSection(&pWriter->cs);
+    return hr;
+}
+static HRESULT DoValue(
+    __in JSON_WRITER* pWriter,
+    __in_z_opt LPCWSTR wzValue
+    )
+{
+    HRESULT hr = S_OK;
+    JSON_TOKEN token = JSON_TOKEN_NONE;
+    BOOL fNeedComma = FALSE;
+    ::EnterCriticalSection(&pWriter->cs);
+    hr = EnsureTokenStack(pWriter);
+    JsonExitOnFailure(hr, "Failed to ensure token stack for value.");
+    token = pWriter->rgTokenStack[pWriter->cTokens - 1];
+    switch (token)
+    {
+    case JSON_TOKEN_ARRAY_START:
+        token = JSON_TOKEN_ARRAY_VALUE;
+        break;
+    case JSON_TOKEN_ARRAY_VALUE:
+        fNeedComma = TRUE;
+        break;
+    case JSON_TOKEN_OBJECT_KEY:
+        token = JSON_TOKEN_OBJECT_VALUE;
+        break;
+    case JSON_TOKEN_NONE:
+        token = JSON_TOKEN_VALUE;
+        break;
+    default: // everything else is not allowed.
+        hr = E_UNEXPECTED;
+        break;
+    }
+    JsonExitOnRootFailure(hr, "Cannot add value to JSON serializer now.");
+    if (fNeedComma)
+    {
+        hr = StrAllocConcat(&pWriter->sczJson, L",", 0);
+        JsonExitOnFailure(hr, "Failed to add comma for value to JSON.");
+    }
+    if (wzValue)
+    {
+        hr = StrAllocConcat(&pWriter->sczJson, wzValue, 0);
+        JsonExitOnFailure(hr, "Failed to add value to JSON.");
+    }
+    else
+    {
+        hr = StrAllocConcat(&pWriter->sczJson, L"null", 0);
+        JsonExitOnFailure(hr, "Failed to add null value to JSON.");
+    }
+    pWriter->rgTokenStack[pWriter->cTokens - 1] = token;
+LExit:
+    ::LeaveCriticalSection(&pWriter->cs);
+    return hr;
+}
+static HRESULT EnsureTokenStack(
+    __in JSON_WRITER* pWriter
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD cNumAlloc = pWriter->cTokens != 0 ? pWriter->cTokens : 0;
+    hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&pWriter->rgTokenStack), cNumAlloc, sizeof(JSON_TOKEN), JSON_STACK_INCREMENT);
+    JsonExitOnFailure(hr, "Failed to allocate JSON token stack.");
+    if (0 == pWriter->cTokens)
+    {
+        pWriter->rgTokenStack[0] = JSON_TOKEN_NONE;
+        ++pWriter->cTokens;
+    }
+LExit:
+    return hr;
+}
+static HRESULT SerializeJsonString(
+    __out_z LPWSTR* psczJsonString,
+    __in_z LPCWSTR wzString
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD cchRequired = 3; // start with enough space for null terminated empty quoted string (aka: ""\0)
+    for (LPCWSTR pch = wzString; *pch; ++pch)
+    {
+        // If it is a special JSON character, add space for the escape backslash.
+        if (L'"' == *pch || L'\\' == *pch || L'/' == *pch || L'\b' == *pch || L'\f' == *pch || L'\n' == *pch || L'\r' == *pch || L'\t' == *pch)
+        {
+            ++cchRequired;
+        }
+        ++cchRequired;
+    }
+    hr = StrAlloc(psczJsonString, cchRequired);
+    JsonExitOnFailure(hr, "Failed to allocate space for JSON string.");
+    LPWSTR pchTarget = *psczJsonString;
+    *pchTarget = L'\"';
+    ++pchTarget;
+    for (LPCWSTR pch = wzString; *pch; ++pch, ++pchTarget)
+    {
+        // If it is a special JSON character, handle it or just add the character as is.
+        switch (*pch)
+        {
+        case L'"':
+            *pchTarget = L'\\';
+            ++pchTarget;
+            *pchTarget = L'"';
+            break;
+        case L'\\':
+            *pchTarget = L'\\';
+            ++pchTarget;
+            *pchTarget = L'\\';
+            break;
+        case L'/':
+            *pchTarget = L'\\';
+            ++pchTarget;
+            *pchTarget = L'/';
+            break;
+        case L'\b':
+            *pchTarget = L'\\';
+            ++pchTarget;
+            *pchTarget = L'b';
+            break;
+        case L'\f':
+            *pchTarget = L'\\';
+            ++pchTarget;
+            *pchTarget = L'f';
+            break;
+        case L'\n':
+            *pchTarget = L'\\';
+            ++pchTarget;
+            *pchTarget = L'n';
+            break;
+        case L'\r':
+            *pchTarget = L'\\';
+            ++pchTarget;
+            *pchTarget = L'r';
+            break;
+        case L'\t':
+            *pchTarget = L'\\';
+            ++pchTarget;
+            *pchTarget = L't';
+            break;
+        default:
+            *pchTarget = *pch;
+            break;
+        }
+    }
+    *pchTarget = L'\"';
+    ++pchTarget;
+    *pchTarget = L'\0';
+LExit:
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/locutil.cpp b/src/libs/dutil/WixToolset.DUtil/locutil.cpp
new file mode 100644
index 00000000..c4567c03
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/locutil.cpp
@@ -0,0 +1,628 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define LocExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_LOCUTIL, x, s, __VA_ARGS__)
+#define LocExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_LOCUTIL, x, s, __VA_ARGS__)
+#define LocExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_LOCUTIL, x, s, __VA_ARGS__)
+#define LocExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_LOCUTIL, x, s, __VA_ARGS__)
+#define LocExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_LOCUTIL, x, s, __VA_ARGS__)
+#define LocExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_LOCUTIL, x, s, __VA_ARGS__)
+#define LocExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_LOCUTIL, p, x, e, s, __VA_ARGS__)
+#define LocExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_LOCUTIL, p, x, s, __VA_ARGS__)
+#define LocExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_LOCUTIL, p, x, e, s, __VA_ARGS__)
+#define LocExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_LOCUTIL, p, x, s, __VA_ARGS__)
+#define LocExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_LOCUTIL, e, x, s, __VA_ARGS__)
+#define LocExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_LOCUTIL, g, x, s, __VA_ARGS__)
+// prototypes
+static HRESULT ParseWxl(
+    __in IXMLDOMDocument* pixd,
+    __out WIX_LOCALIZATION** ppWixLoc
+    );
+static HRESULT ParseWxlStrings(
+    __in IXMLDOMElement* pElement,
+    __in WIX_LOCALIZATION* pWixLoc
+    );
+static HRESULT ParseWxlControls(
+    __in IXMLDOMElement* pElement,
+    __in WIX_LOCALIZATION* pWixLoc
+    );
+static HRESULT ParseWxlString(
+    __in IXMLDOMNode* pixn,
+    __in DWORD dwIdx,
+    __in WIX_LOCALIZATION* pWixLoc
+    );
+static HRESULT ParseWxlControl(
+    __in IXMLDOMNode* pixn,
+    __in DWORD dwIdx,
+    __in WIX_LOCALIZATION* pWixLoc
+    );
+// from Winnls.h
+#ifndef MUI_LANGUAGE_ID
+#define MUI_LANGUAGE_ID                     0x4      // Use traditional language ID convention
+#endif
+#ifndef MUI_MERGE_USER_FALLBACK
+#define MUI_MERGE_USER_FALLBACK             0x20     // GetThreadPreferredUILanguages merges in user preferred languages
+#endif
+#ifndef MUI_MERGE_SYSTEM_FALLBACK
+#define MUI_MERGE_SYSTEM_FALLBACK           0x10     // GetThreadPreferredUILanguages merges in parent and base languages
+#endif
+typedef WINBASEAPI BOOL (WINAPI *GET_THREAD_PREFERRED_UI_LANGUAGES) (
+    __in DWORD dwFlags,
+    __out PULONG pulNumLanguages,
+    __out_ecount_opt(*pcchLanguagesBuffer) PZZWSTR pwszLanguagesBuffer,
+    __inout PULONG pcchLanguagesBuffer
+);
+extern "C" HRESULT DAPI LocProbeForFile(
+    __in_z LPCWSTR wzBasePath,
+    __in_z LPCWSTR wzLocFileName,
+    __in_z_opt LPCWSTR wzLanguage,
+    __inout LPWSTR* psczPath
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczProbePath = NULL;
+    LANGID langid = 0;
+    LPWSTR sczLangIdFile = NULL;
+    LPWSTR sczLangsBuff = NULL;
+    GET_THREAD_PREFERRED_UI_LANGUAGES pvfnGetThreadPreferredUILanguages =
+        reinterpret_cast<GET_THREAD_PREFERRED_UI_LANGUAGES>(
+            GetProcAddress(GetModuleHandle("Kernel32.dll"), "GetThreadPreferredUILanguages"));
+    // If a language was specified, look for a loc file in that as a directory.
+    if (wzLanguage && *wzLanguage)
+    {
+        hr = PathConcat(wzBasePath, wzLanguage, &sczProbePath);
+        LocExitOnFailure(hr, "Failed to concat base path to language.");
+        hr = PathConcat(sczProbePath, wzLocFileName, &sczProbePath);
+        LocExitOnFailure(hr, "Failed to concat loc file name to probe path.");
+        if (FileExistsEx(sczProbePath, NULL))
+        {
+            ExitFunction();
+        }
+    }
+    if (pvfnGetThreadPreferredUILanguages)
+    {
+        ULONG nLangs;
+        ULONG cchLangs = 0;
+        DWORD dwFlags = MUI_LANGUAGE_ID | MUI_MERGE_USER_FALLBACK | MUI_MERGE_SYSTEM_FALLBACK;
+        if (!(*pvfnGetThreadPreferredUILanguages)(dwFlags, &nLangs, NULL, &cchLangs))
+        {
+            LocExitWithLastError(hr, "GetThreadPreferredUILanguages failed to return buffer size.");
+        }
+        hr = StrAlloc(&sczLangsBuff, cchLangs);
+        LocExitOnFailure(hr, "Failed to allocate buffer for languages");
+        nLangs = 0;
+        if (!(*pvfnGetThreadPreferredUILanguages)(dwFlags, &nLangs, sczLangsBuff, &cchLangs))
+        {
+            LocExitWithLastError(hr, "GetThreadPreferredUILanguages failed to return language list.");
+        }
+        LPWSTR szLangs = sczLangsBuff;
+        for (ULONG i = 0; i < nLangs; ++i, szLangs += 5)
+        {
+            // StrHexDecode assumes low byte is first. We'll need to swap the bytes once we parse out the value.
+            hr = StrHexDecode(szLangs, reinterpret_cast<BYTE*>(&langid), sizeof(langid));
+            LocExitOnFailure(hr, "Failed to parse langId.");
+            langid = MAKEWORD(HIBYTE(langid), LOBYTE(langid));
+            hr = StrAllocFormatted(&sczLangIdFile, L"%u\\%ls", langid, wzLocFileName); 
+            LocExitOnFailure(hr, "Failed to format user preferred langid.");
+            hr = PathConcat(wzBasePath, sczLangIdFile, &sczProbePath); 
+            LocExitOnFailure(hr, "Failed to concat user preferred langid file name to base path.");
+            if (FileExistsEx(sczProbePath, NULL)) 
+            { 
+                ExitFunction(); 
+            }
+        }
+    }
+    langid = ::GetUserDefaultUILanguage();
+    hr = StrAllocFormatted(&sczLangIdFile, L"%u\\%ls", langid, wzLocFileName);
+    LocExitOnFailure(hr, "Failed to format user langid.");
+    hr = PathConcat(wzBasePath, sczLangIdFile, &sczProbePath);
+    LocExitOnFailure(hr, "Failed to concat user langid file name to base path.");
+    if (FileExistsEx(sczProbePath, NULL))
+    {
+        ExitFunction();
+    }
+    if (MAKELANGID(langid & 0x3FF, SUBLANG_DEFAULT) != langid) 
+    { 
+        langid = MAKELANGID(langid & 0x3FF, SUBLANG_DEFAULT); 
+        
+        hr = StrAllocFormatted(&sczLangIdFile, L"%u\\%ls", langid, wzLocFileName); 
+        LocExitOnFailure(hr, "Failed to format user langid (default sublang).");
+        hr = PathConcat(wzBasePath, sczLangIdFile, &sczProbePath); 
+        LocExitOnFailure(hr, "Failed to concat user langid file name to base path (default sublang).");
+        if (FileExistsEx(sczProbePath, NULL)) 
+        { 
+            ExitFunction(); 
+        } 
+    }
+    langid = ::GetSystemDefaultUILanguage();
+    hr = StrAllocFormatted(&sczLangIdFile, L"%u\\%ls", langid, wzLocFileName);
+    LocExitOnFailure(hr, "Failed to format system langid.");
+    hr = PathConcat(wzBasePath, sczLangIdFile, &sczProbePath);
+    LocExitOnFailure(hr, "Failed to concat system langid file name to base path.");
+    if (FileExistsEx(sczProbePath, NULL))
+    {
+        ExitFunction();
+    }
+    if (MAKELANGID(langid & 0x3FF, SUBLANG_DEFAULT) != langid) 
+    { 
+        langid = MAKELANGID(langid & 0x3FF, SUBLANG_DEFAULT); 
+        
+        hr = StrAllocFormatted(&sczLangIdFile, L"%u\\%ls", langid, wzLocFileName); 
+        LocExitOnFailure(hr, "Failed to format user langid (default sublang).");
+        hr = PathConcat(wzBasePath, sczLangIdFile, &sczProbePath); 
+        LocExitOnFailure(hr, "Failed to concat user langid file name to base path (default sublang).");
+        if (FileExistsEx(sczProbePath, NULL)) 
+        { 
+            ExitFunction(); 
+        } 
+    }
+    // Finally, look for the loc file in the base path.
+    hr = PathConcat(wzBasePath, wzLocFileName, &sczProbePath);
+    LocExitOnFailure(hr, "Failed to concat loc file name to base path.");
+    if (!FileExistsEx(sczProbePath, NULL))
+    {
+        hr = E_FILENOTFOUND;
+    }
+LExit:
+    if (SUCCEEDED(hr))
+    {
+        hr = StrAllocString(psczPath, sczProbePath, 0);
+    }
+    ReleaseStr(sczLangIdFile);
+    ReleaseStr(sczProbePath);
+    ReleaseStr(sczLangsBuff);
+    return hr;
+}
+extern "C" HRESULT DAPI LocLoadFromFile(
+    __in_z LPCWSTR wzWxlFile,
+    __out WIX_LOCALIZATION** ppWixLoc
+    )
+{
+    HRESULT hr = S_OK;
+    IXMLDOMDocument* pixd = NULL;
+    hr = XmlLoadDocumentFromFile(wzWxlFile, &pixd);
+    LocExitOnFailure(hr, "Failed to load WXL file as XML document.");
+    hr = ParseWxl(pixd, ppWixLoc);
+    LocExitOnFailure(hr, "Failed to parse WXL.");
+LExit:
+    ReleaseObject(pixd);
+    return hr;
+}
+extern "C" HRESULT DAPI LocLoadFromResource(
+    __in HMODULE hModule,
+    __in_z LPCSTR szResource,
+    __out WIX_LOCALIZATION** ppWixLoc
+    )
+{
+    HRESULT hr = S_OK;
+    LPVOID pvResource = NULL;
+    DWORD cbResource = 0;
+    LPWSTR sczXml = NULL;
+    IXMLDOMDocument* pixd = NULL;
+    hr = ResReadData(hModule, szResource, &pvResource, &cbResource);
+    LocExitOnFailure(hr, "Failed to read theme from resource.");
+    hr = StrAllocStringAnsi(&sczXml, reinterpret_cast<LPCSTR>(pvResource), cbResource, CP_UTF8);
+    LocExitOnFailure(hr, "Failed to convert XML document data from UTF-8 to unicode string.");
+    hr = XmlLoadDocument(sczXml, &pixd);
+    LocExitOnFailure(hr, "Failed to load theme resource as XML document.");
+    hr = ParseWxl(pixd, ppWixLoc);
+    LocExitOnFailure(hr, "Failed to parse WXL.");
+LExit:
+    ReleaseObject(pixd);
+    ReleaseStr(sczXml);
+    return hr;
+}
+extern "C" void DAPI LocFree(
+    __in_opt WIX_LOCALIZATION* pWixLoc
+    )
+{
+    if (pWixLoc)
+    {
+        for (DWORD idx = 0; idx < pWixLoc->cLocStrings; ++idx)
+        {
+            ReleaseStr(pWixLoc->rgLocStrings[idx].wzId);
+            ReleaseStr(pWixLoc->rgLocStrings[idx].wzText);
+        }
+        for (DWORD idx = 0; idx < pWixLoc->cLocControls; ++idx)
+        {
+            ReleaseStr(pWixLoc->rgLocControls[idx].wzControl);
+            ReleaseStr(pWixLoc->rgLocControls[idx].wzText);
+        }
+        ReleaseMem(pWixLoc->rgLocStrings);
+        ReleaseMem(pWixLoc->rgLocControls);
+        ReleaseMem(pWixLoc);
+    }
+}
+extern "C" HRESULT DAPI LocLocalizeString(
+    __in const WIX_LOCALIZATION* pWixLoc,
+    __inout LPWSTR* ppsczInput
+    )
+{
+    Assert(ppsczInput && pWixLoc);
+    HRESULT hr = S_OK;
+    for (DWORD i = 0; i < pWixLoc->cLocStrings; ++i)
+    {
+        hr = StrReplaceStringAll(ppsczInput, pWixLoc->rgLocStrings[i].wzId, pWixLoc->rgLocStrings[i].wzText);
+        LocExitOnFailure(hr, "Localizing string failed.");
+    }
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI LocGetControl(
+    __in const WIX_LOCALIZATION* pWixLoc,
+    __in_z LPCWSTR wzId,
+    __out LOC_CONTROL** ppLocControl
+    )
+{
+    HRESULT hr = S_OK;
+    LOC_CONTROL* pLocControl = NULL;
+    for (DWORD i = 0; i < pWixLoc->cLocControls; ++i)
+    {
+        pLocControl = &pWixLoc->rgLocControls[i];
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pLocControl->wzControl, -1, wzId, -1))
+        {
+            *ppLocControl = pLocControl;
+            ExitFunction1(hr = S_OK);
+        }
+    }
+    hr = E_NOTFOUND;
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI LocGetString(
+    __in const WIX_LOCALIZATION* pWixLoc,
+    __in_z LPCWSTR wzId,
+    __out LOC_STRING** ppLocString
+    )
+{
+    HRESULT hr = E_NOTFOUND;
+    LOC_STRING* pLocString = NULL;
+    for (DWORD i = 0; i < pWixLoc->cLocStrings; ++i)
+    {
+        pLocString = pWixLoc->rgLocStrings + i;
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pLocString->wzId, -1, wzId, -1))
+        {
+            *ppLocString = pLocString;
+            hr = S_OK;
+            break;
+        }
+    }
+    return hr;
+}
+extern "C" HRESULT DAPI LocAddString(
+    __in WIX_LOCALIZATION* pWixLoc,
+    __in_z LPCWSTR wzId,
+    __in_z LPCWSTR wzLocString,
+    __in BOOL bOverridable
+    )
+{
+    HRESULT hr = S_OK;
+    ++pWixLoc->cLocStrings;
+    pWixLoc->rgLocStrings = static_cast<LOC_STRING*>(MemReAlloc(pWixLoc->rgLocStrings, sizeof(LOC_STRING) * pWixLoc->cLocStrings, TRUE));
+    LocExitOnNull(pWixLoc->rgLocStrings, hr, E_OUTOFMEMORY, "Failed to reallocate memory for localization strings.");
+    LOC_STRING* pLocString = pWixLoc->rgLocStrings + (pWixLoc->cLocStrings - 1);
+    hr = StrAllocFormatted(&pLocString->wzId, L"#(loc.%s)", wzId);
+    LocExitOnFailure(hr, "Failed to set localization string Id.");
+    hr = StrAllocString(&pLocString->wzText, wzLocString, 0);
+    LocExitOnFailure(hr, "Failed to set localization string Text.");
+    pLocString->bOverridable = bOverridable;
+LExit:
+    return hr;
+}
+// helper functions
+static HRESULT ParseWxl(
+    __in IXMLDOMDocument* pixd,
+    __out WIX_LOCALIZATION** ppWixLoc
+    )
+{
+    HRESULT hr = S_OK;
+    IXMLDOMElement *pWxlElement = NULL;
+    WIX_LOCALIZATION* pWixLoc = NULL;
+    pWixLoc = static_cast<WIX_LOCALIZATION*>(MemAlloc(sizeof(WIX_LOCALIZATION), TRUE));
+    LocExitOnNull(pWixLoc, hr, E_OUTOFMEMORY, "Failed to allocate memory for Wxl file.");
+    // read the WixLocalization tag
+    hr = pixd->get_documentElement(&pWxlElement);
+    LocExitOnFailure(hr, "Failed to get localization element.");
+    // get the Language attribute if present
+    pWixLoc->dwLangId = WIX_LOCALIZATION_LANGUAGE_NOT_SET;
+    hr = XmlGetAttributeNumber(pWxlElement, L"Language", &pWixLoc->dwLangId);
+    if (S_FALSE == hr)
+    {
+        hr = S_OK;
+    }
+    LocExitOnFailure(hr, "Failed to get Language value.");
+    // store the strings and controls in a node list
+    hr = ParseWxlStrings(pWxlElement, pWixLoc);
+    LocExitOnFailure(hr, "Parsing localization strings failed.");
+    hr = ParseWxlControls(pWxlElement, pWixLoc);
+    LocExitOnFailure(hr, "Parsing localization controls failed.");
+    *ppWixLoc = pWixLoc;
+    pWixLoc = NULL;
+LExit:
+    ReleaseObject(pWxlElement);
+    ReleaseMem(pWixLoc);
+    return hr;
+}
+static HRESULT ParseWxlStrings(
+    __in IXMLDOMElement* pElement,
+    __in WIX_LOCALIZATION* pWixLoc
+    )
+{
+    HRESULT hr = S_OK;
+    IXMLDOMNode* pixn = NULL;
+    IXMLDOMNodeList* pixnl = NULL;
+    DWORD dwIdx = 0;
+    hr = XmlSelectNodes(pElement, L"String", &pixnl);
+    LocExitOnLastError(hr, "Failed to get String child nodes of Wxl File.");
+    hr = pixnl->get_length(reinterpret_cast<long*>(&pWixLoc->cLocStrings));
+    LocExitOnLastError(hr, "Failed to get number of String child nodes in Wxl File.");
+    if (0 < pWixLoc->cLocStrings)
+    {
+        pWixLoc->rgLocStrings = static_cast<LOC_STRING*>(MemAlloc(sizeof(LOC_STRING) * pWixLoc->cLocStrings, TRUE));
+        LocExitOnNull(pWixLoc->rgLocStrings, hr, E_OUTOFMEMORY, "Failed to allocate memory for localization strings.");
+        while (S_OK == (hr = XmlNextElement(pixnl, &pixn, NULL)))
+        {
+            hr = ParseWxlString(pixn, dwIdx, pWixLoc);
+            LocExitOnFailure(hr, "Failed to parse localization string.");
+            ++dwIdx;
+            ReleaseNullObject(pixn);
+        }
+        hr = S_OK;
+        LocExitOnFailure(hr, "Failed to enumerate all localization strings.");
+    }
+LExit:
+    if (FAILED(hr) && pWixLoc->rgLocStrings)
+    {
+        for (DWORD idx = 0; idx < pWixLoc->cLocStrings; ++idx)
+        {
+            ReleaseStr(pWixLoc->rgLocStrings[idx].wzId);
+            ReleaseStr(pWixLoc->rgLocStrings[idx].wzText);
+        }
+        ReleaseMem(pWixLoc->rgLocStrings);
+    }
+    ReleaseObject(pixn);
+    ReleaseObject(pixnl);
+    return hr;
+}
+static HRESULT ParseWxlControls(
+    __in IXMLDOMElement* pElement,
+    __in WIX_LOCALIZATION* pWixLoc
+    )
+{
+    HRESULT hr = S_OK;
+    IXMLDOMNode* pixn = NULL;
+    IXMLDOMNodeList* pixnl = NULL;
+    DWORD dwIdx = 0;
+    hr = XmlSelectNodes(pElement, L"UI|Control", &pixnl);
+    LocExitOnLastError(hr, "Failed to get UI child nodes of Wxl File.");
+    hr = pixnl->get_length(reinterpret_cast<long*>(&pWixLoc->cLocControls));
+    LocExitOnLastError(hr, "Failed to get number of UI child nodes in Wxl File.");
+    if (0 < pWixLoc->cLocControls)
+    {
+        pWixLoc->rgLocControls = static_cast<LOC_CONTROL*>(MemAlloc(sizeof(LOC_CONTROL) * pWixLoc->cLocControls, TRUE));
+        LocExitOnNull(pWixLoc->rgLocControls, hr, E_OUTOFMEMORY, "Failed to allocate memory for localized controls.");
+        while (S_OK == (hr = XmlNextElement(pixnl, &pixn, NULL)))
+        {
+            hr = ParseWxlControl(pixn, dwIdx, pWixLoc);
+            LocExitOnFailure(hr, "Failed to parse localized control.");
+            ++dwIdx;
+            ReleaseNullObject(pixn);
+        }
+        hr = S_OK;
+        LocExitOnFailure(hr, "Failed to enumerate all localized controls.");
+    }
+LExit:
+    if (FAILED(hr) && pWixLoc->rgLocControls)
+    {
+        for (DWORD idx = 0; idx < pWixLoc->cLocControls; ++idx)
+        {
+            ReleaseStr(pWixLoc->rgLocControls[idx].wzControl);
+            ReleaseStr(pWixLoc->rgLocControls[idx].wzText);
+        }
+        ReleaseMem(pWixLoc->rgLocControls);
+    }
+    ReleaseObject(pixn);
+    ReleaseObject(pixnl);
+    return hr;
+}
+static HRESULT ParseWxlString(
+    __in IXMLDOMNode* pixn,
+    __in DWORD dwIdx,
+    __in WIX_LOCALIZATION* pWixLoc
+    )
+{
+    HRESULT hr = S_OK;
+    LOC_STRING* pLocString = NULL;
+    BSTR bstrText = NULL;
+    pLocString = pWixLoc->rgLocStrings + dwIdx;
+    // Id
+    hr = XmlGetAttribute(pixn, L"Id", &bstrText);
+    LocExitOnFailure(hr, "Failed to get Xml attribute Id in Wxl file.");
+    hr = StrAllocFormatted(&pLocString->wzId, L"#(loc.%s)", bstrText);
+    LocExitOnFailure(hr, "Failed to duplicate Xml attribute Id in Wxl file.");
+    ReleaseNullBSTR(bstrText);
+    // Overrideable
+    hr = XmlGetAttribute(pixn, L"Overridable", &bstrText);
+    LocExitOnFailure(hr, "Failed to get Xml attribute Overridable.");
+    if (S_OK == hr)
+    {
+        pLocString->bOverridable = CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrText, -1, L"yes", -1);
+    }
+    ReleaseNullBSTR(bstrText);
+    // Text
+    hr = XmlGetText(pixn, &bstrText);
+    LocExitOnFailure(hr, "Failed to get Xml text in Wxl file.");
+    hr = StrAllocString(&pLocString->wzText, bstrText, 0);
+    LocExitOnFailure(hr, "Failed to duplicate Xml text in Wxl file.");
+LExit:
+    ReleaseBSTR(bstrText);
+    return hr;
+}
+static HRESULT ParseWxlControl(
+    __in IXMLDOMNode* pixn,
+    __in DWORD dwIdx,
+    __in WIX_LOCALIZATION* pWixLoc
+    )
+{
+    HRESULT hr = S_OK;
+    LOC_CONTROL* pLocControl = NULL;
+    BSTR bstrText = NULL;
+    pLocControl = pWixLoc->rgLocControls + dwIdx;
+    // Id
+    hr = XmlGetAttribute(pixn, L"Control", &bstrText);
+    LocExitOnFailure(hr, "Failed to get Xml attribute Control in Wxl file.");
+    hr = StrAllocString(&pLocControl->wzControl, bstrText, 0);
+    LocExitOnFailure(hr, "Failed to duplicate Xml attribute Control in Wxl file.");
+    ReleaseNullBSTR(bstrText);
+    // X
+    pLocControl->nX = LOC_CONTROL_NOT_SET;
+    hr = XmlGetAttributeNumber(pixn, L"X", reinterpret_cast<DWORD*>(&pLocControl->nX));
+    LocExitOnFailure(hr, "Failed to get control X attribute.");
+    // Y
+    pLocControl->nY = LOC_CONTROL_NOT_SET;
+    hr = XmlGetAttributeNumber(pixn, L"Y", reinterpret_cast<DWORD*>(&pLocControl->nY));
+    LocExitOnFailure(hr, "Failed to get control Y attribute.");
+    // Width
+    pLocControl->nWidth = LOC_CONTROL_NOT_SET;
+    hr = XmlGetAttributeNumber(pixn, L"Width", reinterpret_cast<DWORD*>(&pLocControl->nWidth));
+    LocExitOnFailure(hr, "Failed to get control width attribute.");
+    // Height
+    pLocControl->nHeight = LOC_CONTROL_NOT_SET;
+    hr = XmlGetAttributeNumber(pixn, L"Height", reinterpret_cast<DWORD*>(&pLocControl->nHeight));
+    LocExitOnFailure(hr, "Failed to get control height attribute.");
+    // Text
+    hr = XmlGetText(pixn, &bstrText);
+    LocExitOnFailure(hr, "Failed to get control text in Wxl file.");
+    hr = StrAllocString(&pLocControl->wzText, bstrText, 0);
+    LocExitOnFailure(hr, "Failed to duplicate control text in Wxl file.");
+LExit:
+    ReleaseBSTR(bstrText);
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/logutil.cpp b/src/libs/dutil/WixToolset.DUtil/logutil.cpp
new file mode 100644
index 00000000..ac68036a
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/logutil.cpp
@@ -0,0 +1,961 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define LoguExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_LOGUTIL, x, s, __VA_ARGS__)
+#define LoguExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_LOGUTIL, x, s, __VA_ARGS__)
+#define LoguExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_LOGUTIL, x, s, __VA_ARGS__)
+#define LoguExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_LOGUTIL, x, s, __VA_ARGS__)
+#define LoguExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_LOGUTIL, x, s, __VA_ARGS__)
+#define LoguExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_LOGUTIL, x, s, __VA_ARGS__)
+#define LoguExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_LOGUTIL, p, x, e, s, __VA_ARGS__)
+#define LoguExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_LOGUTIL, p, x, s, __VA_ARGS__)
+#define LoguExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_LOGUTIL, p, x, e, s, __VA_ARGS__)
+#define LoguExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_LOGUTIL, p, x, s, __VA_ARGS__)
+#define LoguExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_LOGUTIL, e, x, s, __VA_ARGS__)
+#define LoguExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_LOGUTIL, g, x, s, __VA_ARGS__)
+// globals
+static HMODULE LogUtil_hModule = NULL;
+static BOOL LogUtil_fDisabled = FALSE;
+static HANDLE LogUtil_hLog = INVALID_HANDLE_VALUE;
+static LPWSTR LogUtil_sczLogPath = NULL;
+static LPSTR LogUtil_sczPreInitBuffer = NULL;
+static REPORT_LEVEL LogUtil_rlCurrent = REPORT_STANDARD;
+static CRITICAL_SECTION LogUtil_csLog = { };
+static BOOL LogUtil_fInitializedCriticalSection = FALSE;
+// Customization of certain parts of the string, within a line
+static LPWSTR LogUtil_sczSpecialBeginLine = NULL;
+static LPWSTR LogUtil_sczSpecialEndLine = NULL;
+static LPWSTR LogUtil_sczSpecialAfterTimeStamp = NULL;
+static LPCSTR LOGUTIL_UNKNOWN = "unknown";
+static LPCSTR LOGUTIL_WARNING = "warning";
+static LPCSTR LOGUTIL_STANDARD = "standard";
+static LPCSTR LOGUTIL_VERBOSE = "verbose";
+static LPCSTR LOGUTIL_DEBUG = "debug";
+static LPCSTR LOGUTIL_NONE = "none";
+// prototypes
+static HRESULT LogIdWork(
+    __in REPORT_LEVEL rl,
+    __in_opt HMODULE hModule,
+    __in DWORD dwLogId,
+    __in va_list args,
+    __in BOOL fLOGUTIL_NEWLINE
+    );
+static HRESULT LogStringWorkArgs(
+    __in REPORT_LEVEL rl,
+    __in_z __format_string LPCSTR szFormat,
+    __in va_list args,
+    __in BOOL fLOGUTIL_NEWLINE
+    );
+static HRESULT LogStringWork(
+    __in REPORT_LEVEL rl,
+    __in DWORD dwLogId,
+    __in_z LPCWSTR sczString,
+    __in BOOL fLOGUTIL_NEWLINE
+    );
+// Hook to allow redirecting LogStringWorkRaw function calls
+static PFN_LOGSTRINGWORKRAW s_vpfLogStringWorkRaw = NULL;
+static LPVOID s_vpvLogStringWorkRawContext = NULL;
+/********************************************************************
+ IsLogInitialized - Checks if log is currently initialized.
+********************************************************************/
+extern "C" BOOL DAPI IsLogInitialized()
+{
+    return LogUtil_fInitializedCriticalSection;
+}
+/********************************************************************
+ IsLogOpen - Checks if log is currently initialized and open.
+********************************************************************/
+extern "C" BOOL DAPI IsLogOpen()
+{
+    return (INVALID_HANDLE_VALUE != LogUtil_hLog && NULL != LogUtil_sczLogPath);
+}
+/********************************************************************
+ LogInitialize - initializes the logutil API
+********************************************************************/
+extern "C" void DAPI LogInitialize(
+    __in HMODULE hModule
+    )
+{
+    AssertSz(INVALID_HANDLE_VALUE == LogUtil_hLog && !LogUtil_sczLogPath, "LogInitialize() or LogOpen() - already called.");
+    LogUtil_hModule = hModule;
+    LogUtil_fDisabled = FALSE;
+    ::InitializeCriticalSection(&LogUtil_csLog);
+    LogUtil_fInitializedCriticalSection = TRUE;
+}
+/********************************************************************
+ LogOpen - creates an application log file
+ NOTE: if wzExt is null then wzLog is path to desired log else wzLog and wzExt are used to generate log name
+********************************************************************/
+extern "C" HRESULT DAPI LogOpen(
+    __in_z_opt LPCWSTR wzDirectory,
+    __in_z LPCWSTR wzLog,
+    __in_z_opt LPCWSTR wzPostfix,
+    __in_z_opt LPCWSTR wzExt,
+    __in BOOL fAppend,
+    __in BOOL fHeader,
+    __out_z_opt LPWSTR* psczLogPath
+    )
+{
+    HRESULT hr = S_OK;
+    BOOL fEnteredCriticalSection = FALSE;
+    LPWSTR sczLogDirectory = NULL;
+    ::EnterCriticalSection(&LogUtil_csLog);
+    fEnteredCriticalSection = TRUE;
+    if (wzExt && *wzExt)
+    {
+        hr = PathCreateTimeBasedTempFile(wzDirectory, wzLog, wzPostfix, wzExt, &LogUtil_sczLogPath, &LogUtil_hLog);
+        LoguExitOnFailure(hr, "Failed to create log based on current system time.");
+    }
+    else
+    {
+        hr = PathConcat(wzDirectory, wzLog, &LogUtil_sczLogPath);
+        LoguExitOnFailure(hr, "Failed to combine the log path.");
+        hr = PathGetDirectory(LogUtil_sczLogPath, &sczLogDirectory);
+        LoguExitOnFailure(hr, "Failed to get log directory.");
+        hr = DirEnsureExists(sczLogDirectory, NULL);
+        LoguExitOnFailure(hr, "Failed to ensure log file directory exists: %ls", sczLogDirectory);
+        LogUtil_hLog = ::CreateFileW(LogUtil_sczLogPath, GENERIC_WRITE, FILE_SHARE_READ, NULL, (fAppend) ? OPEN_ALWAYS : CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+        if (INVALID_HANDLE_VALUE == LogUtil_hLog)
+        {
+            LoguExitOnLastError(hr, "failed to create log file: %ls", LogUtil_sczLogPath);
+        }
+        if (fAppend)
+        {
+            ::SetFilePointer(LogUtil_hLog, 0, 0, FILE_END);
+        }
+    }
+    LogUtil_fDisabled = FALSE;
+    if (fHeader)
+    {
+        LogHeader();
+    }
+    if (NULL != LogUtil_sczPreInitBuffer)
+    {
+        // Log anything that was logged before LogOpen() was called.
+        LogStringWorkRaw(LogUtil_sczPreInitBuffer);
+        ReleaseNullStr(LogUtil_sczPreInitBuffer);
+    }
+    if (psczLogPath)
+    {
+        hr = StrAllocString(psczLogPath, LogUtil_sczLogPath, 0);
+        LoguExitOnFailure(hr, "Failed to copy log path.");
+    }
+LExit:
+    if (fEnteredCriticalSection)
+    {
+        ::LeaveCriticalSection(&LogUtil_csLog);
+    }
+    ReleaseStr(sczLogDirectory);
+    return hr;
+}
+/********************************************************************
+ LogDisable - closes any open files and disables in memory logging.
+********************************************************************/
+void DAPI LogDisable()
+{
+    ::EnterCriticalSection(&LogUtil_csLog);
+    LogUtil_fDisabled = TRUE;
+    ReleaseFileHandle(LogUtil_hLog);
+    ReleaseNullStr(LogUtil_sczLogPath);
+    ReleaseNullStr(LogUtil_sczPreInitBuffer);
+    ::LeaveCriticalSection(&LogUtil_csLog);
+}
+/********************************************************************
+ LogRedirect - Redirects all logging strings to the specified
+               function - or set NULL to disable the hook
+********************************************************************/
+void DAPI LogRedirect(
+    __in_opt PFN_LOGSTRINGWORKRAW vpfLogStringWorkRaw,
+    __in_opt LPVOID pvContext
+    )
+{
+    s_vpfLogStringWorkRaw = vpfLogStringWorkRaw;
+    s_vpvLogStringWorkRawContext = pvContext;
+}
+/********************************************************************
+ LogRename - Renames a logfile, moving its contents to a new path,
+             and re-opening the file for appending at the new
+             location
+********************************************************************/
+HRESULT DAPI LogRename(
+    __in_z LPCWSTR wzNewPath
+    )
+{
+    HRESULT hr = S_OK;
+    BOOL fEnteredCriticalSection = FALSE;
+    ::EnterCriticalSection(&LogUtil_csLog);
+    fEnteredCriticalSection = TRUE;
+    ReleaseFileHandle(LogUtil_hLog);
+    hr = FileEnsureMove(LogUtil_sczLogPath, wzNewPath, TRUE, TRUE);
+    LoguExitOnFailure(hr, "Failed to move logfile to new location: %ls", wzNewPath);
+    hr = StrAllocString(&LogUtil_sczLogPath, wzNewPath, 0);
+    LoguExitOnFailure(hr, "Failed to store new logfile path: %ls", wzNewPath);
+    LogUtil_hLog = ::CreateFileW(LogUtil_sczLogPath, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+    if (INVALID_HANDLE_VALUE == LogUtil_hLog)
+    {
+        LoguExitOnLastError(hr, "failed to create log file: %ls", LogUtil_sczLogPath);
+    }
+    // Enable "append" mode by moving file pointer to the end
+    ::SetFilePointer(LogUtil_hLog, 0, 0, FILE_END);
+LExit:
+    if (fEnteredCriticalSection)
+    {
+        ::LeaveCriticalSection(&LogUtil_csLog);
+    }
+    return hr;
+}
+extern "C" void DAPI LogClose(
+    __in BOOL fFooter
+    )
+{
+    if (INVALID_HANDLE_VALUE != LogUtil_hLog && fFooter)
+    {
+        LogFooter();
+    }
+    ReleaseFileHandle(LogUtil_hLog);
+    ReleaseNullStr(LogUtil_sczLogPath);
+    ReleaseNullStr(LogUtil_sczPreInitBuffer);
+}
+extern "C" void DAPI LogUninitialize(
+    __in BOOL fFooter
+    )
+{
+    LogClose(fFooter);
+    if (LogUtil_fInitializedCriticalSection)
+    {
+        ::DeleteCriticalSection(&LogUtil_csLog);
+        LogUtil_fInitializedCriticalSection = FALSE;
+    }
+    LogUtil_hModule = NULL;
+    LogUtil_fDisabled = FALSE;
+    ReleaseNullStr(LogUtil_sczSpecialBeginLine);
+    ReleaseNullStr(LogUtil_sczSpecialAfterTimeStamp);
+    ReleaseNullStr(LogUtil_sczSpecialEndLine);
+}
+/********************************************************************
+ LogIsOpen - returns whether log file is open or note
+********************************************************************/
+extern "C" BOOL DAPI LogIsOpen()
+{
+    return INVALID_HANDLE_VALUE != LogUtil_hLog;
+}
+/********************************************************************
+ LogSetSpecialParams - sets a special beginline string, endline
+                       string, post-timestamp string, etc.
+********************************************************************/
+HRESULT DAPI LogSetSpecialParams(
+    __in_z_opt LPCWSTR wzSpecialBeginLine,
+    __in_z_opt LPCWSTR wzSpecialAfterTimeStamp,
+    __in_z_opt LPCWSTR wzSpecialEndLine
+    )
+{
+    HRESULT hr = S_OK;
+    // Handle special string to be prepended before every full line
+    if (NULL == wzSpecialBeginLine)
+    {
+        ReleaseNullStr(LogUtil_sczSpecialBeginLine);
+    }
+    else
+    {
+        hr = StrAllocConcat(&LogUtil_sczSpecialBeginLine, wzSpecialBeginLine, 0);
+        LoguExitOnFailure(hr, "Failed to allocate copy of special beginline string");
+    }
+    // Handle special string to be appended to every time stamp
+    if (NULL == wzSpecialAfterTimeStamp)
+    {
+        ReleaseNullStr(LogUtil_sczSpecialAfterTimeStamp);
+    }
+    else
+    {
+        hr = StrAllocConcat(&LogUtil_sczSpecialAfterTimeStamp, wzSpecialAfterTimeStamp, 0);
+        LoguExitOnFailure(hr, "Failed to allocate copy of special post-timestamp string");
+    }
+    // Handle special string to be appended before every full line
+    if (NULL == wzSpecialEndLine)
+    {
+        ReleaseNullStr(LogUtil_sczSpecialEndLine);
+    }
+    else
+    {
+        hr = StrAllocConcat(&LogUtil_sczSpecialEndLine, wzSpecialEndLine, 0);
+        LoguExitOnFailure(hr, "Failed to allocate copy of special endline string");
+    }
+LExit:
+    return hr;
+}
+/********************************************************************
+ LogSetLevel - sets the logging level
+ NOTE: returns previous logging level
+********************************************************************/
+extern "C" REPORT_LEVEL DAPI LogSetLevel(
+    __in REPORT_LEVEL rl,
+    __in BOOL fLogChange
+    )
+{
+    AssertSz(REPORT_ERROR != rl, "REPORT_ERROR is not a valid logging level to set");
+    REPORT_LEVEL rlPrev = LogUtil_rlCurrent;
+    if (LogUtil_rlCurrent != rl)
+    {
+        LogUtil_rlCurrent = rl;
+        if (fLogChange)
+        {
+            LPCSTR szLevel = LOGUTIL_UNKNOWN;
+            switch (LogUtil_rlCurrent)
+            {
+            case REPORT_WARNING:
+                szLevel = LOGUTIL_WARNING;
+                break;
+            case REPORT_STANDARD:
+                szLevel = LOGUTIL_STANDARD;
+                break;
+            case REPORT_VERBOSE:
+                szLevel = LOGUTIL_VERBOSE;
+                break;
+            case REPORT_DEBUG:
+                szLevel = LOGUTIL_DEBUG;
+                break;
+            case REPORT_NONE:
+                szLevel = LOGUTIL_NONE;
+                break;
+            }
+            LogStringLine(REPORT_STANDARD, "--- logging level: %hs ---", szLevel);
+        }
+    }
+    return rlPrev;
+}
+/********************************************************************
+ LogGetLevel - gets the current logging level
+********************************************************************/
+extern "C" REPORT_LEVEL DAPI LogGetLevel()
+{
+    return LogUtil_rlCurrent;
+}
+/********************************************************************
+ LogGetPath - gets the current log path
+********************************************************************/
+extern "C" HRESULT DAPI LogGetPath(
+    __out_ecount_z(cchLogPath) LPWSTR pwzLogPath,
+    __in DWORD cchLogPath
+    )
+{
+    Assert(pwzLogPath);
+    HRESULT hr = S_OK;
+    if (NULL == LogUtil_sczLogPath)        // they can't have a path if there isn't one!
+    {
+        ExitFunction1(hr = E_UNEXPECTED);
+    }
+    hr = ::StringCchCopyW(pwzLogPath, cchLogPath, LogUtil_sczLogPath);
+LExit:
+    return hr;
+}
+/********************************************************************
+ LogGetHandle - gets the current log file handle
+********************************************************************/
+extern "C" HANDLE DAPI LogGetHandle()
+{
+    return LogUtil_hLog;
+}
+/********************************************************************
+ LogString - write a string to the log
+ NOTE: use printf formatting ("%ls", "%d", etc.)
+********************************************************************/
+extern "C" HRESULT DAPIV LogString(
+    __in REPORT_LEVEL rl,
+    __in_z __format_string LPCSTR szFormat,
+    ...
+    )
+{
+    HRESULT hr = S_OK;
+    va_list args;
+    va_start(args, szFormat);
+    hr = LogStringArgs(rl, szFormat, args);
+    va_end(args);
+    return hr;
+}
+extern "C" HRESULT DAPI LogStringArgs(
+    __in REPORT_LEVEL rl,
+    __in_z __format_string LPCSTR szFormat,
+    __in va_list args
+    )
+{
+    AssertSz(REPORT_NONE != rl, "REPORT_NONE is not a valid logging level");
+    HRESULT hr = S_OK;
+    if (REPORT_ERROR != rl && LogUtil_rlCurrent < rl)
+    {
+        ExitFunction1(hr = S_FALSE);
+    }
+    hr = LogStringWorkArgs(rl, szFormat, args, FALSE);
+LExit:
+    return hr;
+}
+/********************************************************************
+ LogStringLine - write a string plus LOGUTIL_NEWLINE to the log
+ NOTE: use printf formatting ("%ls", "%d", etc.)
+********************************************************************/
+extern "C" HRESULT DAPIV LogStringLine(
+    __in REPORT_LEVEL rl,
+    __in_z __format_string LPCSTR szFormat,
+    ...
+    )
+{
+    HRESULT hr = S_OK;
+    va_list args;
+    va_start(args, szFormat);
+    hr = LogStringLineArgs(rl, szFormat, args);
+    va_end(args);
+    return hr;
+}
+extern "C" HRESULT DAPI LogStringLineArgs(
+    __in REPORT_LEVEL rl,
+    __in_z __format_string LPCSTR szFormat,
+    __in va_list args
+    )
+{
+    AssertSz(REPORT_NONE != rl, "REPORT_NONE is not a valid logging level");
+    HRESULT hr = S_OK;
+    if (REPORT_ERROR != rl && LogUtil_rlCurrent < rl)
+    {
+        ExitFunction1(hr = S_FALSE);
+    }
+    hr = LogStringWorkArgs(rl, szFormat, args, TRUE);
+LExit:
+    return hr;
+}
+/********************************************************************
+ LogIdModuleArgs - write a string embedded in a MESSAGETABLE to the log
+ NOTE: uses format string from MESSAGETABLE resource
+********************************************************************/
+extern "C" HRESULT DAPI LogIdModuleArgs(
+    __in REPORT_LEVEL rl,
+    __in DWORD dwLogId,
+    __in_opt HMODULE hModule,
+    __in va_list args
+    )
+{
+    AssertSz(REPORT_NONE != rl, "REPORT_NONE is not a valid logging level");
+    HRESULT hr = S_OK;
+    if (REPORT_ERROR != rl && LogUtil_rlCurrent < rl)
+    {
+        ExitFunction1(hr = S_FALSE);
+    }
+    hr = LogIdWork(rl, (hModule) ? hModule : LogUtil_hModule, dwLogId, args, TRUE);
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI LogIdModule(
+    __in REPORT_LEVEL rl,
+    __in DWORD dwLogId,
+    __in_opt HMODULE hModule,
+    ...
+    )
+{
+    AssertSz(REPORT_NONE != rl, "REPORT_NONE is not a valid logging level");
+    HRESULT hr = S_OK;
+    va_list args;
+    if (REPORT_ERROR != rl && LogUtil_rlCurrent < rl)
+    {
+        ExitFunction1(hr = S_FALSE);
+    }
+    va_start(args, hModule);
+    hr = LogIdWork(rl, (hModule) ? hModule : LogUtil_hModule, dwLogId, args, TRUE);
+    va_end(args);
+LExit:
+    return hr;
+}
+/********************************************************************
+ LogError - write an error to the log
+ NOTE: use printf formatting ("%ls", "%d", etc.)
+********************************************************************/
+extern "C" HRESULT DAPIV LogErrorString(
+    __in HRESULT hrError,
+    __in_z __format_string LPCSTR szFormat,
+    ...
+    )
+{
+    HRESULT hr  = S_OK;
+    va_list args;
+    va_start(args, szFormat);
+    hr = LogErrorStringArgs(hrError, szFormat, args);
+    va_end(args);
+    return hr;
+}
+extern "C" HRESULT DAPI LogErrorStringArgs(
+    __in HRESULT hrError,
+    __in_z __format_string LPCSTR szFormat,
+    __in va_list args
+    )
+{
+    HRESULT hr  = S_OK;
+    LPWSTR sczFormat = NULL;
+    LPWSTR sczMessage = NULL;
+    hr = StrAllocStringAnsi(&sczFormat, szFormat, 0, CP_ACP);
+    LoguExitOnFailure(hr, "Failed to convert format string to wide character string");
+    // format the string as a unicode string - this is necessary to be able to include
+    // international characters in our output string. This does have the counterintuitive effect
+    // that the caller's "%s" is interpreted differently
+    // (so callers should use %hs for LPSTR and %ls for LPWSTR)
+    hr = StrAllocFormattedArgs(&sczMessage, sczFormat, args);
+    LoguExitOnFailure(hr, "Failed to format error message: \"%ls\"", sczFormat);
+    hr = LogStringLine(REPORT_ERROR, "Error 0x%x: %ls", hrError, sczMessage);
+LExit:
+    ReleaseStr(sczFormat);
+    ReleaseStr(sczMessage);
+    return hr;
+}
+/********************************************************************
+ LogErrorIdModule - write an error string embedded in a MESSAGETABLE to the log
+ NOTE:  uses format string from MESSAGETABLE resource
+        can log no more than three strings in the error message
+********************************************************************/
+extern "C" HRESULT DAPI LogErrorIdModule(
+    __in HRESULT hrError,
+    __in DWORD dwLogId,
+    __in_opt HMODULE hModule,
+    __in_z_opt LPCWSTR wzString1 = NULL,
+    __in_z_opt LPCWSTR wzString2 = NULL,
+    __in_z_opt LPCWSTR wzString3 = NULL
+    )
+{
+    HRESULT hr = S_OK;
+    WCHAR wzError[11];
+    WORD cStrings = 1; // guaranteed wzError is in the list
+    hr = ::StringCchPrintfW(wzError, countof(wzError), L"0x%08x", hrError);
+    LoguExitOnFailure(hr, "failed to format error code: \"0%08x\"", hrError);
+    cStrings += wzString1 ? 1 : 0;
+    cStrings += wzString2 ? 1 : 0;
+    cStrings += wzString3 ? 1 : 0;
+    hr = LogIdModule(REPORT_ERROR, dwLogId, hModule, wzError, wzString1, wzString2, wzString3);
+    LoguExitOnFailure(hr, "Failed to log id module.");
+LExit:
+    return hr;
+}
+/********************************************************************
+ LogHeader - write a standard header to the log
+********************************************************************/
+extern "C" HRESULT DAPI LogHeader()
+{
+    HRESULT hr = S_OK;
+    WCHAR wzComputerName[MAX_PATH];
+    DWORD cchComputerName = countof(wzComputerName);
+    WCHAR wzPath[MAX_PATH];
+    DWORD dwMajorVersion = 0;
+    DWORD dwMinorVersion = 0;
+    LPCSTR szLevel = LOGUTIL_UNKNOWN;
+    LPWSTR sczCurrentDateTime = NULL;
+    //
+    // get the interesting data
+    //
+    if (!::GetModuleFileNameW(NULL, wzPath, countof(wzPath)))
+    {
+        memset(wzPath, 0, sizeof(wzPath));
+    }
+    hr = FileVersion(wzPath, &dwMajorVersion, &dwMinorVersion);
+    if (FAILED(hr))
+    {
+        dwMajorVersion = 0;
+        dwMinorVersion = 0;
+    }
+    if (!::GetComputerNameW(wzComputerName, &cchComputerName))
+    {
+        ::SecureZeroMemory(wzComputerName, sizeof(wzComputerName));
+    }
+    TimeCurrentDateTime(&sczCurrentDateTime, FALSE);
+    //
+    // write data to the log
+    //
+    LogStringLine(REPORT_STANDARD, "=== Logging started: %ls ===", sczCurrentDateTime);
+    LogStringLine(REPORT_STANDARD, "Executable: %ls v%d.%d.%d.%d", wzPath, dwMajorVersion >> 16, dwMajorVersion & 0xFFFF, dwMinorVersion >> 16, dwMinorVersion & 0xFFFF);
+    LogStringLine(REPORT_STANDARD, "Computer  : %ls", wzComputerName);
+    switch (LogUtil_rlCurrent)
+    {
+    case REPORT_WARNING:
+        szLevel = LOGUTIL_WARNING;
+        break;
+    case REPORT_STANDARD:
+        szLevel = LOGUTIL_STANDARD;
+        break;
+    case REPORT_VERBOSE:
+        szLevel = LOGUTIL_VERBOSE;
+        break;
+    case REPORT_DEBUG:
+        szLevel = LOGUTIL_DEBUG;
+        break;
+    case REPORT_NONE:
+        szLevel = LOGUTIL_NONE;
+        break;
+    }
+    LogStringLine(REPORT_STANDARD, "--- logging level: %hs ---", szLevel);
+    hr = S_OK;
+    ReleaseStr(sczCurrentDateTime);
+    return hr;
+}
+/********************************************************************
+ LogFooterWork - write a standard footer to the log
+********************************************************************/
+static HRESULT LogFooterWork(
+    __in_z __format_string LPCSTR szFormat,
+    ...
+    )
+{
+    HRESULT hr = S_OK;
+    va_list args;
+    va_start(args, szFormat);
+    hr = LogStringWorkArgs(REPORT_STANDARD, szFormat, args, TRUE);
+    va_end(args);
+    return hr;
+}
+extern "C" HRESULT DAPI LogFooter()
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczCurrentDateTime = NULL;
+    TimeCurrentDateTime(&sczCurrentDateTime, FALSE);
+    hr = LogFooterWork("=== Logging stopped: %ls ===", sczCurrentDateTime);
+    ReleaseStr(sczCurrentDateTime);
+    return hr;
+}
+/********************************************************************
+ LogStringWorkRaw - Write a raw, unformatted string to the log
+********************************************************************/
+extern "C" HRESULT LogStringWorkRaw(
+    __in_z LPCSTR szLogData
+    )
+{
+    Assert(szLogData && *szLogData);
+    HRESULT hr = S_OK;
+    size_t cchLogData = 0;
+    DWORD cbLogData = 0;
+    DWORD cbTotal = 0;
+    DWORD cbWrote = 0;
+    hr = ::StringCchLengthA(szLogData, STRSAFE_MAX_CCH, &cchLogData);
+    LoguExitOnRootFailure(hr, "Failed to get length of raw string");
+    cbLogData = (DWORD)cchLogData;
+    // If the log hasn't been initialized yet, store it in a buffer
+    if (INVALID_HANDLE_VALUE == LogUtil_hLog)
+    {
+        hr = StrAnsiAllocConcat(&LogUtil_sczPreInitBuffer, szLogData, 0);
+        LoguExitOnFailure(hr, "Failed to concatenate string to pre-init buffer");
+        ExitFunction1(hr = S_OK);
+    }
+    // write the string
+    while (cbTotal < cbLogData)
+    {
+        if (!::WriteFile(LogUtil_hLog, reinterpret_cast<const BYTE*>(szLogData) + cbTotal, cbLogData - cbTotal, &cbWrote, NULL))
+        {
+            LoguExitOnLastError(hr, "Failed to write output to log: %ls - %hs", LogUtil_sczLogPath, szLogData);
+        }
+        cbTotal += cbWrote;
+    }
+LExit:
+    return hr;
+}
+//
+// private worker functions
+//
+static HRESULT LogIdWork(
+    __in REPORT_LEVEL rl,
+    __in_opt HMODULE hModule,
+    __in DWORD dwLogId,
+    __in va_list args,
+    __in BOOL fLOGUTIL_NEWLINE
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR pwz = NULL;
+    DWORD cch = 0;
+    // get the string for the id
+#pragma prefast(push)
+#pragma prefast(disable:25028)
+#pragma prefast(disable:25068)
+    cch = ::FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE,
+                           static_cast<LPCVOID>(hModule), dwLogId, 0, reinterpret_cast<LPWSTR>(&pwz), 0, &args);
+#pragma prefast(pop)
+    if (0 == cch)
+    {
+        LoguExitOnLastError(hr, "failed to log id: %d", dwLogId);
+    }
+    if (2 <= cch && L'\r' == pwz[cch-2] && L'\n' == pwz[cch-1])
+    {
+        pwz[cch-2] = L'\0'; // remove newline from message table
+    }
+    LogStringWork(rl, dwLogId, pwz, fLOGUTIL_NEWLINE);
+LExit:
+    if (pwz)
+    {
+        ::LocalFree(pwz);
+    }
+    return hr;
+}
+static HRESULT LogStringWorkArgs(
+    __in REPORT_LEVEL rl,
+    __in_z __format_string LPCSTR szFormat,
+    __in va_list args,
+    __in BOOL fLOGUTIL_NEWLINE
+    )
+{
+    Assert(szFormat && *szFormat);
+    HRESULT hr = S_OK;
+    LPWSTR sczFormat = NULL;
+    LPWSTR sczMessage = NULL;
+    hr = StrAllocStringAnsi(&sczFormat, szFormat, 0, CP_ACP);
+    LoguExitOnFailure(hr, "Failed to convert format string to wide character string");
+    // format the string as a unicode string
+    hr = StrAllocFormattedArgs(&sczMessage, sczFormat, args);
+    LoguExitOnFailure(hr, "Failed to format message: \"%ls\"", sczFormat);
+    hr = LogStringWork(rl, 0, sczMessage, fLOGUTIL_NEWLINE);
+    LoguExitOnFailure(hr, "Failed to write formatted string to log:%ls", sczMessage);
+LExit:
+    ReleaseStr(sczFormat);
+    ReleaseStr(sczMessage);
+    return hr;
+}
+static HRESULT LogStringWork(
+    __in REPORT_LEVEL rl,
+    __in DWORD dwLogId,
+    __in_z LPCWSTR sczString,
+    __in BOOL fLOGUTIL_NEWLINE
+    )
+{
+    Assert(sczString && *sczString);
+    HRESULT hr = S_OK;
+    BOOL fEnteredCriticalSection = FALSE;
+    LPWSTR scz = NULL;
+    LPCWSTR wzLogData = NULL;
+    LPSTR sczMultiByte = NULL;
+    // If logging is disabled, just bail.
+    if (LogUtil_fDisabled)
+    {
+        ExitFunction();
+    }
+    ::EnterCriticalSection(&LogUtil_csLog);
+    fEnteredCriticalSection = TRUE;
+    if (fLOGUTIL_NEWLINE)
+    {
+        // get the process and thread id.
+        DWORD dwProcessId = ::GetCurrentProcessId();
+        DWORD dwThreadId = ::GetCurrentThreadId();
+        // get the time relative to GMT.
+        SYSTEMTIME st = { };
+        ::GetLocalTime(&st);
+        DWORD dwId = dwLogId & 0xFFFFFFF;
+        DWORD dwType = dwLogId & 0xF0000000;
+        LPSTR szType = (0xE0000000 == dwType || REPORT_ERROR == rl) ? "e" : (0xA0000000 == dwType || REPORT_WARNING == rl) ? "w" : "i";
+        // add line prefix and trailing newline
+        hr = StrAllocFormatted(&scz, L"%ls[%04X:%04X][%04hu-%02hu-%02huT%02hu:%02hu:%02hu]%hs%03d:%ls %ls%ls", LogUtil_sczSpecialBeginLine ? LogUtil_sczSpecialBeginLine : L"",
+            dwProcessId, dwThreadId, st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, szType, dwId,
+            LogUtil_sczSpecialAfterTimeStamp ? LogUtil_sczSpecialAfterTimeStamp : L"", sczString, LogUtil_sczSpecialEndLine ? LogUtil_sczSpecialEndLine : L"\r\n");
+        LoguExitOnFailure(hr, "Failed to format line prefix.");
+    }
+    wzLogData = scz ? scz : sczString;
+    // Convert to UTF-8 before writing out to the log file
+    hr = StrAnsiAllocString(&sczMultiByte, wzLogData, 0, CP_UTF8);
+    LoguExitOnFailure(hr, "Failed to convert log string to UTF-8");
+    if (s_vpfLogStringWorkRaw)
+    {
+        hr = s_vpfLogStringWorkRaw(sczMultiByte, s_vpvLogStringWorkRawContext);
+        LoguExitOnFailure(hr, "Failed to write string to log using redirected function: %ls", sczString);
+    }
+    else
+    {
+        hr = LogStringWorkRaw(sczMultiByte);
+        LoguExitOnFailure(hr, "Failed to write string to log using default function: %ls", sczString);
+    }
+LExit:
+    if (fEnteredCriticalSection)
+    {
+        ::LeaveCriticalSection(&LogUtil_csLog);
+    }
+    ReleaseStr(scz);
+    ReleaseStr(sczMultiByte);
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/memutil.cpp b/src/libs/dutil/WixToolset.DUtil/memutil.cpp
new file mode 100644
index 00000000..c805a9c0
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/memutil.cpp
@@ -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.
+#include "precomp.h"
+// Exit macros
+#define MemExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_MEMUTIL, x, s, __VA_ARGS__)
+#define MemExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_MEMUTIL, x, s, __VA_ARGS__)
+#define MemExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_MEMUTIL, x, s, __VA_ARGS__)
+#define MemExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_MEMUTIL, x, s, __VA_ARGS__)
+#define MemExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_MEMUTIL, x, s, __VA_ARGS__)
+#define MemExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_MEMUTIL, x, s, __VA_ARGS__)
+#define MemExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_MEMUTIL, p, x, e, s, __VA_ARGS__)
+#define MemExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_MEMUTIL, p, x, s, __VA_ARGS__)
+#define MemExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_MEMUTIL, p, x, e, s, __VA_ARGS__)
+#define MemExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_MEMUTIL, p, x, s, __VA_ARGS__)
+#define MemExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_MEMUTIL, e, x, s, __VA_ARGS__)
+#define MemExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_MEMUTIL, g, x, s, __VA_ARGS__)
+#if DEBUG
+static BOOL vfMemInitialized = FALSE;
+#endif
+extern "C" HRESULT DAPI MemInitialize()
+{
+#if DEBUG
+    vfMemInitialized = TRUE;
+#endif
+    return S_OK;
+}
+extern "C" void DAPI MemUninitialize()
+{
+#if DEBUG
+    vfMemInitialized = FALSE;
+#endif
+}
+extern "C" LPVOID DAPI MemAlloc(
+    __in SIZE_T cbSize,
+    __in BOOL fZero
+    )
+{
+//    AssertSz(vfMemInitialized, "MemInitialize() not called, this would normally crash");
+    AssertSz(0 < cbSize, "MemAlloc() called with invalid size");
+    return ::HeapAlloc(::GetProcessHeap(), fZero ? HEAP_ZERO_MEMORY : 0, cbSize);
+}
+extern "C" LPVOID DAPI MemReAlloc(
+    __in LPVOID pv,
+    __in SIZE_T cbSize,
+    __in BOOL fZero
+    )
+{
+//    AssertSz(vfMemInitialized, "MemInitialize() not called, this would normally crash");
+    AssertSz(0 < cbSize, "MemReAlloc() called with invalid size");
+    return ::HeapReAlloc(::GetProcessHeap(), fZero ? HEAP_ZERO_MEMORY : 0, pv, cbSize);
+}
+extern "C" HRESULT DAPI MemReAllocSecure(
+    __in LPVOID pv,
+    __in SIZE_T cbSize,
+    __in BOOL fZero,
+    __deref_out LPVOID* ppvNew
+    )
+{
+//    AssertSz(vfMemInitialized, "MemInitialize() not called, this would normally crash");
+    AssertSz(ppvNew, "MemReAllocSecure() called with uninitialized pointer");
+    AssertSz(0 < cbSize, "MemReAllocSecure() called with invalid size");
+    HRESULT hr = S_OK;
+    DWORD dwFlags = HEAP_REALLOC_IN_PLACE_ONLY;
+    LPVOID pvNew = NULL;
+    dwFlags |= fZero ? HEAP_ZERO_MEMORY : 0;
+    pvNew = ::HeapReAlloc(::GetProcessHeap(), dwFlags, pv, cbSize);
+    if (!pvNew)
+    {
+        pvNew = MemAlloc(cbSize, fZero);
+        if (pvNew)
+        {
+            const SIZE_T cbCurrent = MemSize(pv);
+            if (-1 == cbCurrent)
+            {
+                MemExitOnRootFailure(hr = E_INVALIDARG, "Failed to get memory size");
+            }
+            // HeapReAlloc may allocate more memory than requested.
+            const SIZE_T cbNew = MemSize(pvNew);
+            if (-1 == cbNew)
+            {
+                MemExitOnRootFailure(hr = E_INVALIDARG, "Failed to get memory size");
+            }
+            cbSize = cbNew;
+            if (cbSize > cbCurrent)
+            {
+                cbSize = cbCurrent;
+            }
+            memcpy_s(pvNew, cbNew, pv, cbSize);
+            SecureZeroMemory(pv, cbCurrent);
+            MemFree(pv);
+        }
+    }
+    MemExitOnNull(pvNew, hr, E_OUTOFMEMORY, "Failed to reallocate memory");
+    *ppvNew = pvNew;
+    pvNew = NULL;
+LExit:
+    ReleaseMem(pvNew);
+    return hr;
+}
+extern "C" HRESULT DAPI MemAllocArray(
+    __inout LPVOID* ppvArray,
+    __in SIZE_T cbArrayType,
+    __in DWORD dwItemCount
+    )
+{
+    return MemReAllocArray(ppvArray, 0, cbArrayType, dwItemCount);
+}
+extern "C" HRESULT DAPI MemReAllocArray(
+    __inout LPVOID* ppvArray,
+    __in DWORD cArray,
+    __in SIZE_T cbArrayType,
+    __in DWORD dwNewItemCount
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD cNew = 0;
+    LPVOID pvNew = NULL;
+    SIZE_T cbNew = 0;
+    hr = ::DWordAdd(cArray, dwNewItemCount, &cNew);
+    MemExitOnFailure(hr, "Integer overflow when calculating new element count.");
+    hr = ::SIZETMult(cNew, cbArrayType, &cbNew);
+    MemExitOnFailure(hr, "Integer overflow when calculating new block size.");
+    if (*ppvArray)
+    {
+        SIZE_T cbCurrent = MemSize(*ppvArray);
+        if (cbCurrent < cbNew)
+        {
+            pvNew = MemReAlloc(*ppvArray, cbNew, TRUE);
+            MemExitOnNull(pvNew, hr, E_OUTOFMEMORY, "Failed to allocate larger array.");
+            *ppvArray = pvNew;
+        }
+    }
+    else
+    {
+        pvNew = MemAlloc(cbNew, TRUE);
+        MemExitOnNull(pvNew, hr, E_OUTOFMEMORY, "Failed to allocate new array.");
+        *ppvArray = pvNew;
+    }
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI MemEnsureArraySize(
+    __deref_inout_bcount(cArray * cbArrayType) LPVOID* ppvArray,
+    __in DWORD cArray,
+    __in SIZE_T cbArrayType,
+    __in DWORD dwGrowthCount
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD cNew = 0;
+    LPVOID pvNew = NULL;
+    SIZE_T cbNew = 0;
+    hr = ::DWordAdd(cArray, dwGrowthCount, &cNew);
+    MemExitOnFailure(hr, "Integer overflow when calculating new element count.");
+    hr = ::SIZETMult(cNew, cbArrayType, &cbNew);
+    MemExitOnFailure(hr, "Integer overflow when calculating new block size.");
+    if (*ppvArray)
+    {
+        SIZE_T cbUsed = cArray * cbArrayType;
+        SIZE_T cbCurrent = MemSize(*ppvArray);
+        if (cbCurrent < cbUsed)
+        {
+            pvNew = MemReAlloc(*ppvArray, cbNew, TRUE);
+            MemExitOnNull(pvNew, hr, E_OUTOFMEMORY, "Failed to allocate array larger.");
+            *ppvArray = pvNew;
+        }
+    }
+    else
+    {
+        pvNew = MemAlloc(cbNew, TRUE);
+        MemExitOnNull(pvNew, hr, E_OUTOFMEMORY, "Failed to allocate new array.");
+        *ppvArray = pvNew;
+    }
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI MemInsertIntoArray(
+    __deref_inout_bcount((cExistingArray + cInsertItems) * cbArrayType) LPVOID* ppvArray,
+    __in DWORD dwInsertIndex,
+    __in DWORD cInsertItems,
+    __in DWORD cExistingArray,
+    __in SIZE_T cbArrayType,
+    __in DWORD dwGrowthCount
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD i;
+    BYTE *pbArray = NULL;
+    if (0 == cInsertItems)
+    {
+        ExitFunction1(hr = S_OK);
+    }
+    hr = MemEnsureArraySize(ppvArray, cExistingArray + cInsertItems, cbArrayType, dwGrowthCount);
+    MemExitOnFailure(hr, "Failed to resize array while inserting items");
+    pbArray = reinterpret_cast<BYTE *>(*ppvArray);
+    for (i = cExistingArray + cInsertItems - 1; i > dwInsertIndex; --i)
+    {
+        memcpy_s(pbArray + i * cbArrayType, cbArrayType, pbArray + (i - 1) * cbArrayType, cbArrayType);
+    }
+    // Zero out the newly-inserted items
+    memset(pbArray + dwInsertIndex * cbArrayType, 0, cInsertItems * cbArrayType);
+LExit:
+    return hr;
+}
+extern "C" void DAPI MemRemoveFromArray(
+    __inout_bcount((cExistingArray) * cbArrayType) LPVOID pvArray,
+    __in DWORD dwRemoveIndex,
+    __in DWORD cRemoveItems,
+    __in DWORD cExistingArray,
+    __in SIZE_T cbArrayType,
+    __in BOOL fPreserveOrder
+    )
+{
+    BYTE *pbArray = static_cast<BYTE *>(pvArray);
+    DWORD cItemsLeftAfterRemoveIndex = (cExistingArray - cRemoveItems - dwRemoveIndex);
+    if (fPreserveOrder)
+    {
+        memmove(pbArray + dwRemoveIndex * cbArrayType, pbArray + (dwRemoveIndex + cRemoveItems) * cbArrayType, cItemsLeftAfterRemoveIndex * cbArrayType);
+    }
+    else
+    {
+        DWORD cItemsToMove = (cRemoveItems > cItemsLeftAfterRemoveIndex ? cItemsLeftAfterRemoveIndex : cRemoveItems);
+        memmove(pbArray + dwRemoveIndex * cbArrayType, pbArray + (cExistingArray - cItemsToMove) * cbArrayType, cItemsToMove * cbArrayType);
+    }
+    ZeroMemory(pbArray + (cExistingArray - cRemoveItems) * cbArrayType, cRemoveItems * cbArrayType);
+}
+extern "C" void DAPI MemArraySwapItems(
+    __inout_bcount(cbArrayType) LPVOID pvArray,
+    __in DWORD dwIndex1,
+    __in DWORD dwIndex2,
+    __in SIZE_T cbArrayType
+    )
+{
+    BYTE *pbArrayItem1 = static_cast<BYTE *>(pvArray) + dwIndex1 * cbArrayType;
+    BYTE *pbArrayItem2 = static_cast<BYTE *>(pvArray) + dwIndex2 * cbArrayType;
+    DWORD dwByteIndex = 0;
+    if (dwIndex1 == dwIndex2)
+    {
+        return;
+    }
+    // Use XOR swapping to avoid the need for a temporary item
+    while (dwByteIndex < cbArrayType)
+    {
+        // Try to do many bytes at a time in most cases
+        if (cbArrayType - dwByteIndex > sizeof(DWORD64))
+        {
+            // x: X xor Y
+            *(reinterpret_cast<DWORD64 *>(pbArrayItem1 + dwByteIndex)) ^= *(reinterpret_cast<DWORD64 *>(pbArrayItem2 + dwByteIndex));
+            // y: X xor Y
+            *(reinterpret_cast<DWORD64 *>(pbArrayItem2 + dwByteIndex)) = *(reinterpret_cast<DWORD64 *>(pbArrayItem1 + dwByteIndex)) ^ *(reinterpret_cast<DWORD64 *>(pbArrayItem2 + dwByteIndex));
+            // x: X xor Y
+            *(reinterpret_cast<DWORD64 *>(pbArrayItem1 + dwByteIndex)) ^= *(reinterpret_cast<DWORD64 *>(pbArrayItem2 + dwByteIndex));
+            dwByteIndex += sizeof(DWORD64);
+        }
+        else
+        {
+            // x: X xor Y
+            *(reinterpret_cast<unsigned char *>(pbArrayItem1 + dwByteIndex)) ^= *(reinterpret_cast<unsigned char *>(pbArrayItem2 + dwByteIndex));
+            // y: X xor Y
+            *(reinterpret_cast<unsigned char *>(pbArrayItem2 + dwByteIndex)) = *(reinterpret_cast<unsigned char *>(pbArrayItem1 + dwByteIndex)) ^ *(reinterpret_cast<unsigned char *>(pbArrayItem2 + dwByteIndex));
+            // x: X xor Y
+            *(reinterpret_cast<unsigned char *>(pbArrayItem1 + dwByteIndex)) ^= *(reinterpret_cast<unsigned char *>(pbArrayItem2 + dwByteIndex));
+            dwByteIndex += sizeof(unsigned char);
+        }
+    }
+}
+extern "C" HRESULT DAPI MemFree(
+    __in LPVOID pv
+    )
+{
+//    AssertSz(vfMemInitialized, "MemInitialize() not called, this would normally crash");
+    return ::HeapFree(::GetProcessHeap(), 0, pv) ? S_OK : HRESULT_FROM_WIN32(::GetLastError());
+}
+extern "C" SIZE_T DAPI MemSize(
+    __in LPCVOID pv
+    )
+{
+//    AssertSz(vfMemInitialized, "MemInitialize() not called, this would normally crash");
+    return ::HeapSize(::GetProcessHeap(), 0, pv);
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/metautil.cpp b/src/libs/dutil/WixToolset.DUtil/metautil.cpp
new file mode 100644
index 00000000..f313fc1c
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/metautil.cpp
@@ -0,0 +1,378 @@
+// 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.
+#include "precomp.h"
+// okay, this may look a little weird, but metautil.h cannot be in the 
+// pre-compiled header because we need to #define these things so the
+// correct GUID's get pulled into this object file
+#include <initguid.h>
+#include "metautil.h"
+// Exit macros
+#define MetaExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_METAUTIL, x, s, __VA_ARGS__)
+#define MetaExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_METAUTIL, x, s, __VA_ARGS__)
+#define MetaExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_METAUTIL, x, s, __VA_ARGS__)
+#define MetaExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_METAUTIL, x, s, __VA_ARGS__)
+#define MetaExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_METAUTIL, x, s, __VA_ARGS__)
+#define MetaExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_METAUTIL, x, s, __VA_ARGS__)
+#define MetaExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_METAUTIL, p, x, e, s, __VA_ARGS__)
+#define MetaExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_METAUTIL, p, x, s, __VA_ARGS__)
+#define MetaExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_METAUTIL, p, x, e, s, __VA_ARGS__)
+#define MetaExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_METAUTIL, p, x, s, __VA_ARGS__)
+#define MetaExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_METAUTIL, e, x, s, __VA_ARGS__)
+#define MetaExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_METAUTIL, g, x, s, __VA_ARGS__)
+// prototypes
+static void Sort(
+    __in_ecount(cArray) DWORD dwArray[], 
+    __in int cArray
+    );
+/********************************************************************
+ MetaFindWebBase - finds a metabase base string that matches IP, Port and Header
+********************************************************************/
+extern "C" HRESULT DAPI MetaFindWebBase(
+    __in IMSAdminBaseW* piMetabase, 
+    __in_z LPCWSTR wzIP, 
+    __in int iPort, 
+    __in_z LPCWSTR wzHeader,
+    __in BOOL fSecure,
+    __out_ecount(cchWebBase) LPWSTR wzWebBase, 
+    __in DWORD cchWebBase
+    )
+{
+    Assert(piMetabase && cchWebBase);
+    HRESULT hr = S_OK;
+    BOOL fFound = FALSE;
+    WCHAR wzKey[METADATA_MAX_NAME_LEN];
+    WCHAR wzSubkey[METADATA_MAX_NAME_LEN];
+    DWORD dwIndex = 0;
+    METADATA_RECORD mr;
+    METADATA_RECORD mrAddress;
+    LPWSTR pwzExists = NULL;
+    LPWSTR pwzIPExists = NULL;
+    LPWSTR pwzPortExists = NULL;
+    int iPortExists = 0;
+    LPCWSTR pwzHeaderExists = NULL;
+    memset(&mr, 0, sizeof(mr));
+    mr.dwMDIdentifier = MD_KEY_TYPE;
+    mr.dwMDAttributes = METADATA_INHERIT;
+    mr.dwMDUserType = IIS_MD_UT_SERVER;
+    mr.dwMDDataType = ALL_METADATA;
+    memset(&mrAddress, 0, sizeof(mrAddress));
+    mrAddress.dwMDIdentifier = (fSecure) ? MD_SECURE_BINDINGS : MD_SERVER_BINDINGS;
+    mrAddress.dwMDAttributes = METADATA_INHERIT;
+    mrAddress.dwMDUserType = IIS_MD_UT_SERVER;
+    mrAddress.dwMDDataType = ALL_METADATA;
+    // loop through the "web keys" looking for the "IIsWebServer" key that matches wzWeb
+    for (dwIndex = 0; SUCCEEDED(hr); ++dwIndex)
+    { 
+        hr = piMetabase->EnumKeys(METADATA_MASTER_ROOT_HANDLE, L"/LM/W3SVC", wzSubkey, dwIndex); 
+        if (FAILED(hr))
+            break;
+        ::StringCchPrintfW(wzKey, countof(wzKey), L"/LM/W3SVC/%s", wzSubkey);
+        hr = MetaGetValue(piMetabase, METADATA_MASTER_ROOT_HANDLE, wzKey, &mr);
+        if (MD_ERROR_DATA_NOT_FOUND == hr || HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) == hr)
+        {
+            hr = S_FALSE;  // didn't find anything, try next one
+            continue;
+        }
+        MetaExitOnFailure(hr, "failed to get key from metabase while searching for web servers");
+        // if we have an IIsWebServer store the key
+        if (0 == lstrcmpW(L"IIsWebServer", (LPCWSTR)mr.pbMDData))
+        {
+            hr = MetaGetValue(piMetabase, METADATA_MASTER_ROOT_HANDLE, wzKey, &mrAddress);
+            if (MD_ERROR_DATA_NOT_FOUND == hr)
+                hr = S_FALSE;
+            MetaExitOnFailure(hr, "failed to get address from metabase while searching for web servers");
+            // break down the first address into parts
+            pwzIPExists = reinterpret_cast<LPWSTR>(mrAddress.pbMDData);
+            pwzExists = wcsstr(pwzIPExists, L":");
+            if (NULL == pwzExists)
+                continue;
+            *pwzExists = L'\0';
+            pwzPortExists = pwzExists + 1;
+            pwzExists = wcsstr(pwzPortExists, L":");
+            if (NULL == pwzExists)
+                continue;
+            *pwzExists = L'\0';
+            iPortExists = wcstol(pwzPortExists, NULL, 10);
+            pwzHeaderExists = pwzExists + 1;
+            // compare the passed in address with the address listed for this web
+            if (S_OK == hr && 
+                (0 == lstrcmpW(wzIP, pwzIPExists) || 0 == lstrcmpW(wzIP, L"*")) &&
+                iPort == iPortExists &&
+                0 == lstrcmpW(wzHeader, pwzHeaderExists))
+            {
+                // if the passed in buffer wasn't big enough
+                hr = ::StringCchCopyW(wzWebBase, cchWebBase, wzKey);
+                MetaExitOnFailure(hr, "failed to copy in web base: %ls", wzKey);
+                fFound = TRUE;
+                break;
+            }
+        }
+    } 
+    if (E_NOMOREITEMS == hr)
+    {
+        Assert(!fFound);
+        hr = S_FALSE;
+    }
+LExit:
+    MetaFreeValue(&mrAddress);
+    MetaFreeValue(&mr);
+    if (!fFound && SUCCEEDED(hr))
+        hr = S_FALSE;
+    return hr;
+}
+/********************************************************************
+ MetaFindFreeWebBase - finds the next metabase base string
+********************************************************************/
+extern "C" HRESULT DAPI MetaFindFreeWebBase(
+    __in IMSAdminBaseW* piMetabase, 
+    __out_ecount(cchWebBase) LPWSTR wzWebBase, 
+    __in DWORD cchWebBase
+    )
+{
+    Assert(piMetabase);
+    HRESULT hr = S_OK;
+    WCHAR wzKey[METADATA_MAX_NAME_LEN];
+    WCHAR wzSubkey[METADATA_MAX_NAME_LEN];
+    DWORD dwSubKeys[100];
+    int cSubKeys = 0;
+    DWORD dwIndex = 0;
+    int i;
+    DWORD dwKey;
+    METADATA_RECORD mr;
+    memset(&mr, 0, sizeof(mr));
+    mr.dwMDIdentifier = MD_KEY_TYPE;
+    mr.dwMDAttributes = 0;
+    mr.dwMDUserType = IIS_MD_UT_SERVER;
+    mr.dwMDDataType = STRING_METADATA;
+    // loop through the "web keys" looking for the "IIsWebServer" key that matches wzWeb
+    for (dwIndex = 0; SUCCEEDED(hr); ++dwIndex)
+    { 
+        hr = piMetabase->EnumKeys(METADATA_MASTER_ROOT_HANDLE, L"/LM/W3SVC", wzSubkey, dwIndex); 
+        if (FAILED(hr))
+            break;
+        ::StringCchPrintfW(wzKey, countof(wzKey), L"/LM/W3SVC/%s", wzSubkey);
+        hr = MetaGetValue(piMetabase, METADATA_MASTER_ROOT_HANDLE, wzKey, &mr);
+        if (MD_ERROR_DATA_NOT_FOUND == hr || HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) == hr)
+        {
+            hr = S_FALSE;  // didn't find anything, try next one
+            continue;
+        }
+        MetaExitOnFailure(hr, "failed to get key from metabase while searching for free web root");
+        // if we have a IIsWebServer get the address information
+        if (0 == lstrcmpW(L"IIsWebServer", reinterpret_cast<LPCWSTR>(mr.pbMDData)))
+        {
+            if (cSubKeys >= countof(dwSubKeys))
+            {
+                hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+                MetaExitOnFailure(hr, "Insufficient buffer to track all sub-WebSites");
+            }
+            dwSubKeys[cSubKeys] = wcstol(wzSubkey, NULL, 10);
+            ++cSubKeys;
+            Sort(dwSubKeys, cSubKeys);
+        }
+    } 
+    if (E_NOMOREITEMS == hr)
+        hr = S_OK;
+    MetaExitOnFailure(hr, "failed to find free web root");
+    // find the lowest free web root
+    dwKey  = 1;
+    for (i = 0; i < cSubKeys; ++i)
+    {
+        if (dwKey < dwSubKeys[i])
+            break;
+        dwKey = dwSubKeys[i] + 1;
+    }
+    hr = ::StringCchPrintfW(wzWebBase, cchWebBase, L"/LM/W3SVC/%u", dwKey);
+LExit:
+    MetaFreeValue(&mr);
+    return hr;
+}
+/********************************************************************
+ MetaOpenKey - open key
+********************************************************************/
+extern "C" HRESULT DAPI MetaOpenKey(
+    __in IMSAdminBaseW* piMetabase, 
+    __in METADATA_HANDLE mhKey, 
+    __in_z LPCWSTR wzKey,
+    __in DWORD dwAccess,
+    __in DWORD cRetries,
+    __out METADATA_HANDLE* pmh
+    )
+{
+    Assert(piMetabase && pmh);
+    HRESULT hr = S_OK;
+    // loop while the key is busy
+    do
+    {
+        hr = piMetabase->OpenKey(mhKey, wzKey, dwAccess, 10, pmh);
+        if (HRESULT_FROM_WIN32(ERROR_PATH_BUSY) == hr)
+            ::SleepEx(1000, TRUE);
+    } while (HRESULT_FROM_WIN32(ERROR_PATH_BUSY) == hr && 0 < cRetries--);
+    return hr;
+}
+/********************************************************************
+ MetaGetValue - finds the next metabase base string
+ NOTE: piMetabase is optional
+********************************************************************/
+extern "C" HRESULT DAPI MetaGetValue(
+    __in IMSAdminBaseW* piMetabase, 
+    __in METADATA_HANDLE mhKey, 
+    __in_z LPCWSTR wzKey, 
+    __inout METADATA_RECORD* pmr
+    )
+{
+    Assert(pmr);
+    HRESULT hr = S_OK;
+    BOOL fInitialized = FALSE;
+    DWORD cbRequired = 0;
+    if (!piMetabase)
+    {
+        hr = ::CoInitialize(NULL);
+        MetaExitOnFailure(hr, "failed to initialize COM");
+        fInitialized = TRUE;
+        hr = ::CoCreateInstance(CLSID_MSAdminBase, NULL, CLSCTX_ALL, IID_IMSAdminBase, reinterpret_cast<LPVOID*>(&piMetabase)); 
+        MetaExitOnFailure(hr, "failed to get IID_IMSAdminBaseW object");
+    }
+    if (!pmr->pbMDData)
+    {
+        pmr->dwMDDataLen = 256;
+        pmr->pbMDData = static_cast<BYTE*>(MemAlloc(pmr->dwMDDataLen, TRUE));
+        MetaExitOnNull(pmr->pbMDData, hr, E_OUTOFMEMORY, "failed to allocate memory for metabase value");
+    }
+    else  // set the size of the data to the actual size of the memory
+    {
+        SIZE_T cb = MemSize(pmr->pbMDData);
+        if (cb > DWORD_MAX)
+        {
+            MetaExitOnRootFailure(hr = E_INVALIDSTATE, "metabase data is too large: %Iu", cb);
+        }
+        pmr->dwMDDataLen = (DWORD)cb;
+    }
+    hr = piMetabase->GetData(mhKey, wzKey, pmr, &cbRequired);
+    if (HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) == hr)
+    {
+        pmr->dwMDDataLen = cbRequired;
+        BYTE* pb = static_cast<BYTE*>(MemReAlloc(pmr->pbMDData, pmr->dwMDDataLen, TRUE));
+        MetaExitOnNull(pb, hr, E_OUTOFMEMORY, "failed to reallocate memory for metabase value");
+        pmr->pbMDData = pb;
+        hr = piMetabase->GetData(mhKey, wzKey, pmr, &cbRequired);
+    }
+    MetaExitOnFailure(hr, "failed to get metabase data");
+LExit:
+    if (fInitialized)
+    {
+        ReleaseObject(piMetabase);
+        ::CoUninitialize();
+    }
+    return hr;
+}
+/********************************************************************
+ MetaFreeValue - frees data in METADATA_RECORD remove MetaGetValue()
+ NOTE: METADATA_RECORD must have been returned from MetaGetValue() above
+********************************************************************/
+extern "C" void DAPI MetaFreeValue(
+    __in METADATA_RECORD* pmr
+    )
+{
+    Assert(pmr);
+    ReleaseNullMem(pmr->pbMDData);
+}
+//
+// private
+//
+/********************************************************************
+ Sort - quick and dirty insertion sort
+********************************************************************/
+static void Sort(
+    __in_ecount(cArray) DWORD dwArray[], 
+    __in int cArray
+    )
+{
+    int i, j;
+    DWORD dwData;
+    for (i = 1; i < cArray; ++i)
+    {
+        dwData = dwArray[i];
+        j = i - 1;
+        while (0 <= j && dwArray[j] > dwData)
+        {
+            dwArray[j + 1] = dwArray[j];
+            j--;
+        }
+        dwArray[j + 1] = dwData;
+    }
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/monutil.cpp b/src/libs/dutil/WixToolset.DUtil/monutil.cpp
new file mode 100644
index 00000000..6a7f0596
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/monutil.cpp
@@ -0,0 +1,2019 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define MonExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_MONUTIL, x, s, __VA_ARGS__)
+#define MonExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_MONUTIL, x, s, __VA_ARGS__)
+#define MonExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_MONUTIL, x, s, __VA_ARGS__)
+#define MonExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_MONUTIL, x, s, __VA_ARGS__)
+#define MonExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_MONUTIL, x, s, __VA_ARGS__)
+#define MonExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_MONUTIL, x, s, __VA_ARGS__)
+#define MonExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_MONUTIL, p, x, e, s, __VA_ARGS__)
+#define MonExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_MONUTIL, p, x, s, __VA_ARGS__)
+#define MonExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_MONUTIL, p, x, e, s, __VA_ARGS__)
+#define MonExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_MONUTIL, p, x, s, __VA_ARGS__)
+#define MonExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_MONUTIL, e, x, s, __VA_ARGS__)
+#define MonExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_MONUTIL, g, x, s, __VA_ARGS__)
+const int MON_THREAD_GROWTH = 5;
+const int MON_ARRAY_GROWTH = 40;
+const int MON_MAX_MONITORS_PER_THREAD = 63;
+const int MON_THREAD_INIT_RETRIES = 1000;
+const int MON_THREAD_INIT_RETRY_PERIOD_IN_MS = 10;
+const int MON_THREAD_NETWORK_FAIL_RETRY_IN_MS = 1000*60; // if we know we failed to connect, retry every minute
+const int MON_THREAD_NETWORK_SUCCESSFUL_RETRY_IN_MS = 1000*60*20; // if we're just checking for remote servers dieing, check much less frequently
+const int MON_THREAD_WAIT_REMOVE_DEVICE = 5000;
+const LPCWSTR MONUTIL_WINDOW_CLASS = L"MonUtilClass";
+enum MON_MESSAGE
+{
+    MON_MESSAGE_ADD = WM_APP + 1,
+    MON_MESSAGE_REMOVE,
+    MON_MESSAGE_REMOVED, // Sent by waiter thread back to coordinator thread to indicate a remove occurred
+    MON_MESSAGE_NETWORK_WAIT_FAILED, // Sent by waiter thread back to coordinator thread to indicate a network wait failed. Coordinator thread will periodically trigger retries (via MON_MESSAGE_NETWORK_STATUS_UPDATE messages).
+    MON_MESSAGE_NETWORK_WAIT_SUCCEEDED, // Sent by waiter thread back to coordinator thread to indicate a previously failing network wait is now succeeding. Coordinator thread will stop triggering retries if no other failing waits exist.
+    MON_MESSAGE_NETWORK_STATUS_UPDATE, // Some change to network connectivity occurred (a network connection was connected or disconnected for example)
+    MON_MESSAGE_NETWORK_RETRY_SUCCESSFUL_NETWORK_WAITS, // Coordinator thread is telling waiters to retry any successful network waits.
+        // Annoyingly, this is necessary to catch the rare case that the remote server goes offline unexpectedly, such as by
+        // network cable unplugged or power loss - in this case there is no local network status change, and the wait will just never fire.
+        // So we very occasionally retry all successful network waits. When this occurs, we notify for changes, even though there may not have been any.
+        // This is because we have no way to detect if the old wait had failed (and changes were lost) due to the remote server going offline during that time or not.
+        // If we do this often, it can cause a lot of wasted work (which could be expensive for battery life), so the default is to do it very rarely (every 20 minutes).
+    MON_MESSAGE_NETWORK_RETRY_FAILED_NETWORK_WAITS, // Coordinator thread is telling waiters to retry any failed network waits
+    MON_MESSAGE_DRIVE_STATUS_UPDATE, // Some change to local drive has occurred (new drive created or plugged in, or removed)
+    MON_MESSAGE_DRIVE_QUERY_REMOVE, // User wants to unplug a drive, which MonUtil will always allow
+    MON_MESSAGE_STOP
+};
+enum MON_TYPE
+{
+    MON_NONE = 0,
+    MON_DIRECTORY = 1,
+    MON_REGKEY = 2
+};
+struct MON_REQUEST
+{
+    MON_TYPE type;
+    DWORD dwMaxSilencePeriodInMs;
+    // Handle to the main window for RegisterDeviceNotification() (same handle as owned by coordinator thread)
+    HWND hwnd;
+    // and handle to the notification (specific to this request)
+    HDEVNOTIFY hNotify;
+    BOOL fRecursive;
+    void *pvContext;
+    HRESULT hrStatus;
+    LPWSTR sczOriginalPathRequest;
+    BOOL fNetwork; // This reflects either a UNC or mounted drive original request
+    DWORD dwPathHierarchyIndex;
+    LPWSTR *rgsczPathHierarchy;
+    DWORD cPathHierarchy;
+    // If the notify fires, fPendingFire gets set to TRUE, and we wait to see if other writes are occurring, and only after the configured silence period do we notify of changes
+    // after notification, we set fPendingFire back to FALSE
+    BOOL fPendingFire;
+    BOOL fSkipDeltaAdd;
+    DWORD dwSilencePeriodInMs;
+    union
+    {
+        struct
+        {
+        } directory;
+        struct
+        {
+            HKEY hkRoot;
+            HKEY hkSubKey;
+            REG_KEY_BITNESS kbKeyBitness; // Only used to pass on 32-bit, 64-bit, or default parameter
+        } regkey;
+    };
+};
+struct MON_ADD_MESSAGE
+{
+    MON_REQUEST request;
+    HANDLE handle;
+};
+struct MON_REMOVE_MESSAGE
+{
+    MON_TYPE type;
+    BOOL fRecursive;
+    union
+    {
+        struct
+        {
+            LPWSTR sczDirectory;
+        } directory;
+        struct
+        {
+            HKEY hkRoot;
+            LPWSTR sczSubKey;
+            REG_KEY_BITNESS kbKeyBitness;
+        } regkey;
+    };
+};
+struct MON_WAITER_CONTEXT
+{
+    DWORD dwCoordinatorThreadId;
+    HANDLE hWaiterThread;
+    DWORD dwWaiterThreadId;
+    BOOL fWaiterThreadMessageQueueInitialized;
+    // Callbacks
+    PFN_MONGENERAL vpfMonGeneral;
+    PFN_MONDIRECTORY vpfMonDirectory;
+    PFN_MONREGKEY vpfMonRegKey;
+    // Context for callbacks
+    LPVOID pvContext;
+    // HANDLEs are in their own array for easy use with WaitForMultipleObjects()
+    // After initialization, the very first handle is just to wake the listener thread to have it re-wait on a new list
+    // Because this array is read by both coordinator thread and waiter thread, to avoid locking between both threads, it must start at the maximum size
+    HANDLE *rgHandles;
+    DWORD cHandles;
+    // Requested things to monitor
+    MON_REQUEST *rgRequests;
+    DWORD cRequests;
+    // Number of pending notifications
+    DWORD cRequestsPending;
+    // Number of requests in a failed state (couldn't initiate wait)
+    DWORD cRequestsFailing;
+};
+// Info stored about each waiter by the coordinator
+struct MON_WAITER_INFO
+{
+    DWORD cMonitorCount;
+    MON_WAITER_CONTEXT *pWaiterContext;
+};
+// This struct is used when Thread A wants to send a task to another thread B (and get notified when the task finishes)
+// You typically declare this struct in a manner that a pointer to it is valid as long as a thread that could respond is still running
+// (even long after sender is no longer waiting, in case thread has huge message queue)
+// and you must send 2 parameters in the message:
+// 1) a pointer to this struct (which is always valid)
+// 2) the original value of dwIteration
+// The receiver of the message can compare the current value of dwSendIteration in the struct with what was sent in the message
+// If values are different, we're too late and thread A is no longer waiting on this response
+// otherwise, set dwResponseIteration to the same value, and call ::SetEvent() on hWait
+// Thread A will then wakeup, and must verify that dwResponseIteration == dwSendIteration to ensure it isn't an earlier out-of-date reply
+// replying to a newer wait
+// pvContext is used to send a misc parameter related to processing data
+struct MON_INTERNAL_TEMPORARY_WAIT
+{
+    // Should be incremented each time sender sends a pointer to this struct, so each request has a different iteration
+    DWORD dwSendIteration;
+    DWORD dwReceiveIteration;
+    HANDLE hWait;
+    void *pvContext;
+};
+struct MON_STRUCT
+{
+    HANDLE hCoordinatorThread;
+    DWORD dwCoordinatorThreadId;
+    BOOL fCoordinatorThreadMessageQueueInitialized;
+    // Invisible window for receiving network status & drive added/removal messages
+    HWND hwnd;
+    // Used by window procedure for sending request and waiting for response from waiter threads
+    // such as in event of a request to remove a device
+    MON_INTERNAL_TEMPORARY_WAIT internalWait;
+    // Callbacks
+    PFN_MONGENERAL vpfMonGeneral;
+    PFN_MONDRIVESTATUS vpfMonDriveStatus;
+    PFN_MONDIRECTORY vpfMonDirectory;
+    PFN_MONREGKEY vpfMonRegKey;
+    // Context for callbacks
+    LPVOID pvContext;
+    // Waiter thread array
+    MON_WAITER_INFO *rgWaiterThreads;
+    DWORD cWaiterThreads;
+};
+const int MON_HANDLE_BYTES = sizeof(MON_STRUCT);
+static DWORD WINAPI CoordinatorThread(
+    __in_bcount(sizeof(MON_STRUCT)) LPVOID pvContext
+    );
+// Initiates (or if *pHandle is non-null, continues) wait on the directory or subkey
+// if the directory or subkey doesn't exist, instead calls it on the first existing parent directory or subkey
+// writes to pRequest->dwPathHierarchyIndex with the array index that was waited on
+static HRESULT InitiateWait(
+    __inout MON_REQUEST *pRequest,
+    __inout HANDLE *pHandle
+    );
+static DWORD WINAPI WaiterThread(
+    __in_bcount(sizeof(MON_WAITER_CONTEXT)) LPVOID pvContext
+    );
+static void Notify(
+    __in HRESULT hr,
+    __in MON_WAITER_CONTEXT *pWaiterContext,
+    __in MON_REQUEST *pRequest
+    );
+static void MonRequestDestroy(
+    __in MON_REQUEST *pRequest
+    );
+static void MonAddMessageDestroy(
+    __in_opt MON_ADD_MESSAGE *pMessage
+    );
+static void MonRemoveMessageDestroy(
+    __in_opt MON_REMOVE_MESSAGE *pMessage
+    );
+static BOOL GetRecursiveFlag(
+    __in MON_REQUEST *pRequest,
+    __in DWORD dwIndex
+    );
+static HRESULT FindRequestIndex(
+    __in MON_WAITER_CONTEXT *pWaiterContext,
+    __in MON_REMOVE_MESSAGE *pMessage,
+    __out DWORD *pdwIndex
+    );
+static HRESULT RemoveRequest(
+    __inout MON_WAITER_CONTEXT *pWaiterContext,
+    __in DWORD dwRequestIndex
+    );
+static REGSAM GetRegKeyBitness(
+    __in MON_REQUEST *pRequest
+    );
+static HRESULT DuplicateRemoveMessage(
+    __in MON_REMOVE_MESSAGE *pMessage,
+    __out MON_REMOVE_MESSAGE **ppMessage
+    );
+static LRESULT CALLBACK MonWndProc(
+    __in HWND hWnd,
+    __in UINT uMsg,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    );
+static HRESULT CreateMonWindow(
+    __in MON_STRUCT *pm,
+    __out HWND *pHwnd
+    );
+// if *phMonitor is non-NULL, closes the old wait before re-starting the new wait
+static HRESULT WaitForNetworkChanges(
+    __inout HANDLE *phMonitor,
+    __in MON_STRUCT *pm
+    );
+static HRESULT UpdateWaitStatus(
+    __in HRESULT hrNewStatus,
+    __inout MON_WAITER_CONTEXT *pWaiterContext,
+    __in DWORD dwRequestIndex,
+    __out_opt DWORD *pdwNewRequestIndex
+    );
+extern "C" HRESULT DAPI MonCreate(
+    __out_bcount(MON_HANDLE_BYTES) MON_HANDLE *pHandle,
+    __in PFN_MONGENERAL vpfMonGeneral,
+    __in_opt PFN_MONDRIVESTATUS vpfMonDriveStatus,
+    __in_opt PFN_MONDIRECTORY vpfMonDirectory,
+    __in_opt PFN_MONREGKEY vpfMonRegKey,
+    __in_opt LPVOID pvContext
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD dwRetries = MON_THREAD_INIT_RETRIES;
+    MonExitOnNull(pHandle, hr, E_INVALIDARG, "Pointer to handle not specified while creating monitor");
+    // Allocate the struct
+    *pHandle = static_cast<MON_HANDLE>(MemAlloc(sizeof(MON_STRUCT), TRUE));
+    MonExitOnNull(*pHandle, hr, E_OUTOFMEMORY, "Failed to allocate monitor object");
+    MON_STRUCT *pm = static_cast<MON_STRUCT *>(*pHandle);
+    pm->vpfMonGeneral = vpfMonGeneral;
+    pm->vpfMonDriveStatus = vpfMonDriveStatus;
+    pm->vpfMonDirectory = vpfMonDirectory;
+    pm->vpfMonRegKey = vpfMonRegKey;
+    pm->pvContext = pvContext;
+    pm->hCoordinatorThread = ::CreateThread(NULL, 0, CoordinatorThread, pm, 0, &pm->dwCoordinatorThreadId);
+    if (!pm->hCoordinatorThread)
+    {
+        MonExitWithLastError(hr, "Failed to create waiter thread.");
+    }
+    // Ensure the created thread initializes its message queue. It does this first thing, so if it doesn't within 10 seconds, there must be a huge problem.
+    while (!pm->fCoordinatorThreadMessageQueueInitialized && 0 < dwRetries)
+    {
+        ::Sleep(MON_THREAD_INIT_RETRY_PERIOD_IN_MS);
+        --dwRetries;
+    }
+    if (0 == dwRetries)
+    {
+        hr = E_UNEXPECTED;
+        MonExitOnFailure(hr, "Waiter thread apparently never initialized its message queue.");
+    }
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI MonAddDirectory(
+    __in_bcount(MON_HANDLE_BYTES) MON_HANDLE handle,
+    __in_z LPCWSTR wzDirectory,
+    __in BOOL fRecursive,
+    __in DWORD dwSilencePeriodInMs,
+    __in_opt LPVOID pvDirectoryContext
+    )
+{
+    HRESULT hr = S_OK;
+    MON_STRUCT *pm = static_cast<MON_STRUCT *>(handle);
+    LPWSTR sczDirectory = NULL;
+    LPWSTR sczOriginalPathRequest = NULL;
+    MON_ADD_MESSAGE *pMessage = NULL;
+    hr = StrAllocString(&sczOriginalPathRequest, wzDirectory, 0);
+    MonExitOnFailure(hr, "Failed to convert directory string to UNC path");
+    hr = PathBackslashTerminate(&sczOriginalPathRequest);
+    MonExitOnFailure(hr, "Failed to ensure directory ends in backslash");
+    pMessage = reinterpret_cast<MON_ADD_MESSAGE *>(MemAlloc(sizeof(MON_ADD_MESSAGE), TRUE));
+    MonExitOnNull(pMessage, hr, E_OUTOFMEMORY, "Failed to allocate memory for message");
+    if (sczOriginalPathRequest[0] == L'\\' && sczOriginalPathRequest[1] == L'\\')
+    {
+        pMessage->request.fNetwork = TRUE;
+    }
+    else
+    {
+        hr = UncConvertFromMountedDrive(&sczDirectory, sczOriginalPathRequest);
+        if (SUCCEEDED(hr))
+        {
+            pMessage->request.fNetwork = TRUE;
+        }
+    }
+    if (NULL == sczDirectory)
+    {
+        // Likely not a mounted drive - just copy the request then
+        hr = S_OK;
+        hr = StrAllocString(&sczDirectory, sczOriginalPathRequest, 0);
+        MonExitOnFailure(hr, "Failed to copy original path request: %ls", sczOriginalPathRequest);
+    }
+    pMessage->handle = INVALID_HANDLE_VALUE;
+    pMessage->request.type = MON_DIRECTORY;
+    pMessage->request.fRecursive = fRecursive;
+    pMessage->request.dwMaxSilencePeriodInMs = dwSilencePeriodInMs;
+    pMessage->request.hwnd = pm->hwnd;
+    pMessage->request.pvContext = pvDirectoryContext;
+    pMessage->request.sczOriginalPathRequest = sczOriginalPathRequest;
+    sczOriginalPathRequest = NULL;
+    hr = PathGetHierarchyArray(sczDirectory, &pMessage->request.rgsczPathHierarchy, reinterpret_cast<LPUINT>(&pMessage->request.cPathHierarchy));
+    MonExitOnFailure(hr, "Failed to get hierarchy array for path %ls", sczDirectory);
+    if (0 < pMessage->request.cPathHierarchy)
+    {
+        pMessage->request.hrStatus = InitiateWait(&pMessage->request, &pMessage->handle);
+        if (!::PostThreadMessageW(pm->dwCoordinatorThreadId, MON_MESSAGE_ADD, reinterpret_cast<WPARAM>(pMessage), 0))
+        {
+            MonExitWithLastError(hr, "Failed to send message to worker thread to add directory wait for path %ls", sczDirectory);
+        }
+        pMessage = NULL;
+    }
+LExit:
+    ReleaseStr(sczDirectory);
+    ReleaseStr(sczOriginalPathRequest);
+    MonAddMessageDestroy(pMessage);
+    return hr;
+}
+extern "C" HRESULT DAPI MonAddRegKey(
+    __in_bcount(MON_HANDLE_BYTES) MON_HANDLE handle,
+    __in HKEY hkRoot,
+    __in_z LPCWSTR wzSubKey,
+    __in REG_KEY_BITNESS kbKeyBitness,
+    __in BOOL fRecursive,
+    __in DWORD dwSilencePeriodInMs,
+    __in_opt LPVOID pvRegKeyContext
+    )
+{
+    HRESULT hr = S_OK;
+    MON_STRUCT *pm = static_cast<MON_STRUCT *>(handle);
+    LPWSTR sczSubKey = NULL;
+    MON_ADD_MESSAGE *pMessage = NULL;
+    hr = StrAllocString(&sczSubKey, wzSubKey, 0);
+    MonExitOnFailure(hr, "Failed to copy subkey string");
+    hr = PathBackslashTerminate(&sczSubKey);
+    MonExitOnFailure(hr, "Failed to ensure subkey path ends in backslash");
+    pMessage = reinterpret_cast<MON_ADD_MESSAGE *>(MemAlloc(sizeof(MON_ADD_MESSAGE), TRUE));
+    MonExitOnNull(pMessage, hr, E_OUTOFMEMORY, "Failed to allocate memory for message");
+    pMessage->handle = ::CreateEventW(NULL, TRUE, FALSE, NULL);
+    MonExitOnNullWithLastError(pMessage->handle, hr, "Failed to create anonymous event for regkey monitor");
+    pMessage->request.type = MON_REGKEY;
+    pMessage->request.regkey.hkRoot = hkRoot;
+    pMessage->request.regkey.kbKeyBitness = kbKeyBitness;
+    pMessage->request.fRecursive = fRecursive;
+    pMessage->request.dwMaxSilencePeriodInMs = dwSilencePeriodInMs,
+    pMessage->request.hwnd = pm->hwnd;
+    pMessage->request.pvContext = pvRegKeyContext;
+    hr = PathGetHierarchyArray(sczSubKey, &pMessage->request.rgsczPathHierarchy, reinterpret_cast<LPUINT>(&pMessage->request.cPathHierarchy));
+    MonExitOnFailure(hr, "Failed to get hierarchy array for subkey %ls", sczSubKey);
+    if (0 < pMessage->request.cPathHierarchy)
+    {
+        pMessage->request.hrStatus = InitiateWait(&pMessage->request, &pMessage->handle);
+        MonExitOnFailure(hr, "Failed to initiate wait");
+        if (!::PostThreadMessageW(pm->dwCoordinatorThreadId, MON_MESSAGE_ADD, reinterpret_cast<WPARAM>(pMessage), 0))
+        {
+            MonExitWithLastError(hr, "Failed to send message to worker thread to add directory wait for regkey %ls", sczSubKey);
+        }
+        pMessage = NULL;
+    }
+LExit:
+    ReleaseStr(sczSubKey);
+    MonAddMessageDestroy(pMessage);
+    return hr;
+}
+extern "C" HRESULT DAPI MonRemoveDirectory(
+    __in_bcount(MON_HANDLE_BYTES) MON_HANDLE handle,
+    __in_z LPCWSTR wzDirectory,
+    __in BOOL fRecursive
+    )
+{
+    HRESULT hr = S_OK;
+    MON_STRUCT *pm = static_cast<MON_STRUCT *>(handle);
+    LPWSTR sczDirectory = NULL;
+    MON_REMOVE_MESSAGE *pMessage = NULL;
+    hr = StrAllocString(&sczDirectory, wzDirectory, 0);
+    MonExitOnFailure(hr, "Failed to copy directory string");
+    hr = PathBackslashTerminate(&sczDirectory);
+    MonExitOnFailure(hr, "Failed to ensure directory ends in backslash");
+    pMessage = reinterpret_cast<MON_REMOVE_MESSAGE *>(MemAlloc(sizeof(MON_REMOVE_MESSAGE), TRUE));
+    MonExitOnNull(pMessage, hr, E_OUTOFMEMORY, "Failed to allocate memory for message");
+    pMessage->type = MON_DIRECTORY;
+    pMessage->fRecursive = fRecursive;
+    hr = StrAllocString(&pMessage->directory.sczDirectory, sczDirectory, 0);
+    MonExitOnFailure(hr, "Failed to allocate copy of directory string");
+    if (!::PostThreadMessageW(pm->dwCoordinatorThreadId, MON_MESSAGE_REMOVE, reinterpret_cast<WPARAM>(pMessage), 0))
+    {
+        MonExitWithLastError(hr, "Failed to send message to worker thread to add directory wait for path %ls", sczDirectory);
+    }
+    pMessage = NULL;
+LExit:
+    MonRemoveMessageDestroy(pMessage);
+    return hr;
+}
+extern "C" HRESULT DAPI MonRemoveRegKey(
+    __in_bcount(MON_HANDLE_BYTES) MON_HANDLE handle,
+    __in HKEY hkRoot,
+    __in_z LPCWSTR wzSubKey,
+    __in REG_KEY_BITNESS kbKeyBitness,
+    __in BOOL fRecursive
+    )
+{
+    HRESULT hr = S_OK;
+    MON_STRUCT *pm = static_cast<MON_STRUCT *>(handle);
+    LPWSTR sczSubKey = NULL;
+    MON_REMOVE_MESSAGE *pMessage = NULL;
+    hr = StrAllocString(&sczSubKey, wzSubKey, 0);
+    MonExitOnFailure(hr, "Failed to copy subkey string");
+    hr = PathBackslashTerminate(&sczSubKey);
+    MonExitOnFailure(hr, "Failed to ensure subkey path ends in backslash");
+    pMessage = reinterpret_cast<MON_REMOVE_MESSAGE *>(MemAlloc(sizeof(MON_REMOVE_MESSAGE), TRUE));
+    MonExitOnNull(pMessage, hr, E_OUTOFMEMORY, "Failed to allocate memory for message");
+    pMessage->type = MON_REGKEY;
+    pMessage->regkey.hkRoot = hkRoot;
+    pMessage->regkey.kbKeyBitness = kbKeyBitness;
+    pMessage->fRecursive = fRecursive;
+    hr = StrAllocString(&pMessage->regkey.sczSubKey, sczSubKey, 0);
+    MonExitOnFailure(hr, "Failed to allocate copy of directory string");
+    if (!::PostThreadMessageW(pm->dwCoordinatorThreadId, MON_MESSAGE_REMOVE, reinterpret_cast<WPARAM>(pMessage), 0))
+    {
+        MonExitWithLastError(hr, "Failed to send message to worker thread to add directory wait for path %ls", sczSubKey);
+    }
+    pMessage = NULL;
+LExit:
+    ReleaseStr(sczSubKey);
+    MonRemoveMessageDestroy(pMessage);
+    return hr;
+}
+extern "C" void DAPI MonDestroy(
+    __in_bcount(MON_HANDLE_BYTES) MON_HANDLE handle
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    MON_STRUCT *pm = static_cast<MON_STRUCT *>(handle);
+    if (!::PostThreadMessageW(pm->dwCoordinatorThreadId, MON_MESSAGE_STOP, 0, 0))
+    {
+        er = ::GetLastError();
+        if (ERROR_INVALID_THREAD_ID == er)
+        {
+            // It already halted, or doesn't exist for some other reason, so let's just ignore it and clean up
+            er = ERROR_SUCCESS;
+        }
+        MonExitOnWin32Error(er, hr, "Failed to send message to background thread to halt");
+    }
+    if (pm->hCoordinatorThread)
+    {
+        ::WaitForSingleObject(pm->hCoordinatorThread, INFINITE);
+        ::CloseHandle(pm->hCoordinatorThread);
+    }
+LExit:
+    return;
+}
+static void MonRequestDestroy(
+    __in MON_REQUEST *pRequest
+    )
+{
+    if (NULL != pRequest)
+    {
+        if (MON_REGKEY == pRequest->type)
+        {
+            ReleaseRegKey(pRequest->regkey.hkSubKey);
+        }
+        else if (MON_DIRECTORY == pRequest->type && pRequest->hNotify)
+        {
+            UnregisterDeviceNotification(pRequest->hNotify);
+            pRequest->hNotify = NULL;
+        }
+        ReleaseStr(pRequest->sczOriginalPathRequest);
+        ReleaseStrArray(pRequest->rgsczPathHierarchy, pRequest->cPathHierarchy);
+    }
+}
+static void MonAddMessageDestroy(
+    __in_opt MON_ADD_MESSAGE *pMessage
+    )
+{
+    if (pMessage)
+    {
+        MonRequestDestroy(&pMessage->request);
+        if (MON_DIRECTORY == pMessage->request.type && INVALID_HANDLE_VALUE != pMessage->handle)
+        {
+            ::FindCloseChangeNotification(pMessage->handle);
+        }
+        else if (MON_REGKEY == pMessage->request.type)
+        {
+            ReleaseHandle(pMessage->handle);
+        }
+        ReleaseMem(pMessage);
+    }
+}
+static void MonRemoveMessageDestroy(
+    __in_opt MON_REMOVE_MESSAGE *pMessage
+    )
+{
+    if (pMessage)
+    {
+        switch (pMessage->type)
+        {
+        case MON_DIRECTORY:
+            ReleaseStr(pMessage->directory.sczDirectory);
+            break;
+        case MON_REGKEY:
+            ReleaseStr(pMessage->regkey.sczSubKey);
+            break;
+        default:
+            Assert(false);
+        }
+        ReleaseMem(pMessage);
+    }
+}
+static DWORD WINAPI CoordinatorThread(
+    __in_bcount(sizeof(MON_STRUCT)) LPVOID pvContext
+    )
+{
+    HRESULT hr = S_OK;
+    MSG msg = { };
+    DWORD dwThreadIndex = DWORD_MAX;
+    DWORD dwRetries;
+    DWORD dwFailingNetworkWaits = 0;
+    MON_WAITER_CONTEXT *pWaiterContext = NULL;
+    MON_REMOVE_MESSAGE *pRemoveMessage = NULL;
+    MON_REMOVE_MESSAGE *pTempRemoveMessage = NULL;
+    MON_STRUCT *pm = reinterpret_cast<MON_STRUCT*>(pvContext);
+    WSADATA wsaData = { };
+    HANDLE hMonitor = NULL;
+    BOOL fRet = FALSE;
+    UINT_PTR uTimerSuccessfulNetworkRetry = 0;
+    UINT_PTR uTimerFailedNetworkRetry = 0;
+    // Ensure the thread has a message queue
+    ::PeekMessage(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE);
+    pm->fCoordinatorThreadMessageQueueInitialized = TRUE;
+    hr = CreateMonWindow(pm, &pm->hwnd);
+    MonExitOnFailure(hr, "Failed to create window for status update thread");
+    ::WSAStartup(MAKEWORD(2, 2), &wsaData);
+    hr = WaitForNetworkChanges(&hMonitor, pm);
+    MonExitOnFailure(hr, "Failed to wait for network changes");
+    uTimerSuccessfulNetworkRetry = ::SetTimer(NULL, 1, MON_THREAD_NETWORK_SUCCESSFUL_RETRY_IN_MS, NULL);
+    if (0 == uTimerSuccessfulNetworkRetry)
+    {
+        MonExitWithLastError(hr, "Failed to set timer for network successful retry");
+    }
+    while (0 != (fRet = ::GetMessageW(&msg, NULL, 0, 0)))
+    {
+        if (-1 == fRet)
+        {
+            hr = E_UNEXPECTED;
+            MonExitOnRootFailure(hr, "Unexpected return value from message pump.");
+        }
+        else
+        {
+            switch (msg.message)
+            {
+            case MON_MESSAGE_ADD:
+                dwThreadIndex = DWORD_MAX;
+                for (DWORD i = 0; i < pm->cWaiterThreads; ++i)
+                {
+                    if (pm->rgWaiterThreads[i].cMonitorCount < MON_MAX_MONITORS_PER_THREAD)
+                    {
+                        dwThreadIndex = i;
+                        break;
+                    }
+                }
+                if (dwThreadIndex < pm->cWaiterThreads)
+                {
+                    pWaiterContext = pm->rgWaiterThreads[dwThreadIndex].pWaiterContext;
+                }
+                else
+                {
+                    hr = MemEnsureArraySize(reinterpret_cast<void **>(&pm->rgWaiterThreads), pm->cWaiterThreads + 1, sizeof(MON_WAITER_INFO), MON_THREAD_GROWTH);
+                    MonExitOnFailure(hr, "Failed to grow waiter thread array size");
+                    ++pm->cWaiterThreads;
+                    dwThreadIndex = pm->cWaiterThreads - 1;
+                    pm->rgWaiterThreads[dwThreadIndex].pWaiterContext = reinterpret_cast<MON_WAITER_CONTEXT*>(MemAlloc(sizeof(MON_WAITER_CONTEXT), TRUE));
+                    MonExitOnNull(pm->rgWaiterThreads[dwThreadIndex].pWaiterContext, hr, E_OUTOFMEMORY, "Failed to allocate waiter context struct");
+                    pWaiterContext = pm->rgWaiterThreads[dwThreadIndex].pWaiterContext;
+                    pWaiterContext->dwCoordinatorThreadId = ::GetCurrentThreadId();
+                    pWaiterContext->vpfMonGeneral = pm->vpfMonGeneral;
+                    pWaiterContext->vpfMonDirectory = pm->vpfMonDirectory;
+                    pWaiterContext->vpfMonRegKey = pm->vpfMonRegKey;
+                    pWaiterContext->pvContext = pm->pvContext;
+                    hr = MemEnsureArraySize(reinterpret_cast<void **>(&pWaiterContext->rgHandles), MON_MAX_MONITORS_PER_THREAD + 1, sizeof(HANDLE), 0);
+                    MonExitOnFailure(hr, "Failed to allocate first handle");
+                    pWaiterContext->cHandles = 1;
+                    pWaiterContext->rgHandles[0] = ::CreateEventW(NULL, FALSE, FALSE, NULL);
+                    MonExitOnNullWithLastError(pWaiterContext->rgHandles[0], hr, "Failed to create general event");
+                    pWaiterContext->hWaiterThread = ::CreateThread(NULL, 0, WaiterThread, pWaiterContext, 0, &pWaiterContext->dwWaiterThreadId);
+                    if (!pWaiterContext->hWaiterThread)
+                    {
+                        MonExitWithLastError(hr, "Failed to create waiter thread.");
+                    }
+                    dwRetries = MON_THREAD_INIT_RETRIES;
+                    while (!pWaiterContext->fWaiterThreadMessageQueueInitialized && 0 < dwRetries)
+                    {
+                        ::Sleep(MON_THREAD_INIT_RETRY_PERIOD_IN_MS);
+                        --dwRetries;
+                    }
+                    if (0 == dwRetries)
+                    {
+                        hr = E_UNEXPECTED;
+                        MonExitOnFailure(hr, "Waiter thread apparently never initialized its message queue.");
+                    }
+                }
+                ++pm->rgWaiterThreads[dwThreadIndex].cMonitorCount;
+                if (!::PostThreadMessageW(pWaiterContext->dwWaiterThreadId, MON_MESSAGE_ADD, msg.wParam, 0))
+                {
+                    MonExitWithLastError(hr, "Failed to send message to waiter thread to add monitor");
+                }
+                if (!::SetEvent(pWaiterContext->rgHandles[0]))
+                {
+                    MonExitWithLastError(hr, "Failed to set event to notify waiter thread of incoming message");
+                }
+                break;
+            case MON_MESSAGE_REMOVE:
+                // Send remove to all waiter threads. They'll ignore it if they don't have that monitor.
+                // If they do have that monitor, they'll remove it from their list, and tell coordinator they have another
+                // empty slot via MON_MESSAGE_REMOVED message
+                for (DWORD i = 0; i < pm->cWaiterThreads; ++i)
+                {
+                    pWaiterContext = pm->rgWaiterThreads[i].pWaiterContext;
+                    pRemoveMessage = reinterpret_cast<MON_REMOVE_MESSAGE *>(msg.wParam);
+                    hr = DuplicateRemoveMessage(pRemoveMessage, &pTempRemoveMessage);
+                    MonExitOnFailure(hr, "Failed to duplicate remove message");
+                    if (!::PostThreadMessageW(pWaiterContext->dwWaiterThreadId, MON_MESSAGE_REMOVE, reinterpret_cast<WPARAM>(pTempRemoveMessage), msg.lParam))
+                    {
+                        MonExitWithLastError(hr, "Failed to send message to waiter thread to add monitor");
+                    }
+                    pTempRemoveMessage = NULL;
+                    if (!::SetEvent(pWaiterContext->rgHandles[0]))
+                    {
+                        MonExitWithLastError(hr, "Failed to set event to notify waiter thread of incoming remove message");
+                    }
+                }
+                MonRemoveMessageDestroy(pRemoveMessage);
+                pRemoveMessage = NULL;
+                break;
+            case MON_MESSAGE_REMOVED:
+                for (DWORD i = 0; i < pm->cWaiterThreads; ++i)
+                {
+                    if (pm->rgWaiterThreads[i].pWaiterContext->dwWaiterThreadId == static_cast<DWORD>(msg.wParam))
+                    {
+                        Assert(pm->rgWaiterThreads[i].cMonitorCount > 0);
+                        --pm->rgWaiterThreads[i].cMonitorCount;
+                        if (0 == pm->rgWaiterThreads[i].cMonitorCount)
+                        {
+                            if (!::PostThreadMessageW(pm->rgWaiterThreads[i].pWaiterContext->dwWaiterThreadId, MON_MESSAGE_STOP, msg.wParam, msg.lParam))
+                            {
+                                MonExitWithLastError(hr, "Failed to send message to waiter thread to stop");
+                            }
+                            MemRemoveFromArray(reinterpret_cast<LPVOID>(pm->rgWaiterThreads), i, 1, pm->cWaiterThreads, sizeof(MON_WAITER_INFO), TRUE);
+                            --pm->cWaiterThreads;
+                            --i; // reprocess this index in the for loop, which will now contain the item after the one we removed
+                        }
+                    }
+                }
+                break;
+            case MON_MESSAGE_NETWORK_WAIT_FAILED:
+                if (0 == dwFailingNetworkWaits)
+                {
+                    uTimerFailedNetworkRetry = ::SetTimer(NULL, uTimerSuccessfulNetworkRetry + 1, MON_THREAD_NETWORK_FAIL_RETRY_IN_MS, NULL);
+                    if (0 == uTimerFailedNetworkRetry)
+                    {
+                        MonExitWithLastError(hr, "Failed to set timer for network fail retry");
+                    }
+                }
+                ++dwFailingNetworkWaits;
+                break;
+            case MON_MESSAGE_NETWORK_WAIT_SUCCEEDED:
+                --dwFailingNetworkWaits;
+                if (0 == dwFailingNetworkWaits)
+                {
+                    if (!::KillTimer(NULL, uTimerFailedNetworkRetry))
+                    {
+                        MonExitWithLastError(hr, "Failed to kill timer for network fail retry");
+                    }
+                    uTimerFailedNetworkRetry = 0;
+                }
+                break;
+            case MON_MESSAGE_NETWORK_STATUS_UPDATE:
+                hr = WaitForNetworkChanges(&hMonitor, pm);
+                MonExitOnFailure(hr, "Failed to re-wait for network changes");
+                // Propagate any network status update messages to all waiter threads
+                for (DWORD i = 0; i < pm->cWaiterThreads; ++i)
+                {
+                    pWaiterContext = pm->rgWaiterThreads[i].pWaiterContext;
+                    if (!::PostThreadMessageW(pWaiterContext->dwWaiterThreadId, MON_MESSAGE_NETWORK_STATUS_UPDATE, 0, 0))
+                    {
+                        MonExitWithLastError(hr, "Failed to send message to waiter thread to notify of network status update");
+                    }
+                    if (!::SetEvent(pWaiterContext->rgHandles[0]))
+                    {
+                        MonExitWithLastError(hr, "Failed to set event to notify waiter thread of incoming network status update message");
+                    }
+                }
+                break;
+            case WM_TIMER:
+                // Timer means some network wait is failing, and we need to retry every so often in case a remote server goes back up
+                for (DWORD i = 0; i < pm->cWaiterThreads; ++i)
+                {
+                    pWaiterContext = pm->rgWaiterThreads[i].pWaiterContext;
+                    if (!::PostThreadMessageW(pWaiterContext->dwWaiterThreadId, msg.wParam == uTimerFailedNetworkRetry ? MON_MESSAGE_NETWORK_RETRY_FAILED_NETWORK_WAITS : MON_MESSAGE_NETWORK_RETRY_SUCCESSFUL_NETWORK_WAITS, 0, 0))
+                    {
+                        MonExitWithLastError(hr, "Failed to send message to waiter thread to notify of network status update");
+                    }
+                    if (!::SetEvent(pWaiterContext->rgHandles[0]))
+                    {
+                        MonExitWithLastError(hr, "Failed to set event to notify waiter thread of incoming network status update message");
+                    }
+                }
+                break;
+            case MON_MESSAGE_DRIVE_STATUS_UPDATE:
+                // If user requested to be notified of drive status updates, notify!
+                if (pm->vpfMonDriveStatus)
+                {
+                    pm->vpfMonDriveStatus(static_cast<WCHAR>(msg.wParam), static_cast<BOOL>(msg.lParam), pm->pvContext);
+                }
+                // Propagate any drive status update messages to all waiter threads
+                for (DWORD i = 0; i < pm->cWaiterThreads; ++i)
+                {
+                    pWaiterContext = pm->rgWaiterThreads[i].pWaiterContext;
+                    if (!::PostThreadMessageW(pWaiterContext->dwWaiterThreadId, MON_MESSAGE_DRIVE_STATUS_UPDATE, msg.wParam, msg.lParam))
+                    {
+                        MonExitWithLastError(hr, "Failed to send message to waiter thread to notify of drive status update");
+                    }
+                    if (!::SetEvent(pWaiterContext->rgHandles[0]))
+                    {
+                        MonExitWithLastError(hr, "Failed to set event to notify waiter thread of incoming drive status update message");
+                    }
+                }
+                break;
+            case MON_MESSAGE_STOP:
+                ExitFunction1(hr = static_cast<HRESULT>(msg.wParam));
+            default:
+                // This thread owns a window, so this handles all the other random messages we get
+                ::TranslateMessage(&msg);
+                ::DispatchMessageW(&msg);
+                break;
+            }
+        }
+    }
+LExit:
+    if (uTimerFailedNetworkRetry)
+    {
+        fRet = ::KillTimer(NULL, uTimerFailedNetworkRetry);
+    }
+    if (uTimerSuccessfulNetworkRetry)
+    {
+        fRet = ::KillTimer(NULL, uTimerSuccessfulNetworkRetry);
+    }
+    if (pm->hwnd)
+    {
+        ::CloseWindow(pm->hwnd);
+    }
+    // Tell all waiter threads to shutdown
+    for (DWORD i = 0; i < pm->cWaiterThreads; ++i)
+    {
+        pWaiterContext = pm->rgWaiterThreads[i].pWaiterContext;
+        if (NULL != pWaiterContext->rgHandles[0])
+        {
+            if (!::PostThreadMessageW(pWaiterContext->dwWaiterThreadId, MON_MESSAGE_STOP, msg.wParam, msg.lParam))
+            {
+                TraceError(HRESULT_FROM_WIN32(::GetLastError()), "Failed to send message to waiter thread to stop");
+            }
+            if (!::SetEvent(pWaiterContext->rgHandles[0]))
+            {
+                TraceError(HRESULT_FROM_WIN32(::GetLastError()), "Failed to set event to notify waiter thread of incoming message");
+            }
+        }
+    }
+    if (hMonitor != NULL)
+    {
+        ::WSALookupServiceEnd(hMonitor);
+    }
+    // Now confirm they're actually shut down before returning
+    for (DWORD i = 0; i < pm->cWaiterThreads; ++i)
+    {
+        pWaiterContext = pm->rgWaiterThreads[i].pWaiterContext;
+        if (NULL != pWaiterContext->hWaiterThread)
+        {
+            ::WaitForSingleObject(pWaiterContext->hWaiterThread, INFINITE);
+            ::CloseHandle(pWaiterContext->hWaiterThread);
+        }
+        // Waiter thread can't release these, because coordinator thread uses it to try communicating with waiter thread
+        ReleaseHandle(pWaiterContext->rgHandles[0]);
+        ReleaseMem(pWaiterContext->rgHandles);
+        ReleaseMem(pWaiterContext);
+    }
+    if (FAILED(hr))
+    {
+        // If coordinator thread fails, notify general callback of an error
+        Assert(pm->vpfMonGeneral);
+        pm->vpfMonGeneral(hr, pm->pvContext);
+    }
+    MonRemoveMessageDestroy(pRemoveMessage);
+    MonRemoveMessageDestroy(pTempRemoveMessage);
+    ::WSACleanup();
+    return hr;
+}
+static HRESULT InitiateWait(
+    __inout MON_REQUEST *pRequest,
+    __inout HANDLE *pHandle
+    )
+{
+    HRESULT hr = S_OK;
+    HRESULT hrTemp = S_OK;
+    DEV_BROADCAST_HANDLE dev = { };
+    BOOL fRedo = FALSE;
+    BOOL fHandleFound;
+    DWORD er = ERROR_SUCCESS;
+    DWORD dwIndex = 0;
+    HKEY hk = NULL;
+    HANDLE hTemp = INVALID_HANDLE_VALUE;
+    if (pRequest->hNotify)
+    {
+        UnregisterDeviceNotification(pRequest->hNotify);
+        pRequest->hNotify = NULL;
+    }
+    do
+    {
+        fRedo = FALSE;
+        fHandleFound = FALSE;
+        for (DWORD i = 0; i < pRequest->cPathHierarchy && !fHandleFound; ++i)
+        {
+            dwIndex = pRequest->cPathHierarchy - i - 1;
+            switch (pRequest->type)
+            {
+            case MON_DIRECTORY:
+                if (INVALID_HANDLE_VALUE != *pHandle)
+                {
+                    ::FindCloseChangeNotification(*pHandle);
+                    *pHandle = INVALID_HANDLE_VALUE;
+                }
+                *pHandle = ::FindFirstChangeNotificationW(pRequest->rgsczPathHierarchy[dwIndex], GetRecursiveFlag(pRequest, dwIndex), FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_DIR_NAME | FILE_NOTIFY_CHANGE_SECURITY);
+                if (INVALID_HANDLE_VALUE == *pHandle)
+                {
+                    hr = HRESULT_FROM_WIN32(::GetLastError());
+                    if (E_FILENOTFOUND == hr || E_PATHNOTFOUND == hr || E_ACCESSDENIED == hr)
+                    {
+                        continue;
+                    }
+                    MonExitOnWin32Error(er, hr, "Failed to wait on path %ls", pRequest->rgsczPathHierarchy[dwIndex]);
+                }
+                else
+                {
+                    fHandleFound = TRUE;
+                    hr = S_OK;
+                }
+                break;
+            case MON_REGKEY:
+                ReleaseRegKey(pRequest->regkey.hkSubKey);
+                hr = RegOpen(pRequest->regkey.hkRoot, pRequest->rgsczPathHierarchy[dwIndex], KEY_NOTIFY | GetRegKeyBitness(pRequest), &pRequest->regkey.hkSubKey);
+                if (E_FILENOTFOUND == hr || E_PATHNOTFOUND == hr)
+                {
+                    continue;
+                }
+                MonExitOnFailure(hr, "Failed to open regkey %ls", pRequest->rgsczPathHierarchy[dwIndex]);
+                er = ::RegNotifyChangeKeyValue(pRequest->regkey.hkSubKey, GetRecursiveFlag(pRequest, dwIndex), REG_NOTIFY_CHANGE_NAME | REG_NOTIFY_CHANGE_LAST_SET | REG_NOTIFY_CHANGE_SECURITY, *pHandle, TRUE);
+                ReleaseRegKey(hk);
+                hr = HRESULT_FROM_WIN32(er);
+                if (E_FILENOTFOUND == hr || E_PATHNOTFOUND == hr || HRESULT_FROM_WIN32(ERROR_KEY_DELETED) == hr)
+                {
+                    continue;
+                }
+                else
+                {
+                    MonExitOnWin32Error(er, hr, "Failed to wait on subkey %ls", pRequest->rgsczPathHierarchy[dwIndex]);
+                    fHandleFound = TRUE;
+                }
+                break;
+            default:
+                return E_INVALIDARG;
+            }
+        }
+        pRequest->dwPathHierarchyIndex = dwIndex;
+        // If we're monitoring a parent instead of the real path because the real path didn't exist, double-check the child hasn't been created since.
+        // If it has, restart the whole loop
+        if (dwIndex < pRequest->cPathHierarchy - 1)
+        {
+            switch (pRequest->type)
+            {
+            case MON_DIRECTORY:
+                hTemp = ::FindFirstChangeNotificationW(pRequest->rgsczPathHierarchy[dwIndex + 1], GetRecursiveFlag(pRequest, dwIndex + 1), FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_DIR_NAME | FILE_NOTIFY_CHANGE_SECURITY);
+                if (INVALID_HANDLE_VALUE != hTemp)
+                {
+                    ::FindCloseChangeNotification(hTemp);
+                    fRedo = TRUE;
+                }
+                break;
+            case MON_REGKEY:
+                hrTemp = RegOpen(pRequest->regkey.hkRoot, pRequest->rgsczPathHierarchy[dwIndex + 1], KEY_NOTIFY | GetRegKeyBitness(pRequest), &hk);
+                ReleaseRegKey(hk);
+                fRedo = SUCCEEDED(hrTemp);
+                break;
+            default:
+                Assert(false);
+            }
+        }
+    } while (fRedo);
+    MonExitOnFailure(hr, "Didn't get a successful wait after looping through all available options %ls", pRequest->rgsczPathHierarchy[pRequest->cPathHierarchy - 1]);
+    if (MON_DIRECTORY == pRequest->type)
+    {
+        dev.dbch_size = sizeof(dev);
+        dev.dbch_devicetype = DBT_DEVTYP_HANDLE;
+        dev.dbch_handle = *pHandle;
+        // Ignore failure on this - some drives by design don't support it (like network paths), and the worst that can happen is a
+        // removable device will be left in use so user cannot gracefully remove
+        pRequest->hNotify = RegisterDeviceNotification(pRequest->hwnd, &dev, DEVICE_NOTIFY_WINDOW_HANDLE);
+    }
+LExit:
+    ReleaseRegKey(hk);
+    return hr;
+}
+static DWORD WINAPI WaiterThread(
+    __in_bcount(sizeof(MON_WAITER_CONTEXT)) LPVOID pvContext
+    )
+{
+    HRESULT hr = S_OK;
+    HRESULT hrTemp = S_OK;
+    DWORD dwRet = 0;
+    BOOL fAgain = FALSE;
+    BOOL fContinue = TRUE;
+    BOOL fNotify = FALSE;
+    BOOL fRet = FALSE;
+    MSG msg = { };
+    MON_ADD_MESSAGE *pAddMessage = NULL;
+    MON_REMOVE_MESSAGE *pRemoveMessage = NULL;
+    MON_WAITER_CONTEXT *pWaiterContext = reinterpret_cast<MON_WAITER_CONTEXT *>(pvContext);
+    DWORD dwRequestIndex;
+    DWORD dwNewRequestIndex;
+    // If we have one or more requests pending notification, this is the period we intend to wait for multiple objects (shortest amount of time to next potential notify)
+    DWORD dwWait = 0;
+    DWORD uCurrentTime = 0;
+    DWORD uLastTimeInMs = ::GetTickCount();
+    DWORD uDeltaInMs = 0;
+    DWORD cRequestsPendingBeforeLoop = 0;
+    LPWSTR sczDirectory = NULL;
+    bool rgfProcessedIndex[MON_MAX_MONITORS_PER_THREAD + 1] = { };
+    MON_INTERNAL_TEMPORARY_WAIT * pInternalWait = NULL;
+    // Ensure the thread has a message queue
+    ::PeekMessage(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE);
+    pWaiterContext->fWaiterThreadMessageQueueInitialized = TRUE;
+    do
+    {
+        dwRet = ::WaitForMultipleObjects(pWaiterContext->cHandles - pWaiterContext->cRequestsFailing, pWaiterContext->rgHandles, FALSE, pWaiterContext->cRequestsPending > 0 ? dwWait : INFINITE);
+        uCurrentTime = ::GetTickCount();
+        uDeltaInMs = uCurrentTime - uLastTimeInMs;
+        uLastTimeInMs = uCurrentTime;
+        if (WAIT_OBJECT_0 == dwRet)
+        {
+            do
+            {
+                fRet = ::PeekMessage(&msg, reinterpret_cast<HWND>(-1), 0, 0, PM_REMOVE);
+                fAgain = fRet;
+                if (fRet)
+                {
+                    switch (msg.message)
+                    {
+                        case MON_MESSAGE_ADD:
+                            pAddMessage = reinterpret_cast<MON_ADD_MESSAGE *>(msg.wParam);
+                            // Don't just blindly put it at the end of the array - it must be before any failing requests
+                            // for WaitForMultipleObjects() to succeed
+                            dwNewRequestIndex = pWaiterContext->cRequests - pWaiterContext->cRequestsFailing;
+                            if (FAILED(pAddMessage->request.hrStatus))
+                            {
+                                ++pWaiterContext->cRequestsFailing;
+                            }
+                            hr = MemInsertIntoArray(reinterpret_cast<void **>(&pWaiterContext->rgHandles), dwNewRequestIndex + 1, 1, pWaiterContext->cHandles, sizeof(HANDLE), MON_ARRAY_GROWTH);
+                            MonExitOnFailure(hr, "Failed to insert additional handle");
+                            ++pWaiterContext->cHandles;
+                            // Ugh - directory types start with INVALID_HANDLE_VALUE instead of NULL
+                            if (MON_DIRECTORY == pAddMessage->request.type)
+                            {
+                                pWaiterContext->rgHandles[dwNewRequestIndex + 1] = INVALID_HANDLE_VALUE;
+                            }
+                            hr = MemInsertIntoArray(reinterpret_cast<void **>(&pWaiterContext->rgRequests), dwNewRequestIndex, 1, pWaiterContext->cRequests, sizeof(MON_REQUEST), MON_ARRAY_GROWTH);
+                            MonExitOnFailure(hr, "Failed to insert additional request struct");
+                            ++pWaiterContext->cRequests;
+                            pWaiterContext->rgRequests[dwNewRequestIndex] = pAddMessage->request;
+                            pWaiterContext->rgHandles[dwNewRequestIndex + 1] = pAddMessage->handle;
+                            ReleaseNullMem(pAddMessage);
+                            break;
+                        case MON_MESSAGE_REMOVE:
+                            pRemoveMessage = reinterpret_cast<MON_REMOVE_MESSAGE *>(msg.wParam);
+                            // Find the request to remove
+                            hr = FindRequestIndex(pWaiterContext, pRemoveMessage, &dwRequestIndex);
+                            if (E_NOTFOUND == hr)
+                            {
+                                // Coordinator sends removes blindly to all waiter threads, so maybe this one wasn't intended for us
+                                hr = S_OK;
+                            }
+                            else
+                            {
+                                MonExitOnFailure(hr, "Failed to find request index for remove message");
+                                hr = RemoveRequest(pWaiterContext, dwRequestIndex);
+                                MonExitOnFailure(hr, "Failed to remove request after request from coordinator thread.");
+                            }
+                            MonRemoveMessageDestroy(pRemoveMessage);
+                            pRemoveMessage = NULL;
+                            break;
+                        case MON_MESSAGE_NETWORK_RETRY_FAILED_NETWORK_WAITS:
+                            if (::PeekMessage(&msg, NULL, MON_MESSAGE_NETWORK_RETRY_FAILED_NETWORK_WAITS, MON_MESSAGE_NETWORK_RETRY_FAILED_NETWORK_WAITS, PM_NOREMOVE))
+                            {
+                                // If there is another a pending retry failed wait message, skip this one
+                                continue;
+                            }
+                            ZeroMemory(rgfProcessedIndex, sizeof(rgfProcessedIndex));
+                            for (DWORD i = 0; i < pWaiterContext->cRequests; ++i)
+                            { 
+                                if (rgfProcessedIndex[i])
+                                {
+                                    // if we already processed this item due to UpdateWaitStatus swapping array indices, then skip it
+                                    continue;
+                                }
+                                if (MON_DIRECTORY == pWaiterContext->rgRequests[i].type && pWaiterContext->rgRequests[i].fNetwork && FAILED(pWaiterContext->rgRequests[i].hrStatus))
+                                {
+                                    // This is not a failure, just record this in the request's status
+                                    hrTemp = InitiateWait(pWaiterContext->rgRequests + i, pWaiterContext->rgHandles + i + 1);
+                                    hr = UpdateWaitStatus(hrTemp, pWaiterContext, i, &dwNewRequestIndex);
+                                    MonExitOnFailure(hr, "Failed to update wait status");
+                                    hrTemp = S_OK;
+                                    if (dwNewRequestIndex != i)
+                                    {
+                                        // If this request was moved to the end of the list, reprocess this index and mark the new index for skipping
+                                        rgfProcessedIndex[dwNewRequestIndex] = true;
+                                        --i;
+                                    }
+                                }
+                            }
+                        break;
+                        case MON_MESSAGE_NETWORK_RETRY_SUCCESSFUL_NETWORK_WAITS:
+                            if (::PeekMessage(&msg, NULL, MON_MESSAGE_NETWORK_RETRY_SUCCESSFUL_NETWORK_WAITS, MON_MESSAGE_NETWORK_RETRY_SUCCESSFUL_NETWORK_WAITS, PM_NOREMOVE))
+                            {
+                                // If there is another a pending retry successful wait message, skip this one
+                                continue;
+                            }
+                            ZeroMemory(rgfProcessedIndex, sizeof(rgfProcessedIndex));
+                            for (DWORD i = 0; i < pWaiterContext->cRequests; ++i)
+                            { 
+                                if (rgfProcessedIndex[i])
+                                {
+                                    // if we already processed this item due to UpdateWaitStatus swapping array indices, then skip it
+                                    continue;
+                                }
+                                if (MON_DIRECTORY == pWaiterContext->rgRequests[i].type && pWaiterContext->rgRequests[i].fNetwork && SUCCEEDED(pWaiterContext->rgRequests[i].hrStatus))
+                                {
+                                    // This is not a failure, just record this in the request's status
+                                    hrTemp = InitiateWait(pWaiterContext->rgRequests + i, pWaiterContext->rgHandles + i + 1);
+                                    hr = UpdateWaitStatus(hrTemp, pWaiterContext, i, &dwNewRequestIndex);
+                                    MonExitOnFailure(hr, "Failed to update wait status");
+                                    hrTemp = S_OK;
+                                    if (dwNewRequestIndex != i)
+                                    {
+                                        // If this request was moved to the end of the list, reprocess this index and mark the new index for skipping
+                                        rgfProcessedIndex[dwNewRequestIndex] = true;
+                                        --i;
+                                    }
+                                }
+                            }
+                            break;
+                        case MON_MESSAGE_NETWORK_STATUS_UPDATE:
+                            if (::PeekMessage(&msg, NULL, MON_MESSAGE_NETWORK_STATUS_UPDATE, MON_MESSAGE_NETWORK_STATUS_UPDATE, PM_NOREMOVE))
+                            {
+                                // If there is another a pending network status update message, skip this one
+                                continue;
+                            }
+                            ZeroMemory(rgfProcessedIndex, sizeof(rgfProcessedIndex));
+                            for (DWORD i = 0; i < pWaiterContext->cRequests; ++i)
+                            { 
+                                if (rgfProcessedIndex[i])
+                                {
+                                    // if we already processed this item due to UpdateWaitStatus swapping array indices, then skip it
+                                    continue;
+                                }
+                                if (MON_DIRECTORY == pWaiterContext->rgRequests[i].type && pWaiterContext->rgRequests[i].fNetwork)
+                                {
+                                    // Failures here get recorded in the request's status
+                                    hrTemp = InitiateWait(pWaiterContext->rgRequests + i, pWaiterContext->rgHandles + i + 1);
+                                    hr = UpdateWaitStatus(hrTemp, pWaiterContext, i, &dwNewRequestIndex);
+                                    MonExitOnFailure(hr, "Failed to update wait status");
+                                    hrTemp = S_OK;
+                                    if (dwNewRequestIndex != i)
+                                    {
+                                        // If this request was moved to the end of the list, reprocess this index and mark the new index for skipping
+                                        rgfProcessedIndex[dwNewRequestIndex] = true;
+                                        --i;
+                                    }
+                                }
+                            }
+                            break;
+                        case MON_MESSAGE_DRIVE_STATUS_UPDATE:
+                            ZeroMemory(rgfProcessedIndex, sizeof(rgfProcessedIndex));
+                            for (DWORD i = 0; i < pWaiterContext->cRequests; ++i)
+                            { 
+                                if (rgfProcessedIndex[i])
+                                {
+                                    // if we already processed this item due to UpdateWaitStatus swapping array indices, then skip it
+                                    continue;
+                                }
+                                if (MON_DIRECTORY == pWaiterContext->rgRequests[i].type && pWaiterContext->rgRequests[i].sczOriginalPathRequest[0] == static_cast<WCHAR>(msg.wParam))
+                                {
+                                    // Failures here get recorded in the request's status
+                                    if (static_cast<BOOL>(msg.lParam))
+                                    {
+                                        hrTemp = InitiateWait(pWaiterContext->rgRequests + i, pWaiterContext->rgHandles + i + 1);
+                                    }
+                                    else
+                                    {
+                                        // If the message says the drive is disconnected, don't even try to wait, just mark it as gone
+                                        hrTemp = E_PATHNOTFOUND;
+                                    }
+                                    hr = UpdateWaitStatus(hrTemp, pWaiterContext, i, &dwNewRequestIndex);
+                                    MonExitOnFailure(hr, "Failed to update wait status");
+                                    hrTemp = S_OK;
+                                    if (dwNewRequestIndex != i)
+                                    {
+                                        // If this request was moved to the end of the list, reprocess this index and mark the new index for skipping
+                                        rgfProcessedIndex[dwNewRequestIndex] = true;
+                                        --i;
+                                    }
+                                }
+                            }
+                            break;
+                        case MON_MESSAGE_DRIVE_QUERY_REMOVE:
+                            pInternalWait = reinterpret_cast<MON_INTERNAL_TEMPORARY_WAIT *>(msg.wParam);
+                            // Only do any work if message is not yet out of date
+                            // While it could become out of date while doing this processing, sending thread will check response to guard against this
+                            if (pInternalWait->dwSendIteration == static_cast<DWORD>(msg.lParam))
+                            {
+                                for (DWORD i = 0; i < pWaiterContext->cRequests; ++i)
+                                { 
+                                    if (MON_DIRECTORY == pWaiterContext->rgRequests[i].type && pWaiterContext->rgHandles[i + 1] == reinterpret_cast<HANDLE>(pInternalWait->pvContext))
+                                    {
+                                        // Release handles ASAP so the remove request will succeed
+                                        if (pWaiterContext->rgRequests[i].hNotify)
+                                        {
+                                            UnregisterDeviceNotification(pWaiterContext->rgRequests[i].hNotify);
+                                            pWaiterContext->rgRequests[i].hNotify = NULL;
+                                        }
+                                        ::FindCloseChangeNotification(pWaiterContext->rgHandles[i + 1]);
+                                        pWaiterContext->rgHandles[i + 1] = INVALID_HANDLE_VALUE;
+                                        // Reply to unblock our reply to the remove request
+                                        pInternalWait->dwReceiveIteration = static_cast<DWORD>(msg.lParam);
+                                        if (!::SetEvent(pInternalWait->hWait))
+                                        {
+                                            TraceError(HRESULT_FROM_WIN32(::GetLastError()), "Failed to set event to notify coordinator thread that removable device handle was released, this could be due to wndproc no longer waiting for waiter thread's response");
+                                        }
+                                        // Drive is disconnecting, don't even try to wait, just mark it as gone
+                                        hrTemp = E_PATHNOTFOUND;
+                                        hr = UpdateWaitStatus(hrTemp, pWaiterContext, i, &dwNewRequestIndex);
+                                        MonExitOnFailure(hr, "Failed to update wait status");
+                                        hrTemp = S_OK;
+                                        break;
+                                    }
+                                }
+                            }
+                            break;
+                        case MON_MESSAGE_STOP:
+                            // Stop requested, so abort the whole thread
+                            Trace(REPORT_DEBUG, "Waiter thread was told to stop");
+                            fAgain = FALSE;
+                            fContinue = FALSE;
+                            ExitFunction1(hr = static_cast<HRESULT>(msg.wParam));
+                        default:
+                            Assert(false);
+                            break;
+                    }
+                }
+            } while (fAgain);
+        }
+        else if (dwRet > WAIT_OBJECT_0 && dwRet - WAIT_OBJECT_0 < pWaiterContext->cHandles)
+        {
+            // OK a handle fired - only notify if it's the actual target, and not just some parent waiting for the target child to exist
+            dwRequestIndex = dwRet - WAIT_OBJECT_0 - 1;
+            fNotify = (pWaiterContext->rgRequests[dwRequestIndex].dwPathHierarchyIndex == pWaiterContext->rgRequests[dwRequestIndex].cPathHierarchy - 1);
+            // Initiate re-waits before we notify callback, to ensure we don't miss a single update
+            hrTemp = InitiateWait(pWaiterContext->rgRequests + dwRequestIndex, pWaiterContext->rgHandles + dwRequestIndex + 1);
+            hr = UpdateWaitStatus(hrTemp, pWaiterContext, dwRequestIndex, &dwRequestIndex);
+            MonExitOnFailure(hr, "Failed to update wait status");
+            hrTemp = S_OK;
+            // If there were no errors and we were already waiting on the right target, or if we weren't yet but are able to now, it's a successful notify
+            if (SUCCEEDED(pWaiterContext->rgRequests[dwRequestIndex].hrStatus) && (fNotify || (pWaiterContext->rgRequests[dwRequestIndex].dwPathHierarchyIndex == pWaiterContext->rgRequests[dwRequestIndex].cPathHierarchy - 1)))
+            {
+                Trace(REPORT_DEBUG, "Changes detected, waiting for silence period index %u", dwRequestIndex);
+                if (0 < pWaiterContext->rgRequests[dwRequestIndex].dwMaxSilencePeriodInMs)
+                {
+                    pWaiterContext->rgRequests[dwRequestIndex].dwSilencePeriodInMs = 0;
+                    pWaiterContext->rgRequests[dwRequestIndex].fSkipDeltaAdd = TRUE;
+                    if (!pWaiterContext->rgRequests[dwRequestIndex].fPendingFire)
+                    {
+                        pWaiterContext->rgRequests[dwRequestIndex].fPendingFire = TRUE;
+                        ++pWaiterContext->cRequestsPending;
+                    }
+                }
+                else
+                {
+                    // If no silence period, notify immediately
+                    Notify(S_OK, pWaiterContext, pWaiterContext->rgRequests + dwRequestIndex);
+                }
+            }
+        }
+        else if (WAIT_TIMEOUT != dwRet)
+        {
+            MonExitWithLastError(hr, "Failed to wait for multiple objects with return code %u", dwRet);
+        }
+        // OK, now that we've checked all triggered handles (resetting silence period timers appropriately), check for any pending notifications that we can finally fire
+        // And set dwWait appropriately so we awaken at the right time to fire the next pending notification (in case no further writes occur during that time)
+        if (0 < pWaiterContext->cRequestsPending)
+        {
+            // Start at max value and find the lowest wait we can below that
+            dwWait = DWORD_MAX;
+            cRequestsPendingBeforeLoop = pWaiterContext->cRequestsPending;
+            for (DWORD i = 0; i < pWaiterContext->cRequests; ++i)
+            {
+                if (pWaiterContext->rgRequests[i].fPendingFire)
+                {
+                    if (0 == cRequestsPendingBeforeLoop)
+                    {
+                        Assert(FALSE);
+                        hr = HRESULT_FROM_WIN32(ERROR_EA_LIST_INCONSISTENT);
+                        MonExitOnFailure(hr, "Phantom pending fires were found!");
+                    }
+                    --cRequestsPendingBeforeLoop;
+                    dwRequestIndex = i;
+                    if (pWaiterContext->rgRequests[dwRequestIndex].fSkipDeltaAdd)
+                    {
+                        pWaiterContext->rgRequests[dwRequestIndex].fSkipDeltaAdd = FALSE;
+                    }
+                    else
+                    {
+                        pWaiterContext->rgRequests[dwRequestIndex].dwSilencePeriodInMs += uDeltaInMs;
+                    }
+                    // silence period has elapsed without further notifications, so reset pending-related variables, and finally fire a notify!
+                    if (pWaiterContext->rgRequests[dwRequestIndex].dwSilencePeriodInMs >= pWaiterContext->rgRequests[dwRequestIndex].dwMaxSilencePeriodInMs)
+                    {
+                        Trace(REPORT_DEBUG, "Silence period surpassed, notifying %u ms late", pWaiterContext->rgRequests[dwRequestIndex].dwSilencePeriodInMs - pWaiterContext->rgRequests[dwRequestIndex].dwMaxSilencePeriodInMs);
+                        Notify(S_OK, pWaiterContext, pWaiterContext->rgRequests + dwRequestIndex);
+                    }
+                    else
+                    {
+                        // set dwWait to the shortest interval period so that if no changes occur, WaitForMultipleObjects
+                        // wakes the thread back up when it's time to fire the next pending notification
+                        if (dwWait > pWaiterContext->rgRequests[dwRequestIndex].dwMaxSilencePeriodInMs - pWaiterContext->rgRequests[dwRequestIndex].dwSilencePeriodInMs)
+                        {
+                            dwWait = pWaiterContext->rgRequests[dwRequestIndex].dwMaxSilencePeriodInMs - pWaiterContext->rgRequests[dwRequestIndex].dwSilencePeriodInMs;
+                        }
+                    }
+                }
+            }
+            // Some post-loop list validation for sanity checking
+            if (0 < cRequestsPendingBeforeLoop)
+            {
+                Assert(FALSE);
+                hr = HRESULT_FROM_WIN32(PEERDIST_ERROR_MISSING_DATA);
+                MonExitOnFailure(hr, "Missing %u pending fires! Total pending fires: %u, wait: %u", cRequestsPendingBeforeLoop, pWaiterContext->cRequestsPending, dwWait);
+            }
+            if (0 < pWaiterContext->cRequestsPending && DWORD_MAX == dwWait)
+            {
+                Assert(FALSE);
+                hr = HRESULT_FROM_WIN32(ERROR_CANT_WAIT);
+                MonExitOnFailure(hr, "Pending fires exist (%u), but wait was infinite", cRequestsPendingBeforeLoop);
+            }
+        }
+    } while (fContinue);
+    // Don't bother firing pending notifications. We were told to stop monitoring, so client doesn't care.
+LExit:
+    ReleaseStr(sczDirectory);
+    MonAddMessageDestroy(pAddMessage);
+    MonRemoveMessageDestroy(pRemoveMessage);
+    for (DWORD i = 0; i < pWaiterContext->cRequests; ++i)
+    {
+        MonRequestDestroy(pWaiterContext->rgRequests + i);
+        switch (pWaiterContext->rgRequests[i].type)
+        {
+        case MON_DIRECTORY:
+            if (INVALID_HANDLE_VALUE != pWaiterContext->rgHandles[i + 1])
+            {
+                ::FindCloseChangeNotification(pWaiterContext->rgHandles[i + 1]);
+            }
+            break;
+        case MON_REGKEY:
+            ReleaseHandle(pWaiterContext->rgHandles[i + 1]);
+            break;
+        default:
+            Assert(false);
+        }
+    }
+    if (FAILED(hr))
+    {
+        // If waiter thread fails, notify general callback of an error
+        Assert(pWaiterContext->vpfMonGeneral);
+        pWaiterContext->vpfMonGeneral(hr, pWaiterContext->pvContext);
+        // And tell coordinator to shut all other waiters down
+        if (!::PostThreadMessageW(pWaiterContext->dwCoordinatorThreadId, MON_MESSAGE_STOP, 0, 0))
+        {
+            TraceError(HRESULT_FROM_WIN32(::GetLastError()), "Failed to send message to coordinator thread to stop (due to general failure).");
+        }
+    }
+    return hr;
+}
+static void Notify(
+    __in HRESULT hr,
+    __in MON_WAITER_CONTEXT *pWaiterContext,
+    __in MON_REQUEST *pRequest
+    )
+{
+    if (pRequest->fPendingFire)
+    {
+        --pWaiterContext->cRequestsPending;
+    }
+    pRequest->fPendingFire = FALSE;
+    pRequest->fSkipDeltaAdd = FALSE;
+    pRequest->dwSilencePeriodInMs = 0;
+    switch (pRequest->type)
+    {
+    case MON_DIRECTORY:
+        Assert(pWaiterContext->vpfMonDirectory);
+        pWaiterContext->vpfMonDirectory(hr, pRequest->sczOriginalPathRequest, pRequest->fRecursive, pWaiterContext->pvContext, pRequest->pvContext);
+        break;
+    case MON_REGKEY:
+        Assert(pWaiterContext->vpfMonRegKey);
+        pWaiterContext->vpfMonRegKey(hr, pRequest->regkey.hkRoot, pRequest->rgsczPathHierarchy[pRequest->cPathHierarchy - 1], pRequest->regkey.kbKeyBitness, pRequest->fRecursive, pWaiterContext->pvContext, pRequest->pvContext);
+        break;
+    default:
+        Assert(false);
+    }
+}
+static BOOL GetRecursiveFlag(
+    __in MON_REQUEST *pRequest,
+    __in DWORD dwIndex
+    )
+{
+    if (pRequest->cPathHierarchy - 1 == dwIndex)
+    {
+        return pRequest->fRecursive;
+    }
+    else
+    {
+        return FALSE;
+    }
+}
+static HRESULT FindRequestIndex(
+    __in MON_WAITER_CONTEXT *pWaiterContext,
+    __in MON_REMOVE_MESSAGE *pMessage,
+    __out DWORD *pdwIndex
+    )
+{
+    HRESULT hr = S_OK;
+    for (DWORD i = 0; i < pWaiterContext->cRequests; ++i)
+    {
+        if (pWaiterContext->rgRequests[i].type == pMessage->type)
+        {
+            switch (pWaiterContext->rgRequests[i].type)
+            {
+            case MON_DIRECTORY:
+                if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pWaiterContext->rgRequests[i].rgsczPathHierarchy[pWaiterContext->rgRequests[i].cPathHierarchy - 1], -1, pMessage->directory.sczDirectory, -1) && pWaiterContext->rgRequests[i].fRecursive == pMessage->fRecursive)
+                {
+                    *pdwIndex = i;
+                    ExitFunction1(hr = S_OK);
+                }
+                break;
+            case MON_REGKEY:
+                if (reinterpret_cast<DWORD_PTR>(pMessage->regkey.hkRoot) == reinterpret_cast<DWORD_PTR>(pWaiterContext->rgRequests[i].regkey.hkRoot) && CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pWaiterContext->rgRequests[i].rgsczPathHierarchy[pWaiterContext->rgRequests[i].cPathHierarchy - 1], -1, pMessage->regkey.sczSubKey, -1) && pWaiterContext->rgRequests[i].fRecursive == pMessage->fRecursive && pWaiterContext->rgRequests[i].regkey.kbKeyBitness == pMessage->regkey.kbKeyBitness)
+                {
+                    *pdwIndex = i;
+                    ExitFunction1(hr = S_OK);
+                }
+                break;
+            default:
+                Assert(false);
+            }
+        }
+    }
+    hr = E_NOTFOUND;
+LExit:
+    return hr;
+}
+static HRESULT RemoveRequest(
+    __inout MON_WAITER_CONTEXT *pWaiterContext,
+    __in DWORD dwRequestIndex
+    )
+{
+    HRESULT hr = S_OK;
+    MonRequestDestroy(pWaiterContext->rgRequests + dwRequestIndex);
+    switch (pWaiterContext->rgRequests[dwRequestIndex].type)
+    {
+    case MON_DIRECTORY:
+        if (pWaiterContext->rgHandles[dwRequestIndex + 1] != INVALID_HANDLE_VALUE)
+        {
+            ::FindCloseChangeNotification(pWaiterContext->rgHandles[dwRequestIndex + 1]);
+        }
+        break;
+    case MON_REGKEY:
+        ReleaseHandle(pWaiterContext->rgHandles[dwRequestIndex + 1]);
+        break;
+    default:
+        Assert(false);
+    }
+    if (pWaiterContext->rgRequests[dwRequestIndex].fPendingFire)
+    {
+        --pWaiterContext->cRequestsPending;
+    }
+    if (FAILED(pWaiterContext->rgRequests[dwRequestIndex].hrStatus))
+    {
+        --pWaiterContext->cRequestsFailing;
+    }
+    MemRemoveFromArray(reinterpret_cast<void *>(pWaiterContext->rgHandles), dwRequestIndex + 1, 1, pWaiterContext->cHandles, sizeof(HANDLE), TRUE);
+    --pWaiterContext->cHandles;
+    MemRemoveFromArray(reinterpret_cast<void *>(pWaiterContext->rgRequests), dwRequestIndex, 1, pWaiterContext->cRequests, sizeof(MON_REQUEST), TRUE);
+    --pWaiterContext->cRequests;
+    // Notify coordinator thread that a wait was removed
+    if (!::PostThreadMessageW(pWaiterContext->dwCoordinatorThreadId, MON_MESSAGE_REMOVED, static_cast<WPARAM>(::GetCurrentThreadId()), 0))
+    {
+        MonExitWithLastError(hr, "Failed to send message to coordinator thread to confirm directory was removed.");
+    }
+LExit:
+    return hr;
+}
+static REGSAM GetRegKeyBitness(
+    __in MON_REQUEST *pRequest
+    )
+{
+    if (REG_KEY_32BIT == pRequest->regkey.kbKeyBitness)
+    {
+        return KEY_WOW64_32KEY;
+    }
+    else if (REG_KEY_64BIT == pRequest->regkey.kbKeyBitness)
+    {
+        return KEY_WOW64_64KEY;
+    }
+    else
+    {
+        return 0;
+    }
+}
+static HRESULT DuplicateRemoveMessage(
+    __in MON_REMOVE_MESSAGE *pMessage,
+    __out MON_REMOVE_MESSAGE **ppMessage
+    )
+{
+    HRESULT hr = S_OK;
+    *ppMessage = reinterpret_cast<MON_REMOVE_MESSAGE *>(MemAlloc(sizeof(MON_REMOVE_MESSAGE), TRUE));
+    MonExitOnNull(*ppMessage, hr, E_OUTOFMEMORY, "Failed to allocate copy of remove message");
+    (*ppMessage)->type = pMessage->type;
+    (*ppMessage)->fRecursive = pMessage->fRecursive;
+    switch (pMessage->type)
+    {
+    case MON_DIRECTORY:
+        hr = StrAllocString(&(*ppMessage)->directory.sczDirectory, pMessage->directory.sczDirectory, 0);
+        MonExitOnFailure(hr, "Failed to copy directory");
+        break;
+    case MON_REGKEY:
+        (*ppMessage)->regkey.hkRoot = pMessage->regkey.hkRoot;
+        (*ppMessage)->regkey.kbKeyBitness = pMessage->regkey.kbKeyBitness;
+        hr = StrAllocString(&(*ppMessage)->regkey.sczSubKey, pMessage->regkey.sczSubKey, 0);
+        MonExitOnFailure(hr, "Failed to copy subkey");
+        break;
+    default:
+        Assert(false);
+        break;
+    }
+LExit:
+    return hr;
+}
+static LRESULT CALLBACK MonWndProc(
+    __in HWND hWnd,
+    __in UINT uMsg,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    )
+{
+    HRESULT hr = S_OK;
+    DEV_BROADCAST_HDR *pHdr = NULL;
+    DEV_BROADCAST_HANDLE *pHandle = NULL;
+    DEV_BROADCAST_VOLUME *pVolume = NULL;
+    DWORD dwUnitMask = 0;
+    DWORD er = ERROR_SUCCESS;
+    WCHAR chDrive = L'\0';
+    BOOL fArrival = FALSE;
+    BOOL fReturnTrue = FALSE;
+    CREATESTRUCT *pCreateStruct = NULL;
+    MON_WAITER_CONTEXT *pWaiterContext = NULL;
+    MON_STRUCT *pm = NULL;
+    // keep track of the MON_STRUCT pointer that was passed in on init, associate it with the window
+    if (WM_CREATE == uMsg)
+    {
+        pCreateStruct = reinterpret_cast<CREATESTRUCT *>(lParam);
+        if (pCreateStruct)
+        {
+            ::SetWindowLongPtrW(hWnd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(pCreateStruct->lpCreateParams));
+        }
+    }
+    else if (WM_NCDESTROY == uMsg)
+    {
+        ::SetWindowLongPtrW(hWnd, GWLP_USERDATA, 0);
+    }
+    // Note this message ONLY comes in through WndProc, it isn't visible from the GetMessage loop.
+    else if (WM_DEVICECHANGE == uMsg)
+    {
+        if (DBT_DEVICEARRIVAL == wParam || DBT_DEVICEREMOVECOMPLETE == wParam)
+        {
+            fArrival = DBT_DEVICEARRIVAL == wParam;
+            pHdr = reinterpret_cast<DEV_BROADCAST_HDR*>(lParam);
+            if (DBT_DEVTYP_VOLUME == pHdr->dbch_devicetype)
+            {
+                pVolume = reinterpret_cast<DEV_BROADCAST_VOLUME*>(lParam);
+                dwUnitMask = pVolume->dbcv_unitmask;
+                chDrive = L'a';
+                while (0 < dwUnitMask)
+                {
+                    if (dwUnitMask & 0x1)
+                    {
+                        // This drive had a status update, so send it out to all threads
+                        if (!::PostThreadMessageW(::GetCurrentThreadId(), MON_MESSAGE_DRIVE_STATUS_UPDATE, static_cast<WPARAM>(chDrive), static_cast<LPARAM>(fArrival)))
+                        {
+                            MonExitWithLastError(hr, "Failed to send drive status update with drive %wc and arrival %ls", chDrive, fArrival ? L"TRUE" : L"FALSE");
+                        }
+                    }
+                    dwUnitMask >>= 1;
+                    ++chDrive;
+                    if (chDrive == 'z')
+                    {
+                        hr = E_UNEXPECTED;
+                        MonExitOnFailure(hr, "UnitMask showed drives beyond z:. Remaining UnitMask at this point: %u", dwUnitMask);
+                    }
+                }
+            }
+        }
+        // We can only process device query remove messages if we have a MON_STRUCT pointer
+        else if (DBT_DEVICEQUERYREMOVE == wParam)
+        {
+            pm = reinterpret_cast<MON_STRUCT*>(::GetWindowLongPtrW(hWnd, GWLP_USERDATA));
+            if (!pm)
+            {
+                hr = E_POINTER;
+                MonExitOnFailure(hr, "DBT_DEVICEQUERYREMOVE message received with no MON_STRUCT pointer, so message was ignored");
+            }
+            fReturnTrue = TRUE;
+            pHdr = reinterpret_cast<DEV_BROADCAST_HDR*>(lParam);
+            if (DBT_DEVTYP_HANDLE == pHdr->dbch_devicetype)
+            {
+                // We must wait for the actual wait handle to be released by waiter thread before telling windows to proceed with device removal, otherwise it could fail
+                // due to handles still being open, so use a MON_INTERNAL_TEMPORARY_WAIT struct to send and receive a reply from a waiter thread
+                pm->internalWait.hWait = ::CreateEventW(NULL, TRUE, FALSE, NULL);
+                MonExitOnNullWithLastError(pm->internalWait.hWait, hr, "Failed to create anonymous event for waiter to notify wndproc device can be removed");
+                pHandle = reinterpret_cast<DEV_BROADCAST_HANDLE*>(lParam);
+                pm->internalWait.pvContext = pHandle->dbch_handle;
+                pm->internalWait.dwReceiveIteration = pm->internalWait.dwSendIteration - 1;
+                // This drive had a status update, so send it out to all threads
+                for (DWORD i = 0; i < pm->cWaiterThreads; ++i)
+                {
+                    pWaiterContext = pm->rgWaiterThreads[i].pWaiterContext;
+                    if (!::PostThreadMessageW(pWaiterContext->dwWaiterThreadId, MON_MESSAGE_DRIVE_QUERY_REMOVE, reinterpret_cast<WPARAM>(&pm->internalWait), static_cast<LPARAM>(pm->internalWait.dwSendIteration)))
+                    {
+                        MonExitWithLastError(hr, "Failed to send message to waiter thread to notify of drive query remove");
+                    }
+                    if (!::SetEvent(pWaiterContext->rgHandles[0]))
+                    {
+                        MonExitWithLastError(hr, "Failed to set event to notify waiter thread of incoming drive query remove message");
+                    }
+                }
+                er = ::WaitForSingleObject(pm->internalWait.hWait, MON_THREAD_WAIT_REMOVE_DEVICE);
+                // Make sure any waiter thread processing really old messages can immediately know that we're no longer waiting for a response
+                if (WAIT_OBJECT_0 == er)
+                {
+                    // If the response ID matches what we sent, we actually got a valid reply!
+                    if (pm->internalWait.dwReceiveIteration != pm->internalWait.dwSendIteration)
+                    {
+                        TraceError(HRESULT_FROM_WIN32(er), "Waiter thread received wrong ID reply");
+                    }
+                }
+                else if (WAIT_TIMEOUT == er)
+                {
+                    TraceError(HRESULT_FROM_WIN32(er), "No response from any waiter thread for query remove message");
+                }
+                else
+                {
+                    MonExitWithLastError(hr, "WaitForSingleObject failed with non-timeout reason while waiting for response from waiter thread");
+                }
+                ++pm->internalWait.dwSendIteration;
+            }
+        }
+    }
+LExit:
+    if (pm)
+    {
+        ReleaseHandle(pm->internalWait.hWait);
+    }
+    if (fReturnTrue)
+    {
+        return TRUE;
+    }
+    else
+    {
+        return ::DefWindowProcW(hWnd, uMsg, wParam, lParam);
+    }
+}
+static HRESULT CreateMonWindow(
+    __in MON_STRUCT *pm,
+    __out HWND *pHwnd
+    )
+{
+    HRESULT hr = S_OK;
+    WNDCLASSW wc = { };
+    wc.lpfnWndProc = MonWndProc;
+    wc.hInstance = ::GetModuleHandleW(NULL);
+    wc.lpszClassName = MONUTIL_WINDOW_CLASS;
+    if (!::RegisterClassW(&wc))
+    {
+        if (ERROR_CLASS_ALREADY_EXISTS != ::GetLastError())
+        {
+            MonExitWithLastError(hr, "Failed to register MonUtil window class.");
+        }
+    }
+    *pHwnd = ::CreateWindowExW(0, wc.lpszClassName, L"", 0, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, HWND_DESKTOP, NULL, wc.hInstance, pm);
+    MonExitOnNullWithLastError(*pHwnd, hr, "Failed to create window.");
+    // Rumor has it that drive arrival / removal events can be lost in the rare event that some other application higher up in z-order is hanging if we don't make our window topmost
+    // SWP_NOACTIVATE is important so the currently active window doesn't lose focus
+    SetWindowPos(*pHwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_DEFERERASE | SWP_NOACTIVATE);
+LExit:
+    return hr;
+}
+static HRESULT WaitForNetworkChanges(
+    __inout HANDLE *phMonitor,
+    __in MON_STRUCT *pm
+    )
+{
+    HRESULT hr = S_OK;
+    int nResult = 0;
+    DWORD dwBytesReturned = 0;
+    WSACOMPLETION wsaCompletion = { };
+    WSAQUERYSET qsRestrictions = { };
+    qsRestrictions.dwSize = sizeof(WSAQUERYSET);
+    qsRestrictions.dwNameSpace = NS_NLA;
+    if (NULL != *phMonitor)
+    {
+        ::WSALookupServiceEnd(*phMonitor);
+        *phMonitor = NULL;
+    }
+    if (::WSALookupServiceBegin(&qsRestrictions, LUP_RETURN_ALL, phMonitor))
+    {
+        hr = HRESULT_FROM_WIN32(::WSAGetLastError());
+        MonExitOnFailure(hr, "WSALookupServiceBegin() failed");
+    }
+    wsaCompletion.Type = NSP_NOTIFY_HWND;
+    wsaCompletion.Parameters.WindowMessage.hWnd = pm->hwnd;
+    wsaCompletion.Parameters.WindowMessage.uMsg = MON_MESSAGE_NETWORK_STATUS_UPDATE;
+    nResult = ::WSANSPIoctl(*phMonitor, SIO_NSP_NOTIFY_CHANGE, NULL, 0, NULL, 0, &dwBytesReturned, &wsaCompletion);
+    if (SOCKET_ERROR != nResult || WSA_IO_PENDING != ::WSAGetLastError())
+    {
+        hr = HRESULT_FROM_WIN32(::WSAGetLastError());
+        if (SUCCEEDED(hr))
+        {
+            hr = E_FAIL;
+        }
+        MonExitOnFailure(hr, "WSANSPIoctl() failed with return code %i, wsa last error %u", nResult, ::WSAGetLastError());
+    }
+LExit:
+    return hr;
+}
+static HRESULT UpdateWaitStatus(
+    __in HRESULT hrNewStatus,
+    __inout MON_WAITER_CONTEXT *pWaiterContext,
+    __in DWORD dwRequestIndex,
+    __out_opt DWORD *pdwNewRequestIndex
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD dwNewRequestIndex;
+    MON_REQUEST *pRequest = pWaiterContext->rgRequests + dwRequestIndex;
+    if (NULL != pdwNewRequestIndex)
+    {
+        *pdwNewRequestIndex = dwRequestIndex;
+    }
+    if (SUCCEEDED(pRequest->hrStatus) || SUCCEEDED(hrNewStatus))
+    {
+        // If it's a network wait, notify as long as it's new status is successful because we *may* have lost some changes
+        // before the wait was re-initiated. Otherwise, only notify if there was an interesting status change
+        if (SUCCEEDED(pRequest->hrStatus) != SUCCEEDED(hrNewStatus) || (pRequest->fNetwork && SUCCEEDED(hrNewStatus)))
+        {
+            Notify(hrNewStatus, pWaiterContext, pRequest);
+        }
+        if (SUCCEEDED(pRequest->hrStatus) && FAILED(hrNewStatus))
+        {
+            // If it's a network wait, notify coordinator thread that a network wait is failing
+            if (pRequest->fNetwork && !::PostThreadMessageW(pWaiterContext->dwCoordinatorThreadId, MON_MESSAGE_NETWORK_WAIT_FAILED, 0, 0))
+            {
+                MonExitWithLastError(hr, "Failed to send message to coordinator thread to notify a network wait started to fail");
+            }
+            // Move the failing wait to the end of the list of waits and increment cRequestsFailing so WaitForMultipleObjects isn't passed an invalid handle
+            ++pWaiterContext->cRequestsFailing;
+            dwNewRequestIndex = pWaiterContext->cRequests - 1;
+            MemArraySwapItems(reinterpret_cast<void *>(pWaiterContext->rgHandles), dwRequestIndex + 1, dwNewRequestIndex + 1, sizeof(*pWaiterContext->rgHandles));
+            MemArraySwapItems(reinterpret_cast<void *>(pWaiterContext->rgRequests), dwRequestIndex, dwNewRequestIndex, sizeof(*pWaiterContext->rgRequests));
+            // Reset pRequest to the newly swapped item
+            pRequest = pWaiterContext->rgRequests + dwNewRequestIndex;
+            if (NULL != pdwNewRequestIndex)
+            {
+                *pdwNewRequestIndex = dwNewRequestIndex;
+            }
+        }
+        else if (FAILED(pRequest->hrStatus) && SUCCEEDED(hrNewStatus))
+        {
+            Assert(pWaiterContext->cRequestsFailing > 0);
+            // If it's a network wait, notify coordinator thread that a network wait is succeeding again
+            if (pRequest->fNetwork && !::PostThreadMessageW(pWaiterContext->dwCoordinatorThreadId, MON_MESSAGE_NETWORK_WAIT_SUCCEEDED, 0, 0))
+            {
+                MonExitWithLastError(hr, "Failed to send message to coordinator thread to notify a network wait is succeeding again");
+            }
+            --pWaiterContext->cRequestsFailing;
+            dwNewRequestIndex = 0;
+            MemArraySwapItems(reinterpret_cast<void *>(pWaiterContext->rgHandles), dwRequestIndex + 1, dwNewRequestIndex + 1, sizeof(*pWaiterContext->rgHandles));
+            MemArraySwapItems(reinterpret_cast<void *>(pWaiterContext->rgRequests), dwRequestIndex, dwNewRequestIndex, sizeof(*pWaiterContext->rgRequests));
+            // Reset pRequest to the newly swapped item
+            pRequest = pWaiterContext->rgRequests + dwNewRequestIndex;
+            if (NULL != pdwNewRequestIndex)
+            {
+                *pdwNewRequestIndex = dwNewRequestIndex;
+            }
+        }
+    }
+    pRequest->hrStatus = hrNewStatus;
+LExit:
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/osutil.cpp b/src/libs/dutil/WixToolset.DUtil/osutil.cpp
new file mode 100644
index 00000000..880ec3ea
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/osutil.cpp
@@ -0,0 +1,251 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define OsExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_OSUTIL, x, s, __VA_ARGS__)
+#define OsExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_OSUTIL, x, s, __VA_ARGS__)
+#define OsExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_OSUTIL, x, s, __VA_ARGS__)
+#define OsExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_OSUTIL, x, s, __VA_ARGS__)
+#define OsExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_OSUTIL, x, s, __VA_ARGS__)
+#define OsExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_OSUTIL, x, s, __VA_ARGS__)
+#define OsExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_OSUTIL, p, x, e, s, __VA_ARGS__)
+#define OsExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_OSUTIL, p, x, s, __VA_ARGS__)
+#define OsExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_OSUTIL, p, x, e, s, __VA_ARGS__)
+#define OsExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_OSUTIL, p, x, s, __VA_ARGS__)
+#define OsExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_OSUTIL, e, x, s, __VA_ARGS__)
+#define OsExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_OSUTIL, g, x, s, __VA_ARGS__)
+typedef NTSTATUS(NTAPI* PFN_RTL_GET_VERSION)(_Out_ PRTL_OSVERSIONINFOEXW lpVersionInformation);
+OS_VERSION vOsVersion = OS_VERSION_UNKNOWN;
+DWORD vdwOsServicePack = 0;
+RTL_OSVERSIONINFOEXW vovix = { };
+/********************************************************************
+ OsGetVersion
+********************************************************************/
+extern "C" void DAPI OsGetVersion(
+    __out OS_VERSION* pVersion,
+    __out DWORD* pdwServicePack
+    )
+{
+    OSVERSIONINFOEXW ovi = { };
+    if (OS_VERSION_UNKNOWN == vOsVersion)
+    {
+        ovi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW);
+#pragma warning (push)
+#pragma warning(suppress: 4996) // deprecated
+#pragma warning (push)
+#pragma warning(suppress: 28159)// deprecated, use other function instead
+        ::GetVersionExW(reinterpret_cast<OSVERSIONINFOW*>(&ovi)); // only fails if version info size is set incorrectly.
+#pragma warning (pop)
+#pragma warning (pop)
+        vdwOsServicePack = static_cast<DWORD>(ovi.wServicePackMajor) << 16 | ovi.wServicePackMinor;
+        if (4 == ovi.dwMajorVersion)
+        {
+            vOsVersion = OS_VERSION_WINNT;
+        }
+        else if (5 == ovi.dwMajorVersion)
+        {
+            if (0 == ovi.dwMinorVersion)
+            {
+                vOsVersion = OS_VERSION_WIN2000;
+            }
+            else if (1 == ovi.dwMinorVersion)
+            {
+                vOsVersion = OS_VERSION_WINXP;
+            }
+            else if (2 == ovi.dwMinorVersion)
+            {
+                vOsVersion = OS_VERSION_WIN2003;
+            }
+            else
+            {
+                vOsVersion = OS_VERSION_FUTURE;
+            }
+        }
+        else if (6 == ovi.dwMajorVersion)
+        {
+            if (0 == ovi.dwMinorVersion)
+            {
+                vOsVersion = (VER_NT_WORKSTATION == ovi.wProductType) ? OS_VERSION_VISTA : OS_VERSION_WIN2008;
+            }
+            else if (1 == ovi.dwMinorVersion)
+            {
+                vOsVersion = (VER_NT_WORKSTATION == ovi.wProductType) ? OS_VERSION_WIN7 : OS_VERSION_WIN2008_R2;
+            }
+            else
+            {
+                vOsVersion = OS_VERSION_FUTURE;
+            }
+        }
+        else
+        {
+            vOsVersion = OS_VERSION_FUTURE;
+        }
+    }
+    *pVersion = vOsVersion;
+    *pdwServicePack = vdwOsServicePack;
+}
+extern "C" HRESULT DAPI OsCouldRunPrivileged(
+    __out BOOL* pfPrivileged
+    )
+{
+    HRESULT hr = S_OK;
+    BOOL fUacEnabled = FALSE;
+    SID_IDENTIFIER_AUTHORITY NtAuthority = SECURITY_NT_AUTHORITY;
+    PSID AdministratorsGroup = NULL;
+    // Do a best effort check to see if UAC is enabled on this machine.
+    OsIsUacEnabled(&fUacEnabled);
+    // If UAC is enabled then the process could run privileged by asking to elevate.
+    if (fUacEnabled)
+    {
+        *pfPrivileged = TRUE;
+    }
+    else // no UAC so only privilged if user is in administrators group.
+    {
+        *pfPrivileged = ::AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &AdministratorsGroup);
+        if (*pfPrivileged)
+        {
+            if (!::CheckTokenMembership(NULL, AdministratorsGroup, pfPrivileged))
+            {
+                 *pfPrivileged = FALSE;
+            }
+        }
+    }
+    ReleaseSid(AdministratorsGroup);
+    return hr;
+}
+extern "C" HRESULT DAPI OsIsRunningPrivileged(
+    __out BOOL* pfPrivileged
+    )
+{
+    HRESULT hr = S_OK;
+    UINT er = ERROR_SUCCESS;
+    HANDLE hToken = NULL;
+    TOKEN_ELEVATION_TYPE elevationType = TokenElevationTypeDefault;
+    DWORD dwSize = 0;
+    SID_IDENTIFIER_AUTHORITY NtAuthority = SECURITY_NT_AUTHORITY;
+    PSID AdministratorsGroup = NULL;
+    if (!::OpenProcessToken(::GetCurrentProcess(), TOKEN_QUERY, &hToken))
+    {
+        OsExitOnLastError(hr, "Failed to open process token.");
+    }
+    if (::GetTokenInformation(hToken, TokenElevationType, &elevationType, sizeof(TOKEN_ELEVATION_TYPE), &dwSize))
+    {
+        *pfPrivileged = (TokenElevationTypeFull == elevationType);
+        ExitFunction1(hr = S_OK);
+    }
+    // If it's invalid argument, this means they don't support TokenElevationType, and we should fallback to another check
+    er = ::GetLastError();
+    if (ERROR_INVALID_FUNCTION == er)
+    {
+        er = ERROR_SUCCESS;
+    }
+    OsExitOnWin32Error(er, hr, "Failed to get process token information.");
+    // Fallback to this check for some OS's (like XP)
+    *pfPrivileged = ::AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &AdministratorsGroup);
+    if (*pfPrivileged)
+    {
+        if (!::CheckTokenMembership(NULL, AdministratorsGroup, pfPrivileged))
+        {
+             *pfPrivileged = FALSE;
+        }
+    }
+LExit:
+    ReleaseSid(AdministratorsGroup);
+    if (hToken)
+    {
+        ::CloseHandle(hToken);
+    }
+    return hr;
+}
+extern "C" HRESULT DAPI OsIsUacEnabled(
+    __out BOOL* pfUacEnabled
+    )
+{
+    HRESULT hr = S_OK;
+    HKEY hk = NULL;
+    DWORD dwUacEnabled = 0;
+    *pfUacEnabled = FALSE; // assume UAC not enabled.
+    hr = RegOpen(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Policies\\System", KEY_READ, &hk);
+    if (E_FILENOTFOUND == hr)
+    {
+        ExitFunction1(hr = S_OK);
+    }
+    OsExitOnFailure(hr, "Failed to open system policy key to detect UAC.");
+    hr = RegReadNumber(hk, L"EnableLUA", &dwUacEnabled);
+    if (E_FILENOTFOUND == hr)
+    {
+        ExitFunction1(hr = S_OK);
+    }
+    OsExitOnFailure(hr, "Failed to read registry value to detect UAC.");
+    *pfUacEnabled = (0 != dwUacEnabled);
+LExit:
+    ReleaseRegKey(hk);
+    return hr;
+}
+HRESULT DAPI OsRtlGetVersion(
+    __inout RTL_OSVERSIONINFOEXW* pOvix
+    )
+{
+    HRESULT hr = S_OK;
+    HMODULE hNtdll = NULL;
+    PFN_RTL_GET_VERSION pfnRtlGetVersion = NULL;
+    if (vovix.dwOSVersionInfoSize)
+    {
+        ExitFunction();
+    }
+    vovix.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW);
+    hr = LoadSystemLibrary(L"ntdll.dll", &hNtdll);
+    if (E_MODNOTFOUND == hr)
+    {
+        OsExitOnRootFailure(hr = E_NOTIMPL, "Failed to load ntdll.dll");
+    }
+    OsExitOnFailure(hr, "Failed to load ntdll.dll.");
+    pfnRtlGetVersion = reinterpret_cast<PFN_RTL_GET_VERSION>(::GetProcAddress(hNtdll, "RtlGetVersion"));
+    OsExitOnNullWithLastError(pfnRtlGetVersion, hr, "Failed to locate RtlGetVersion.");
+    hr = static_cast<HRESULT>(pfnRtlGetVersion(&vovix));
+LExit:
+    memcpy(pOvix, &vovix, sizeof(RTL_OSVERSIONINFOEXW));
+    if (hNtdll)
+    {
+        ::FreeLibrary(hNtdll);
+    }
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/packages.config b/src/libs/dutil/WixToolset.DUtil/packages.config
new file mode 100644
index 00000000..5bbcd994
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" />
+  <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
+  <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
+  <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
+</packages>
+\ No newline at end of file
diff --git a/src/libs/dutil/WixToolset.DUtil/path2utl.cpp b/src/libs/dutil/WixToolset.DUtil/path2utl.cpp
new file mode 100644
index 00000000..ff3a946d
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/path2utl.cpp
@@ -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.
+#include "precomp.h"
+// Exit macros
+#define PathExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_PATHUTIL, x, s, __VA_ARGS__)
+#define PathExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_PATHUTIL, x, s, __VA_ARGS__)
+#define PathExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_PATHUTIL, x, s, __VA_ARGS__)
+#define PathExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_PATHUTIL, x, s, __VA_ARGS__)
+#define PathExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_PATHUTIL, x, s, __VA_ARGS__)
+#define PathExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_PATHUTIL, x, s, __VA_ARGS__)
+#define PathExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_PATHUTIL, p, x, e, s, __VA_ARGS__)
+#define PathExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_PATHUTIL, p, x, s, __VA_ARGS__)
+#define PathExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_PATHUTIL, p, x, e, s, __VA_ARGS__)
+#define PathExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_PATHUTIL, p, x, s, __VA_ARGS__)
+#define PathExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_PATHUTIL, e, x, s, __VA_ARGS__)
+#define PathExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_PATHUTIL, g, x, s, __VA_ARGS__)
+DAPI_(HRESULT) PathCanonicalizePath(
+    __in_z LPCWSTR wzPath,
+    __deref_out_z LPWSTR* psczCanonicalized
+    )
+{
+    HRESULT hr = S_OK;
+    int cch = MAX_PATH + 1;
+    hr = StrAlloc(psczCanonicalized, cch);
+    PathExitOnFailure(hr, "Failed to allocate string for the canonicalized path.");
+    if (::PathCanonicalizeW(*psczCanonicalized, wzPath))
+    {
+        hr = S_OK;
+    }
+    else
+    {
+        ExitFunctionWithLastError(hr);
+    }
+LExit:
+    return hr;
+}
+DAPI_(HRESULT) PathDirectoryContainsPath(
+    __in_z LPCWSTR wzDirectory,
+    __in_z LPCWSTR wzPath
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczPath = NULL;
+    LPWSTR sczDirectory = NULL;
+    LPWSTR sczOriginalPath = NULL;
+    LPWSTR sczOriginalDirectory = NULL;
+    hr = PathCanonicalizePath(wzPath, &sczOriginalPath);
+    PathExitOnFailure(hr, "Failed to canonicalize the path.");
+    hr = PathCanonicalizePath(wzDirectory, &sczOriginalDirectory);
+    PathExitOnFailure(hr, "Failed to canonicalize the directory.");
+    if (!sczOriginalPath || !*sczOriginalPath)
+    {
+        ExitFunction1(hr = S_FALSE);
+    }
+    if (!sczOriginalDirectory || !*sczOriginalDirectory)
+    {
+        ExitFunction1(hr = S_FALSE);
+    }
+    sczPath = sczOriginalPath;
+    sczDirectory = sczOriginalDirectory;
+    for (; *sczDirectory;)
+    {
+        if (!*sczPath)
+        {
+            ExitFunction1(hr = S_FALSE);
+        }
+        if (CSTR_EQUAL != ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, sczDirectory, 1, sczPath, 1))
+        {
+            ExitFunction1(hr = S_FALSE);
+        }
+        ++sczDirectory;
+        ++sczPath;
+    }
+    --sczDirectory;
+    if (('\\' == *sczDirectory && *sczPath) || '\\' == *sczPath)
+    {
+        hr = S_OK;
+    }
+    else
+    {
+        hr = S_FALSE;
+    }
+LExit:
+    ReleaseStr(sczOriginalPath);
+    ReleaseStr(sczOriginalDirectory);
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/pathutil.cpp b/src/libs/dutil/WixToolset.DUtil/pathutil.cpp
new file mode 100644
index 00000000..7c3cfe06
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/pathutil.cpp
@@ -0,0 +1,1083 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define PathExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_PATHUTIL, x, s, __VA_ARGS__)
+#define PathExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_PATHUTIL, x, s, __VA_ARGS__)
+#define PathExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_PATHUTIL, x, s, __VA_ARGS__)
+#define PathExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_PATHUTIL, x, s, __VA_ARGS__)
+#define PathExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_PATHUTIL, x, s, __VA_ARGS__)
+#define PathExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_PATHUTIL, x, s, __VA_ARGS__)
+#define PathExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_PATHUTIL, p, x, e, s, __VA_ARGS__)
+#define PathExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_PATHUTIL, p, x, s, __VA_ARGS__)
+#define PathExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_PATHUTIL, p, x, e, s, __VA_ARGS__)
+#define PathExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_PATHUTIL, p, x, s, __VA_ARGS__)
+#define PathExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_PATHUTIL, e, x, s, __VA_ARGS__)
+#define PathExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_PATHUTIL, g, x, s, __VA_ARGS__)
+#define PATH_GOOD_ENOUGH 64
+DAPI_(HRESULT) PathCommandLineAppend(
+    __deref_inout_z LPWSTR* psczCommandLine,
+    __in_z LPCWSTR wzArgument
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczQuotedArg = NULL;
+    BOOL fRequiresQuoting = FALSE;
+    DWORD dwMaxEscapedSize = 0;
+    // Loop through the argument determining if it needs to be quoted and what the maximum
+    // size would be if there are escape characters required.
+    for (LPCWSTR pwz = wzArgument; *pwz; ++pwz)
+    {
+        // Arguments with whitespace need quoting.
+        if (L' ' == *pwz || L'\t' == *pwz || L'\n' == *pwz || L'\v' == *pwz)
+        {
+            fRequiresQuoting = TRUE;
+        }
+        else if (L'"' == *pwz) // quotes need quoting and sometimes escaping.
+        {
+            fRequiresQuoting = TRUE;
+            ++dwMaxEscapedSize;
+        }
+        else if (L'\\' == *pwz) // some backslashes need escaping, so we'll count them all to make sure there is room.
+        {
+            ++dwMaxEscapedSize;
+        }
+        ++dwMaxEscapedSize;
+    }
+    // If we found anything in the argument that requires our argument to be quoted
+    if (fRequiresQuoting)
+    {
+        hr = StrAlloc(&sczQuotedArg, dwMaxEscapedSize + 3); // plus three for the start and end quote plus null terminator.
+        PathExitOnFailure(hr, "Failed to allocate argument to be quoted.");
+        LPCWSTR pwz = wzArgument; 
+        LPWSTR pwzQuoted = sczQuotedArg;
+        *pwzQuoted = L'"';
+        ++pwzQuoted;
+        while (*pwz)
+        {
+            DWORD dwBackslashes = 0;
+            while (L'\\' == *pwz)
+            {
+                ++dwBackslashes;
+                ++pwz;
+            }
+            // Escape all backslashes at the end of the string.
+            if (!*pwz)
+            {
+                dwBackslashes *= 2;
+            }
+            else if (L'"' == *pwz) // escape all backslashes before the quote and escape the quote itself.
+            {
+                dwBackslashes = dwBackslashes * 2 + 1;
+            }
+            // the backslashes don't have to be escaped.
+            // Add the appropriate number of backslashes
+            for (DWORD i = 0; i < dwBackslashes; ++i)
+            {
+                *pwzQuoted = L'\\';
+                ++pwzQuoted;
+            }
+            // If there is a character, add it after all the escaped backslashes
+            if (*pwz)
+            {
+                *pwzQuoted = *pwz;
+                ++pwz;
+                ++pwzQuoted;
+            }
+        }
+        *pwzQuoted = L'"';
+        ++pwzQuoted;
+        *pwzQuoted = L'\0'; // ensure the arg is null terminated.
+    }
+    // If there is already data in the command line, append a space before appending the
+    // argument.
+    if (*psczCommandLine && **psczCommandLine)
+    {
+        hr = StrAllocConcat(psczCommandLine, L" ", 0);
+        PathExitOnFailure(hr, "Failed to append space to command line with existing data.");
+    }
+    hr = StrAllocConcat(psczCommandLine, sczQuotedArg ? sczQuotedArg : wzArgument, 0);
+    PathExitOnFailure(hr, "Failed to copy command line argument.");
+LExit:
+    ReleaseStr(sczQuotedArg);
+    return hr;
+}
+DAPI_(LPWSTR) PathFile(
+    __in_z LPCWSTR wzPath
+    )
+{
+    if (!wzPath)
+    {
+        return NULL;
+    }
+    LPWSTR wzFile = const_cast<LPWSTR>(wzPath);
+    for (LPWSTR wz = wzFile; *wz; ++wz)
+    {
+        // valid delineators 
+        //     \ => Windows path
+        //     / => unix and URL path
+        //     : => relative path from mapped root
+        if (L'\\' == *wz || L'/' == *wz || (L':' == *wz && wz == wzPath + 1))
+        {
+            wzFile = wz + 1;
+        }
+    }
+    return wzFile;
+}
+DAPI_(LPCWSTR) PathExtension(
+    __in_z LPCWSTR wzPath
+    )
+{
+    if (!wzPath)
+    {
+        return NULL;
+    }
+    // Find the last dot in the last thing that could be a file.
+    LPCWSTR wzExtension = NULL;
+    for (LPCWSTR wz = wzPath; *wz; ++wz)
+    {
+        if (L'\\' == *wz || L'/' == *wz || L':' == *wz)
+        {
+            wzExtension = NULL;
+        }
+        else if (L'.' == *wz)
+        {
+            wzExtension = wz;
+        }
+    }
+    return wzExtension;
+}
+DAPI_(HRESULT) PathGetDirectory(
+    __in_z LPCWSTR wzPath,
+    __out_z LPWSTR *psczDirectory
+    )
+{
+    HRESULT hr = S_OK;
+    size_t cchDirectory = SIZE_T_MAX;
+    for (LPCWSTR wz = wzPath; *wz; ++wz)
+    {
+        // valid delineators:
+        //     \ => Windows path
+        //     / => unix and URL path
+        //     : => relative path from mapped root
+        if (L'\\' == *wz || L'/' == *wz || (L':' == *wz && wz == wzPath + 1))
+        {
+            cchDirectory = static_cast<size_t>(wz - wzPath) + 1;
+        }
+    }
+    if (SIZE_T_MAX == cchDirectory)
+    {
+        // we were given just a file name, so there's no directory available
+        return S_FALSE;
+    }
+    if (wzPath[0] == L'\"')
+    {
+        ++wzPath;
+        --cchDirectory;
+    }
+    hr = StrAllocString(psczDirectory, wzPath, cchDirectory);
+    PathExitOnFailure(hr, "Failed to copy directory.");
+LExit:
+    return hr;
+}
+DAPI_(HRESULT) PathGetParentPath(
+    __in_z LPCWSTR wzPath,
+    __out_z LPWSTR *psczParent
+    )
+{
+    HRESULT hr = S_OK;
+    LPCWSTR wzParent = NULL;
+    for (LPCWSTR wz = wzPath; *wz; ++wz)
+    {
+        if (wz[1] && (L'\\' == *wz || L'/' == *wz))
+        {
+            wzParent = wz;
+        }
+    }
+    if (wzParent)
+    {
+        size_t cchPath = static_cast<size_t>(wzParent - wzPath) + 1;
+        hr = StrAllocString(psczParent, wzPath, cchPath);
+        PathExitOnFailure(hr, "Failed to copy directory.");
+    }
+    else
+    {
+        ReleaseNullStr(psczParent);
+    }
+LExit:
+    return hr;
+}
+DAPI_(HRESULT) PathExpand(
+    __out LPWSTR *psczFullPath,
+    __in_z LPCWSTR wzRelativePath,
+    __in DWORD dwResolveFlags
+    )
+{
+    Assert(wzRelativePath && *wzRelativePath);
+    HRESULT hr = S_OK;
+    DWORD cch = 0;
+    LPWSTR sczExpandedPath = NULL;
+    DWORD cchExpandedPath = 0;
+    SIZE_T cbSize = 0;
+    LPWSTR sczFullPath = NULL;
+    //
+    // First, expand any environment variables.
+    //
+    if (dwResolveFlags & PATH_EXPAND_ENVIRONMENT)
+    {
+        cchExpandedPath = PATH_GOOD_ENOUGH;
+        hr = StrAlloc(&sczExpandedPath, cchExpandedPath);
+        PathExitOnFailure(hr, "Failed to allocate space for expanded path.");
+        cch = ::ExpandEnvironmentStringsW(wzRelativePath, sczExpandedPath, cchExpandedPath);
+        if (0 == cch)
+        {
+            PathExitWithLastError(hr, "Failed to expand environment variables in string: %ls", wzRelativePath);
+        }
+        else if (cchExpandedPath < cch)
+        {
+            cchExpandedPath = cch;
+            hr = StrAlloc(&sczExpandedPath, cchExpandedPath);
+            PathExitOnFailure(hr, "Failed to re-allocate more space for expanded path.");
+            cch = ::ExpandEnvironmentStringsW(wzRelativePath, sczExpandedPath, cchExpandedPath);
+            if (0 == cch)
+            {
+                PathExitWithLastError(hr, "Failed to expand environment variables in string: %ls", wzRelativePath);
+            }
+            else if (cchExpandedPath < cch)
+            {
+                hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+                PathExitOnRootFailure(hr, "Failed to allocate buffer for expanded path.");
+            }
+        }
+        if (MAX_PATH < cch)
+        {
+            hr = PathPrefix(&sczExpandedPath); // ignore invald arg from path prefix because this may not be a complete path yet
+            if (E_INVALIDARG == hr)
+            {
+                hr = S_OK;
+            }
+            PathExitOnFailure(hr, "Failed to prefix long path after expanding environment variables.");
+            hr = StrMaxLength(sczExpandedPath, &cbSize);
+            PathExitOnFailure(hr, "Failed to get max length of expanded path.");
+            cchExpandedPath = (DWORD)min(DWORD_MAX, cbSize);
+        }
+    }
+    //
+    // Second, get the full path.
+    //
+    if (dwResolveFlags & PATH_EXPAND_FULLPATH)
+    {
+        LPWSTR wzFileName = NULL;
+        LPCWSTR wzPath = sczExpandedPath ? sczExpandedPath : wzRelativePath;
+        DWORD cchFullPath = max(PATH_GOOD_ENOUGH, cchExpandedPath);
+        hr = StrAlloc(&sczFullPath, cchFullPath);
+        PathExitOnFailure(hr, "Failed to allocate space for full path.");
+        cch = ::GetFullPathNameW(wzPath, cchFullPath, sczFullPath, &wzFileName);
+        if (0 == cch)
+        {
+            PathExitWithLastError(hr, "Failed to get full path for string: %ls", wzPath);
+        }
+        else if (cchFullPath < cch)
+        {
+            cchFullPath = cch < MAX_PATH ? cch : cch + 7; // ensure space for "\\?\UNC" prefix if needed
+            hr = StrAlloc(&sczFullPath, cchFullPath);
+            PathExitOnFailure(hr, "Failed to re-allocate more space for full path.");
+            cch = ::GetFullPathNameW(wzPath, cchFullPath, sczFullPath, &wzFileName);
+            if (0 == cch)
+            {
+                PathExitWithLastError(hr, "Failed to get full path for string: %ls", wzPath);
+            }
+            else if (cchFullPath < cch)
+            {
+                hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+                PathExitOnRootFailure(hr, "Failed to allocate buffer for full path.");
+            }
+        }
+        if (MAX_PATH < cch)
+        {
+            hr = PathPrefix(&sczFullPath);
+            PathExitOnFailure(hr, "Failed to prefix long path after expanding.");
+        }
+    }
+    else
+    {
+        sczFullPath = sczExpandedPath;
+        sczExpandedPath = NULL;
+    }
+    hr = StrAllocString(psczFullPath, sczFullPath? sczFullPath : wzRelativePath, 0);
+    PathExitOnFailure(hr, "Failed to copy relative path into full path.");
+LExit:
+    ReleaseStr(sczFullPath);
+    ReleaseStr(sczExpandedPath);
+    return hr;
+}
+DAPI_(HRESULT) PathPrefix(
+    __inout LPWSTR *psczFullPath
+    )
+{
+    Assert(psczFullPath && *psczFullPath);
+    HRESULT hr = S_OK;
+    LPWSTR wzFullPath = *psczFullPath;
+    SIZE_T cbFullPath = 0;
+    if (((L'a' <= wzFullPath[0] && L'z' >= wzFullPath[0]) ||
+         (L'A' <= wzFullPath[0] && L'Z' >= wzFullPath[0])) &&
+        L':' == wzFullPath[1] &&
+        L'\\' == wzFullPath[2]) // normal path
+    {
+        hr = StrAllocPrefix(psczFullPath, L"\\\\?\\", 4);
+        PathExitOnFailure(hr, "Failed to add prefix to file path.");
+    }
+    else if (L'\\' == wzFullPath[0] && L'\\' == wzFullPath[1]) // UNC
+    {
+        // ensure that we're not already prefixed
+        if (!(L'?' == wzFullPath[2] && L'\\' == wzFullPath[3]))
+        {
+            hr = StrSize(*psczFullPath, &cbFullPath);
+            PathExitOnFailure(hr, "Failed to get size of full path.");
+            memmove_s(wzFullPath, cbFullPath, wzFullPath + 1, cbFullPath - sizeof(WCHAR));
+            hr = StrAllocPrefix(psczFullPath, L"\\\\?\\UNC", 7);
+            PathExitOnFailure(hr, "Failed to add prefix to UNC path.");
+        }
+    }
+    else
+    {
+        hr = E_INVALIDARG;
+        PathExitOnFailure(hr, "Invalid path provided to prefix: %ls.", wzFullPath);
+    }
+LExit:
+    return hr;
+}
+DAPI_(HRESULT) PathFixedBackslashTerminate(
+    __inout_ecount_z(cchPath) LPWSTR wzPath,
+    __in SIZE_T cchPath
+    )
+{
+    HRESULT hr = S_OK;
+    size_t cchLength = 0;
+    hr = ::StringCchLengthW(wzPath, cchPath, &cchLength);
+    PathExitOnFailure(hr, "Failed to get length of path.");
+    if (cchLength >= cchPath)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+    }
+    else if (L'\\' != wzPath[cchLength - 1])
+    {
+        wzPath[cchLength] = L'\\';
+        wzPath[cchLength + 1] = L'\0';
+    }
+LExit:
+    return hr;
+}
+DAPI_(HRESULT) PathBackslashTerminate(
+    __inout LPWSTR* psczPath
+    )
+{
+    Assert(psczPath && *psczPath);
+    HRESULT hr = S_OK;
+    SIZE_T cchPath = 0;
+    size_t cchLength = 0;
+    hr = StrMaxLength(*psczPath, &cchPath);
+    PathExitOnFailure(hr, "Failed to get size of path string.");
+    hr = ::StringCchLengthW(*psczPath, cchPath, &cchLength);
+    PathExitOnFailure(hr, "Failed to get length of path.");
+    if (L'\\' != (*psczPath)[cchLength - 1])
+    {
+        hr = StrAllocConcat(psczPath, L"\\", 1);
+        PathExitOnFailure(hr, "Failed to concat backslash onto string.");
+    }
+LExit:
+    return hr;
+}
+DAPI_(HRESULT) PathForCurrentProcess(
+    __inout LPWSTR *psczFullPath,
+    __in_opt HMODULE hModule
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD cch = MAX_PATH;
+    do
+    {
+        hr = StrAlloc(psczFullPath, cch);
+        PathExitOnFailure(hr, "Failed to allocate string for module path.");
+        DWORD cchRequired = ::GetModuleFileNameW(hModule, *psczFullPath, cch);
+        if (0 == cchRequired)
+        {
+            PathExitWithLastError(hr, "Failed to get path for executing process.");
+        }
+        else if (cchRequired == cch)
+        {
+            cch = cchRequired + 1;
+            hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+        }
+        else
+        {
+            hr = S_OK;
+        }
+    } while (HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) == hr);
+LExit:
+    return hr;
+}
+DAPI_(HRESULT) PathRelativeToModule(
+    __inout LPWSTR *psczFullPath,
+    __in_opt LPCWSTR wzFileName,
+    __in_opt HMODULE hModule
+    )
+{
+    HRESULT hr = PathForCurrentProcess(psczFullPath, hModule);
+    PathExitOnFailure(hr, "Failed to get current module path.");
+    hr = PathGetDirectory(*psczFullPath, psczFullPath);
+    PathExitOnFailure(hr, "Failed to get current module directory.");
+    if (wzFileName)
+    {
+        hr = PathConcat(*psczFullPath, wzFileName, psczFullPath);
+        PathExitOnFailure(hr, "Failed to append filename.");
+    }
+LExit:
+    return hr;
+}
+DAPI_(HRESULT) PathCreateTempFile(
+    __in_opt LPCWSTR wzDirectory,
+    __in_opt __format_string LPCWSTR wzFileNameTemplate,
+    __in DWORD dwUniqueCount,
+    __in DWORD dwFileAttributes,
+    __out_opt LPWSTR* psczTempFile,
+    __out_opt HANDLE* phTempFile
+    )
+{
+    AssertSz(0 < dwUniqueCount, "Must specify a non-zero unique count.");
+    HRESULT hr = S_OK;
+    LPWSTR sczTempPath = NULL;
+    DWORD cchTempPath = MAX_PATH;
+    HANDLE hTempFile = INVALID_HANDLE_VALUE;
+    LPWSTR scz = NULL;
+    LPWSTR sczTempFile = NULL;
+    if (wzDirectory && *wzDirectory)
+    {
+        hr = StrAllocString(&sczTempPath, wzDirectory, 0);
+        PathExitOnFailure(hr, "Failed to copy temp path.");
+    }
+    else
+    {
+        hr = StrAlloc(&sczTempPath, cchTempPath);
+        PathExitOnFailure(hr, "Failed to allocate memory for the temp path.");
+        if (!::GetTempPathW(cchTempPath, sczTempPath))
+        {
+            PathExitWithLastError(hr, "Failed to get temp path.");
+        }
+    }
+    if (wzFileNameTemplate && *wzFileNameTemplate)
+    {
+        for (DWORD i = 1; i <= dwUniqueCount && INVALID_HANDLE_VALUE == hTempFile; ++i)
+        {
+            hr = StrAllocFormatted(&scz, wzFileNameTemplate, i);
+            PathExitOnFailure(hr, "Failed to allocate memory for file template.");
+            hr = StrAllocFormatted(&sczTempFile, L"%s%s", sczTempPath, scz);
+            PathExitOnFailure(hr, "Failed to allocate temp file name.");
+            hTempFile = ::CreateFileW(sczTempFile, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, CREATE_NEW, dwFileAttributes, NULL);
+            if (INVALID_HANDLE_VALUE == hTempFile)
+            {
+                // if the file already exists, just try again
+                hr = HRESULT_FROM_WIN32(::GetLastError());
+                if (HRESULT_FROM_WIN32(ERROR_FILE_EXISTS) == hr)
+                {
+                    hr = S_OK;
+                }
+                PathExitOnFailure(hr, "Failed to create file: %ls", sczTempFile);
+            }
+        }
+    }
+    // If we were not able to or we did not try to create a temp file, ask
+    // the system to provide us a temp file using its built-in mechanism.
+    if (INVALID_HANDLE_VALUE == hTempFile)
+    {
+        hr = StrAlloc(&sczTempFile, MAX_PATH);
+        PathExitOnFailure(hr, "Failed to allocate memory for the temp path");
+        if (!::GetTempFileNameW(sczTempPath, L"TMP", 0, sczTempFile))
+        {
+            PathExitWithLastError(hr, "Failed to create new temp file name.");
+        }
+        hTempFile = ::CreateFileW(sczTempFile, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, dwFileAttributes, NULL);
+        if (INVALID_HANDLE_VALUE == hTempFile)
+        {
+            PathExitWithLastError(hr, "Failed to open new temp file: %ls", sczTempFile);
+        }
+    }
+    // If the caller wanted the temp file name or handle, return them here.
+    if (psczTempFile)
+    {
+        hr = StrAllocString(psczTempFile, sczTempFile, 0);
+        PathExitOnFailure(hr, "Failed to copy temp file string.");
+    }
+    if (phTempFile)
+    {
+        *phTempFile = hTempFile;
+        hTempFile = INVALID_HANDLE_VALUE;
+    }
+LExit:
+    if (INVALID_HANDLE_VALUE != hTempFile)
+    {
+        ::CloseHandle(hTempFile);
+    }
+    ReleaseStr(scz);
+    ReleaseStr(sczTempFile);
+    ReleaseStr(sczTempPath);
+    return hr;
+}
+DAPI_(HRESULT) PathCreateTimeBasedTempFile(
+    __in_z_opt LPCWSTR wzDirectory,
+    __in_z LPCWSTR wzPrefix,
+    __in_z_opt LPCWSTR wzPostfix,
+    __in_z LPCWSTR wzExtension,
+    __deref_opt_out_z LPWSTR* psczTempFile,
+    __out_opt HANDLE* phTempFile
+    )
+{
+    HRESULT hr = S_OK;
+    BOOL fRetry = FALSE;
+    WCHAR wzTempPath[MAX_PATH] = { };
+    LPWSTR sczPrefix = NULL;
+    LPWSTR sczPrefixFolder = NULL;
+    SYSTEMTIME time = { };
+    LPWSTR sczTempPath = NULL;
+    HANDLE hTempFile = INVALID_HANDLE_VALUE;
+    DWORD dwAttempts = 0;
+    if (wzDirectory && *wzDirectory)
+    {
+        hr = PathConcat(wzDirectory, wzPrefix, &sczPrefix);
+        PathExitOnFailure(hr, "Failed to combine directory and log prefix.");
+    }
+    else
+    {
+        if (!::GetTempPathW(countof(wzTempPath), wzTempPath))
+        {
+            PathExitWithLastError(hr, "Failed to get temp folder.");
+        }
+        hr = PathConcat(wzTempPath, wzPrefix, &sczPrefix);
+        PathExitOnFailure(hr, "Failed to concatenate the temp folder and log prefix.");
+    }
+    hr = PathGetDirectory(sczPrefix, &sczPrefixFolder);
+    if (S_OK == hr)
+    {
+        hr = DirEnsureExists(sczPrefixFolder, NULL);
+        PathExitOnFailure(hr, "Failed to ensure temp file path exists: %ls", sczPrefixFolder);
+    }
+    if (!wzPostfix)
+    {
+        wzPostfix = L"";
+    }
+    do
+    {
+        fRetry = FALSE;
+        ++dwAttempts;
+        ::GetLocalTime(&time);
+        // Log format:                         pre YYYY MM  dd  hh  mm  ss post ext
+        hr = StrAllocFormatted(&sczTempPath, L"%ls_%04u%02u%02u%02u%02u%02u%ls%ls%ls", sczPrefix, time.wYear, time.wMonth, time.wDay, time.wHour, time.wMinute, time.wSecond, wzPostfix, L'.' == *wzExtension ? L"" : L".", wzExtension);
+        PathExitOnFailure(hr, "failed to allocate memory for the temp path");
+        hTempFile = ::CreateFileW(sczTempPath, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL);
+        if (INVALID_HANDLE_VALUE == hTempFile)
+        {
+            // If the file already exists, just try again.
+            DWORD er = ::GetLastError();
+            if (ERROR_FILE_EXISTS == er || ERROR_ACCESS_DENIED == er)
+            {
+                ::Sleep(100);
+                if (10 > dwAttempts)
+                {
+                    er = ERROR_SUCCESS;
+                    fRetry = TRUE;
+                }
+            }
+            hr = HRESULT_FROM_WIN32(er);
+            PathExitOnFailureDebugTrace(hr, "Failed to create temp file: %ls", sczTempPath);
+        }
+    } while (fRetry);
+    if (psczTempFile)
+    {
+        hr = StrAllocString(psczTempFile, sczTempPath, 0);
+        PathExitOnFailure(hr, "Failed to copy temp path to return.");
+    }
+    if (phTempFile)
+    {
+        *phTempFile = hTempFile;
+        hTempFile = INVALID_HANDLE_VALUE;
+    }
+LExit:
+    ReleaseFile(hTempFile);
+    ReleaseStr(sczTempPath);
+    ReleaseStr(sczPrefixFolder);
+    ReleaseStr(sczPrefix);
+    return hr;
+}
+DAPI_(HRESULT) PathCreateTempDirectory(
+    __in_opt LPCWSTR wzDirectory,
+    __in __format_string LPCWSTR wzDirectoryNameTemplate,
+    __in DWORD dwUniqueCount,
+    __out LPWSTR* psczTempDirectory
+    )
+{
+    AssertSz(wzDirectoryNameTemplate && *wzDirectoryNameTemplate, "DirectoryNameTemplate must be specified.");
+    AssertSz(0 < dwUniqueCount, "Must specify a non-zero unique count.");
+    HRESULT hr = S_OK;
+    LPWSTR sczTempPath = NULL;
+    DWORD cchTempPath = MAX_PATH;
+    LPWSTR scz = NULL;
+    if (wzDirectory && *wzDirectory)
+    {
+        hr = StrAllocString(&sczTempPath, wzDirectory, 0);
+        PathExitOnFailure(hr, "Failed to copy temp path.");
+        hr = PathBackslashTerminate(&sczTempPath);
+        PathExitOnFailure(hr, "Failed to ensure path ends in backslash: %ls", wzDirectory);
+    }
+    else
+    {
+        hr = StrAlloc(&sczTempPath, cchTempPath);
+        PathExitOnFailure(hr, "Failed to allocate memory for the temp path.");
+        if (!::GetTempPathW(cchTempPath, sczTempPath))
+        {
+            PathExitWithLastError(hr, "Failed to get temp path.");
+        }
+    }
+    for (DWORD i = 1; i <= dwUniqueCount; ++i)
+    {
+        hr = StrAllocFormatted(&scz, wzDirectoryNameTemplate, i);
+        PathExitOnFailure(hr, "Failed to allocate memory for directory name template.");
+        hr = StrAllocFormatted(psczTempDirectory, L"%s%s", sczTempPath, scz);
+        PathExitOnFailure(hr, "Failed to allocate temp directory name.");
+        if (!::CreateDirectoryW(*psczTempDirectory, NULL))
+        {
+            DWORD er = ::GetLastError();
+            if (ERROR_ALREADY_EXISTS == er)
+            {
+                hr = HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS);
+                continue;
+            }
+            else if (ERROR_PATH_NOT_FOUND == er)
+            {
+                hr = DirEnsureExists(*psczTempDirectory, NULL);
+                break;
+            }
+            else
+            {
+                hr = HRESULT_FROM_WIN32(er);
+                break;
+            }
+        }
+        else
+        {
+            hr = S_OK;
+            break;
+        }
+    }
+    PathExitOnFailure(hr, "Failed to create temp directory.");
+    hr = PathBackslashTerminate(psczTempDirectory);
+    PathExitOnFailure(hr, "Failed to ensure temp directory is backslash terminated.");
+LExit:
+    ReleaseStr(scz);
+    ReleaseStr(sczTempPath);
+    return hr;
+}
+DAPI_(HRESULT) PathGetKnownFolder(
+    __in int csidl,
+    __out LPWSTR* psczKnownFolder
+    )
+{
+    HRESULT hr = S_OK;
+    hr = StrAlloc(psczKnownFolder, MAX_PATH);
+    PathExitOnFailure(hr, "Failed to allocate memory for known folder.");
+    hr = ::SHGetFolderPathW(NULL, csidl, NULL, SHGFP_TYPE_CURRENT, *psczKnownFolder);
+    PathExitOnFailure(hr, "Failed to get known folder path.");
+    hr = PathBackslashTerminate(psczKnownFolder);
+    PathExitOnFailure(hr, "Failed to ensure known folder path is backslash terminated.");
+LExit:
+    return hr;
+}
+DAPI_(BOOL) PathIsAbsolute(
+    __in_z LPCWSTR wzPath
+    )
+{
+    return wzPath && wzPath[0] && wzPath[1] && (wzPath[0] == L'\\') || (wzPath[1] == L':');
+}
+DAPI_(HRESULT) PathConcat(
+    __in_opt LPCWSTR wzPath1,
+    __in_opt LPCWSTR wzPath2,
+    __deref_out_z LPWSTR* psczCombined
+    )
+{
+    return PathConcatCch(wzPath1, 0, wzPath2, 0, psczCombined);
+}
+DAPI_(HRESULT) PathConcatCch(
+    __in_opt LPCWSTR wzPath1,
+    __in SIZE_T cchPath1,
+    __in_opt LPCWSTR wzPath2,
+    __in SIZE_T cchPath2,
+    __deref_out_z LPWSTR* psczCombined
+    )
+{
+    HRESULT hr = S_OK;
+    if (!wzPath2 || !*wzPath2)
+    {
+        hr = StrAllocString(psczCombined, wzPath1, cchPath1);
+        PathExitOnFailure(hr, "Failed to copy just path1 to output.");
+    }
+    else if (!wzPath1 || !*wzPath1 || PathIsAbsolute(wzPath2))
+    {
+        hr = StrAllocString(psczCombined, wzPath2, cchPath2);
+        PathExitOnFailure(hr, "Failed to copy just path2 to output.");
+    }
+    else
+    {
+        hr = StrAllocString(psczCombined, wzPath1, cchPath1);
+        PathExitOnFailure(hr, "Failed to copy path1 to output.");
+        hr = PathBackslashTerminate(psczCombined);
+        PathExitOnFailure(hr, "Failed to backslashify.");
+        hr = StrAllocConcat(psczCombined, wzPath2, cchPath2);
+        PathExitOnFailure(hr, "Failed to append path2 to output.");
+    }
+LExit:
+    return hr;
+}
+DAPI_(HRESULT) PathEnsureQuoted(
+    __inout LPWSTR* ppszPath,
+    __in BOOL fDirectory
+    )
+{
+    Assert(ppszPath && *ppszPath);
+    HRESULT hr = S_OK;
+    size_t cchPath = 0;
+    hr = ::StringCchLengthW(*ppszPath, STRSAFE_MAX_CCH, &cchPath);
+    PathExitOnFailure(hr, "Failed to get the length of the path.");
+    // Handle simple special cases.
+    if (0 == cchPath || (1 == cchPath && L'"' == (*ppszPath)[0]))
+    {
+        hr = StrAllocString(ppszPath, L"\"\"", 2);
+        PathExitOnFailure(hr, "Failed to allocate a quoted empty string.");
+        ExitFunction();
+    }
+    if (L'"' != (*ppszPath)[0])
+    {
+        hr = StrAllocPrefix(ppszPath, L"\"", 1);
+        PathExitOnFailure(hr, "Failed to allocate an opening quote.");
+        // Add a char for the opening quote.
+        ++cchPath;
+    }
+    if (L'"' != (*ppszPath)[cchPath - 1])
+    {
+        hr = StrAllocConcat(ppszPath, L"\"", 1);
+        PathExitOnFailure(hr, "Failed to allocate a closing quote.");
+        // Add a char for the closing quote.
+        ++cchPath;
+    }
+    if (fDirectory)
+    {
+        if (L'\\' != (*ppszPath)[cchPath - 2])
+        {
+            // Change the last char to a backslash and re-append the closing quote.
+            (*ppszPath)[cchPath - 1] = L'\\';
+            hr = StrAllocConcat(ppszPath, L"\"", 1);
+            PathExitOnFailure(hr, "Failed to allocate another closing quote after the backslash.");
+        }
+    }
+LExit:
+    return hr;
+}
+DAPI_(HRESULT) PathCompare(
+    __in_z LPCWSTR wzPath1,
+    __in_z LPCWSTR wzPath2,
+    __out int* pnResult
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczPath1 = NULL;
+    LPWSTR sczPath2 = NULL;
+    hr = PathExpand(&sczPath1, wzPath1, PATH_EXPAND_ENVIRONMENT | PATH_EXPAND_FULLPATH);
+    PathExitOnFailure(hr, "Failed to expand path1.");
+    hr = PathExpand(&sczPath2, wzPath2, PATH_EXPAND_ENVIRONMENT | PATH_EXPAND_FULLPATH);
+    PathExitOnFailure(hr, "Failed to expand path2.");
+    *pnResult = ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, sczPath1, -1, sczPath2, -1);
+LExit:
+    ReleaseStr(sczPath2);
+    ReleaseStr(sczPath1);
+    return hr;
+}
+DAPI_(HRESULT) PathCompress(
+    __in_z LPCWSTR wzPath
+    )
+{
+    HRESULT hr = S_OK;
+    HANDLE hPath = INVALID_HANDLE_VALUE;
+    hPath = ::CreateFileW(wzPath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+    if (INVALID_HANDLE_VALUE == hPath)
+    {
+        PathExitWithLastError(hr, "Failed to open path %ls for compression.", wzPath);
+    }
+    DWORD dwBytesReturned = 0;
+    USHORT usCompressionFormat = COMPRESSION_FORMAT_DEFAULT;
+    if (0 == ::DeviceIoControl(hPath, FSCTL_SET_COMPRESSION, &usCompressionFormat, sizeof(usCompressionFormat), NULL, 0, &dwBytesReturned, NULL))
+    {
+        // ignore compression attempts on file systems that don't support it
+        DWORD er = ::GetLastError();
+        if (ERROR_INVALID_FUNCTION != er)
+        {
+            PathExitOnWin32Error(er, hr, "Failed to set compression state for path %ls.", wzPath);
+        }
+    }
+LExit:
+    ReleaseFile(hPath);
+    return hr;
+}
+DAPI_(HRESULT) PathGetHierarchyArray(
+    __in_z LPCWSTR wzPath,
+    __deref_inout_ecount_opt(*pcPathArray) LPWSTR **prgsczPathArray,
+    __inout LPUINT pcPathArray
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczPathCopy = NULL;
+    LPWSTR sczNewPathCopy = NULL;
+    DWORD cArraySpacesNeeded = 0;
+    size_t cchPath = 0;
+    hr = ::StringCchLengthW(wzPath, STRSAFE_MAX_LENGTH, &cchPath);
+    PathExitOnRootFailure(hr, "Failed to get string length of path: %ls", wzPath);
+    if (!cchPath)
+    {
+        ExitFunction1(hr = E_INVALIDARG);
+    }
+    for (size_t i = 0; i < cchPath; ++i)
+    {
+        if (wzPath[i] == L'\\')
+        {
+            ++cArraySpacesNeeded;
+        }
+    }
+    if (wzPath[cchPath - 1] != L'\\')
+    {
+        ++cArraySpacesNeeded;
+    }
+    // If it's a UNC path, cut off the first three paths, 2 because it starts with a double backslash, and another because the first ("\\servername\") isn't a path.
+    if (wzPath[0] == L'\\' && wzPath[1] == L'\\')
+    {
+        cArraySpacesNeeded -= 3;
+    }
+    Assert(cArraySpacesNeeded >= 1);
+    hr = MemEnsureArraySize(reinterpret_cast<void **>(prgsczPathArray), cArraySpacesNeeded, sizeof(LPWSTR), 0);
+    PathExitOnFailure(hr, "Failed to allocate array of size %u for parent directories", cArraySpacesNeeded);
+    *pcPathArray = cArraySpacesNeeded;
+    hr = StrAllocString(&sczPathCopy, wzPath, 0);
+    PathExitOnFailure(hr, "Failed to allocate copy of original path");
+    for (DWORD i = 0; i < cArraySpacesNeeded; ++i)
+    {
+        hr = StrAllocString((*prgsczPathArray) + cArraySpacesNeeded - 1 - i, sczPathCopy, 0);
+        PathExitOnFailure(hr, "Failed to copy path");
+        DWORD cchPathCopy = lstrlenW(sczPathCopy);
+        // If it ends in a backslash, it's a directory path, so cut off everything the last backslash before we get the directory portion of the path
+        if (wzPath[cchPathCopy - 1] == L'\\')
+        {
+            sczPathCopy[cchPathCopy - 1] = L'\0';
+        }
+        
+        hr = PathGetDirectory(sczPathCopy, &sczNewPathCopy);
+        PathExitOnFailure(hr, "Failed to get directory portion of path");
+        ReleaseStr(sczPathCopy);
+        sczPathCopy = sczNewPathCopy;
+        sczNewPathCopy = NULL;
+    }
+    hr = S_OK;
+LExit:
+    ReleaseStr(sczPathCopy);
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/perfutil.cpp b/src/libs/dutil/WixToolset.DUtil/perfutil.cpp
new file mode 100644
index 00000000..bc138d34
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/perfutil.cpp
@@ -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.
+#include "precomp.h"
+// Exit macros
+#define PerfExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_PERFUTIL, x, s, __VA_ARGS__)
+#define PerfExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_PERFUTIL, x, s, __VA_ARGS__)
+#define PerfExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_PERFUTIL, x, s, __VA_ARGS__)
+#define PerfExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_PERFUTIL, x, s, __VA_ARGS__)
+#define PerfExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_PERFUTIL, x, s, __VA_ARGS__)
+#define PerfExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_PERFUTIL, x, s, __VA_ARGS__)
+#define PerfExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_PERFUTIL, p, x, e, s, __VA_ARGS__)
+#define PerfExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_PERFUTIL, p, x, s, __VA_ARGS__)
+#define PerfExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_PERFUTIL, p, x, e, s, __VA_ARGS__)
+#define PerfExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_PERFUTIL, p, x, s, __VA_ARGS__)
+#define PerfExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_PERFUTIL, e, x, s, __VA_ARGS__)
+#define PerfExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_PERFUTIL, g, x, s, __VA_ARGS__)
+static BOOL vfHighPerformanceCounter = TRUE;   // assume the system has a high performance counter
+static double vdFrequency = 1;
+/********************************************************************
+ PerfInitialize - initializes internal static variables
+********************************************************************/
+extern "C" void DAPI PerfInitialize(
+    )
+{
+    LARGE_INTEGER liFrequency = { };
+    //
+    // check for high perf counter
+    //
+    if (!::QueryPerformanceFrequency(&liFrequency))
+    {
+        vfHighPerformanceCounter = FALSE;
+        vdFrequency = 1000;  // ticks are measured in milliseconds
+    }
+    else
+        vdFrequency = static_cast<double>(liFrequency.QuadPart);
+}
+/********************************************************************
+ PerfClickTime - resets the clicker, or returns elapsed time since last call
+ NOTE: if pliElapsed is NULL, resets the elapsed time
+       if pliElapsed is not NULL, returns perf number since last call to PerfClickTime()
+********************************************************************/
+extern "C" void DAPI PerfClickTime(
+    __out_opt LARGE_INTEGER* pliElapsed
+    )
+{
+    static LARGE_INTEGER liStart = { };
+    LARGE_INTEGER* pli = pliElapsed;
+    if (!pli)  // if elapsed time time was not requested, reset the start time
+        pli = &liStart;
+    if (vfHighPerformanceCounter)
+        ::QueryPerformanceCounter(pli);
+    else
+        pli->QuadPart = ::GetTickCount();
+    if (pliElapsed)
+        pliElapsed->QuadPart -= liStart.QuadPart;
+}
+/********************************************************************
+ PerfConvertToSeconds - converts perf number to seconds
+********************************************************************/
+extern "C" double DAPI PerfConvertToSeconds(
+    __in const LARGE_INTEGER* pli
+    )
+{
+    Assert(0 < vdFrequency);
+    return pli->QuadPart / vdFrequency;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/polcutil.cpp b/src/libs/dutil/WixToolset.DUtil/polcutil.cpp
new file mode 100644
index 00000000..1fdfa18c
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/polcutil.cpp
@@ -0,0 +1,126 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define PolcExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_POLCUTIL, x, s, __VA_ARGS__)
+#define PolcExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_POLCUTIL, x, s, __VA_ARGS__)
+#define PolcExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_POLCUTIL, x, s, __VA_ARGS__)
+#define PolcExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_POLCUTIL, x, s, __VA_ARGS__)
+#define PolcExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_POLCUTIL, x, s, __VA_ARGS__)
+#define PolcExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_POLCUTIL, x, s, __VA_ARGS__)
+#define PolcExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_POLCUTIL, p, x, e, s, __VA_ARGS__)
+#define PolcExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_POLCUTIL, p, x, s, __VA_ARGS__)
+#define PolcExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_POLCUTIL, p, x, e, s, __VA_ARGS__)
+#define PolcExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_POLCUTIL, p, x, s, __VA_ARGS__)
+#define PolcExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_POLCUTIL, e, x, s, __VA_ARGS__)
+#define PolcExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_POLCUTIL, g, x, s, __VA_ARGS__)
+const LPCWSTR REGISTRY_POLICIES_KEY = L"SOFTWARE\\Policies\\";
+static HRESULT OpenPolicyKey(
+    __in_z LPCWSTR wzPolicyPath,
+    __out HKEY* phk
+    );
+extern "C" HRESULT DAPI PolcReadNumber(
+    __in_z LPCWSTR wzPolicyPath,
+    __in_z LPCWSTR wzPolicyName,
+    __in DWORD dwDefault,
+    __out DWORD* pdw
+    )
+{
+    HRESULT hr = S_OK;
+    HKEY hk = NULL;
+    hr = OpenPolicyKey(wzPolicyPath, &hk);
+    if (E_FILENOTFOUND == hr || E_PATHNOTFOUND == hr)
+    {
+        ExitFunction1(hr = S_FALSE);
+    }
+    PolcExitOnFailure(hr, "Failed to open policy key: %ls", wzPolicyPath);
+    hr = RegReadNumber(hk, wzPolicyName, pdw);
+    if (E_FILENOTFOUND == hr || E_PATHNOTFOUND == hr)
+    {
+        ExitFunction1(hr = S_FALSE);
+    }
+    PolcExitOnFailure(hr, "Failed to open policy key: %ls, name: %ls", wzPolicyPath, wzPolicyName);
+LExit:
+    ReleaseRegKey(hk);
+    if (S_FALSE == hr || FAILED(hr))
+    {
+        *pdw = dwDefault;
+    }
+    return hr;
+}
+extern "C" HRESULT DAPI PolcReadString(
+    __in_z LPCWSTR wzPolicyPath,
+    __in_z LPCWSTR wzPolicyName,
+    __in_z_opt LPCWSTR wzDefault,
+    __deref_out_z LPWSTR* pscz
+    )
+{
+    HRESULT hr = S_OK;
+    HKEY hk = NULL;
+    hr = OpenPolicyKey(wzPolicyPath, &hk);
+    if (E_FILENOTFOUND == hr || E_PATHNOTFOUND == hr)
+    {
+        ExitFunction1(hr = S_FALSE);
+    }
+    PolcExitOnFailure(hr, "Failed to open policy key: %ls", wzPolicyPath);
+    hr = RegReadString(hk, wzPolicyName, pscz);
+    if (E_FILENOTFOUND == hr || E_PATHNOTFOUND == hr)
+    {
+        ExitFunction1(hr = S_FALSE);
+    }
+    PolcExitOnFailure(hr, "Failed to open policy key: %ls, name: %ls", wzPolicyPath, wzPolicyName);
+LExit:
+    ReleaseRegKey(hk);
+    if (S_FALSE == hr || FAILED(hr))
+    {
+        if (NULL == wzDefault)
+        {
+            ReleaseNullStr(*pscz);
+        }
+        else
+        {
+            hr = StrAllocString(pscz, wzDefault, 0);
+        }
+    }
+    return hr;
+}
+// internal functions
+static HRESULT OpenPolicyKey(
+    __in_z LPCWSTR wzPolicyPath,
+    __out HKEY* phk
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczPath = NULL;
+    hr = PathConcat(REGISTRY_POLICIES_KEY, wzPolicyPath, &sczPath);
+    PolcExitOnFailure(hr, "Failed to combine logging path with root path.");
+    hr = RegOpen(HKEY_LOCAL_MACHINE, sczPath, KEY_READ, phk);
+    PolcExitOnFailure(hr, "Failed to open policy registry key.");
+LExit:
+    ReleaseStr(sczPath);
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/precomp.h b/src/libs/dutil/WixToolset.DUtil/precomp.h
new file mode 100644
index 00000000..f8f3b944
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/precomp.h
@@ -0,0 +1,98 @@
+#pragma once
+// 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.
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0500
+#endif
+#ifndef _WIN32_MSI
+#define _WIN32_MSI 200
+#endif
+#define JET_VERSION 0x0501
+#include <WinSock2.h>
+#include <windows.h>
+#include <windowsx.h>
+#include <intsafe.h>
+#include <strsafe.h>
+#include <wininet.h>
+#include <msi.h>
+#include <msiquery.h>
+#include <psapi.h>
+#include <shlobj.h>
+#include <shlwapi.h>
+#include <gdiplus.h>
+#include <Tlhelp32.h>
+#include <lm.h>
+#include <Iads.h>
+#include <activeds.h>
+#include <richedit.h>
+#include <stddef.h>
+#include <esent.h>
+#include <ahadmin.h>
+#include <SRRestorePtAPI.h>
+#include <userenv.h>
+#include <WinIoCtl.h>
+#include <wtsapi32.h>
+#include <wuapi.h>
+#include <commctrl.h>
+#include <dbt.h>
+#include <ShellScalingApi.h>
+#include "dutilsources.h"
+#include "dutil.h"
+#include "verutil.h"
+#include "aclutil.h"
+#include "atomutil.h"
+#include "buffutil.h"
+#include "butil.h"
+#include "cabcutil.h"
+#include "cabutil.h"
+#include "conutil.h"
+#include "cryputil.h"
+#include "eseutil.h"
+#include "dirutil.h"
+#include "dlutil.h"
+#include "dpiutil.h"
+#include "fileutil.h"
+#include "guidutil.h"
+#include "gdiputil.h"
+#include "dictutil.h"
+#include "deputil.h" // NOTE: This must come after dictutil.h since it uses it.
+#include "inetutil.h"
+#include "iniutil.h"
+#include "jsonutil.h"
+#include "locutil.h"
+#include "logutil.h"
+#include "memutil.h"  // NOTE: almost everying is inlined so there is a small .cpp file
+//#include "metautil.h" - see metautil.cpp why this *must* be commented out
+#include "monutil.h"
+#include "osutil.h"
+#include "pathutil.h"
+#include "perfutil.h"
+#include "polcutil.h"
+#include "procutil.h"
+#include "regutil.h"
+#include "resrutil.h"
+#include "reswutil.h"
+#include "rmutil.h"
+#include "rssutil.h"
+#include "apuputil.h" // NOTE: this must come after atomutil.h and rssutil.h since it uses them.
+#include "shelutil.h"
+//#include "sqlutil.h" - see sqlutil.cpp why this *must* be commented out
+#include "srputil.h"
+#include "strutil.h"
+#include "timeutil.h"
+#include "timeutil.h"
+#include "thmutil.h"
+#include "uncutil.h"
+#include "uriutil.h"
+#include "userutil.h"
+#include "wiutil.h"
+#include "wuautil.h"
+#include <comutil.h>  // This header is needed for msxml2.h to compile correctly
+#include <msxml2.h>   // This file is needed to include xmlutil.h
+#include "xmlutil.h"
diff --git a/src/libs/dutil/WixToolset.DUtil/proc2utl.cpp b/src/libs/dutil/WixToolset.DUtil/proc2utl.cpp
new file mode 100644
index 00000000..a59d2ffc
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/proc2utl.cpp
@@ -0,0 +1,83 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define ProcExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_PROCUTIL, x, s, __VA_ARGS__)
+#define ProcExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_PROCUTIL, x, s, __VA_ARGS__)
+#define ProcExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_PROCUTIL, x, s, __VA_ARGS__)
+#define ProcExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_PROCUTIL, x, s, __VA_ARGS__)
+#define ProcExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_PROCUTIL, x, s, __VA_ARGS__)
+#define ProcExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_PROCUTIL, x, s, __VA_ARGS__)
+#define ProcExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_PROCUTIL, p, x, e, s, __VA_ARGS__)
+#define ProcExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_PROCUTIL, p, x, s, __VA_ARGS__)
+#define ProcExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_PROCUTIL, p, x, e, s, __VA_ARGS__)
+#define ProcExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_PROCUTIL, p, x, s, __VA_ARGS__)
+#define ProcExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_PROCUTIL, e, x, s, __VA_ARGS__)
+#define ProcExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_PROCUTIL, g, x, s, __VA_ARGS__)
+/********************************************************************
+ ProcFindAllIdsFromExeName() - returns an array of process ids that are running specified executable.
+*******************************************************************/
+extern "C" HRESULT DAPI ProcFindAllIdsFromExeName(
+    __in_z LPCWSTR wzExeName,
+    __out DWORD** ppdwProcessIds,
+    __out DWORD* pcProcessIds
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    HANDLE hSnap = INVALID_HANDLE_VALUE;
+    BOOL fContinue = FALSE;
+    PROCESSENTRY32W peData = { sizeof(peData) };
+    
+    hSnap = ::CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+    if (INVALID_HANDLE_VALUE == hSnap)
+    {
+        ProcExitWithLastError(hr, "Failed to create snapshot of processes on system");
+    }
+    fContinue = ::Process32FirstW(hSnap, &peData);
+    while (fContinue)
+    {
+        if (0 == lstrcmpiW((LPCWSTR)&(peData.szExeFile), wzExeName))
+        {
+            if (!*ppdwProcessIds)
+            {
+                *ppdwProcessIds = static_cast<DWORD*>(MemAlloc(sizeof(DWORD), TRUE));
+                ProcExitOnNull(ppdwProcessIds, hr, E_OUTOFMEMORY, "Failed to allocate array for returned process IDs.");
+            }
+            else
+            {
+                DWORD* pdwReAllocReturnedPids = NULL;
+                pdwReAllocReturnedPids = static_cast<DWORD*>(MemReAlloc(*ppdwProcessIds, sizeof(DWORD) * ((*pcProcessIds) + 1), TRUE));
+                ProcExitOnNull(pdwReAllocReturnedPids, hr, E_OUTOFMEMORY, "Failed to re-allocate array for returned process IDs.");
+                *ppdwProcessIds = pdwReAllocReturnedPids;
+            }
+            
+            (*ppdwProcessIds)[*pcProcessIds] = peData.th32ProcessID;
+            ++(*pcProcessIds);
+        }
+        fContinue = ::Process32NextW(hSnap, &peData);
+    }
+    er = ::GetLastError();
+    if (ERROR_NO_MORE_FILES == er)
+    {
+        hr = S_OK;
+    }
+    else
+    {
+        hr = HRESULT_FROM_WIN32(er);
+    }
+LExit:
+    ReleaseFile(hSnap);
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/proc3utl.cpp b/src/libs/dutil/WixToolset.DUtil/proc3utl.cpp
new file mode 100644
index 00000000..6d3cbc67
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/proc3utl.cpp
@@ -0,0 +1,129 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define ProcExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_PROCUTIL, x, s, __VA_ARGS__)
+#define ProcExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_PROCUTIL, x, s, __VA_ARGS__)
+#define ProcExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_PROCUTIL, x, s, __VA_ARGS__)
+#define ProcExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_PROCUTIL, x, s, __VA_ARGS__)
+#define ProcExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_PROCUTIL, x, s, __VA_ARGS__)
+#define ProcExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_PROCUTIL, x, s, __VA_ARGS__)
+#define ProcExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_PROCUTIL, p, x, e, s, __VA_ARGS__)
+#define ProcExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_PROCUTIL, p, x, s, __VA_ARGS__)
+#define ProcExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_PROCUTIL, p, x, e, s, __VA_ARGS__)
+#define ProcExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_PROCUTIL, p, x, s, __VA_ARGS__)
+#define ProcExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_PROCUTIL, e, x, s, __VA_ARGS__)
+#define ProcExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_PROCUTIL, g, x, s, __VA_ARGS__)
+static HRESULT GetActiveSessionUserToken(
+    __out HANDLE *phToken
+    );
+/********************************************************************
+ ProcExecuteAsInteractiveUser() - runs process as currently logged in
+                                  user.
+*******************************************************************/
+extern "C" HRESULT DAPI ProcExecuteAsInteractiveUser(
+    __in_z LPCWSTR wzExecutablePath,
+    __in_z LPCWSTR wzCommandLine,
+    __out HANDLE *phProcess
+    )
+{
+    HRESULT hr = S_OK;
+    HANDLE hToken = NULL;
+    LPVOID pEnvironment = NULL;
+    LPWSTR sczFullCommandLine = NULL;
+    STARTUPINFOW si = { };
+    PROCESS_INFORMATION pi = { };
+    hr = GetActiveSessionUserToken(&hToken);
+    ProcExitOnFailure(hr, "Failed to get active session user token.");
+    if (!::CreateEnvironmentBlock(&pEnvironment, hToken, FALSE))
+    {
+        ProcExitWithLastError(hr, "Failed to create environment block for UI process.");
+    }
+    hr = StrAllocFormatted(&sczFullCommandLine, L"\"%ls\" %ls", wzExecutablePath, wzCommandLine);
+    ProcExitOnFailure(hr, "Failed to allocate full command-line.");
+    si.cb = sizeof(si);
+    if (!::CreateProcessAsUserW(hToken, wzExecutablePath, sczFullCommandLine, NULL, NULL, FALSE, CREATE_UNICODE_ENVIRONMENT, pEnvironment, NULL, &si, &pi))
+    {
+        ProcExitWithLastError(hr, "Failed to create UI process: %ls", sczFullCommandLine);
+    }
+    *phProcess = pi.hProcess;
+    pi.hProcess = NULL;
+LExit:
+    ReleaseHandle(pi.hThread);
+    ReleaseHandle(pi.hProcess);
+    ReleaseStr(sczFullCommandLine);
+    if (pEnvironment)
+    {
+        ::DestroyEnvironmentBlock(pEnvironment);
+    }
+    ReleaseHandle(hToken);
+    return hr;
+}
+static HRESULT GetActiveSessionUserToken(
+    __out HANDLE *phToken
+    )
+{
+    HRESULT hr = S_OK;
+    PWTS_SESSION_INFO pSessionInfo = NULL;
+    DWORD cSessions = 0;
+    DWORD dwSessionId = 0;
+    BOOL fSessionFound = FALSE;
+    HANDLE hToken = NULL;
+    // Loop through the sessions looking for the active one.
+    if (!::WTSEnumerateSessions(WTS_CURRENT_SERVER_HANDLE, 0, 1, &pSessionInfo, &cSessions))
+    {
+        ProcExitWithLastError(hr, "Failed to enumerate sessions.");
+    }
+    for (DWORD i = 0; i < cSessions; ++i)
+    {
+        if (WTSActive == pSessionInfo[i].State)
+        {
+            dwSessionId = pSessionInfo[i].SessionId;
+            fSessionFound = TRUE;
+            break;
+        }
+    }
+    if (!fSessionFound)
+    {
+        ExitFunction1(hr = E_NOTFOUND);
+    }
+    // Get the user token from the active session.
+    if (!::WTSQueryUserToken(dwSessionId, &hToken))
+    {
+        ProcExitWithLastError(hr, "Failed to get active session user token.");
+    }
+    *phToken = hToken;
+    hToken = NULL;
+LExit:
+    ReleaseHandle(hToken);
+    if (pSessionInfo)
+    {
+        ::WTSFreeMemory(pSessionInfo);
+    }
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/procutil.cpp b/src/libs/dutil/WixToolset.DUtil/procutil.cpp
new file mode 100644
index 00000000..6bfe5017
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/procutil.cpp
@@ -0,0 +1,522 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define ProcExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_PROCUTIL, x, s, __VA_ARGS__)
+#define ProcExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_PROCUTIL, x, s, __VA_ARGS__)
+#define ProcExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_PROCUTIL, x, s, __VA_ARGS__)
+#define ProcExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_PROCUTIL, x, s, __VA_ARGS__)
+#define ProcExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_PROCUTIL, x, s, __VA_ARGS__)
+#define ProcExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_PROCUTIL, x, s, __VA_ARGS__)
+#define ProcExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_PROCUTIL, p, x, e, s, __VA_ARGS__)
+#define ProcExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_PROCUTIL, p, x, s, __VA_ARGS__)
+#define ProcExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_PROCUTIL, p, x, e, s, __VA_ARGS__)
+#define ProcExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_PROCUTIL, p, x, s, __VA_ARGS__)
+#define ProcExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_PROCUTIL, e, x, s, __VA_ARGS__)
+#define ProcExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_PROCUTIL, g, x, s, __VA_ARGS__)
+// private functions
+static HRESULT CreatePipes(
+    __out HANDLE *phOutRead,
+    __out HANDLE *phOutWrite,
+    __out HANDLE *phErrWrite,
+    __out HANDLE *phInRead,
+    __out HANDLE *phInWrite
+    );
+static BOOL CALLBACK CloseWindowEnumCallback(
+    __in HWND hWnd,
+    __in LPARAM lParam
+    );
+extern "C" HRESULT DAPI ProcElevated(
+    __in HANDLE hProcess,
+    __out BOOL* pfElevated
+    )
+{
+    HRESULT hr = S_OK;
+    HANDLE hToken = NULL;
+    TOKEN_ELEVATION tokenElevated = { };
+    DWORD cbToken = 0;
+    if (!::OpenProcessToken(hProcess, TOKEN_QUERY, &hToken))
+    {
+        ProcExitWithLastError(hr, "Failed to open process token.");
+    }
+    if (::GetTokenInformation(hToken, TokenElevation, &tokenElevated, sizeof(TOKEN_ELEVATION), &cbToken))
+    {
+        *pfElevated = (0 != tokenElevated.TokenIsElevated);
+    }
+    else
+    {
+        DWORD er = ::GetLastError();
+        hr = HRESULT_FROM_WIN32(er);
+        // If it's invalid argument, this means the OS doesn't support TokenElevation, so we're not elevated.
+        if (E_INVALIDARG == hr)
+        {
+            *pfElevated = FALSE;
+            hr = S_OK;
+        }
+        else
+        {
+            ProcExitOnRootFailure(hr, "Failed to get elevation token from process.");
+        }
+    }
+LExit:
+    ReleaseHandle(hToken);
+    return hr;
+}
+extern "C" HRESULT DAPI ProcWow64(
+    __in HANDLE hProcess,
+    __out BOOL* pfWow64
+    )
+{
+    HRESULT hr = S_OK;
+    BOOL fIsWow64 = FALSE;
+    typedef BOOL(WINAPI* LPFN_ISWOW64PROCESS2)(HANDLE, USHORT *, USHORT *);
+    LPFN_ISWOW64PROCESS2 pfnIsWow64Process2 = (LPFN_ISWOW64PROCESS2)::GetProcAddress(::GetModuleHandleW(L"kernel32"), "IsWow64Process2");
+    if (pfnIsWow64Process2)
+    {
+        USHORT pProcessMachine = IMAGE_FILE_MACHINE_UNKNOWN;
+        if (!pfnIsWow64Process2(hProcess, &pProcessMachine, nullptr))
+        {
+            ProcExitWithLastError(hr, "Failed to check WOW64 process - IsWow64Process2.");
+        }
+        if (pProcessMachine != IMAGE_FILE_MACHINE_UNKNOWN)
+        {
+            fIsWow64 = TRUE;
+        }
+    }
+    else
+    {
+    typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS)(HANDLE, PBOOL);
+    LPFN_ISWOW64PROCESS pfnIsWow64Process = (LPFN_ISWOW64PROCESS)::GetProcAddress(::GetModuleHandleW(L"kernel32"), "IsWow64Process");
+    if (pfnIsWow64Process)
+    {
+        if (!pfnIsWow64Process(hProcess, &fIsWow64))
+        {
+                ProcExitWithLastError(hr, "Failed to check WOW64 process - IsWow64Process.");
+            }
+        }
+    }
+    *pfWow64 = fIsWow64;
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI ProcDisableWowFileSystemRedirection(
+    __in PROC_FILESYSTEMREDIRECTION* pfsr
+    )
+{
+    AssertSz(!pfsr->fDisabled, "File system redirection was already disabled.");
+    HRESULT hr = S_OK;
+    typedef BOOL (WINAPI *LPFN_Wow64DisableWow64FsRedirection)(PVOID *);
+    LPFN_Wow64DisableWow64FsRedirection pfnWow64DisableWow64FsRedirection = (LPFN_Wow64DisableWow64FsRedirection)::GetProcAddress(::GetModuleHandleW(L"kernel32"), "Wow64DisableWow64FsRedirection");
+    if (!pfnWow64DisableWow64FsRedirection)
+    {
+        ExitFunction1(hr = E_NOTIMPL);
+    }
+    if (!pfnWow64DisableWow64FsRedirection(&pfsr->pvRevertState))
+    {
+        ProcExitWithLastError(hr, "Failed to disable file system redirection.");
+    }
+    pfsr->fDisabled = TRUE;
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI ProcRevertWowFileSystemRedirection(
+    __in PROC_FILESYSTEMREDIRECTION* pfsr
+    )
+{
+    HRESULT hr = S_OK;
+    if (pfsr->fDisabled)
+    {
+        typedef BOOL (WINAPI *LPFN_Wow64RevertWow64FsRedirection)(PVOID);
+        LPFN_Wow64RevertWow64FsRedirection pfnWow64RevertWow64FsRedirection = (LPFN_Wow64RevertWow64FsRedirection)::GetProcAddress(::GetModuleHandleW(L"kernel32"), "Wow64RevertWow64FsRedirection");
+        if (!pfnWow64RevertWow64FsRedirection(pfsr->pvRevertState))
+        {
+            ProcExitWithLastError(hr, "Failed to revert file system redirection.");
+        }
+        pfsr->fDisabled = FALSE;
+        pfsr->pvRevertState = NULL;
+    }
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI ProcExec(
+    __in_z LPCWSTR wzExecutablePath,
+    __in_z_opt LPCWSTR wzCommandLine,
+    __in int nCmdShow,
+    __out HANDLE *phProcess
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczFullCommandLine = NULL;
+    STARTUPINFOW si = { };
+    PROCESS_INFORMATION pi = { };
+    hr = StrAllocFormatted(&sczFullCommandLine, L"\"%ls\" %ls", wzExecutablePath, wzCommandLine ? wzCommandLine : L"");
+    ProcExitOnFailure(hr, "Failed to allocate full command-line.");
+    si.cb = sizeof(si);
+    si.wShowWindow = static_cast<WORD>(nCmdShow);
+    if (!::CreateProcessW(wzExecutablePath, sczFullCommandLine, NULL, NULL, FALSE, 0, 0, NULL, &si, &pi))
+    {
+        ProcExitWithLastError(hr, "Failed to create process: %ls", sczFullCommandLine);
+    }
+    *phProcess = pi.hProcess;
+    pi.hProcess = NULL;
+LExit:
+    ReleaseHandle(pi.hThread);
+    ReleaseHandle(pi.hProcess);
+    ReleaseStr(sczFullCommandLine);
+    return hr;
+}
+/********************************************************************
+ ProcExecute() - executes a command-line.
+*******************************************************************/
+extern "C" HRESULT DAPI ProcExecute(
+    __in_z LPWSTR wzCommand,
+    __out HANDLE *phProcess,
+    __out_opt HANDLE *phChildStdIn,
+    __out_opt HANDLE *phChildStdOutErr
+    )
+{
+    HRESULT hr = S_OK;
+    PROCESS_INFORMATION pi = { };
+    STARTUPINFOW si = { };
+    HANDLE hOutRead = INVALID_HANDLE_VALUE;
+    HANDLE hOutWrite = INVALID_HANDLE_VALUE;
+    HANDLE hErrWrite = INVALID_HANDLE_VALUE;
+    HANDLE hInRead = INVALID_HANDLE_VALUE;
+    HANDLE hInWrite = INVALID_HANDLE_VALUE;
+    // Create redirect pipes.
+    hr = CreatePipes(&hOutRead, &hOutWrite, &hErrWrite, &hInRead, &hInWrite);
+    ProcExitOnFailure(hr, "failed to create output pipes");
+    // Set up startup structure.
+    si.cb = sizeof(STARTUPINFOW);
+    si.dwFlags = STARTF_USESTDHANDLES;
+    si.hStdInput = hInRead;
+    si.hStdOutput = hOutWrite;
+    si.hStdError = hErrWrite;
+#pragma prefast(push)
+#pragma prefast(disable:25028)
+    if (::CreateProcessW(NULL,
+        wzCommand, // command line
+        NULL, // security info
+        NULL, // thread info
+        TRUE, // inherit handles
+        ::GetPriorityClass(::GetCurrentProcess()) | CREATE_NO_WINDOW, // creation flags
+        NULL, // environment
+        NULL, // cur dir
+        &si,
+        &pi))
+#pragma prefast(pop)
+    {
+        // Close child process output/input handles so child doesn't hang
+        // while waiting for input from parent process.
+        ::CloseHandle(hOutWrite);
+        hOutWrite = INVALID_HANDLE_VALUE;
+        ::CloseHandle(hErrWrite);
+        hErrWrite = INVALID_HANDLE_VALUE;
+        ::CloseHandle(hInRead);
+        hInRead = INVALID_HANDLE_VALUE;
+    }
+    else
+    {
+        ProcExitWithLastError(hr, "Process failed to execute.");
+    }
+    *phProcess = pi.hProcess;
+    pi.hProcess = 0;
+    if (phChildStdIn)
+    {
+        *phChildStdIn = hInWrite;
+        hInWrite = INVALID_HANDLE_VALUE;
+    }
+    if (phChildStdOutErr)
+    {
+        *phChildStdOutErr = hOutRead;
+        hOutRead = INVALID_HANDLE_VALUE;
+    }
+LExit:
+    if (pi.hThread)
+    {
+        ::CloseHandle(pi.hThread);
+    }
+    if (pi.hProcess)
+    {
+        ::CloseHandle(pi.hProcess);
+    }
+    ReleaseFileHandle(hOutRead);
+    ReleaseFileHandle(hOutWrite);
+    ReleaseFileHandle(hErrWrite);
+    ReleaseFileHandle(hInRead);
+    ReleaseFileHandle(hInWrite);
+    return hr;
+}
+/********************************************************************
+ ProcWaitForCompletion() - waits for process to complete and gets return code.
+*******************************************************************/
+extern "C" HRESULT DAPI ProcWaitForCompletion(
+    __in HANDLE hProcess,
+    __in DWORD dwTimeout,
+    __out DWORD *pReturnCode
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    // Wait for everything to finish
+    er = ::WaitForSingleObject(hProcess, dwTimeout);
+    if (WAIT_FAILED == er)
+    {
+        ProcExitWithLastError(hr, "Failed to wait for process to complete.");
+    }
+    else if (WAIT_TIMEOUT == er)
+    {
+        ExitFunction1(hr = HRESULT_FROM_WIN32(er));
+    }
+    if (!::GetExitCodeProcess(hProcess, &er))
+    {
+        ProcExitWithLastError(hr, "Failed to get process return code.");
+    }
+    *pReturnCode = er;
+LExit:
+    return hr;
+}
+/********************************************************************
+ ProcWaitForIds() - waits for multiple processes to complete.
+*******************************************************************/
+extern "C" HRESULT DAPI ProcWaitForIds(
+    __in_ecount(cProcessIds) const DWORD rgdwProcessIds[],
+    __in DWORD cProcessIds,
+    __in DWORD dwMilliseconds
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    HANDLE hProcess = NULL;
+    HANDLE * rghProcesses = NULL;
+    DWORD cProcesses = 0;
+    rghProcesses =  static_cast<HANDLE*>(MemAlloc(sizeof(DWORD) * cProcessIds, TRUE));
+    ProcExitOnNull(rgdwProcessIds, hr, E_OUTOFMEMORY, "Failed to allocate array for process ID Handles.");
+    for (DWORD i = 0; i < cProcessIds; ++i)
+    {
+        hProcess = ::OpenProcess(SYNCHRONIZE, FALSE, rgdwProcessIds[i]);
+        if (hProcess != NULL)
+        {
+            rghProcesses[cProcesses++] = hProcess;
+        }
+    }
+    er = ::WaitForMultipleObjects(cProcesses, rghProcesses, TRUE, dwMilliseconds);
+    if (WAIT_FAILED == er)
+    {
+        ProcExitWithLastError(hr, "Failed to wait for process to complete.");
+    }
+    else if (WAIT_TIMEOUT == er)
+    {
+        ProcExitOnWin32Error(er, hr, "Timed out while waiting for process to complete.");
+    }
+    
+LExit:
+    if (rghProcesses)
+    {
+        for (DWORD i = 0; i < cProcesses; ++i)
+        {
+            if (NULL != rghProcesses[i])
+            {
+                ::CloseHandle(rghProcesses[i]);
+            }
+        }
+        
+        MemFree(rghProcesses);
+    }
+    return hr;
+}
+/********************************************************************
+ ProcCloseIds() - sends WM_CLOSE messages to all process ids.
+*******************************************************************/
+extern "C" HRESULT DAPI ProcCloseIds(
+    __in_ecount(cProcessIds) const DWORD* pdwProcessIds,
+    __in DWORD cProcessIds
+    )
+{
+    HRESULT hr = S_OK;
+    for (DWORD i = 0; i < cProcessIds; ++i)
+    {
+        if (!::EnumWindows(&CloseWindowEnumCallback, pdwProcessIds[i]))
+        {
+            ProcExitWithLastError(hr, "Failed to enumerate windows.");
+        }
+    }
+LExit:
+    return hr;
+}
+static HRESULT CreatePipes(
+    __out HANDLE *phOutRead,
+    __out HANDLE *phOutWrite,
+    __out HANDLE *phErrWrite,
+    __out HANDLE *phInRead,
+    __out HANDLE *phInWrite
+    )
+{
+    HRESULT hr = S_OK;
+    SECURITY_ATTRIBUTES sa;
+    HANDLE hOutTemp = INVALID_HANDLE_VALUE;
+    HANDLE hInTemp = INVALID_HANDLE_VALUE;
+    HANDLE hOutRead = INVALID_HANDLE_VALUE;
+    HANDLE hOutWrite = INVALID_HANDLE_VALUE;
+    HANDLE hErrWrite = INVALID_HANDLE_VALUE;
+    HANDLE hInRead = INVALID_HANDLE_VALUE;
+    HANDLE hInWrite = INVALID_HANDLE_VALUE;
+    // Fill out security structure so we can inherit handles
+    ZeroMemory(&sa, sizeof(SECURITY_ATTRIBUTES));
+    sa.nLength = sizeof(SECURITY_ATTRIBUTES);
+    sa.bInheritHandle = TRUE;
+    sa.lpSecurityDescriptor = NULL;
+    // Create pipes
+    if (!::CreatePipe(&hOutTemp, &hOutWrite, &sa, 0))
+    {
+        ProcExitWithLastError(hr, "failed to create output pipe");
+    }
+    if (!::CreatePipe(&hInRead, &hInTemp, &sa, 0))
+    {
+        ProcExitWithLastError(hr, "failed to create input pipe");
+    }
+    // Duplicate output pipe so standard error and standard output write to the same pipe.
+    if (!::DuplicateHandle(::GetCurrentProcess(), hOutWrite, ::GetCurrentProcess(), &hErrWrite, 0, TRUE, DUPLICATE_SAME_ACCESS))
+    {
+        ProcExitWithLastError(hr, "failed to duplicate write handle");
+    }
+    // We need to create new "output read" and "input write" handles that are non inheritable.  Otherwise CreateProcess will creates handles in 
+    // the child process that can't be closed.
+    if (!::DuplicateHandle(::GetCurrentProcess(), hOutTemp, ::GetCurrentProcess(), &hOutRead, 0, FALSE, DUPLICATE_SAME_ACCESS))
+    {
+        ProcExitWithLastError(hr, "failed to duplicate output pipe");
+    }
+    if (!::DuplicateHandle(::GetCurrentProcess(), hInTemp, ::GetCurrentProcess(), &hInWrite, 0, FALSE, DUPLICATE_SAME_ACCESS))
+    {
+        ProcExitWithLastError(hr, "failed to duplicate input pipe");
+    }
+    // now that everything has succeeded, assign to the outputs
+    *phOutRead = hOutRead;
+    hOutRead = INVALID_HANDLE_VALUE;
+    *phOutWrite = hOutWrite;
+    hOutWrite = INVALID_HANDLE_VALUE;
+    *phErrWrite = hErrWrite;
+    hErrWrite = INVALID_HANDLE_VALUE;
+    *phInRead = hInRead;
+    hInRead = INVALID_HANDLE_VALUE;
+    *phInWrite = hInWrite;
+    hInWrite = INVALID_HANDLE_VALUE;
+LExit:
+    ReleaseFileHandle(hOutRead);
+    ReleaseFileHandle(hOutWrite);
+    ReleaseFileHandle(hErrWrite);
+    ReleaseFileHandle(hInRead);
+    ReleaseFileHandle(hInWrite);
+    ReleaseFileHandle(hOutTemp);
+    ReleaseFileHandle(hInTemp);
+    return hr;
+}
+/********************************************************************
+ CloseWindowEnumCallback() - outputs trace and log info
+*******************************************************************/
+static BOOL CALLBACK CloseWindowEnumCallback(
+    __in HWND hWnd,
+    __in LPARAM lParam
+    )
+{
+    DWORD dwPid = static_cast<DWORD>(lParam);
+    DWORD dwProcessId = 0;
+    ::GetWindowThreadProcessId(hWnd, &dwProcessId);
+    if (dwPid == dwProcessId)
+    {
+        ::SendMessageW(hWnd, WM_CLOSE, 0, 0);
+    }
+    return TRUE;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/regutil.cpp b/src/libs/dutil/WixToolset.DUtil/regutil.cpp
new file mode 100644
index 00000000..cb617932
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/regutil.cpp
@@ -0,0 +1,1035 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define RegExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_REGUTIL, x, s, __VA_ARGS__)
+#define RegExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_REGUTIL, x, s, __VA_ARGS__)
+#define RegExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_REGUTIL, x, s, __VA_ARGS__)
+#define RegExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_REGUTIL, x, s, __VA_ARGS__)
+#define RegExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_REGUTIL, x, s, __VA_ARGS__)
+#define RegExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_REGUTIL, x, s, __VA_ARGS__)
+#define RegExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_REGUTIL, p, x, e, s, __VA_ARGS__)
+#define RegExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_REGUTIL, p, x, s, __VA_ARGS__)
+#define RegExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_REGUTIL, p, x, e, s, __VA_ARGS__)
+#define RegExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_REGUTIL, p, x, s, __VA_ARGS__)
+#define RegExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_REGUTIL, e, x, s, __VA_ARGS__)
+#define RegExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_REGUTIL, g, x, s, __VA_ARGS__)
+static PFN_REGCREATEKEYEXW vpfnRegCreateKeyExW = ::RegCreateKeyExW;
+static PFN_REGOPENKEYEXW vpfnRegOpenKeyExW = ::RegOpenKeyExW;
+static PFN_REGDELETEKEYEXW vpfnRegDeleteKeyExW = NULL;
+static PFN_REGDELETEKEYEXW vpfnRegDeleteKeyExWFromLibrary = NULL;
+static PFN_REGDELETEKEYW vpfnRegDeleteKeyW = ::RegDeleteKeyW;
+static PFN_REGENUMKEYEXW vpfnRegEnumKeyExW = ::RegEnumKeyExW;
+static PFN_REGENUMVALUEW vpfnRegEnumValueW = ::RegEnumValueW;
+static PFN_REGQUERYINFOKEYW vpfnRegQueryInfoKeyW = ::RegQueryInfoKeyW;
+static PFN_REGQUERYVALUEEXW vpfnRegQueryValueExW = ::RegQueryValueExW;
+static PFN_REGSETVALUEEXW vpfnRegSetValueExW = ::RegSetValueExW;
+static PFN_REGDELETEVALUEW vpfnRegDeleteValueW = ::RegDeleteValueW;
+static HMODULE vhAdvApi32Dll = NULL;
+static BOOL vfRegInitialized = FALSE;
+static HRESULT WriteStringToRegistry(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __in_z_opt LPCWSTR wzValue,
+    __in DWORD dwType
+);
+/********************************************************************
+ RegInitialize - initializes regutil
+*********************************************************************/
+extern "C" HRESULT DAPI RegInitialize(
+    )
+{
+    HRESULT hr = S_OK;
+    hr = LoadSystemLibrary(L"AdvApi32.dll", &vhAdvApi32Dll);
+    RegExitOnFailure(hr, "Failed to load AdvApi32.dll");
+    // ignore failures - if this doesn't exist, we'll fall back to RegDeleteKeyW
+    vpfnRegDeleteKeyExWFromLibrary = reinterpret_cast<PFN_REGDELETEKEYEXW>(::GetProcAddress(vhAdvApi32Dll, "RegDeleteKeyExW"));
+    if (NULL == vpfnRegDeleteKeyExW)
+    {
+        vpfnRegDeleteKeyExW = vpfnRegDeleteKeyExWFromLibrary;
+    }
+    vfRegInitialized = TRUE;
+LExit:
+    return hr;
+}
+/********************************************************************
+ RegUninitialize - uninitializes regutil
+*********************************************************************/
+extern "C" void DAPI RegUninitialize(
+    )
+{
+    if (vhAdvApi32Dll)
+    {
+        ::FreeLibrary(vhAdvApi32Dll);
+        vhAdvApi32Dll = NULL;
+        vpfnRegDeleteKeyExWFromLibrary = NULL;
+        vpfnRegDeleteKeyExW = NULL;
+    }
+    vfRegInitialized = FALSE;
+}
+/********************************************************************
+ RegFunctionOverride - overrides the registry functions. Typically used
+                       for unit testing.
+*********************************************************************/
+extern "C" void DAPI RegFunctionOverride(
+    __in_opt PFN_REGCREATEKEYEXW pfnRegCreateKeyExW,
+    __in_opt PFN_REGOPENKEYEXW pfnRegOpenKeyExW,
+    __in_opt PFN_REGDELETEKEYEXW pfnRegDeleteKeyExW,
+    __in_opt PFN_REGENUMKEYEXW pfnRegEnumKeyExW,
+    __in_opt PFN_REGENUMVALUEW pfnRegEnumValueW,
+    __in_opt PFN_REGQUERYINFOKEYW pfnRegQueryInfoKeyW,
+    __in_opt PFN_REGQUERYVALUEEXW pfnRegQueryValueExW,
+    __in_opt PFN_REGSETVALUEEXW pfnRegSetValueExW,
+    __in_opt PFN_REGDELETEVALUEW pfnRegDeleteValueW
+    )
+{
+    vpfnRegCreateKeyExW = pfnRegCreateKeyExW ? pfnRegCreateKeyExW : ::RegCreateKeyExW;
+    vpfnRegOpenKeyExW = pfnRegOpenKeyExW ? pfnRegOpenKeyExW : ::RegOpenKeyExW;
+    vpfnRegDeleteKeyExW = pfnRegDeleteKeyExW ? pfnRegDeleteKeyExW : vpfnRegDeleteKeyExWFromLibrary;
+    vpfnRegEnumKeyExW = pfnRegEnumKeyExW ? pfnRegEnumKeyExW : ::RegEnumKeyExW;
+    vpfnRegEnumValueW = pfnRegEnumValueW ? pfnRegEnumValueW : ::RegEnumValueW;
+    vpfnRegQueryInfoKeyW = pfnRegQueryInfoKeyW ? pfnRegQueryInfoKeyW : ::RegQueryInfoKeyW;
+    vpfnRegQueryValueExW = pfnRegQueryValueExW ? pfnRegQueryValueExW : ::RegQueryValueExW;
+    vpfnRegSetValueExW = pfnRegSetValueExW ? pfnRegSetValueExW : ::RegSetValueExW;
+    vpfnRegDeleteValueW = pfnRegDeleteValueW ? pfnRegDeleteValueW : ::RegDeleteValueW;
+}
+/********************************************************************
+ RegCreate - creates a registry key.
+*********************************************************************/
+extern "C" HRESULT DAPI RegCreate(
+    __in HKEY hkRoot,
+    __in_z LPCWSTR wzSubKey,
+    __in DWORD dwAccess,
+    __out HKEY* phk
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    er = vpfnRegCreateKeyExW(hkRoot, wzSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, dwAccess, NULL, phk, NULL);
+    RegExitOnWin32Error(er, hr, "Failed to create registry key.");
+LExit:
+    return hr;
+}
+/********************************************************************
+ RegCreate - creates a registry key with extra options.
+*********************************************************************/
+HRESULT DAPI RegCreateEx(
+    __in HKEY hkRoot,
+    __in_z LPCWSTR wzSubKey,
+    __in DWORD dwAccess,
+    __in BOOL fVolatile,
+    __in_opt SECURITY_ATTRIBUTES* pSecurityAttributes,
+    __out HKEY* phk,
+    __out_opt BOOL* pfCreated
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    DWORD dwDisposition;
+    er = vpfnRegCreateKeyExW(hkRoot, wzSubKey, 0, NULL, fVolatile ? REG_OPTION_VOLATILE : REG_OPTION_NON_VOLATILE, dwAccess, pSecurityAttributes, phk, &dwDisposition);
+    RegExitOnWin32Error(er, hr, "Failed to create registry key.");
+    if (pfCreated)
+    {
+        *pfCreated = (REG_CREATED_NEW_KEY == dwDisposition);
+    }
+LExit:
+    return hr;
+}
+/********************************************************************
+ RegOpen - opens a registry key.
+*********************************************************************/
+extern "C" HRESULT DAPI RegOpen(
+    __in HKEY hkRoot,
+    __in_z LPCWSTR wzSubKey,
+    __in DWORD dwAccess,
+    __out HKEY* phk
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    er = vpfnRegOpenKeyExW(hkRoot, wzSubKey, 0, dwAccess, phk);
+    if (E_FILENOTFOUND == HRESULT_FROM_WIN32(er))
+    {
+        ExitFunction1(hr = E_FILENOTFOUND);
+    }
+    RegExitOnWin32Error(er, hr, "Failed to open registry key.");
+LExit:
+    return hr;
+}
+/********************************************************************
+ RegDelete - deletes a registry key (and optionally it's whole tree).
+*********************************************************************/
+extern "C" HRESULT DAPI RegDelete(
+    __in HKEY hkRoot,
+    __in_z LPCWSTR wzSubKey,
+    __in REG_KEY_BITNESS kbKeyBitness,
+    __in BOOL fDeleteTree
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    LPWSTR pszEnumeratedSubKey = NULL;
+    LPWSTR pszRecursiveSubKey = NULL;
+    HKEY hkKey = NULL;
+    REGSAM samDesired = 0;
+    if (!vfRegInitialized && REG_KEY_DEFAULT != kbKeyBitness)
+    {
+        hr = E_INVALIDARG;
+        RegExitOnFailure(hr, "RegInitialize must be called first in order to RegDelete() a key with non-default bit attributes!");
+    }
+    switch (kbKeyBitness)
+    {
+    case REG_KEY_32BIT:
+        samDesired = KEY_WOW64_32KEY;
+        break;
+    case REG_KEY_64BIT:
+        samDesired = KEY_WOW64_64KEY;
+        break;
+    case REG_KEY_DEFAULT:
+        // Nothing to do
+        break;
+    }
+    if (fDeleteTree)
+    {
+        hr = RegOpen(hkRoot, wzSubKey, KEY_READ | samDesired, &hkKey);
+        if (E_FILENOTFOUND == hr)
+        {
+            ExitFunction1(hr = S_OK);
+        }
+        RegExitOnFailure(hr, "Failed to open this key for enumerating subkeys: %ls", wzSubKey);
+        // Yes, keep enumerating the 0th item, because we're deleting it every time
+        while (E_NOMOREITEMS != (hr = RegKeyEnum(hkKey, 0, &pszEnumeratedSubKey)))
+        {
+            RegExitOnFailure(hr, "Failed to enumerate key 0");
+            hr = PathConcat(wzSubKey, pszEnumeratedSubKey, &pszRecursiveSubKey);
+            RegExitOnFailure(hr, "Failed to concatenate paths while recursively deleting subkeys. Path1: %ls, Path2: %ls", wzSubKey, pszEnumeratedSubKey);
+            hr = RegDelete(hkRoot, pszRecursiveSubKey, kbKeyBitness, fDeleteTree);
+            RegExitOnFailure(hr, "Failed to recursively delete subkey: %ls", pszRecursiveSubKey);
+        }
+        hr = S_OK;
+    }
+    if (NULL != vpfnRegDeleteKeyExW)
+    {
+        er = vpfnRegDeleteKeyExW(hkRoot, wzSubKey, samDesired, 0);
+        if (E_FILENOTFOUND == HRESULT_FROM_WIN32(er))
+        {
+            ExitFunction1(hr = E_FILENOTFOUND);
+        }
+        RegExitOnWin32Error(er, hr, "Failed to delete registry key (ex).");
+    }
+    else
+    {
+        er = vpfnRegDeleteKeyW(hkRoot, wzSubKey);
+        if (E_FILENOTFOUND == HRESULT_FROM_WIN32(er))
+        {
+            ExitFunction1(hr = E_FILENOTFOUND);
+        }
+        RegExitOnWin32Error(er, hr, "Failed to delete registry key.");
+    }
+LExit:
+    ReleaseRegKey(hkKey);
+    ReleaseStr(pszEnumeratedSubKey);
+    ReleaseStr(pszRecursiveSubKey);
+    return hr;
+}
+/********************************************************************
+ RegKeyEnum - enumerates child registry keys.
+*********************************************************************/
+extern "C" HRESULT DAPI RegKeyEnum(
+    __in HKEY hk,
+    __in DWORD dwIndex,
+    __deref_out_z LPWSTR* psczKey
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    SIZE_T cb = 0;
+    DWORD cch = 0;
+    if (psczKey && *psczKey)
+    {
+        hr = StrMaxLength(*psczKey, &cb);
+        RegExitOnFailure(hr, "Failed to determine length of string.");
+        cch = (DWORD)min(DWORD_MAX, cb);
+    }
+    if (2 > cch)
+    {
+        cch = 2;
+        hr = StrAlloc(psczKey, cch);
+        RegExitOnFailure(hr, "Failed to allocate string to minimum size.");
+    }
+    er = vpfnRegEnumKeyExW(hk, dwIndex, *psczKey, &cch, NULL, NULL, NULL, NULL);
+    if (ERROR_MORE_DATA == er)
+    {
+        er = vpfnRegQueryInfoKeyW(hk, NULL, NULL, NULL, NULL, &cch, NULL, NULL, NULL, NULL, NULL, NULL);
+        RegExitOnWin32Error(er, hr, "Failed to get max size of subkey name under registry key.");
+        ++cch; // add one because RegQueryInfoKeyW() returns the length of the subkeys without the null terminator.
+        hr = StrAlloc(psczKey, cch);
+        RegExitOnFailure(hr, "Failed to allocate string bigger for enum registry key.");
+        er = vpfnRegEnumKeyExW(hk, dwIndex, *psczKey, &cch, NULL, NULL, NULL, NULL);
+    }
+    else if (ERROR_NO_MORE_ITEMS == er)
+    {
+        ExitFunction1(hr = E_NOMOREITEMS);
+    }
+    RegExitOnWin32Error(er, hr, "Failed to enum registry key.");
+    // Always ensure the registry key name is null terminated.
+#pragma prefast(push)
+#pragma prefast(disable:26018)
+    (*psczKey)[cch] = L'\0'; // note that cch will always be one less than the size of the buffer because that's how RegEnumKeyExW() works.
+#pragma prefast(pop)
+LExit:
+    return hr;
+}
+/********************************************************************
+ RegValueEnum - enumerates registry values.
+*********************************************************************/
+HRESULT DAPI RegValueEnum(
+    __in HKEY hk,
+    __in DWORD dwIndex,
+    __deref_out_z LPWSTR* psczName,
+    __out_opt DWORD *pdwType
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    DWORD cbValueName = 0;
+    er = vpfnRegQueryInfoKeyW(hk, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &cbValueName, NULL, NULL, NULL);
+    RegExitOnWin32Error(er, hr, "Failed to get max size of value name under registry key.");
+    // Add one for null terminator
+    ++cbValueName;
+    hr = StrAlloc(psczName, cbValueName);
+    RegExitOnFailure(hr, "Failed to allocate array for registry value name");
+    er = vpfnRegEnumValueW(hk, dwIndex, *psczName, &cbValueName, NULL, pdwType, NULL, NULL);
+    if (ERROR_NO_MORE_ITEMS == er)
+    {
+        ExitFunction1(hr = E_NOMOREITEMS);
+    }
+    RegExitOnWin32Error(er, hr, "Failed to enumerate registry value");
+LExit:
+    return hr;
+}
+/********************************************************************
+ RegGetType - reads a registry key value type.
+ *********************************************************************/
+HRESULT DAPI RegGetType(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __out DWORD *pdwType
+     )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    er = vpfnRegQueryValueExW(hk, wzName, NULL, pdwType, NULL, NULL);
+    if (E_FILENOTFOUND == HRESULT_FROM_WIN32(er))
+    {
+        ExitFunction1(hr = E_FILENOTFOUND);
+    }
+    RegExitOnWin32Error(er, hr, "Failed to read registry value.");
+LExit:
+    return hr;
+}
+/********************************************************************
+ RegReadBinary - reads a registry key binary value.
+ NOTE: caller is responsible for freeing *ppbBuffer
+*********************************************************************/
+HRESULT DAPI RegReadBinary(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __deref_out_bcount_opt(*pcbBuffer) BYTE** ppbBuffer,
+    __out SIZE_T *pcbBuffer
+     )
+{
+    HRESULT hr = S_OK;
+    LPBYTE pbBuffer = NULL;
+    DWORD er = ERROR_SUCCESS;
+    DWORD cb = 0;
+    DWORD dwType = 0;
+    er = vpfnRegQueryValueExW(hk, wzName, NULL, &dwType, NULL, &cb);
+    RegExitOnWin32Error(er, hr, "Failed to get size of registry value.");
+    // Zero-length binary values can exist
+    if (0 < cb)
+    {
+        pbBuffer = static_cast<LPBYTE>(MemAlloc(cb, FALSE));
+        RegExitOnNull(pbBuffer, hr, E_OUTOFMEMORY, "Failed to allocate buffer for binary registry value.");
+        er = vpfnRegQueryValueExW(hk, wzName, NULL, &dwType, pbBuffer, &cb);
+        if (E_FILENOTFOUND == HRESULT_FROM_WIN32(er))
+        {
+            ExitFunction1(hr = E_FILENOTFOUND);
+        }
+        RegExitOnWin32Error(er, hr, "Failed to read registry value.");
+    }
+    if (REG_BINARY == dwType)
+    {
+        *ppbBuffer = pbBuffer;
+        pbBuffer = NULL;
+        *pcbBuffer = cb;
+    }
+    else
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATATYPE);
+        RegExitOnRootFailure(hr, "Error reading binary registry value due to unexpected data type: %u", dwType);
+    }
+LExit:
+    ReleaseMem(pbBuffer);
+    return hr;
+}
+/********************************************************************
+ RegReadString - reads a registry key value as a string.
+*********************************************************************/
+extern "C" HRESULT DAPI RegReadString(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __deref_out_z LPWSTR* psczValue
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    SIZE_T cbValue = 0;
+    DWORD cch = 0;
+    DWORD cb = 0;
+    DWORD dwType = 0;
+    LPWSTR sczExpand = NULL;
+    if (psczValue && *psczValue)
+    {
+        hr = StrMaxLength(*psczValue, &cbValue);
+        RegExitOnFailure(hr, "Failed to determine length of string.");
+        cch = (DWORD)min(DWORD_MAX, cbValue);
+    }
+    if (2 > cch)
+    {
+        cch = 2;
+        hr = StrAlloc(psczValue, cch);
+        RegExitOnFailure(hr, "Failed to allocate string to minimum size.");
+    }
+    cb = sizeof(WCHAR) * (cch - 1); // subtract one to ensure there will be a space at the end of the string for the null terminator.
+    er = vpfnRegQueryValueExW(hk, wzName, NULL, &dwType, reinterpret_cast<LPBYTE>(*psczValue), &cb);
+    if (ERROR_MORE_DATA == er)
+    {
+        cch = cb / sizeof(WCHAR) + 1; // add one to ensure there will be space at the end for the null terminator
+        hr = StrAlloc(psczValue, cch);
+        RegExitOnFailure(hr, "Failed to allocate string bigger for registry value.");
+        er = vpfnRegQueryValueExW(hk, wzName, NULL, &dwType, reinterpret_cast<LPBYTE>(*psczValue), &cb);
+    }
+    if (E_FILENOTFOUND == HRESULT_FROM_WIN32(er))
+    {
+        ExitFunction1(hr = E_FILENOTFOUND);
+    }
+    RegExitOnWin32Error(er, hr, "Failed to read registry key.");
+    if (REG_SZ == dwType || REG_EXPAND_SZ == dwType)
+    {
+        // Always ensure the registry value is null terminated.
+        (*psczValue)[cch - 1] = L'\0';
+        if (REG_EXPAND_SZ == dwType)
+        {
+            hr = StrAllocString(&sczExpand, *psczValue, 0);
+            RegExitOnFailure(hr, "Failed to copy registry value to expand.");
+            hr = PathExpand(psczValue, sczExpand, PATH_EXPAND_ENVIRONMENT);
+            RegExitOnFailure(hr, "Failed to expand registry value: %ls", *psczValue);
+        }
+    }
+    else
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATATYPE);
+        RegExitOnRootFailure(hr, "Error reading string registry value due to unexpected data type: %u", dwType);
+    }
+LExit:
+    ReleaseStr(sczExpand);
+    return hr;
+}
+/********************************************************************
+ RegReadStringArray - reads a registry key value REG_MULTI_SZ value as a string array.
+*********************************************************************/
+HRESULT DAPI RegReadStringArray(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __deref_out_ecount_opt(*pcStrings) LPWSTR** prgsczStrings,
+    __out DWORD *pcStrings
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    DWORD dwNullCharacters = 0;
+    DWORD dwType = 0;
+    DWORD cb = 0;
+    DWORD cch = 0;
+    LPCWSTR wzSource = NULL;
+    LPWSTR sczValue = NULL;
+    er = vpfnRegQueryValueExW(hk, wzName, NULL, &dwType, reinterpret_cast<LPBYTE>(sczValue), &cb);
+    if (0 < cb)
+    {
+        cch = cb / sizeof(WCHAR);
+        hr = StrAlloc(&sczValue, cch);
+        RegExitOnFailure(hr, "Failed to allocate string for registry value.");
+        er = vpfnRegQueryValueExW(hk, wzName, NULL, &dwType, reinterpret_cast<LPBYTE>(sczValue), &cb);
+    }
+    if (E_FILENOTFOUND == HRESULT_FROM_WIN32(er))
+    {
+        ExitFunction1(hr = E_FILENOTFOUND);
+    }
+    RegExitOnWin32Error(er, hr, "Failed to read registry key.");
+    if (cb / sizeof(WCHAR) != cch)
+    {
+        hr = E_UNEXPECTED;
+        RegExitOnFailure(hr, "The size of registry value %ls unexpected changed between 2 reads", wzName);
+    }
+    if (REG_MULTI_SZ != dwType)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATATYPE);
+        RegExitOnRootFailure(hr, "Tried to read string array, but registry value %ls is of an incorrect type", wzName);
+    }
+    // Value exists, but is empty, so no strings to return.
+    if (2 > cch)
+    {
+        *prgsczStrings = NULL;
+        *pcStrings = 0;
+        ExitFunction1(hr = S_OK);
+    }
+    // The docs specifically say if the value was written without double-null-termination, it'll get read back without it too.
+    if (L'\0' != sczValue[cch-1] || L'\0' != sczValue[cch-2])
+    {
+        hr = E_INVALIDARG;
+        RegExitOnFailure(hr, "Tried to read string array, but registry value %ls is invalid (isn't double-null-terminated)", wzName);
+    }
+    cch = cb / sizeof(WCHAR);
+    for (DWORD i = 0; i < cch; ++i)
+    {
+        if (L'\0' == sczValue[i])
+        {
+            ++dwNullCharacters;
+        }
+    }
+    // There's one string for every null character encountered (except the extra 1 at the end of the string)
+    *pcStrings = dwNullCharacters - 1;
+    hr = MemEnsureArraySize(reinterpret_cast<LPVOID *>(prgsczStrings), *pcStrings, sizeof(LPWSTR), 0);
+    RegExitOnFailure(hr, "Failed to resize array while reading REG_MULTI_SZ value");
+#pragma prefast(push)
+#pragma prefast(disable:26010)
+    wzSource = sczValue;
+    for (DWORD i = 0; i < *pcStrings; ++i)
+    {
+        hr = StrAllocString(&(*prgsczStrings)[i], wzSource, 0);
+        RegExitOnFailure(hr, "Failed to allocate copy of string");
+        // Skip past this string
+        wzSource += lstrlenW(wzSource) + 1;
+    }
+#pragma prefast(pop)
+LExit:
+    ReleaseStr(sczValue);
+    return hr;
+}
+/********************************************************************
+ RegReadVersion - reads a registry key value as a version.
+*********************************************************************/
+extern "C" HRESULT DAPI RegReadVersion(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __out DWORD64* pdw64Version
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    DWORD dwType = 0;
+    DWORD cb = 0;
+    LPWSTR sczVersion = NULL;
+    cb = sizeof(DWORD64);
+    er = vpfnRegQueryValueExW(hk, wzName, NULL, &dwType, reinterpret_cast<LPBYTE>(*pdw64Version), &cb);
+    if (E_FILENOTFOUND == HRESULT_FROM_WIN32(er))
+    {
+        ExitFunction1(hr = E_FILENOTFOUND);
+    }
+    if (REG_SZ == dwType || REG_EXPAND_SZ == dwType)
+    {
+        hr = RegReadString(hk, wzName, &sczVersion);
+        RegExitOnFailure(hr, "Failed to read registry version as string.");
+        hr = FileVersionFromStringEx(sczVersion, 0, pdw64Version);
+        RegExitOnFailure(hr, "Failed to convert registry string to version.");
+    }
+    else if (REG_QWORD == dwType)
+    {
+        RegExitOnWin32Error(er, hr, "Failed to read registry key.");
+    }
+    else // unexpected data type
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATATYPE);
+        RegExitOnRootFailure(hr, "Error reading version registry value due to unexpected data type: %u", dwType);
+    }
+LExit:
+    ReleaseStr(sczVersion);
+    return hr;
+}
+/********************************************************************
+ RegReadNumber - reads a DWORD registry key value as a number.
+*********************************************************************/
+extern "C" HRESULT DAPI RegReadNumber(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __out DWORD* pdwValue
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    DWORD dwType = 0;
+    DWORD cb = sizeof(DWORD);
+    er = vpfnRegQueryValueExW(hk, wzName, NULL, &dwType, reinterpret_cast<LPBYTE>(pdwValue), &cb);
+    if (E_FILENOTFOUND == HRESULT_FROM_WIN32(er))
+    {
+        ExitFunction1(hr = E_FILENOTFOUND);
+    }
+    RegExitOnWin32Error(er, hr, "Failed to query registry key value.");
+    if (REG_DWORD != dwType)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATATYPE);
+        RegExitOnRootFailure(hr, "Error reading version registry value due to unexpected data type: %u", dwType);
+    }
+LExit:
+    return hr;
+}
+/********************************************************************
+ RegReadQword - reads a QWORD registry key value as a number.
+*********************************************************************/
+extern "C" HRESULT DAPI RegReadQword(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __out DWORD64* pqwValue
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    DWORD dwType = 0;
+    DWORD cb = sizeof(DWORD64);
+    er = vpfnRegQueryValueExW(hk, wzName, NULL, &dwType, reinterpret_cast<LPBYTE>(pqwValue), &cb);
+    if (E_FILENOTFOUND == HRESULT_FROM_WIN32(er))
+    {
+        ExitFunction1(hr = E_FILENOTFOUND);
+    }
+    RegExitOnWin32Error(er, hr, "Failed to query registry key value.");
+    if (REG_QWORD != dwType)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATATYPE);
+        RegExitOnRootFailure(hr, "Error reading version registry value due to unexpected data type: %u", dwType);
+    }
+LExit:
+    return hr;
+}
+/********************************************************************
+ RegWriteBinary - writes a registry key value as a binary.
+*********************************************************************/
+HRESULT DAPI RegWriteBinary(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __in_bcount(cbBuffer) const BYTE *pbBuffer,
+    __in DWORD cbBuffer
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    er = vpfnRegSetValueExW(hk, wzName, 0, REG_BINARY, pbBuffer, cbBuffer);
+    RegExitOnWin32Error(er, hr, "Failed to write binary registry value with name: %ls", wzName);
+LExit:
+    return hr;
+}
+/********************************************************************
+RegWriteExpandString - writes a registry key value as an expand string.
+Note: if wzValue is NULL the value will be removed.
+*********************************************************************/
+extern "C" HRESULT DAPI RegWriteExpandString(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __in_z_opt LPCWSTR wzValue
+)
+{
+    return WriteStringToRegistry(hk, wzName, wzValue, REG_EXPAND_SZ);
+}
+/********************************************************************
+ RegWriteString - writes a registry key value as a string.
+ Note: if wzValue is NULL the value will be removed.
+*********************************************************************/
+extern "C" HRESULT DAPI RegWriteString(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __in_z_opt LPCWSTR wzValue
+    )
+{
+    return WriteStringToRegistry(hk, wzName, wzValue, REG_SZ);
+}
+/********************************************************************
+ RegWriteStringFormatted - writes a registry key value as a formatted string.
+*********************************************************************/
+extern "C" HRESULT DAPI RegWriteStringFormatted(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __in __format_string LPCWSTR szFormat,
+    ...
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczValue = NULL;
+    va_list args;
+    va_start(args, szFormat);
+    hr = StrAllocFormattedArgs(&sczValue, szFormat, args);
+    va_end(args);
+    RegExitOnFailure(hr, "Failed to allocate %ls value.", wzName);
+    hr = WriteStringToRegistry(hk, wzName, sczValue, REG_SZ);
+LExit:
+    ReleaseStr(sczValue);
+    return hr;
+}
+/********************************************************************
+ RegWriteStringArray - writes an array of strings as a REG_MULTI_SZ value
+*********************************************************************/
+HRESULT DAPI RegWriteStringArray(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __in_ecount(cValues) LPWSTR *rgwzValues,
+    __in DWORD cValues
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    LPWSTR wzCopyDestination = NULL;
+    LPCWSTR wzWriteValue = NULL;
+    LPWSTR sczWriteValue = NULL;
+    DWORD dwTotalStringSize = 0;
+    DWORD cbTotalStringSize = 0;
+    DWORD dwTemp = 0;
+    if (0 == cValues)
+    {
+        wzWriteValue = L"\0";
+    }
+    else
+    {
+        // Add space for the null terminator
+        dwTotalStringSize = 1;
+        for (DWORD i = 0; i < cValues; ++i)
+        {
+            dwTemp = dwTotalStringSize;
+            hr = ::DWordAdd(dwTemp, 1 + lstrlenW(rgwzValues[i]), &dwTotalStringSize);
+            RegExitOnFailure(hr, "DWORD Overflow while adding length of string to write REG_MULTI_SZ");
+        }
+        hr = StrAlloc(&sczWriteValue, dwTotalStringSize);
+        RegExitOnFailure(hr, "Failed to allocate space for string while writing REG_MULTI_SZ");
+        wzCopyDestination = sczWriteValue;
+        dwTemp = dwTotalStringSize;
+        for (DWORD i = 0; i < cValues; ++i)
+        {
+            hr = ::StringCchCopyW(wzCopyDestination, dwTotalStringSize, rgwzValues[i]);
+            RegExitOnFailure(hr, "failed to copy string: %ls", rgwzValues[i]);
+            dwTemp -= lstrlenW(rgwzValues[i]) + 1;
+            wzCopyDestination += lstrlenW(rgwzValues[i]) + 1;
+        }
+        wzWriteValue = sczWriteValue;
+    }
+    hr = ::DWordMult(dwTotalStringSize, sizeof(WCHAR), &cbTotalStringSize);
+    RegExitOnFailure(hr, "Failed to get total string size in bytes");
+    er = vpfnRegSetValueExW(hk, wzName, 0, REG_MULTI_SZ, reinterpret_cast<const BYTE *>(wzWriteValue), cbTotalStringSize);
+    RegExitOnWin32Error(er, hr, "Failed to set registry value to array of strings (first string of which is): %ls", wzWriteValue);
+LExit:
+    ReleaseStr(sczWriteValue);
+    return hr;
+}
+/********************************************************************
+ RegWriteNumber - writes a registry key value as a number.
+*********************************************************************/
+extern "C" HRESULT DAPI RegWriteNumber(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __in DWORD dwValue
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    er = vpfnRegSetValueExW(hk, wzName, 0, REG_DWORD, reinterpret_cast<const BYTE *>(&dwValue), sizeof(dwValue));
+    RegExitOnWin32Error(er, hr, "Failed to set %ls value.", wzName);
+LExit:
+    return hr;
+}
+/********************************************************************
+ RegWriteQword - writes a registry key value as a Qword.
+*********************************************************************/
+extern "C" HRESULT DAPI RegWriteQword(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __in DWORD64 qwValue
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    er = vpfnRegSetValueExW(hk, wzName, 0, REG_QWORD, reinterpret_cast<const BYTE *>(&qwValue), sizeof(qwValue));
+    RegExitOnWin32Error(er, hr, "Failed to set %ls value.", wzName);
+LExit:
+    return hr;
+}
+/********************************************************************
+ RegQueryKey - queries the key for the number of subkeys and values.
+*********************************************************************/
+extern "C" HRESULT DAPI RegQueryKey(
+    __in HKEY hk,
+    __out_opt DWORD* pcSubKeys,
+    __out_opt DWORD* pcValues
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    er = vpfnRegQueryInfoKeyW(hk, NULL, NULL, NULL, pcSubKeys, NULL, NULL, pcValues, NULL, NULL, NULL, NULL);
+    RegExitOnWin32Error(er, hr, "Failed to get the number of subkeys and values under registry key.");
+LExit:
+    return hr;
+}
+/********************************************************************
+RegKeyReadNumber - reads a DWORD registry key value as a number from
+a specified subkey.
+*********************************************************************/
+extern "C" HRESULT DAPI RegKeyReadNumber(
+    __in HKEY hk,
+    __in_z LPCWSTR wzSubKey,
+    __in_z_opt LPCWSTR wzName,
+    __in BOOL f64Bit,
+    __out DWORD* pdwValue
+    )
+{
+    HRESULT hr = S_OK;
+    HKEY hkKey = NULL;
+    hr = RegOpen(hk, wzSubKey, KEY_READ | f64Bit ? KEY_WOW64_64KEY : 0, &hkKey);
+    RegExitOnFailure(hr, "Failed to open key: %ls", wzSubKey);
+    hr = RegReadNumber(hkKey, wzName, pdwValue);
+    RegExitOnFailure(hr, "Failed to read value: %ls/@%ls", wzSubKey, wzName);
+LExit:
+    ReleaseRegKey(hkKey);
+    return hr;
+}
+/********************************************************************
+RegValueExists - determines whether a named value exists in a 
+specified subkey.
+*********************************************************************/
+extern "C" BOOL DAPI RegValueExists(
+    __in HKEY hk,
+    __in_z LPCWSTR wzSubKey,
+    __in_z_opt LPCWSTR wzName,
+    __in BOOL f64Bit
+    )
+{
+    HRESULT hr = S_OK;
+    HKEY hkKey = NULL;
+    DWORD dwType = 0;
+    hr = RegOpen(hk, wzSubKey, KEY_READ | f64Bit ? KEY_WOW64_64KEY : 0, &hkKey);
+    RegExitOnFailure(hr, "Failed to open key: %ls", wzSubKey);
+    hr = RegGetType(hkKey, wzName, &dwType);
+    RegExitOnFailure(hr, "Failed to read value type: %ls/@%ls", wzSubKey, wzName);
+LExit:
+    ReleaseRegKey(hkKey);
+    return SUCCEEDED(hr);
+}
+static HRESULT WriteStringToRegistry(
+    __in HKEY hk,
+    __in_z_opt LPCWSTR wzName,
+    __in_z_opt LPCWSTR wzValue,
+    __in DWORD dwType
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    size_t cbValue = 0;
+    if (wzValue)
+    {
+        hr = ::StringCbLengthW(wzValue, STRSAFE_MAX_CCH * sizeof(TCHAR), &cbValue);
+        RegExitOnFailure(hr, "Failed to determine length of registry value: %ls", wzName);
+        er = vpfnRegSetValueExW(hk, wzName, 0, dwType, reinterpret_cast<const BYTE *>(wzValue), static_cast<DWORD>(cbValue));
+        RegExitOnWin32Error(er, hr, "Failed to set registry value: %ls", wzName);
+    }
+    else
+    {
+        er = vpfnRegDeleteValueW(hk, wzName);
+        if (ERROR_FILE_NOT_FOUND == er || ERROR_PATH_NOT_FOUND == er)
+        {
+            er = ERROR_SUCCESS;
+        }
+        RegExitOnWin32Error(er, hr, "Failed to delete registry value: %ls", wzName);
+    }
+LExit:
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/resrutil.cpp b/src/libs/dutil/WixToolset.DUtil/resrutil.cpp
new file mode 100644
index 00000000..a6a7ee23
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/resrutil.cpp
@@ -0,0 +1,266 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define ResrExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_RESRUTIL, x, s, __VA_ARGS__)
+#define ResrExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_RESRUTIL, x, s, __VA_ARGS__)
+#define ResrExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_RESRUTIL, x, s, __VA_ARGS__)
+#define ResrExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_RESRUTIL, x, s, __VA_ARGS__)
+#define ResrExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_RESRUTIL, x, s, __VA_ARGS__)
+#define ResrExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_RESRUTIL, x, s, __VA_ARGS__)
+#define ResrExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_RESRUTIL, p, x, e, s, __VA_ARGS__)
+#define ResrExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_RESRUTIL, p, x, s, __VA_ARGS__)
+#define ResrExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_RESRUTIL, p, x, e, s, __VA_ARGS__)
+#define ResrExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_RESRUTIL, p, x, s, __VA_ARGS__)
+#define ResrExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_RESRUTIL, e, x, s, __VA_ARGS__)
+#define ResrExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_RESRUTIL, g, x, s, __VA_ARGS__)
+#define RES_STRINGS_PER_BLOCK 16
+BOOL CALLBACK EnumLangIdProc(
+    __in_opt HMODULE hModule,
+    __in_z LPCSTR lpType,
+    __in_z LPCSTR lpName,
+    __in WORD wLanguage,
+    __in LONG_PTR lParam
+    );
+/********************************************************************
+ResGetStringLangId - get the language id for a string in the string table.
+********************************************************************/
+extern "C" HRESULT DAPI ResGetStringLangId(
+    __in_opt LPCWSTR wzPath,
+    __in UINT uID,
+    __out WORD *pwLangId
+    )
+{
+    Assert(pwLangId);
+    HRESULT hr = S_OK;
+    HINSTANCE hModule = NULL;
+    DWORD dwBlockId = (uID / RES_STRINGS_PER_BLOCK) + 1;
+    WORD wFoundLangId = 0;
+    if (wzPath && *wzPath)
+    {
+        hModule = LoadLibraryExW(wzPath, NULL, DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE);
+        ResrExitOnNullWithLastError(hModule, hr, "Failed to open resource file: %ls", wzPath);
+    }
+#pragma prefast(push)
+#pragma prefast(disable:25068)
+    if (!::EnumResourceLanguagesA(hModule, RT_STRING, MAKEINTRESOURCE(dwBlockId), static_cast<ENUMRESLANGPROC>(EnumLangIdProc), reinterpret_cast<LONG_PTR>(&wFoundLangId)))
+#pragma prefast(pop)
+    {
+        ResrExitWithLastError(hr, "Failed to find string language identifier.");
+    }
+    *pwLangId = wFoundLangId;
+LExit:
+    if (hModule)
+    {
+        ::FreeLibrary(hModule);
+    }
+    return hr;
+}
+/********************************************************************
+ResReadString
+NOTE: ppwzString should be freed with StrFree()
+********************************************************************/
+extern "C" HRESULT DAPI ResReadString(
+    __in HINSTANCE hinst,
+    __in UINT uID,
+    __deref_out_z LPWSTR* ppwzString
+    )
+{
+    Assert(hinst && ppwzString);
+    HRESULT hr = S_OK;
+    DWORD cch = 64;  // first guess
+    DWORD cchReturned = 0;
+    do
+    {
+        hr = StrAlloc(ppwzString, cch);
+        ResrExitOnFailureDebugTrace(hr, "Failed to allocate string for resource id: %d", uID);
+        cchReturned = ::LoadStringW(hinst, uID, *ppwzString, cch);
+        if (0 == cchReturned)
+        {
+            ResrExitWithLastError(hr, "Failed to load string resource id: %d", uID);
+        }
+        // if the returned string count is one character too small, it's likely we have
+        // more data to read
+        if (cchReturned + 1 == cch)
+        {
+            cch *= 2;
+            hr = S_FALSE;
+        }
+    } while (S_FALSE == hr);
+    ResrExitOnFailure(hr, "Failed to load string resource id: %d", uID);
+LExit:
+    return hr;
+}
+/********************************************************************
+ ResReadStringAnsi
+ NOTE: ppszString should be freed with StrFree()
+********************************************************************/
+extern "C" HRESULT DAPI ResReadStringAnsi(
+    __in HINSTANCE hinst,
+    __in UINT uID,
+    __deref_out_z LPSTR* ppszString
+    )
+{
+    Assert(hinst && ppszString);
+    HRESULT hr = S_OK;
+    DWORD cch = 64;  // first guess
+    DWORD cchReturned = 0;
+    do
+    {
+        hr = StrAnsiAlloc(ppszString, cch);
+        ResrExitOnFailureDebugTrace(hr, "Failed to allocate string for resource id: %d", uID);
+#pragma prefast(push)
+#pragma prefast(disable:25068)
+        cchReturned = ::LoadStringA(hinst, uID, *ppszString, cch);
+#pragma prefast(pop)
+        if (0 == cchReturned)
+        {
+            ResrExitWithLastError(hr, "Failed to load string resource id: %d", uID);
+        }
+        // if the returned string count is one character too small, it's likely we have
+        // more data to read
+        if (cchReturned + 1 == cch)
+        {
+            cch *= 2;
+            hr = S_FALSE;
+        }
+    } while (S_FALSE == hr);
+    ResrExitOnFailure(hr, "failed to load string resource id: %d", uID);
+LExit:
+    return hr;
+}
+/********************************************************************
+ResReadData - returns a pointer to the specified resource data
+NOTE:  there is no "free" function for this call
+********************************************************************/
+extern "C" HRESULT DAPI ResReadData(
+    __in_opt HINSTANCE hinst,
+    __in_z LPCSTR szDataName,
+    __deref_out_bcount(*pcb) PVOID *ppv,
+    __out DWORD *pcb
+    )
+{
+    Assert(szDataName);
+    Assert(ppv);
+    HRESULT hr = S_OK;
+    HRSRC hRsrc = NULL;
+    HGLOBAL hData = NULL;
+    DWORD cbData = 0;
+#pragma prefast(push)
+#pragma prefast(disable:25068)
+    hRsrc = ::FindResourceExA(hinst, RT_RCDATA, szDataName, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL));
+#pragma prefast(pop)
+    ResrExitOnNullWithLastError(hRsrc, hr, "Failed to find resource.");
+    hData = ::LoadResource(hinst, hRsrc);
+    ResrExitOnNullWithLastError(hData, hr, "Failed to load resource.");
+    cbData = ::SizeofResource(hinst, hRsrc);
+    if (!cbData)
+    {
+        ResrExitWithLastError(hr, "Failed to get size of resource.");
+    }
+    *ppv = ::LockResource(hData);
+    ResrExitOnNullWithLastError(*ppv, hr, "Failed to lock data resource.");
+    *pcb = cbData;
+LExit:
+    return hr;
+}
+/********************************************************************
+ResExportDataToFile - extracts the resource data to the specified target file
+********************************************************************/
+extern "C" HRESULT DAPI ResExportDataToFile(
+    __in_z LPCSTR szDataName,
+    __in_z LPCWSTR wzTargetFile,
+    __in DWORD dwCreationDisposition
+    )
+{
+    HRESULT hr = S_OK;
+    PVOID pData = NULL;
+    DWORD cbData = 0;
+    DWORD cbWritten = 0;
+    HANDLE hFile = INVALID_HANDLE_VALUE;
+    BOOL bCreatedFile = FALSE;
+    hr = ResReadData(NULL, szDataName, &pData, &cbData);
+    ResrExitOnFailure(hr, "Failed to GetData from %s.", szDataName);
+    hFile = ::CreateFileW(wzTargetFile, GENERIC_WRITE, 0, NULL, dwCreationDisposition, FILE_ATTRIBUTE_NORMAL, NULL);
+    if (INVALID_HANDLE_VALUE == hFile)
+    {
+        ResrExitWithLastError(hr, "Failed to CreateFileW for %ls.", wzTargetFile);
+    }
+    bCreatedFile = TRUE;
+    if (!::WriteFile(hFile, pData, cbData, &cbWritten, NULL))
+    {
+        ResrExitWithLastError(hr, "Failed to ::WriteFile for %ls.", wzTargetFile);
+    }
+LExit:
+    ReleaseFile(hFile);
+    if (FAILED(hr))
+    {
+        if (bCreatedFile)
+        {
+            ::DeleteFileW(wzTargetFile);
+        }
+    }
+    return hr;
+}
+BOOL CALLBACK EnumLangIdProc(
+    __in_opt HMODULE /* hModule */,
+    __in_z LPCSTR /* lpType */,
+    __in_z LPCSTR /* lpName */,
+    __in WORD wLanguage,
+    __in LONG_PTR lParam
+    )
+{
+    WORD *pwLangId = reinterpret_cast<WORD*>(lParam);
+    *pwLangId = wLanguage;
+    return TRUE;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/reswutil.cpp b/src/libs/dutil/WixToolset.DUtil/reswutil.cpp
new file mode 100644
index 00000000..e78de84a
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/reswutil.cpp
@@ -0,0 +1,386 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define ReswExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_RESWUTIL, x, s, __VA_ARGS__)
+#define ReswExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_RESWUTIL, x, s, __VA_ARGS__)
+#define ReswExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_RESWUTIL, x, s, __VA_ARGS__)
+#define ReswExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_RESWUTIL, x, s, __VA_ARGS__)
+#define ReswExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_RESWUTIL, x, s, __VA_ARGS__)
+#define ReswExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_RESWUTIL, x, s, __VA_ARGS__)
+#define ReswExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_RESWUTIL, p, x, e, s, __VA_ARGS__)
+#define ReswExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_RESWUTIL, p, x, s, __VA_ARGS__)
+#define ReswExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_RESWUTIL, p, x, e, s, __VA_ARGS__)
+#define ReswExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_RESWUTIL, p, x, s, __VA_ARGS__)
+#define ReswExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_RESWUTIL, e, x, s, __VA_ARGS__)
+#define ReswExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_RESWUTIL, g, x, s, __VA_ARGS__)
+#define RES_STRINGS_PER_BLOCK 16
+// Internal data structure format for a string block in a resource table.
+// Note: Strings are always stored as UNICODED.
+typedef struct _RES_STRING_BLOCK
+{
+    DWORD dwBlockId;
+    WORD wLangId;
+    LPWSTR rgwz[RES_STRINGS_PER_BLOCK];
+} RES_STRING_BLOCK;
+// private functions
+static HRESULT StringBlockInitialize(
+    __in_opt HINSTANCE hModule, 
+    __in DWORD dwBlockId,
+    __in WORD wLangId,
+    __in RES_STRING_BLOCK* pStrBlock
+    );
+static void StringBlockUnitialize(
+    __in RES_STRING_BLOCK* pStrBlock
+    );
+static HRESULT StringBlockChangeString(
+    __in RES_STRING_BLOCK* pStrBlock,
+    __in DWORD dwStringId,
+    __in_z LPCWSTR szData
+    );
+static HRESULT StringBlockConvertToResourceData(
+    __in const RES_STRING_BLOCK* pStrBlock,
+    __deref_out_bcount(*pcbData) LPVOID* ppvData,
+    __out DWORD* pcbData
+    );
+static HRESULT StringBlockConvertFromResourceData(
+    __in RES_STRING_BLOCK* pStrBlock,
+    __in_bcount(cbData) LPCVOID pvData,
+    __in SIZE_T cbData
+    );
+/********************************************************************
+ResWriteString - sets the string into to the specified file's resource name
+********************************************************************/
+extern "C" HRESULT DAPI ResWriteString(
+    __in_z LPCWSTR wzResourceFile,
+    __in DWORD dwDataId,
+    __in_z LPCWSTR wzData,
+    __in WORD wLangId
+    )
+{
+    Assert(wzResourceFile);
+    Assert(wzData);
+    HRESULT hr = S_OK;
+    HINSTANCE hModule = NULL;
+    HANDLE hUpdate = NULL;
+    RES_STRING_BLOCK StrBlock = { };
+    LPVOID pvData = NULL;
+    DWORD cbData = 0;
+    DWORD dwBlockId = (dwDataId / RES_STRINGS_PER_BLOCK) + 1;
+    DWORD dwStringId = (dwDataId % RES_STRINGS_PER_BLOCK);
+    hModule = LoadLibraryExW(wzResourceFile, NULL, DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE);
+    ReswExitOnNullWithLastError(hModule, hr, "Failed to load library: %ls", wzResourceFile);
+    hr = StringBlockInitialize(hModule, dwBlockId, wLangId, &StrBlock);
+    ReswExitOnFailure(hr, "Failed to get string block to update.");
+    hr = StringBlockChangeString(&StrBlock, dwStringId, wzData);
+    ReswExitOnFailure(hr, "Failed to update string block string.");
+    hr = StringBlockConvertToResourceData(&StrBlock, &pvData, &cbData);
+    ReswExitOnFailure(hr, "Failed to convert string block to resource data.");
+    ::FreeLibrary(hModule);
+    hModule = NULL;
+    hUpdate = ::BeginUpdateResourceW(wzResourceFile, FALSE);
+    ReswExitOnNullWithLastError(hUpdate, hr, "Failed to ::BeginUpdateResourcesW.");
+    if (!::UpdateResourceA(hUpdate, RT_STRING, MAKEINTRESOURCE(dwBlockId), wLangId, pvData, cbData))
+    {
+        ReswExitWithLastError(hr, "Failed to ::UpdateResourceA.");
+    }
+    if (!::EndUpdateResource(hUpdate, FALSE))
+    {
+        ReswExitWithLastError(hr, "Failed to ::EndUpdateResourceW.");
+    }
+    hUpdate = NULL;
+LExit:
+    ReleaseMem(pvData);
+    StringBlockUnitialize(&StrBlock);
+    if (hUpdate)
+    {
+        ::EndUpdateResource(hUpdate, TRUE);
+    }
+    if (hModule)
+    {
+        ::FreeLibrary(hModule);
+    }
+    return hr;
+}
+/********************************************************************
+ResWriteData - sets the data into to the specified file's resource name
+********************************************************************/
+extern "C" HRESULT DAPI ResWriteData(
+    __in_z LPCWSTR wzResourceFile,
+    __in_z LPCSTR szDataName,
+    __in PVOID pData,
+    __in DWORD cbData
+    )
+{
+    Assert(wzResourceFile);
+    Assert(szDataName);
+    Assert(pData);
+    Assert(cbData);
+    HRESULT hr = S_OK;
+    HANDLE hUpdate = NULL;
+    hUpdate = ::BeginUpdateResourceW(wzResourceFile, FALSE);
+    ReswExitOnNullWithLastError(hUpdate, hr, "Failed to ::BeginUpdateResourcesW.");
+    if (!::UpdateResourceA(hUpdate, RT_RCDATA, szDataName, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), pData, cbData))
+    {
+        ReswExitWithLastError(hr, "Failed to ::UpdateResourceA.");
+    }
+    if (!::EndUpdateResource(hUpdate, FALSE))
+    {
+        ReswExitWithLastError(hr, "Failed to ::EndUpdateResourceW.");
+    }
+    hUpdate = NULL;
+LExit:
+    if (hUpdate)
+    {
+        ::EndUpdateResource(hUpdate, TRUE);
+    }
+    return hr;
+}
+/********************************************************************
+ResImportDataFromFile - reads a file and sets the data into to the specified file's resource name
+********************************************************************/
+extern "C" HRESULT DAPI ResImportDataFromFile(
+    __in_z LPCWSTR wzTargetFile,
+    __in_z LPCWSTR wzSourceFile,
+    __in_z LPCSTR szDataName
+    )
+{
+    HRESULT hr = S_OK;
+    HANDLE hFile = INVALID_HANDLE_VALUE;
+    DWORD cbFile = 0;
+    HANDLE hMap = NULL;
+    PVOID pv = NULL;
+    hFile = ::CreateFileW(wzSourceFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+    if (INVALID_HANDLE_VALUE == hFile)
+    {
+        ReswExitWithLastError(hr, "Failed to CreateFileW for %ls.", wzSourceFile);
+    }
+    cbFile = ::GetFileSize(hFile, NULL);
+    if (!cbFile)
+    {
+        ReswExitWithLastError(hr, "Failed to GetFileSize for %ls.", wzSourceFile);
+    }
+    hMap = ::CreateFileMapping(hFile, NULL, PAGE_READONLY, 0, 0, NULL);
+    ReswExitOnNullWithLastError(hMap, hr, "Failed to CreateFileMapping for %ls.", wzSourceFile);
+    pv = ::MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, cbFile);
+    ReswExitOnNullWithLastError(pv, hr, "Failed to MapViewOfFile for %ls.", wzSourceFile);
+    hr = ResWriteData(wzTargetFile, szDataName, pv, cbFile);
+    ReswExitOnFailure(hr, "Failed to ResSetData %s on file %ls.", szDataName, wzTargetFile);
+LExit:
+    if (pv)
+    {
+        ::UnmapViewOfFile(pv);
+    }
+    if (hMap)
+    {
+        ::CloseHandle(hMap);
+    }
+    ReleaseFile(hFile);
+    return hr;
+}
+static HRESULT StringBlockInitialize(
+    __in_opt HINSTANCE hModule, 
+    __in DWORD dwBlockId,
+    __in WORD wLangId,
+    __in RES_STRING_BLOCK* pStrBlock
+    )
+{
+    HRESULT hr = S_OK;
+    HRSRC hRsrc = NULL;
+    HGLOBAL hData = NULL;
+    LPCVOID pvData = NULL; // does not need to be freed
+    DWORD cbData = 0;
+    hRsrc = ::FindResourceExA(hModule, RT_STRING, MAKEINTRESOURCE(dwBlockId), wLangId);
+    ReswExitOnNullWithLastError(hRsrc, hr, "Failed to ::FindResourceExW.");
+    hData = ::LoadResource(hModule, hRsrc);
+    ReswExitOnNullWithLastError(hData, hr, "Failed to ::LoadResource.");
+    cbData = ::SizeofResource(hModule, hRsrc);
+    if (!cbData)
+    {
+        ReswExitWithLastError(hr, "Failed to ::SizeofResource.");
+    }
+    pvData = ::LockResource(hData);
+    ReswExitOnNullWithLastError(pvData, hr, "Failed to lock data resource.");
+    pStrBlock->dwBlockId = dwBlockId;
+    pStrBlock->wLangId = wLangId;
+    hr = StringBlockConvertFromResourceData(pStrBlock, pvData, cbData);
+    ReswExitOnFailure(hr, "Failed to convert string block from resource data.");
+LExit:
+    return hr;
+}
+static void StringBlockUnitialize(
+    __in RES_STRING_BLOCK* pStrBlock
+    )
+{
+    if (pStrBlock)
+    {
+        for (DWORD i = 0; i < RES_STRINGS_PER_BLOCK; ++i)
+        {
+            ReleaseNullMem(pStrBlock->rgwz[i]);
+        }
+    }
+}
+static HRESULT StringBlockChangeString(
+    __in RES_STRING_BLOCK* pStrBlock,
+    __in DWORD dwStringId,
+    __in_z LPCWSTR szData
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR pwzData = NULL;
+    size_t cchData = 0;
+    hr = ::StringCchLengthW(szData, STRSAFE_MAX_LENGTH, &cchData);
+    ReswExitOnRootFailure(hr, "Failed to get block string length.");
+    pwzData = static_cast<LPWSTR>(MemAlloc((cchData + 1) * sizeof(WCHAR), TRUE));
+    ReswExitOnNull(pwzData, hr, E_OUTOFMEMORY, "Failed to allocate new block string.");
+    hr = ::StringCchCopyW(pwzData, cchData + 1, szData);
+    ReswExitOnRootFailure(hr, "Failed to copy new block string.");
+    ReleaseNullMem(pStrBlock->rgwz[dwStringId]);
+    pStrBlock->rgwz[dwStringId] = pwzData;
+    pwzData = NULL;
+LExit:
+    ReleaseMem(pwzData);
+    return hr;
+}
+static HRESULT StringBlockConvertToResourceData(
+    __in const RES_STRING_BLOCK* pStrBlock,
+    __deref_out_bcount(*pcbData) LPVOID* ppvData,
+    __out DWORD* pcbData
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD cbData = 0;
+    LPVOID pvData = NULL;
+    WCHAR* pwz = NULL;
+    for (DWORD i = 0; i < RES_STRINGS_PER_BLOCK; ++i)
+    {
+        cbData += (lstrlenW(pStrBlock->rgwz[i]) + 1);
+    }
+    cbData *= sizeof(WCHAR);
+    pvData = MemAlloc(cbData, TRUE);
+    ReswExitOnNull(pvData, hr, E_OUTOFMEMORY, "Failed to allocate buffer to convert string block.");
+    pwz = static_cast<LPWSTR>(pvData);
+    for (DWORD i = 0; i < RES_STRINGS_PER_BLOCK; ++i)
+    {
+        DWORD cch = lstrlenW(pStrBlock->rgwz[i]);
+        *pwz = static_cast<WCHAR>(cch);
+        ++pwz;
+        for (DWORD j = 0; j < cch; ++j)
+        {
+            *pwz = pStrBlock->rgwz[i][j];
+            ++pwz;
+        }
+    }
+    *pcbData = cbData;
+    *ppvData = pvData;
+    pvData = NULL;
+LExit:
+    ReleaseMem(pvData);
+    return hr;
+}
+static HRESULT StringBlockConvertFromResourceData(
+    __in RES_STRING_BLOCK* pStrBlock,
+    __in_bcount(cbData) LPCVOID pvData,
+    __in SIZE_T cbData
+    )
+{
+    UNREFERENCED_PARAMETER(cbData);
+    HRESULT hr = S_OK;
+    LPCWSTR pwzParse = static_cast<LPCWSTR>(pvData);
+    for (DWORD i = 0; i < RES_STRINGS_PER_BLOCK; ++i)
+    {
+        DWORD cchParse = static_cast<DWORD>(*pwzParse);
+        ++pwzParse;
+        pStrBlock->rgwz[i] = static_cast<LPWSTR>(MemAlloc((cchParse + 1) * sizeof(WCHAR), TRUE));
+        ReswExitOnNull(pStrBlock->rgwz[i], hr, E_OUTOFMEMORY, "Failed to populate pStrBlock.");
+        hr = ::StringCchCopyNExW(pStrBlock->rgwz[i], cchParse + 1, pwzParse, cchParse, NULL, NULL, STRSAFE_FILL_BEHIND_NULL);
+        ReswExitOnFailure(hr, "Failed to copy parsed resource data into string block.");
+        pwzParse += cchParse;
+    }
+LExit:
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/rexutil.cpp b/src/libs/dutil/WixToolset.DUtil/rexutil.cpp
new file mode 100644
index 00000000..155ca714
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/rexutil.cpp
@@ -0,0 +1,601 @@
+// 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.
+#include "precomp.h"
+#include "rexutil.h"
+// Exit macros
+#define RexExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_REXUTIL, x, s, __VA_ARGS__)
+#define RexExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_REXUTIL, x, s, __VA_ARGS__)
+#define RexExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_REXUTIL, x, s, __VA_ARGS__)
+#define RexExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_REXUTIL, x, s, __VA_ARGS__)
+#define RexExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_REXUTIL, x, s, __VA_ARGS__)
+#define RexExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_REXUTIL, x, s, __VA_ARGS__)
+#define RexExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_REXUTIL, p, x, e, s, __VA_ARGS__)
+#define RexExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_REXUTIL, p, x, s, __VA_ARGS__)
+#define RexExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_REXUTIL, p, x, e, s, __VA_ARGS__)
+#define RexExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_REXUTIL, p, x, s, __VA_ARGS__)
+#define RexExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_REXUTIL, e, x, s, __VA_ARGS__)
+#define RexExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_REXUTIL, g, x, s, __VA_ARGS__)
+//
+// static globals
+//
+static HMODULE vhCabinetDll = NULL;
+static HFDI vhfdi = NULL;
+static ERF verf;
+static FAKE_FILE vrgffFileTable[FILETABLESIZE];
+static DWORD vcbRes;
+static LPCBYTE vpbRes;
+static CHAR vszResource[MAX_PATH];
+static REX_CALLBACK_WRITE vpfnWrite = NULL;
+static HRESULT vhrLastError = S_OK;
+//
+// structs
+//
+struct REX_CALLBACK_STRUCT
+{
+    BOOL fStopExtracting;   // flag set when no more files are needed
+    LPCWSTR pwzExtract;         // file to extract ("*" means extract all)
+    LPCWSTR pwzExtractDir;      // directory to extract files to
+    LPCWSTR pwzExtractName; // name of file (pwzExtract can't be "*")
+    // possible user data
+    REX_CALLBACK_PROGRESS pfnProgress;
+    LPVOID pvContext;
+};
+//
+// prototypes
+//
+static __callback LPVOID DIAMONDAPI RexAlloc(DWORD dwSize);
+static __callback void DIAMONDAPI RexFree(LPVOID pvData);
+static __callback INT_PTR FAR DIAMONDAPI RexOpen(__in_z char FAR *pszFile, int oflag, int pmode);
+static __callback UINT FAR DIAMONDAPI RexRead(INT_PTR hf, __out_bcount(cb) void FAR *pv, UINT cb);
+static __callback UINT FAR DIAMONDAPI RexWrite(INT_PTR hf, __in_bcount(cb) void FAR *pv, UINT cb);
+static __callback int FAR DIAMONDAPI RexClose(INT_PTR hf);
+static __callback long FAR DIAMONDAPI RexSeek(INT_PTR hf, long dist, int seektype);
+static __callback INT_PTR DIAMONDAPI RexCallback(FDINOTIFICATIONTYPE iNotification, FDINOTIFICATION *pFDINotify);
+/********************************************************************
+ RexInitialize - initializes internal static variables
+*******************************************************************/
+extern "C" HRESULT RexInitialize()
+{
+    Assert(!vhfdi);
+    HRESULT hr = S_OK;
+    vhfdi = ::FDICreate(RexAlloc, RexFree, RexOpen, RexRead, RexWrite, RexClose, RexSeek, cpuUNKNOWN, &verf);
+    if (!vhfdi)
+    {
+        hr = E_FAIL;
+        RexExitOnFailure(hr, "failed to initialize cabinet.dll"); // TODO: put verf info in trace message here
+    }
+    ::ZeroMemory(vrgffFileTable, sizeof(vrgffFileTable));
+LExit:
+    if (FAILED(hr))
+    {
+        ::FDIDestroy(vhfdi);
+        vhfdi = NULL;
+    }
+    
+    return hr;
+}
+/********************************************************************
+ RexUninitialize - initializes internal static variables
+*******************************************************************/
+extern "C" void RexUninitialize()
+{
+    if (vhfdi)
+    {
+        ::FDIDestroy(vhfdi);
+        vhfdi = NULL;
+    }
+}
+/********************************************************************
+ RexExtract - extracts one or all files from a resource cabinet
+ NOTE: wzExtractId can be a single file id or "*" to extract all files
+       wzExttractDir must be normalized (end in a "\")
+       wzExtractName is ignored if wzExtractId is "*"
+*******************************************************************/
+extern "C" HRESULT RexExtract(
+    __in_z LPCSTR szResource,
+    __in_z LPCWSTR wzExtractId,
+    __in_z LPCWSTR wzExtractDir,
+    __in_z LPCWSTR wzExtractName,
+    __in REX_CALLBACK_PROGRESS pfnProgress,
+    __in REX_CALLBACK_WRITE pfnWrite,
+    __in LPVOID pvContext
+    )
+{
+    Assert(vhfdi);
+    HRESULT hr = S_OK;
+    BOOL fResult;
+    HRSRC hResInfo = NULL;
+    HANDLE hRes = NULL;
+    REX_CALLBACK_STRUCT rcs;
+    // remember the write callback
+    vpfnWrite = pfnWrite;
+    //
+    // load the cabinet resource
+    //
+    hResInfo = ::FindResourceExA(NULL, RT_RCDATA, szResource, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL));
+    RexExitOnNullWithLastError(hResInfo, hr, "Failed to find resource.");
+    //hResInfo = ::FindResourceW(NULL, wzResource, /*RT_RCDATA*/MAKEINTRESOURCEW(10));
+    //ExitOnNullWithLastError(hResInfo, hr, "failed to load resource info");
+    hRes = ::LoadResource(NULL, hResInfo);
+    RexExitOnNullWithLastError(hRes, hr, "failed to load resource");
+    vcbRes = ::SizeofResource(NULL, hResInfo);
+    vpbRes = (const BYTE*)::LockResource(hRes);
+    // TODO: Call FDIIsCabinet to confirm resource is a cabinet before trying to extract from it
+    //
+    // convert the resource name to multi-byte
+    //
+    //if (!::WideCharToMultiByte(CP_ACP, 0, wzResource, -1, vszResource, countof(vszResource), NULL, NULL))
+    //{
+    //    RexExitOnLastError(hr, "failed to convert cabinet resource name to ASCII: %ls", wzResource);
+    //}
+    hr = ::StringCchCopyA(vszResource, countof(vszResource), szResource);
+    RexExitOnFailure(hr, "Failed to copy resource name to global.");
+    //
+    // iterate through files in cabinet extracting them to the callback function
+    //
+    rcs.fStopExtracting = FALSE;
+    rcs.pwzExtract = wzExtractId;
+    rcs.pwzExtractDir = wzExtractDir;
+    rcs.pwzExtractName = wzExtractName;
+    rcs.pfnProgress = pfnProgress;
+    rcs.pvContext = pvContext;
+    fResult = ::FDICopy(vhfdi, vszResource, "", 0, RexCallback, NULL, static_cast<void*>(&rcs));
+    if (!fResult && !rcs.fStopExtracting)   // if something went wrong and it wasn't us just stopping the extraction, then return a failure
+    {
+        hr = vhrLastError;  // TODO: put verf info in trace message here
+    }
+LExit:
+    return hr;
+}
+/****************************************************************************
+ default extract routines
+****************************************************************************/
+static __callback LPVOID DIAMONDAPI RexAlloc(DWORD dwSize)
+{ 
+    return MemAlloc(dwSize, FALSE);
+}
+static __callback void DIAMONDAPI RexFree(LPVOID pvData)
+{ 
+    MemFree(pvData);
+}
+static __callback INT_PTR FAR DIAMONDAPI RexOpen(__in_z char FAR *pszFile, int oflag, int pmode)
+{
+    HRESULT hr = S_OK;
+    HANDLE hFile = INVALID_HANDLE_VALUE;
+    int i = 0;
+    // if FDI asks for some unusual mode (__in low memory situation it could ask for a scratch file) fail
+    if ((oflag != (/*_O_BINARY*/ 0x8000 | /*_O_RDONLY*/ 0x0000)) || (pmode != (_S_IREAD | _S_IWRITE)))
+    {
+        hr = E_OUTOFMEMORY;
+        RexExitOnFailure(hr, "FDI asked for to create a scratch file, which is unusual");
+    }
+    // find an empty spot in the fake file table
+    for (i = 0; i < FILETABLESIZE; ++i)
+    {
+        if (!vrgffFileTable[i].fUsed)
+        {
+            break;
+        }
+    }
+    // we should never run out of space in the fake file table
+    if (FILETABLESIZE <= i)
+    {
+        hr = E_OUTOFMEMORY;
+        RexExitOnFailure(hr, "File table exceeded");
+    }
+    if (0 == lstrcmpA(vszResource, pszFile))
+    {
+        vrgffFileTable[i].fUsed = TRUE;
+        vrgffFileTable[i].fftType = MEMORY_FILE;
+        vrgffFileTable[i].mfFile.vpStart = static_cast<LPCBYTE>(vpbRes);
+        vrgffFileTable[i].mfFile.uiCurrent = 0;
+        vrgffFileTable[i].mfFile.uiLength = vcbRes;
+    }
+    else   // it's a real file
+    {
+        hFile = ::CreateFileA(pszFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+        if (INVALID_HANDLE_VALUE == hFile)
+        {
+            RexExitWithLastError(hr, "failed to open file: %s", pszFile);
+        }
+        vrgffFileTable[i].fUsed = TRUE;
+        vrgffFileTable[i].fftType = NORMAL_FILE;
+        vrgffFileTable[i].hFile = hFile;
+    }
+LExit:
+    if (FAILED(hr))
+    {
+        vhrLastError = hr;
+    }
+    return FAILED(hr) ? -1 : i;
+}
+static __callback UINT FAR DIAMONDAPI RexRead(INT_PTR hf, __out_bcount(cb) void FAR *pv, UINT cb)
+{
+    Assert(vrgffFileTable[hf].fUsed);
+    HRESULT hr = S_OK;
+    DWORD cbRead = 0;
+    DWORD cbAvailable = 0;
+    if (MEMORY_FILE == vrgffFileTable[hf].fftType)
+    {
+        // ensure that we don't read past the length of the resource
+        cbAvailable = vrgffFileTable[hf].mfFile.uiLength - vrgffFileTable[hf].mfFile.uiCurrent;
+        cbRead = cb < cbAvailable? cb : cbAvailable;
+        memcpy(pv, static_cast<const void *>(vrgffFileTable[hf].mfFile.vpStart + vrgffFileTable[hf].mfFile.uiCurrent), cbRead);
+        vrgffFileTable[hf].mfFile.uiCurrent += cbRead;
+    }
+    else // NORMAL_FILE
+    {
+        Assert(vrgffFileTable[hf].hFile && vrgffFileTable[hf].hFile != INVALID_HANDLE_VALUE);
+        if (!::ReadFile(vrgffFileTable[hf].hFile, pv, cb, &cbRead, NULL))
+        {
+            RexExitWithLastError(hr, "failed to read during cabinet extraction");
+        }
+    }
+LExit:
+    if (FAILED(hr))
+    {
+        vhrLastError = hr;
+    }
+    return FAILED(hr) ? -1 : cbRead;
+}
+static __callback UINT FAR DIAMONDAPI RexWrite(INT_PTR hf, __in_bcount(cb) void FAR *pv, UINT cb)
+{
+    Assert(vrgffFileTable[hf].fUsed);
+    Assert(vrgffFileTable[hf].fftType == NORMAL_FILE); // we should never be writing to a memory file
+    HRESULT hr = S_OK;
+    DWORD cbWrite = 0;
+    Assert(vrgffFileTable[hf].hFile && vrgffFileTable[hf].hFile != INVALID_HANDLE_VALUE);
+    if (!::WriteFile(reinterpret_cast<HANDLE>(vrgffFileTable[hf].hFile), pv, cb, &cbWrite, NULL))
+    {
+        RexExitWithLastError(hr, "failed to write during cabinet extraction");
+    }
+    // call the writer callback if defined
+    if (vpfnWrite)
+    {
+        vpfnWrite(cb);
+    }
+LExit:
+    if (FAILED(hr))
+    {
+        vhrLastError = hr;
+    }
+    return FAILED(hr) ? -1 : cbWrite;
+}
+static __callback long FAR DIAMONDAPI RexSeek(INT_PTR hf, long dist, int seektype)
+{
+    Assert(vrgffFileTable[hf].fUsed);
+    HRESULT hr = S_OK;
+    DWORD dwMoveMethod;
+    LONG lMove = 0;
+    switch (seektype)
+    {
+    case 0:   // SEEK_SET
+        dwMoveMethod = FILE_BEGIN;
+        break;
+    case 1:   /// SEEK_CUR
+        dwMoveMethod = FILE_CURRENT;
+        break;
+    case 2:   // SEEK_END
+        dwMoveMethod = FILE_END;
+        break;
+    default :
+        dwMoveMethod = 0;
+        hr = E_UNEXPECTED;
+        RexExitOnFailure(hr, "unexpected seektype in FDISeek(): %d", seektype);
+    }
+    if (MEMORY_FILE == vrgffFileTable[hf].fftType)
+    {
+        if (FILE_BEGIN == dwMoveMethod)
+        {
+            vrgffFileTable[hf].mfFile.uiCurrent = dist;
+        }
+        else if (FILE_CURRENT == dwMoveMethod)
+        {
+            vrgffFileTable[hf].mfFile.uiCurrent += dist;
+        }
+        else // FILE_END
+        {
+            vrgffFileTable[hf].mfFile.uiCurrent = vrgffFileTable[hf].mfFile.uiLength + dist;
+        }
+        lMove = vrgffFileTable[hf].mfFile.uiCurrent;
+    }
+    else // NORMAL_FILE
+    {
+        Assert(vrgffFileTable[hf].hFile && vrgffFileTable[hf].hFile != INVALID_HANDLE_VALUE);
+        // SetFilePointer returns -1 if it fails (this will cause FDI to quit with an FDIERROR_USER_ABORT error. 
+        // (Unless this happens while working on a cabinet, in which case FDI returns FDIERROR_CORRUPT_CABINET)
+        lMove = ::SetFilePointer(vrgffFileTable[hf].hFile, dist, NULL, dwMoveMethod);
+        if (0xFFFFFFFF == lMove)
+        {
+            RexExitWithLastError(hr, "failed to move file pointer %d bytes", dist);
+        }
+    }
+LExit:
+    if (FAILED(hr))
+    {
+        vhrLastError = hr;
+    }
+    return FAILED(hr) ? -1 : lMove;
+}
+__callback int FAR DIAMONDAPI RexClose(INT_PTR hf)
+{
+    Assert(vrgffFileTable[hf].fUsed);
+    HRESULT hr = S_OK;
+    if (MEMORY_FILE == vrgffFileTable[hf].fftType)
+    {
+        vrgffFileTable[hf].mfFile.vpStart = NULL;
+        vrgffFileTable[hf].mfFile.uiCurrent = 0;
+        vrgffFileTable[hf].mfFile.uiLength = 0;
+    }
+    else
+    {
+        Assert(vrgffFileTable[hf].hFile && vrgffFileTable[hf].hFile != INVALID_HANDLE_VALUE);
+        if (!::CloseHandle(vrgffFileTable[hf].hFile))
+        {
+            RexExitWithLastError(hr, "failed to close file during cabinet extraction");
+        }
+        vrgffFileTable[hf].hFile = INVALID_HANDLE_VALUE;
+    }
+    vrgffFileTable[hf].fUsed = FALSE;
+LExit:
+    if (FAILED(hr))
+    {
+        vhrLastError = hr;
+    }
+    return FAILED(hr) ? -1 : 0;
+}
+static __callback INT_PTR DIAMONDAPI RexCallback(FDINOTIFICATIONTYPE iNotification, FDINOTIFICATION *pFDINotify)
+{
+    Assert(pFDINotify->pv);
+    HRESULT hr = S_OK;
+    int ipResult = 0;   // result to return on success
+    HANDLE hFile = INVALID_HANDLE_VALUE;
+    REX_CALLBACK_STRUCT* prcs = static_cast<REX_CALLBACK_STRUCT*>(pFDINotify->pv);
+    LPCSTR sz;
+    WCHAR wz[MAX_PATH];
+    FILETIME ft;
+    int i = 0;
+    switch (iNotification)
+    {
+    case fdintCOPY_FILE:  // beGIN extracting a resource from cabinet
+        Assert(pFDINotify->psz1);
+        if (prcs->fStopExtracting)
+        {
+            ExitFunction1(hr = S_FALSE);   // no more extracting
+        }
+        // convert params to useful variables
+        sz = static_cast<LPCSTR>(pFDINotify->psz1);
+        if (!::MultiByteToWideChar(CP_ACP, 0, sz, -1, wz, countof(wz)))
+        {
+            RexExitWithLastError(hr, "failed to convert cabinet file id to unicode: %s", sz);
+        }
+        if (prcs->pfnProgress)
+        {
+            hr = prcs->pfnProgress(TRUE, wz, prcs->pvContext);
+            if (S_OK != hr)
+            {
+                ExitFunction();
+            }
+        }
+        if (L'*' == *prcs->pwzExtract || 0 == lstrcmpW(prcs->pwzExtract, wz))
+        {
+            // get the created date for the resource in the cabinet
+            if (!::DosDateTimeToFileTime(pFDINotify->date, pFDINotify->time, &ft))
+            {
+                RexExitWithLastError(hr, "failed to get time for resource: %ls", wz);
+            }
+            WCHAR wzPath[MAX_PATH];
+            hr = ::StringCchCopyW(wzPath, countof(wzPath), prcs->pwzExtractDir);
+            RexExitOnFailure(hr, "failed to copy extract directory: %ls for file: %ls", prcs->pwzExtractDir, wz);
+            if (L'*' == *prcs->pwzExtract)
+            {
+                hr = ::StringCchCatW(wzPath, countof(wzPath), wz);
+                RexExitOnFailure(hr, "failed to concat onto path: %ls file: %ls", wzPath, wz);
+            }
+            else
+            {
+                Assert(*prcs->pwzExtractName);
+                hr = ::StringCchCatW(wzPath, countof(wzPath), prcs->pwzExtractName);
+                RexExitOnFailure(hr, "failed to concat onto path: %ls file: %ls", wzPath, prcs->pwzExtractName);
+            }
+            // Quickly chop off the file name part of the path to ensure the path exists
+            // then put the file name back on the path (by putting the first character
+            // back over the null terminator).
+            LPWSTR wzFile = PathFile(wzPath);
+            WCHAR wzFileFirstChar = *wzFile;
+            *wzFile = L'\0';
+            hr = DirEnsureExists(wzPath, NULL);
+            RexExitOnFailure(hr, "failed to ensure directory: %ls", wzPath);
+            hr = S_OK;
+            *wzFile = wzFileFirstChar;
+            // find an empty spot in the fake file table
+            for (i = 0; i < FILETABLESIZE; ++i)
+            {
+                if (!vrgffFileTable[i].fUsed)
+                {
+                    break;
+                }
+            }
+            // we should never run out of space in the fake file table
+            if (FILETABLESIZE <= i)
+            {
+                hr = E_OUTOFMEMORY;
+                RexExitOnFailure(hr, "File table exceeded");
+            }
+            // open the file
+            hFile = ::CreateFileW(wzPath, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+            if (INVALID_HANDLE_VALUE == hFile)
+            {
+                RexExitWithLastError(hr, "failed to open file: %ls", wzPath);
+            }
+            vrgffFileTable[i].fUsed = TRUE;
+            vrgffFileTable[i].fftType = NORMAL_FILE;
+            vrgffFileTable[i].hFile = hFile;
+            ipResult = i;
+            ::SetFileTime(vrgffFileTable[i].hFile, &ft, &ft, &ft);   // try to set the file time (who cares if it fails)
+            if (::SetFilePointer(vrgffFileTable[i].hFile, pFDINotify->cb, NULL, FILE_BEGIN))   // try to set the end of the file (don't worry if this fails)
+            {
+                if (::SetEndOfFile(vrgffFileTable[i].hFile))
+                {
+                    ::SetFilePointer(vrgffFileTable[i].hFile, 0, NULL, FILE_BEGIN);  // reset the file pointer
+                }
+            }
+        }
+        else  // resource wasn't requested, skip it
+        {
+            hr = S_OK;
+            ipResult = 0;
+        }
+        break;
+    case fdintCLOSE_FILE_INFO:  // resource extraction complete
+        Assert(pFDINotify->hf && pFDINotify->psz1);
+        // convert params to useful variables
+        sz = static_cast<LPCSTR>(pFDINotify->psz1);
+        if (!::MultiByteToWideChar(CP_ACP, 0, sz, -1, wz, countof(wz)))
+        {
+            RexExitWithLastError(hr, "failed to convert cabinet file id to unicode: %s", sz);
+        }
+        RexClose(pFDINotify->hf);
+        if (prcs->pfnProgress)
+        {
+            hr = prcs->pfnProgress(FALSE, wz, prcs->pvContext);
+        }
+        if (S_OK == hr && L'*' == *prcs->pwzExtract)   // if everything is okay and we're extracting all files, keep going
+        {
+            ipResult = TRUE;
+        }
+        else   // something went wrong or we only needed to extract one file
+        {
+            hr = S_OK;
+            ipResult = FALSE;
+            prcs->fStopExtracting = TRUE;
+        }
+        break;
+    case fdintPARTIAL_FILE: __fallthrough;   // no action needed for these messages, fall through
+    case fdintNEXT_CABINET: __fallthrough;
+    case fdintENUMERATE: __fallthrough;
+    case fdintCABINET_INFO:
+        break;
+    default:
+        AssertSz(FALSE, "RexCallback() - unknown FDI notification command");
+    };
+LExit:
+    if (FAILED(hr))
+    {
+        vhrLastError = hr;
+    }
+    return (S_OK == hr) ? ipResult : -1;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/rmutil.cpp b/src/libs/dutil/WixToolset.DUtil/rmutil.cpp
new file mode 100644
index 00000000..95c8c8a4
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/rmutil.cpp
@@ -0,0 +1,488 @@
+// 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.
+#include "precomp.h"
+#include <restartmanager.h>
+// Exit macros
+#define RmExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_RMUTIL, x, s, __VA_ARGS__)
+#define RmExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_RMUTIL, x, s, __VA_ARGS__)
+#define RmExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_RMUTIL, x, s, __VA_ARGS__)
+#define RmExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_RMUTIL, x, s, __VA_ARGS__)
+#define RmExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_RMUTIL, x, s, __VA_ARGS__)
+#define RmExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_RMUTIL, x, s, __VA_ARGS__)
+#define RmExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_RMUTIL, p, x, e, s, __VA_ARGS__)
+#define RmExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_RMUTIL, p, x, s, __VA_ARGS__)
+#define RmExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_RMUTIL, p, x, e, s, __VA_ARGS__)
+#define RmExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_RMUTIL, p, x, s, __VA_ARGS__)
+#define RmExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_RMUTIL, e, x, s, __VA_ARGS__)
+#define RmExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_RMUTIL, g, x, s, __VA_ARGS__)
+#define ARRAY_GROWTH_SIZE 5
+typedef DWORD (WINAPI *PFNRMJOINSESSION)(
+    __out DWORD *pSessionHandle,
+    __in_z const WCHAR strSessionKey[]
+    );
+typedef DWORD (WINAPI *PFNRMENDSESSION)(
+    __in DWORD dwSessionHandle
+    );
+typedef DWORD (WINAPI *PFNRMREGISTERRESOURCES)(
+    __in DWORD dwSessionHandle,
+    __in UINT nFiles,
+    __in_z_opt LPWSTR *rgsFilenames,
+    __in UINT nApplications,
+    __in_opt RM_UNIQUE_PROCESS *rgApplications,
+    __in UINT nServices,
+    __in_z_opt LPWSTR *rgsServiceNames
+    );
+typedef struct _RMU_SESSION
+{
+    CRITICAL_SECTION cs;
+    DWORD dwSessionHandle;
+    BOOL fStartedSessionHandle;
+    BOOL fInitialized;
+    UINT cFilenames;
+    LPWSTR *rgsczFilenames;
+    UINT cApplications;
+    RM_UNIQUE_PROCESS *rgApplications;
+    UINT cServiceNames;
+    LPWSTR *rgsczServiceNames;
+} RMU_SESSION;
+static volatile LONG vcRmuInitialized = 0;
+static HMODULE vhModule = NULL;
+static PFNRMJOINSESSION vpfnRmJoinSession = NULL;
+static PFNRMENDSESSION vpfnRmEndSession = NULL;
+static PFNRMREGISTERRESOURCES vpfnRmRegisterResources = NULL;
+static HRESULT RmuInitialize();
+static void RmuUninitialize();
+static HRESULT RmuApplicationArrayAlloc(
+    __deref_inout_ecount(*pcApplications) RM_UNIQUE_PROCESS **prgApplications,
+    __inout LPUINT pcApplications,
+    __in DWORD dwProcessId,
+    __in FILETIME ProcessStartTime
+    );
+static HRESULT RmuApplicationArrayFree(
+    __in RM_UNIQUE_PROCESS *rgApplications
+    );
+#define ReleaseNullApplicationArray(rg, c) { if (rg) { RmuApplicationArrayFree(rg); c = 0; rg = NULL; } }
+/********************************************************************
+RmuJoinSession - Joins an existing Restart Manager session.
+********************************************************************/
+extern "C" HRESULT DAPI RmuJoinSession(
+    __out PRMU_SESSION *ppSession,
+    __in_z LPCWSTR wzSessionKey
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    PRMU_SESSION pSession = NULL;
+    *ppSession = NULL;
+    pSession = static_cast<PRMU_SESSION>(MemAlloc(sizeof(RMU_SESSION), TRUE));
+    RmExitOnNull(pSession, hr, E_OUTOFMEMORY, "Failed to allocate the RMU_SESSION structure.");
+    hr = RmuInitialize();
+    RmExitOnFailure(hr, "Failed to initialize Restart Manager.");
+    er = vpfnRmJoinSession(&pSession->dwSessionHandle, wzSessionKey);
+    RmExitOnWin32Error(er, hr, "Failed to join Restart Manager session %ls.", wzSessionKey);
+    ::InitializeCriticalSection(&pSession->cs);
+    pSession->fInitialized = TRUE;
+    *ppSession = pSession;
+LExit:
+    if (FAILED(hr))
+    {
+        ReleaseNullMem(pSession);
+    }
+    return hr;
+}
+/********************************************************************
+RmuAddFile - Adds the file path to the Restart Manager session.
+You should call this multiple times as necessary before calling
+RmuRegisterResources.
+********************************************************************/
+extern "C" HRESULT DAPI RmuAddFile(
+    __in PRMU_SESSION pSession,
+    __in_z LPCWSTR wzPath
+    )
+{
+    HRESULT hr = S_OK;
+    ::EnterCriticalSection(&pSession->cs);
+    // Create or grow the jagged array.
+    hr = StrArrayAllocString(&pSession->rgsczFilenames, &pSession->cFilenames, wzPath, 0);
+    RmExitOnFailure(hr, "Failed to add the filename to the array.");
+LExit:
+    ::LeaveCriticalSection(&pSession->cs);
+    return hr;
+}
+/********************************************************************
+RmuAddProcessById - Adds the process ID to the Restart Manager sesion.
+You should call this multiple times as necessary before calling
+RmuRegisterResources.
+********************************************************************/
+extern "C" HRESULT DAPI RmuAddProcessById(
+    __in PRMU_SESSION pSession,
+    __in DWORD dwProcessId
+    )
+{
+    HRESULT hr = S_OK;
+    HANDLE hProcess = NULL;
+    FILETIME CreationTime = {};
+    FILETIME ExitTime = {};
+    FILETIME KernelTime = {};
+    FILETIME UserTime = {};
+    BOOL fLocked = FALSE;
+    HANDLE hToken = NULL;
+    TOKEN_PRIVILEGES priv = { 0 };
+    TOKEN_PRIVILEGES* pPrevPriv = NULL;
+    DWORD cbPrevPriv = 0;
+    DWORD er = ERROR_SUCCESS;
+    BOOL fAdjustedPrivileges = FALSE;
+    BOOL fElevated = FALSE;
+    ProcElevated(::GetCurrentProcess(), &fElevated);
+    // Must be elevated to adjust process privileges
+    if (fElevated) {
+        // Adding SeDebugPrivilege in the event that the process targeted by ::OpenProcess() is in a another user context.
+        if (!::OpenProcessToken(::GetCurrentProcess(), TOKEN_QUERY | TOKEN_ADJUST_PRIVILEGES, &hToken))
+        {
+            RmExitWithLastError(hr, "Failed to get process token.");
+        }
+        priv.PrivilegeCount = 1;
+        priv.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
+        if (!::LookupPrivilegeValueW(NULL, L"SeDebugPrivilege", &priv.Privileges[0].Luid))
+        {
+            RmExitWithLastError(hr, "Failed to get debug privilege LUID.");
+        }
+        cbPrevPriv = sizeof(TOKEN_PRIVILEGES);
+        pPrevPriv = static_cast<TOKEN_PRIVILEGES*>(MemAlloc(cbPrevPriv, TRUE));
+        RmExitOnNull(pPrevPriv, hr, E_OUTOFMEMORY, "Failed to allocate memory for empty previous privileges.");
+        if (!::AdjustTokenPrivileges(hToken, FALSE, &priv, cbPrevPriv, pPrevPriv, &cbPrevPriv))
+        {
+            LPVOID pv = MemReAlloc(pPrevPriv, cbPrevPriv, TRUE);
+            RmExitOnNull(pv, hr, E_OUTOFMEMORY, "Failed to allocate memory for previous privileges.");
+            pPrevPriv = static_cast<TOKEN_PRIVILEGES*>(pv);
+            if (!::AdjustTokenPrivileges(hToken, FALSE, &priv, cbPrevPriv, pPrevPriv, &cbPrevPriv))
+            {
+                RmExitWithLastError(hr, "Failed to get debug privilege LUID.");
+            }
+        }
+        fAdjustedPrivileges = TRUE;
+    }
+    hProcess = ::OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, dwProcessId);
+    if (hProcess)
+    {
+        if (!::GetProcessTimes(hProcess, &CreationTime, &ExitTime, &KernelTime, &UserTime))
+        {
+            RmExitWithLastError(hr, "Failed to get the process times for process ID %d.", dwProcessId);
+        }
+        ::EnterCriticalSection(&pSession->cs);
+        fLocked = TRUE;
+        hr = RmuApplicationArrayAlloc(&pSession->rgApplications, &pSession->cApplications, dwProcessId, CreationTime);
+        RmExitOnFailure(hr, "Failed to add the application to the array.");
+    }
+    else
+    {
+        er = ::GetLastError();
+        if (ERROR_ACCESS_DENIED == er)
+        {
+            // OpenProcess will fail when not elevated and the target process is in another user context. Let the caller log and continue.
+            hr = E_NOTFOUND;
+        }
+        else
+        {
+            RmExitOnWin32Error(er, hr, "Failed to open the process ID %d.", dwProcessId);
+        }
+    }
+LExit:
+    if (hProcess)
+    {
+        ::CloseHandle(hProcess);
+    }
+    if (fAdjustedPrivileges)
+    {
+        ::AdjustTokenPrivileges(hToken, FALSE, pPrevPriv, 0, NULL, NULL);
+    }
+    ReleaseMem(pPrevPriv);
+    ReleaseHandle(hToken);
+    if (fLocked)
+    {
+        ::LeaveCriticalSection(&pSession->cs);
+    }
+    return hr;
+}
+/********************************************************************
+RmuAddProcessesByName - Adds all processes by the given process name
+                        to the Restart Manager Session.
+You should call this multiple times as necessary before calling
+RmuRegisterResources.
+********************************************************************/
+extern "C" HRESULT DAPI RmuAddProcessesByName(
+    __in PRMU_SESSION pSession,
+    __in_z LPCWSTR wzProcessName
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD *pdwProcessIds = NULL;
+    DWORD cProcessIds = 0;
+    BOOL fNotFound = FALSE;
+    hr = ProcFindAllIdsFromExeName(wzProcessName, &pdwProcessIds, &cProcessIds);
+    RmExitOnFailure(hr, "Failed to enumerate all the processes by name %ls.", wzProcessName);
+    for (DWORD i = 0; i < cProcessIds; ++i)
+    {
+        hr = RmuAddProcessById(pSession, pdwProcessIds[i]);
+        if (E_NOTFOUND == hr)
+        {
+            // RmuAddProcessById returns E_NOTFOUND when this setup is not elevated and OpenProcess returned access denied (target process running under another user account). 
+            fNotFound = TRUE;
+        }
+        else
+        {
+            RmExitOnFailure(hr, "Failed to add process %ls (%d) to the Restart Manager session.", wzProcessName, pdwProcessIds[i]);
+        }
+    }
+    // If one or more calls to RmuAddProcessById returned E_NOTFOUND, then return E_NOTFOUND even if other calls succeeded, so that caller can log the issue.
+    if (fNotFound)
+    {
+        hr =  E_NOTFOUND;
+    }
+LExit:
+    ReleaseMem(pdwProcessIds);
+    return hr;
+}
+/********************************************************************
+RmuAddService - Adds the service name to the Restart Manager session.
+You should call this multiple times as necessary before calling
+RmuRegisterResources.
+********************************************************************/
+extern "C" HRESULT DAPI RmuAddService(
+    __in PRMU_SESSION pSession,
+    __in_z LPCWSTR wzServiceName
+    )
+{
+    HRESULT hr = S_OK;
+    ::EnterCriticalSection(&pSession->cs);
+    hr = StrArrayAllocString(&pSession->rgsczServiceNames, &pSession->cServiceNames, wzServiceName, 0);
+    RmExitOnFailure(hr, "Failed to add the service name to the array.");
+LExit:
+    ::LeaveCriticalSection(&pSession->cs);
+    return hr;
+}
+/********************************************************************
+RmuRegisterResources - Registers resources for the Restart Manager.
+This should be called rarely because it is expensive to run. Call
+functions like RmuAddFile for multiple resources then commit them
+as a batch of updates to RmuRegisterResources.
+Duplicate resources appear to be handled by Restart Manager.
+Only one WM_QUERYENDSESSION is being sent for each top-level window.
+********************************************************************/
+extern "C" HRESULT DAPI RmuRegisterResources(
+    __in PRMU_SESSION pSession
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    AssertSz(vcRmuInitialized, "Restart Manager was not properly initialized.");
+    ::EnterCriticalSection(&pSession->cs);
+    er = vpfnRmRegisterResources(
+        pSession->dwSessionHandle,
+        pSession->cFilenames,
+        pSession->rgsczFilenames,
+        pSession->cApplications,
+        pSession->rgApplications,
+        pSession->cServiceNames,
+        pSession->rgsczServiceNames
+        );
+    RmExitOnWin32Error(er, hr, "Failed to register the resources with the Restart Manager session.");
+    // Empty the arrays if registered in case additional resources are added later.
+    ReleaseNullStrArray(pSession->rgsczFilenames, pSession->cFilenames);
+    ReleaseNullApplicationArray(pSession->rgApplications, pSession->cApplications);
+    ReleaseNullStrArray(pSession->rgsczServiceNames, pSession->cServiceNames);
+LExit:
+    ::LeaveCriticalSection(&pSession->cs);
+    return hr;
+}
+/********************************************************************
+RmuEndSession - Ends the session.
+If the session was joined by RmuJoinSession, any remaining resources
+are registered before the session is ended (left).
+********************************************************************/
+extern "C" HRESULT DAPI RmuEndSession(
+    __in PRMU_SESSION pSession
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    AssertSz(vcRmuInitialized, "Restart Manager was not properly initialized.");
+    // Make sure all resources are registered if we joined the session.
+    if (!pSession->fStartedSessionHandle)
+    {
+        hr = RmuRegisterResources(pSession);
+        RmExitOnFailure(hr, "Failed to register remaining resources.");
+    }
+    er = vpfnRmEndSession(pSession->dwSessionHandle);
+    RmExitOnWin32Error(er, hr, "Failed to end the Restart Manager session.");
+LExit:
+    if (pSession->fInitialized)
+    {
+        ::DeleteCriticalSection(&pSession->cs);
+    }
+    ReleaseNullStrArray(pSession->rgsczFilenames, pSession->cFilenames);
+    ReleaseNullApplicationArray(pSession->rgApplications, pSession->cApplications);
+    ReleaseNullStrArray(pSession->rgsczServiceNames, pSession->cServiceNames);
+    ReleaseNullMem(pSession);
+    RmuUninitialize();
+    return hr;
+}
+static HRESULT RmuInitialize()
+{
+    HRESULT hr = S_OK;
+    HMODULE hModule = NULL;
+    LONG iRef = ::InterlockedIncrement(&vcRmuInitialized);
+    if (1 == iRef && !vhModule)
+    {
+        hr = LoadSystemLibrary(L"rstrtmgr.dll", &hModule);
+        RmExitOnFailure(hr, "Failed to load the rstrtmgr.dll module.");
+        vpfnRmJoinSession = reinterpret_cast<PFNRMJOINSESSION>(::GetProcAddress(hModule, "RmJoinSession"));
+        RmExitOnNullWithLastError(vpfnRmJoinSession, hr, "Failed to get the RmJoinSession procedure from rstrtmgr.dll.");
+        vpfnRmRegisterResources = reinterpret_cast<PFNRMREGISTERRESOURCES>(::GetProcAddress(hModule, "RmRegisterResources"));
+        RmExitOnNullWithLastError(vpfnRmRegisterResources, hr, "Failed to get the RmRegisterResources procedure from rstrtmgr.dll.");
+        vpfnRmEndSession = reinterpret_cast<PFNRMENDSESSION>(::GetProcAddress(hModule, "RmEndSession"));
+        RmExitOnNullWithLastError(vpfnRmEndSession, hr, "Failed to get the RmEndSession procedure from rstrtmgr.dll.");
+        vhModule = hModule;
+    }
+LExit:
+    return hr;
+}
+static void RmuUninitialize()
+{
+    LONG iRef = ::InterlockedDecrement(&vcRmuInitialized);
+    if (0 == iRef && vhModule)
+    {
+        vpfnRmJoinSession = NULL;
+        vpfnRmEndSession = NULL;
+        vpfnRmRegisterResources = NULL;
+        ::FreeLibrary(vhModule);
+        vhModule = NULL;
+    }
+}
+static HRESULT RmuApplicationArrayAlloc(
+    __deref_inout_ecount(*pcApplications) RM_UNIQUE_PROCESS **prgApplications,
+    __inout LPUINT pcApplications,
+    __in DWORD dwProcessId,
+    __in FILETIME ProcessStartTime
+    )
+{
+    HRESULT hr = S_OK;
+    RM_UNIQUE_PROCESS *pApplication = NULL;
+    hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(prgApplications), *pcApplications + 1, sizeof(RM_UNIQUE_PROCESS), ARRAY_GROWTH_SIZE);
+    RmExitOnFailure(hr, "Failed to allocate memory for the application array.");
+    pApplication = static_cast<RM_UNIQUE_PROCESS*>(&(*prgApplications)[*pcApplications]);
+    pApplication->dwProcessId = dwProcessId;
+    pApplication->ProcessStartTime = ProcessStartTime;
+    ++(*pcApplications);
+LExit:
+    return hr;
+}
+static HRESULT RmuApplicationArrayFree(
+    __in RM_UNIQUE_PROCESS *rgApplications
+    )
+{
+    HRESULT hr = S_OK;
+    hr = MemFree(rgApplications);
+    RmExitOnFailure(hr, "Failed to free memory for the application array.");
+LExit:
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/rssutil.cpp b/src/libs/dutil/WixToolset.DUtil/rssutil.cpp
new file mode 100644
index 00000000..8f994dfc
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/rssutil.cpp
@@ -0,0 +1,647 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define RssExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_RSSUTIL, x, s, __VA_ARGS__)
+#define RssExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_RSSUTIL, x, s, __VA_ARGS__)
+#define RssExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_RSSUTIL, x, s, __VA_ARGS__)
+#define RssExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_RSSUTIL, x, s, __VA_ARGS__)
+#define RssExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_RSSUTIL, x, s, __VA_ARGS__)
+#define RssExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_RSSUTIL, x, s, __VA_ARGS__)
+#define RssExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_RSSUTIL, p, x, e, s, __VA_ARGS__)
+#define RssExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_RSSUTIL, p, x, s, __VA_ARGS__)
+#define RssExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_RSSUTIL, p, x, e, s, __VA_ARGS__)
+#define RssExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_RSSUTIL, p, x, s, __VA_ARGS__)
+#define RssExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_RSSUTIL, e, x, s, __VA_ARGS__)
+#define RssExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_RSSUTIL, g, x, s, __VA_ARGS__)
+static HRESULT ParseRssDocument(
+    __in IXMLDOMDocument *pixd,
+    __out RSS_CHANNEL **ppChannel
+    );
+static HRESULT ParseRssChannel(
+    __in IXMLDOMNode *pixnChannel,
+    __out RSS_CHANNEL **ppChannel
+    );
+static HRESULT ParseRssItem(
+    __in IXMLDOMNode *pixnItem,
+    __in DWORD cItem,
+    __in_xcount(pChannel->cItems) RSS_CHANNEL *pChannel
+    );
+static HRESULT ParseRssUnknownElement(
+    __in IXMLDOMNode *pNode,
+    __inout RSS_UNKNOWN_ELEMENT** ppUnknownElement
+    );
+static HRESULT ParseRssUnknownAttribute(
+    __in IXMLDOMNode *pNode,
+    __inout RSS_UNKNOWN_ATTRIBUTE** ppUnknownAttribute
+    );
+static void FreeRssUnknownElementList(
+    __in_opt RSS_UNKNOWN_ELEMENT* pUnknownElement
+    );
+static void FreeRssUnknownAttributeList(
+    __in_opt RSS_UNKNOWN_ATTRIBUTE* pUnknownAttribute
+    );
+/********************************************************************
+ RssInitialize - Initialize RSS utilities.
+*********************************************************************/
+extern "C" HRESULT DAPI RssInitialize()
+{
+    return XmlInitialize();
+}
+/********************************************************************
+ RssUninitialize - Uninitialize RSS utilities.
+*********************************************************************/
+extern "C" void DAPI RssUninitialize()
+{
+    XmlUninitialize();
+}
+/********************************************************************
+ RssParseFromString - parses out an RSS channel from a string.
+*********************************************************************/
+extern "C" HRESULT DAPI RssParseFromString(
+    __in_z LPCWSTR wzRssString,
+    __out RSS_CHANNEL **ppChannel
+    )
+{
+    Assert(wzRssString);
+    Assert(ppChannel);
+    HRESULT hr = S_OK;
+    RSS_CHANNEL *pNewChannel = NULL;
+    IXMLDOMDocument *pixdRss = NULL;
+    hr = XmlLoadDocument(wzRssString, &pixdRss);
+    RssExitOnFailure(hr, "Failed to load RSS string as XML document.");
+    hr = ParseRssDocument(pixdRss, &pNewChannel);
+    RssExitOnFailure(hr, "Failed to parse RSS document.");
+    *ppChannel = pNewChannel;
+    pNewChannel = NULL;
+LExit:
+    ReleaseObject(pixdRss);
+    ReleaseRssChannel(pNewChannel);
+    return hr;
+}
+/********************************************************************
+ RssParseFromFile - parses out an RSS channel from a file path.
+*********************************************************************/
+extern "C" HRESULT DAPI RssParseFromFile(
+    __in_z LPCWSTR wzRssFile,
+    __out RSS_CHANNEL **ppChannel
+    )
+{
+    Assert(wzRssFile);
+    Assert(ppChannel);
+    HRESULT hr = S_OK;
+    RSS_CHANNEL *pNewChannel = NULL;
+    IXMLDOMDocument *pixdRss = NULL;
+    hr = XmlLoadDocumentFromFile(wzRssFile, &pixdRss);
+    RssExitOnFailure(hr, "Failed to load RSS string as XML document.");
+    hr = ParseRssDocument(pixdRss, &pNewChannel);
+    RssExitOnFailure(hr, "Failed to parse RSS document.");
+    *ppChannel = pNewChannel;
+    pNewChannel = NULL;
+LExit:
+    ReleaseObject(pixdRss);
+    ReleaseRssChannel(pNewChannel);
+    return hr;
+}
+/********************************************************************
+ RssFreeChannel - parses out an RSS channel from a string.
+*********************************************************************/
+extern "C" void DAPI RssFreeChannel(
+    __in_xcount(pChannel->cItems) RSS_CHANNEL *pChannel
+    )
+{
+    if (pChannel)
+    {
+        for (DWORD i = 0; i < pChannel->cItems; ++i)
+        {
+            ReleaseStr(pChannel->rgItems[i].wzTitle);
+            ReleaseStr(pChannel->rgItems[i].wzLink);
+            ReleaseStr(pChannel->rgItems[i].wzDescription);
+            ReleaseStr(pChannel->rgItems[i].wzGuid);
+            ReleaseStr(pChannel->rgItems[i].wzEnclosureUrl);
+            ReleaseStr(pChannel->rgItems[i].wzEnclosureType);
+            FreeRssUnknownElementList(pChannel->rgItems[i].pUnknownElements);
+        }
+        ReleaseStr(pChannel->wzTitle);
+        ReleaseStr(pChannel->wzLink);
+        ReleaseStr(pChannel->wzDescription);
+        FreeRssUnknownElementList(pChannel->pUnknownElements);
+        MemFree(pChannel);
+    }
+}
+/********************************************************************
+ ParseRssDocument - parses out an RSS channel from a loaded XML DOM document.
+*********************************************************************/
+static HRESULT ParseRssDocument(
+    __in IXMLDOMDocument *pixd,
+    __out RSS_CHANNEL **ppChannel
+    )
+{
+    Assert(pixd);
+    Assert(ppChannel);
+    HRESULT hr = S_OK;
+    IXMLDOMElement *pRssElement = NULL;
+    IXMLDOMNodeList *pChannelNodes = NULL;
+    IXMLDOMNode *pNode = NULL;
+    BSTR bstrNodeName = NULL;
+    RSS_CHANNEL *pNewChannel = NULL;
+    //
+    // Get the document element and start processing channels.
+    //
+    hr = pixd ->get_documentElement(&pRssElement);
+    RssExitOnFailure(hr, "failed get_documentElement in ParseRssDocument");
+    hr = pRssElement->get_childNodes(&pChannelNodes);
+    RssExitOnFailure(hr, "Failed to get child nodes of Rss Document element.");
+    while (S_OK == (hr = XmlNextElement(pChannelNodes, &pNode, &bstrNodeName)))
+    {
+        if (0 == lstrcmpW(bstrNodeName, L"channel"))
+        {
+            hr = ParseRssChannel(pNode, &pNewChannel);
+            RssExitOnFailure(hr, "Failed to parse RSS channel.");
+        }
+        else if (0 == lstrcmpW(bstrNodeName, L"link"))
+        {
+        }
+        ReleaseNullBSTR(bstrNodeName);
+        ReleaseNullObject(pNode);
+    }
+    if (S_FALSE == hr)
+    {
+        hr = S_OK;
+    }
+    *ppChannel = pNewChannel;
+    pNewChannel = NULL;
+LExit:
+    ReleaseBSTR(bstrNodeName);
+    ReleaseObject(pNode);
+    ReleaseObject(pChannelNodes);
+    ReleaseObject(pRssElement);
+    ReleaseRssChannel(pNewChannel);
+    return hr;
+}
+/********************************************************************
+ ParseRssChannel - parses out an RSS channel from a loaded XML DOM element.
+*********************************************************************/
+static HRESULT ParseRssChannel(
+    __in IXMLDOMNode *pixnChannel,
+    __out RSS_CHANNEL **ppChannel
+    )
+{
+    Assert(pixnChannel);
+    Assert(ppChannel);
+    HRESULT hr = S_OK;
+    IXMLDOMNodeList *pNodeList = NULL;
+    RSS_CHANNEL *pNewChannel = NULL;
+    long cItems = 0;
+    IXMLDOMNode *pNode = NULL;
+    BSTR bstrNodeName = NULL;
+    BSTR bstrNodeValue = NULL;
+    //
+    // First, calculate how many RSS items we're going to have and allocate
+    // the RSS_CHANNEL structure
+    //
+    hr = XmlSelectNodes(pixnChannel, L"item", &pNodeList);
+    RssExitOnFailure(hr, "Failed to select all RSS items in an RSS channel.");
+    hr = pNodeList->get_length(&cItems);
+    RssExitOnFailure(hr, "Failed to count the number of RSS items in RSS channel.");
+    pNewChannel = static_cast<RSS_CHANNEL*>(MemAlloc(sizeof(RSS_CHANNEL) + sizeof(RSS_ITEM) * cItems, TRUE));
+    RssExitOnNull(pNewChannel, hr, E_OUTOFMEMORY, "Failed to allocate RSS channel structure.");
+    pNewChannel->cItems = cItems;
+    //
+    // Process the elements under a channel now.
+    //
+    hr = pixnChannel->get_childNodes(&pNodeList);
+    RssExitOnFailure(hr, "Failed to get child nodes of RSS channel element.");
+    cItems = 0; // reset the counter and use this to walk through the channel items
+    while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, &bstrNodeName)))
+    {
+        if (0 == lstrcmpW(bstrNodeName, L"title"))
+        {
+            hr = XmlGetText(pNode, &bstrNodeValue);
+            RssExitOnFailure(hr, "Failed to get RSS channel title.");
+            hr = StrAllocString(&pNewChannel->wzTitle, bstrNodeValue, 0);
+            RssExitOnFailure(hr, "Failed to allocate RSS channel title.");
+        }
+        else if (0 == lstrcmpW(bstrNodeName, L"link"))
+        {
+            hr = XmlGetText(pNode, &bstrNodeValue);
+            RssExitOnFailure(hr, "Failed to get RSS channel link.");
+            hr = StrAllocString(&pNewChannel->wzLink, bstrNodeValue, 0);
+            RssExitOnFailure(hr, "Failed to allocate RSS channel link.");
+        }
+        else if (0 == lstrcmpW(bstrNodeName, L"description"))
+        {
+            hr = XmlGetText(pNode, &bstrNodeValue);
+            RssExitOnFailure(hr, "Failed to get RSS channel description.");
+            hr = StrAllocString(&pNewChannel->wzDescription, bstrNodeValue, 0);
+            RssExitOnFailure(hr, "Failed to allocate RSS channel description.");
+        }
+        else if (0 == lstrcmpW(bstrNodeName, L"ttl"))
+        {
+            hr = XmlGetText(pNode, &bstrNodeValue);
+            RssExitOnFailure(hr, "Failed to get RSS channel description.");
+            pNewChannel->dwTimeToLive = (DWORD)wcstoul(bstrNodeValue, NULL, 10);
+        }
+        else if (0 == lstrcmpW(bstrNodeName, L"item"))
+        {
+            hr = ParseRssItem(pNode, cItems, pNewChannel);
+            RssExitOnFailure(hr, "Failed to parse RSS item.");
+            ++cItems;
+        }
+        else
+        {
+            hr = ParseRssUnknownElement(pNode, &pNewChannel->pUnknownElements);
+            RssExitOnFailure(hr, "Failed to parse unknown RSS channel element: %ls", bstrNodeName);
+        }
+        ReleaseNullBSTR(bstrNodeValue);
+        ReleaseNullBSTR(bstrNodeName);
+        ReleaseNullObject(pNode);
+    }
+    *ppChannel = pNewChannel;
+    pNewChannel = NULL;
+LExit:
+    ReleaseBSTR(bstrNodeName);
+    ReleaseObject(pNode);
+    ReleaseObject(pNodeList);
+    ReleaseRssChannel(pNewChannel);
+    return hr;
+}
+/********************************************************************
+ ParseRssItem - parses out an RSS item from a loaded XML DOM node.
+*********************************************************************/
+static HRESULT ParseRssItem(
+    __in IXMLDOMNode *pixnItem,
+    __in DWORD cItem,
+    __in_xcount(pChannel->cItems) RSS_CHANNEL *pChannel
+    )
+{
+    HRESULT hr = S_OK;
+    RSS_ITEM *pItem = NULL;
+    IXMLDOMNodeList *pNodeList = NULL;
+    IXMLDOMNode *pNode = NULL;
+    BSTR bstrNodeName = NULL;
+    BSTR bstrNodeValue = NULL;
+    //
+    // First make sure we're dealing with a valid item.
+    //
+    if (pChannel->cItems <= cItem)
+    {
+        hr = E_UNEXPECTED;
+        RssExitOnFailure(hr, "Unexpected number of items parsed.");
+    }
+    pItem = pChannel->rgItems + cItem;
+    //
+    // Process the elements under an item now.
+    //
+    hr = pixnItem->get_childNodes(&pNodeList);
+    RssExitOnFailure(hr, "Failed to get child nodes of RSS item element.");
+    while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, &bstrNodeName)))
+    {
+        if (0 == lstrcmpW(bstrNodeName, L"title"))
+        {
+            hr = XmlGetText(pNode, &bstrNodeValue);
+            RssExitOnFailure(hr, "Failed to get RSS channel title.");
+            hr = StrAllocString(&pItem->wzTitle, bstrNodeValue, 0);
+            RssExitOnFailure(hr, "Failed to allocate RSS item title.");
+        }
+        else if (0 == lstrcmpW(bstrNodeName, L"link"))
+        {
+            hr = XmlGetText(pNode, &bstrNodeValue);
+            RssExitOnFailure(hr, "Failed to get RSS channel link.");
+            hr = StrAllocString(&pItem->wzLink, bstrNodeValue, 0);
+            RssExitOnFailure(hr, "Failed to allocate RSS item link.");
+        }
+        else if (0 == lstrcmpW(bstrNodeName, L"description"))
+        {
+            hr = XmlGetText(pNode, &bstrNodeValue);
+            RssExitOnFailure(hr, "Failed to get RSS item description.");
+            hr = StrAllocString(&pItem->wzDescription, bstrNodeValue, 0);
+            RssExitOnFailure(hr, "Failed to allocate RSS item description.");
+        }
+        else if (0 == lstrcmpW(bstrNodeName, L"guid"))
+        {
+            hr = XmlGetText(pNode, &bstrNodeValue);
+            RssExitOnFailure(hr, "Failed to get RSS item guid.");
+            hr = StrAllocString(&pItem->wzGuid, bstrNodeValue, 0);
+            RssExitOnFailure(hr, "Failed to allocate RSS item guid.");
+        }
+        else if (0 == lstrcmpW(bstrNodeName, L"pubDate"))
+        {
+            hr = XmlGetText(pNode, &bstrNodeValue);
+            RssExitOnFailure(hr, "Failed to get RSS item guid.");
+            hr = TimeFromString(bstrNodeValue, &pItem->ftPublished);
+            RssExitOnFailure(hr, "Failed to convert RSS item time.");
+        }
+        else if (0 == lstrcmpW(bstrNodeName, L"enclosure"))
+        {
+            hr = XmlGetAttribute(pNode, L"url", &bstrNodeValue);
+            RssExitOnFailure(hr, "Failed to get RSS item enclosure url.");
+            hr = StrAllocString(&pItem->wzEnclosureUrl, bstrNodeValue, 0);
+            RssExitOnFailure(hr, "Failed to allocate RSS item enclosure url.");
+            ReleaseNullBSTR(bstrNodeValue);
+            hr = XmlGetAttributeNumber(pNode, L"length", &pItem->dwEnclosureSize);
+            RssExitOnFailure(hr, "Failed to get RSS item enclosure length.");
+            hr = XmlGetAttribute(pNode, L"type", &bstrNodeValue);
+            RssExitOnFailure(hr, "Failed to get RSS item enclosure type.");
+            hr = StrAllocString(&pItem->wzEnclosureType, bstrNodeValue, 0);
+            RssExitOnFailure(hr, "Failed to allocate RSS item enclosure type.");
+        }
+        else
+        {
+            hr = ParseRssUnknownElement(pNode, &pItem->pUnknownElements);
+            RssExitOnFailure(hr, "Failed to parse unknown RSS item element: %ls", bstrNodeName);
+        }
+        ReleaseNullBSTR(bstrNodeValue);
+        ReleaseNullBSTR(bstrNodeName);
+        ReleaseNullObject(pNode);
+    }
+LExit:
+    ReleaseBSTR(bstrNodeValue);
+    ReleaseBSTR(bstrNodeName);
+    ReleaseObject(pNode);
+    ReleaseObject(pNodeList);
+    return hr;
+}
+/********************************************************************
+ ParseRssUnknownElement - parses out an unknown item from the RSS feed from a loaded XML DOM node.
+*********************************************************************/
+static HRESULT ParseRssUnknownElement(
+    __in IXMLDOMNode *pNode,
+    __inout RSS_UNKNOWN_ELEMENT** ppUnknownElement
+    )
+{
+    Assert(ppUnknownElement);
+    HRESULT hr = S_OK;
+    BSTR bstrNodeNamespace = NULL;
+    BSTR bstrNodeName = NULL;
+    BSTR bstrNodeValue = NULL;
+    IXMLDOMNamedNodeMap* pixnnmAttributes = NULL;
+    IXMLDOMNode* pixnAttribute = NULL;
+    RSS_UNKNOWN_ELEMENT* pNewUnknownElement;
+    pNewUnknownElement = static_cast<RSS_UNKNOWN_ELEMENT*>(MemAlloc(sizeof(RSS_UNKNOWN_ELEMENT), TRUE));
+    RssExitOnNull(pNewUnknownElement, hr, E_OUTOFMEMORY, "Failed to allocate unknown element.");
+    hr = pNode->get_namespaceURI(&bstrNodeNamespace);
+    if (S_OK == hr)
+    {
+        hr = StrAllocString(&pNewUnknownElement->wzNamespace, bstrNodeNamespace, 0);
+        RssExitOnFailure(hr, "Failed to allocate RSS unknown element namespace.");
+    }
+    else if (S_FALSE == hr)
+    {
+        hr = S_OK;
+    }
+    RssExitOnFailure(hr, "Failed to get unknown element namespace.");
+    hr = pNode->get_baseName(&bstrNodeName);
+    RssExitOnFailure(hr, "Failed to get unknown element name.");
+    hr = StrAllocString(&pNewUnknownElement->wzElement, bstrNodeName, 0);
+    RssExitOnFailure(hr, "Failed to allocate RSS unknown element name.");
+    hr = XmlGetText(pNode, &bstrNodeValue);
+    RssExitOnFailure(hr, "Failed to get unknown element value.");
+    hr = StrAllocString(&pNewUnknownElement->wzValue, bstrNodeValue, 0);
+    RssExitOnFailure(hr, "Failed to allocate RSS unknown element value.");
+    hr = pNode->get_attributes(&pixnnmAttributes);
+    RssExitOnFailure(hr, "Failed get attributes on RSS unknown element.");
+    while (S_OK == (hr = pixnnmAttributes->nextNode(&pixnAttribute)))
+    {
+        hr = ParseRssUnknownAttribute(pixnAttribute, &pNewUnknownElement->pAttributes);
+        RssExitOnFailure(hr, "Failed to parse attribute on RSS unknown element.");
+        ReleaseNullObject(pixnAttribute);
+    }
+    if (S_FALSE == hr)
+    {
+        hr = S_OK;
+    }
+    RssExitOnFailure(hr, "Failed to enumerate all attributes on RSS unknown element.");
+    RSS_UNKNOWN_ELEMENT** ppTail = ppUnknownElement;
+    while (*ppTail)
+    {
+        ppTail = &(*ppTail)->pNext;
+    }
+    *ppTail = pNewUnknownElement;
+    pNewUnknownElement = NULL;
+LExit:
+    FreeRssUnknownElementList(pNewUnknownElement);
+    ReleaseBSTR(bstrNodeNamespace);
+    ReleaseBSTR(bstrNodeName);
+    ReleaseBSTR(bstrNodeValue);
+    ReleaseObject(pixnnmAttributes);
+    ReleaseObject(pixnAttribute);
+    return hr;
+}
+/********************************************************************
+ ParseRssUnknownAttribute - parses out attribute from an unknown element
+*********************************************************************/
+static HRESULT ParseRssUnknownAttribute(
+    __in IXMLDOMNode *pNode,
+    __inout RSS_UNKNOWN_ATTRIBUTE** ppUnknownAttribute
+    )
+{
+    Assert(ppUnknownAttribute);
+    HRESULT hr = S_OK;
+    BSTR bstrNodeNamespace = NULL;
+    BSTR bstrNodeName = NULL;
+    BSTR bstrNodeValue = NULL;
+    RSS_UNKNOWN_ATTRIBUTE* pNewUnknownAttribute;
+    pNewUnknownAttribute = static_cast<RSS_UNKNOWN_ATTRIBUTE*>(MemAlloc(sizeof(RSS_UNKNOWN_ATTRIBUTE), TRUE));
+    RssExitOnNull(pNewUnknownAttribute, hr, E_OUTOFMEMORY, "Failed to allocate unknown attribute.");
+    hr = pNode->get_namespaceURI(&bstrNodeNamespace);
+    if (S_OK == hr)
+    {
+        hr = StrAllocString(&pNewUnknownAttribute->wzNamespace, bstrNodeNamespace, 0);
+        RssExitOnFailure(hr, "Failed to allocate RSS unknown attribute namespace.");
+    }
+    else if (S_FALSE == hr)
+    {
+        hr = S_OK;
+    }
+    RssExitOnFailure(hr, "Failed to get unknown attribute namespace.");
+    hr = pNode->get_baseName(&bstrNodeName);
+    RssExitOnFailure(hr, "Failed to get unknown attribute name.");
+    hr = StrAllocString(&pNewUnknownAttribute->wzAttribute, bstrNodeName, 0);
+    RssExitOnFailure(hr, "Failed to allocate RSS unknown attribute name.");
+    hr = XmlGetText(pNode, &bstrNodeValue);
+    RssExitOnFailure(hr, "Failed to get unknown attribute value.");
+    hr = StrAllocString(&pNewUnknownAttribute->wzValue, bstrNodeValue, 0);
+    RssExitOnFailure(hr, "Failed to allocate RSS unknown attribute value.");
+    RSS_UNKNOWN_ATTRIBUTE** ppTail = ppUnknownAttribute;
+    while (*ppTail)
+    {
+        ppTail = &(*ppTail)->pNext;
+    }
+    *ppTail = pNewUnknownAttribute;
+    pNewUnknownAttribute = NULL;
+LExit:
+    FreeRssUnknownAttributeList(pNewUnknownAttribute);
+    ReleaseBSTR(bstrNodeNamespace);
+    ReleaseBSTR(bstrNodeName);
+    ReleaseBSTR(bstrNodeValue);
+    return hr;
+}
+/********************************************************************
+ FreeRssUnknownElement - releases all of the memory used by a list of unknown elements
+*********************************************************************/
+static void FreeRssUnknownElementList(
+    __in_opt RSS_UNKNOWN_ELEMENT* pUnknownElement
+    )
+{
+    while (pUnknownElement)
+    {
+        RSS_UNKNOWN_ELEMENT* pFree = pUnknownElement;
+        pUnknownElement = pUnknownElement->pNext;
+        FreeRssUnknownAttributeList(pFree->pAttributes);
+        ReleaseStr(pFree->wzNamespace);
+        ReleaseStr(pFree->wzElement);
+        ReleaseStr(pFree->wzValue);
+        MemFree(pFree);
+    }
+}
+/********************************************************************
+ FreeRssUnknownAttribute - releases all of the memory used by a list of unknown attributes
+*********************************************************************/
+static void FreeRssUnknownAttributeList(
+    __in_opt RSS_UNKNOWN_ATTRIBUTE* pUnknownAttribute
+    )
+{
+    while (pUnknownAttribute)
+    {
+        RSS_UNKNOWN_ATTRIBUTE* pFree = pUnknownAttribute;
+        pUnknownAttribute = pUnknownAttribute->pNext;
+        ReleaseStr(pFree->wzNamespace);
+        ReleaseStr(pFree->wzAttribute);
+        ReleaseStr(pFree->wzValue);
+        MemFree(pFree);
+    }
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/sceutil.cpp b/src/libs/dutil/WixToolset.DUtil/sceutil.cpp
new file mode 100644
index 00000000..cdb1623b
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/sceutil.cpp
@@ -0,0 +1,2489 @@
+// 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.
+#include "precomp.h"
+#include "sceutil.h"
+// Limit is documented as 4 GB, but for some reason the API's don't let us specify anything above 4091 MB.
+#define MAX_SQLCE_DATABASE_SIZE 4091
+// In case of some older versions of sqlce_oledb.h don't have these definitions, define some types.
+#ifndef DBTYPEFOR_DBLENGTH
+#ifdef _WIN64
+#define SKIP_SCE_COMPILE
+#else
+#define SCE_32BIT_ONLY
+typedef DWORD DBLENGTH;
+typedef LONG  DBROWOFFSET;
+typedef LONG  DBROWCOUNT;
+typedef DWORD DBCOUNTITEM;
+typedef DWORD DBORDINAL;
+typedef LONG  DB_LORDINAL;
+typedef DWORD DBBKMARK;
+typedef DWORD DBBYTEOFFSET;
+typedef DWORD DBREFCOUNT;
+typedef DWORD DB_UPARAMS;
+typedef LONG  DB_LPARAMS;
+typedef DWORD DBHASHVALUE;
+typedef DWORD DB_DWRESERVE;
+typedef LONG  DB_LRESERVE;
+typedef DWORD DB_URESERVE;
+#endif
+#endif
+#ifndef SKIP_SCE_COMPILE // If the sce headers don't support 64-bit, don't build for 64-bit
+// structs
+struct SCE_DATABASE_INTERNAL
+{
+    // In case we call DllGetClassObject on a specific file
+    HMODULE hSqlCeDll;
+    volatile LONG dwTransactionRefcount;
+    IDBInitialize *pIDBInitialize;
+    IDBCreateSession *pIDBCreateSession;
+    ITransactionLocal *pITransactionLocal;
+    IDBProperties *pIDBProperties;
+    IOpenRowset *pIOpenRowset;
+    ISessionProperties *pISessionProperties;
+    BOOL fChanges; // This database has changed
+    BOOL fPendingChanges; // Some changes are pending, upon transaction commit
+    BOOL fRollbackTransaction; // If this flag is true, the current transaction was requested to be rolled back
+    BOOL fTransactionBadState; // If this flag is true, we were unable to get out of a transaction, so starting a new transaction should fail
+    // If the database was opened as read-only, we copied it here - so delete it on close
+    LPWSTR sczTempDbFile;
+};
+struct SCE_ROW
+{
+    SCE_DATABASE_INTERNAL *pDatabaseInternal;
+    SCE_TABLE_SCHEMA *pTableSchema;
+    IRowset *pIRowset;
+    HROW hRow;
+    BOOL fInserting;
+    DWORD dwBindingIndex;
+    DBBINDING *rgBinding;
+    SIZE_T cbOffset;
+    BYTE *pbData;
+};
+struct SCE_QUERY
+{
+    SCE_TABLE_SCHEMA *pTableSchema;
+    SCE_INDEX_SCHEMA *pIndexSchema;
+    SCE_DATABASE_INTERNAL *pDatabaseInternal;
+    // Accessor build-up members
+    DWORD dwBindingIndex;
+    DBBINDING *rgBinding;
+    SIZE_T cbOffset;
+    BYTE *pbData;
+};
+struct SCE_QUERY_RESULTS
+{
+    SCE_DATABASE_INTERNAL *pDatabaseInternal;
+    IRowset *pIRowset;
+    SCE_TABLE_SCHEMA *pTableSchema;
+};
+extern const int SCE_ROW_HANDLE_BYTES = sizeof(SCE_ROW);
+extern const int SCE_QUERY_HANDLE_BYTES = sizeof(SCE_QUERY);
+extern const int SCE_QUERY_RESULTS_HANDLE_BYTES = sizeof(SCE_QUERY_RESULTS);
+// The following is the internal Sce-maintained table to tell the identifier and version of the schema
+const SCE_COLUMN_SCHEMA SCE_INTERNAL_VERSION_TABLE_VERSION_COLUMN_SCHEMA[] =
+{
+    {
+        L"AppIdentifier",
+        DBTYPE_WSTR,
+        0,
+        FALSE,
+        TRUE,
+        FALSE,
+        NULL,
+        0,
+        0
+    },
+    {
+        L"Version",
+        DBTYPE_I4,
+        0,
+        FALSE,
+        FALSE,
+        FALSE,
+        NULL,
+        0,
+        0
+    }
+};
+const SCE_TABLE_SCHEMA SCE_INTERNAL_VERSION_TABLE_SCHEMA[] =
+{
+    L"SceSchemaTablev1",
+    _countof(SCE_INTERNAL_VERSION_TABLE_VERSION_COLUMN_SCHEMA),
+    (SCE_COLUMN_SCHEMA *)SCE_INTERNAL_VERSION_TABLE_VERSION_COLUMN_SCHEMA,
+    0,
+    NULL,
+    NULL,
+    NULL
+};
+// internal function declarations
+// Creates an instance of SQL Server CE object, returning IDBInitialize object
+// If a file path is provided in wzSqlCeDllPath parameter, it calls DllGetClassObject
+// on that file specifically. Otherwise it calls CoCreateInstance
+static HRESULT CreateSqlCe(
+    __in_z_opt LPCWSTR wzSqlCeDllPath,
+    __out IDBInitialize **ppIDBInitialize,
+    __out_opt HMODULE *phSqlCeDll
+    );
+static HRESULT RunQuery(
+    __in BOOL fRange,
+    __in_bcount(SCE_QUERY_BYTES) SCE_QUERY_HANDLE psqhHandle,
+    __out SCE_QUERY_RESULTS **ppsqrhHandle
+    );
+static HRESULT FillOutColumnDescFromSchema(
+    __in const SCE_COLUMN_SCHEMA *pSchema,
+    __out DBCOLUMNDESC pColumnDesc
+    );
+static HRESULT EnsureSchema(
+    __in SCE_DATABASE *pDatabase,
+    __in SCE_DATABASE_SCHEMA *pDatabaseSchema
+    );
+static HRESULT OpenSchema(
+    __in SCE_DATABASE *pDatabase,
+    __in SCE_DATABASE_SCHEMA *pdsSchema
+    );
+static HRESULT SetColumnValue(
+    __in const SCE_TABLE_SCHEMA *pTableSchema,
+    __in DWORD dwColumnIndex,
+    __in_bcount_opt(cbSize) const BYTE *pbData,
+    __in SIZE_T cbSize,
+    __inout DBBINDING *pBinding,
+    __inout SIZE_T *pcbOffset,
+    __inout BYTE **ppbBuffer
+    );
+static HRESULT GetColumnValue(
+    __in SCE_ROW *pRow,
+    __in DWORD dwColumnIndex,
+    __out_opt BYTE **ppbData,
+    __out SIZE_T *pcbSize
+    );
+static HRESULT GetColumnValueFixed(
+    __in SCE_ROW *pRow,
+    __in DWORD dwColumnIndex,
+    __in DWORD cbSize,
+    __out BYTE *pbData
+    );
+static HRESULT EnsureLocalColumnConstraints(
+    __in ITableDefinition *pTableDefinition,
+    __in DBID *pTableID,
+    __in SCE_TABLE_SCHEMA *pTableSchema
+    );
+static HRESULT EnsureForeignColumnConstraints(
+    __in ITableDefinition *pTableDefinition,
+    __in DBID *pTableID,
+    __in SCE_TABLE_SCHEMA *pTableSchema,
+    __in SCE_DATABASE_SCHEMA *pDatabaseSchema
+    );
+static HRESULT SetSessionProperties(
+    __in ISessionProperties *pISessionProperties
+    );
+static HRESULT GetDatabaseSchemaInfo(
+    __in SCE_DATABASE *pDatabase,
+    __out LPWSTR *psczSchemaType,
+    __out DWORD *pdwVersion
+    );
+static HRESULT SetDatabaseSchemaInfo(
+    __in SCE_DATABASE *pDatabase,
+    __in LPCWSTR wzSchemaType,
+    __in DWORD dwVersion
+    );
+static void ReleaseDatabase(
+    SCE_DATABASE *pDatabase
+    );
+static void ReleaseDatabaseInternal(
+    SCE_DATABASE_INTERNAL *pDatabaseInternal
+    );
+// function definitions
+extern "C" HRESULT DAPI SceCreateDatabase(
+    __in_z LPCWSTR sczFile,
+    __in_z_opt LPCWSTR wzSqlCeDllPath,
+    __out SCE_DATABASE **ppDatabase
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczDirectory = NULL;
+    SCE_DATABASE *pNewSceDatabase = NULL;
+    SCE_DATABASE_INTERNAL *pNewSceDatabaseInternal = NULL;
+    IDBDataSourceAdmin *pIDBDataSourceAdmin = NULL; 
+    DBPROPSET rgdbpDataSourcePropSet[2] = { };
+    DBPROP rgdbpDataSourceProp[2] = { };
+    DBPROP rgdbpDataSourceSsceProp[1] = { };
+    pNewSceDatabase = reinterpret_cast<SCE_DATABASE *>(MemAlloc(sizeof(SCE_DATABASE), TRUE));
+    ExitOnNull(pNewSceDatabase, hr, E_OUTOFMEMORY, "Failed to allocate SCE_DATABASE struct");
+    pNewSceDatabaseInternal = reinterpret_cast<SCE_DATABASE_INTERNAL *>(MemAlloc(sizeof(SCE_DATABASE_INTERNAL), TRUE));
+    ExitOnNull(pNewSceDatabaseInternal, hr, E_OUTOFMEMORY, "Failed to allocate SCE_DATABASE_INTERNAL struct");
+    pNewSceDatabase->sdbHandle = reinterpret_cast<void *>(pNewSceDatabaseInternal);
+    hr = CreateSqlCe(wzSqlCeDllPath, &pNewSceDatabaseInternal->pIDBInitialize, &pNewSceDatabaseInternal->hSqlCeDll);
+    ExitOnFailure(hr, "Failed to get IDBInitialize interface");
+    
+    hr = pNewSceDatabaseInternal->pIDBInitialize->QueryInterface(IID_IDBDataSourceAdmin, reinterpret_cast<void **>(&pIDBDataSourceAdmin));
+    ExitOnFailure(hr, "Failed to get IDBDataSourceAdmin interface");
+    hr = PathGetDirectory(sczFile, &sczDirectory);
+    ExitOnFailure(hr, "Failed to get directory portion of path: %ls", sczFile);
+    hr = DirEnsureExists(sczDirectory, NULL);
+    ExitOnFailure(hr, "Failed to ensure directory exists: %ls", sczDirectory);
+    rgdbpDataSourceProp[0].dwPropertyID = DBPROP_INIT_DATASOURCE;
+    rgdbpDataSourceProp[0].dwOptions = DBPROPOPTIONS_REQUIRED;
+    rgdbpDataSourceProp[0].vValue.vt = VT_BSTR;
+    rgdbpDataSourceProp[0].vValue.bstrVal = ::SysAllocString(sczFile);
+    rgdbpDataSourceProp[1].dwPropertyID = DBPROP_INIT_MODE;
+    rgdbpDataSourceProp[1].dwOptions = DBPROPOPTIONS_REQUIRED;
+    rgdbpDataSourceProp[1].vValue.vt = VT_I4;
+    rgdbpDataSourceProp[1].vValue.lVal = DB_MODE_SHARE_DENY_NONE;
+    // SQL CE doesn't seem to allow us to specify DBPROP_INIT_PROMPT if we include any properties from DBPROPSET_SSCE_DBINIT 
+    rgdbpDataSourcePropSet[0].guidPropertySet = DBPROPSET_DBINIT;
+    rgdbpDataSourcePropSet[0].rgProperties = rgdbpDataSourceProp;
+    rgdbpDataSourcePropSet[0].cProperties = _countof(rgdbpDataSourceProp);
+    rgdbpDataSourceSsceProp[0].dwPropertyID = DBPROP_SSCE_MAX_DATABASE_SIZE;
+    rgdbpDataSourceSsceProp[0].dwOptions = DBPROPOPTIONS_REQUIRED;
+    rgdbpDataSourceSsceProp[0].vValue.vt = VT_I4;
+    rgdbpDataSourceSsceProp[0].vValue.intVal = MAX_SQLCE_DATABASE_SIZE;
+    rgdbpDataSourcePropSet[1].guidPropertySet = DBPROPSET_SSCE_DBINIT;
+    rgdbpDataSourcePropSet[1].rgProperties = rgdbpDataSourceSsceProp;
+    rgdbpDataSourcePropSet[1].cProperties = _countof(rgdbpDataSourceSsceProp);
+    hr = pIDBDataSourceAdmin->CreateDataSource(_countof(rgdbpDataSourcePropSet), rgdbpDataSourcePropSet, NULL, IID_IUnknown, NULL);
+    ExitOnFailure(hr, "Failed to create data source");
+    hr = pNewSceDatabaseInternal->pIDBInitialize->QueryInterface(IID_IDBProperties, reinterpret_cast<void **>(&pNewSceDatabaseInternal->pIDBProperties));
+    ExitOnFailure(hr, "Failed to get IDBProperties interface");
+    hr = pNewSceDatabaseInternal->pIDBInitialize->QueryInterface(IID_IDBCreateSession, reinterpret_cast<void **>(&pNewSceDatabaseInternal->pIDBCreateSession));
+    ExitOnFailure(hr, "Failed to get IDBCreateSession interface");
+    hr = pNewSceDatabaseInternal->pIDBCreateSession->CreateSession(NULL, IID_ISessionProperties, reinterpret_cast<IUnknown **>(&pNewSceDatabaseInternal->pISessionProperties));
+    ExitOnFailure(hr, "Failed to get ISessionProperties interface");
+    hr = SetSessionProperties(pNewSceDatabaseInternal->pISessionProperties);
+    ExitOnFailure(hr, "Failed to set session properties");
+    hr = pNewSceDatabaseInternal->pISessionProperties->QueryInterface(IID_IOpenRowset, reinterpret_cast<void **>(&pNewSceDatabaseInternal->pIOpenRowset));
+    ExitOnFailure(hr, "Failed to get IOpenRowset interface");
+    hr = pNewSceDatabaseInternal->pISessionProperties->QueryInterface(IID_ITransactionLocal, reinterpret_cast<void **>(&pNewSceDatabaseInternal->pITransactionLocal));
+    ExitOnFailure(hr, "Failed to get ITransactionLocal interface");
+    *ppDatabase = pNewSceDatabase;
+    pNewSceDatabase = NULL;
+LExit:
+    ReleaseStr(sczDirectory);
+    ReleaseObject(pIDBDataSourceAdmin);
+    ReleaseDatabase(pNewSceDatabase);
+    ReleaseBSTR(rgdbpDataSourceProp[0].vValue.bstrVal);
+    return hr;
+}
+extern "C" HRESULT DAPI SceOpenDatabase(
+    __in_z LPCWSTR sczFile,
+    __in_z_opt LPCWSTR wzSqlCeDllPath,
+    __in LPCWSTR wzExpectedSchemaType,
+    __in DWORD dwExpectedVersion,
+    __out SCE_DATABASE **ppDatabase,
+    __in BOOL fReadOnly
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD dwVersionFound = 0;
+    WCHAR wzTempDbFile[MAX_PATH];
+    LPCWSTR wzPathToOpen = NULL;
+    LPWSTR sczSchemaType = NULL;
+    SCE_DATABASE *pNewSceDatabase = NULL;
+    SCE_DATABASE_INTERNAL *pNewSceDatabaseInternal = NULL;
+    DBPROPSET rgdbpDataSourcePropSet[2] = { };
+    DBPROP rgdbpDataSourceProp[2] = { };
+    DBPROP rgdbpDataSourceSsceProp[1] =  { };
+    pNewSceDatabase = reinterpret_cast<SCE_DATABASE *>(MemAlloc(sizeof(SCE_DATABASE), TRUE));
+    ExitOnNull(pNewSceDatabase, hr, E_OUTOFMEMORY, "Failed to allocate SCE_DATABASE struct");
+    pNewSceDatabaseInternal = reinterpret_cast<SCE_DATABASE_INTERNAL *>(MemAlloc(sizeof(SCE_DATABASE_INTERNAL), TRUE));
+    ExitOnNull(pNewSceDatabaseInternal, hr, E_OUTOFMEMORY, "Failed to allocate SCE_DATABASE_INTERNAL struct");
+    pNewSceDatabase->sdbHandle = reinterpret_cast<void *>(pNewSceDatabaseInternal);
+    hr = CreateSqlCe(wzSqlCeDllPath, &pNewSceDatabaseInternal->pIDBInitialize, &pNewSceDatabaseInternal->hSqlCeDll);
+    ExitOnFailure(hr, "Failed to get IDBInitialize interface");
+    
+    hr = pNewSceDatabaseInternal->pIDBInitialize->QueryInterface(IID_IDBProperties, reinterpret_cast<void **>(&pNewSceDatabaseInternal->pIDBProperties));
+    ExitOnFailure(hr, "Failed to get IDBProperties interface");
+    // TODO: had trouble getting SQL CE to read a file read-only, so we're copying it to a temp path for now.
+    if (fReadOnly)
+    {
+        hr = DirCreateTempPath(PathFile(sczFile), (LPWSTR)wzTempDbFile, _countof(wzTempDbFile));
+        ExitOnFailure(hr, "Failed to get temp path");
+        hr = FileEnsureCopy(sczFile, (LPCWSTR)wzTempDbFile, TRUE);
+        ExitOnFailure(hr, "Failed to copy file to temp path");
+        hr = StrAllocString(&pNewSceDatabaseInternal->sczTempDbFile, (LPCWSTR)wzTempDbFile, 0);
+        ExitOnFailure(hr, "Failed to copy temp db file path");
+        wzPathToOpen = (LPCWSTR)wzTempDbFile;
+    }
+    else
+    {
+        wzPathToOpen = sczFile;
+    }
+    rgdbpDataSourceProp[0].dwPropertyID = DBPROP_INIT_DATASOURCE;
+    rgdbpDataSourceProp[0].dwOptions = DBPROPOPTIONS_REQUIRED;
+    rgdbpDataSourceProp[0].vValue.vt = VT_BSTR;
+    rgdbpDataSourceProp[0].vValue.bstrVal = ::SysAllocString(wzPathToOpen);
+    rgdbpDataSourceProp[1].dwPropertyID = DBPROP_INIT_MODE;
+    rgdbpDataSourceProp[1].dwOptions = DBPROPOPTIONS_REQUIRED;
+    rgdbpDataSourceProp[1].vValue.vt = VT_I4;
+    rgdbpDataSourceProp[1].vValue.lVal = DB_MODE_SHARE_DENY_NONE;
+    // SQL CE doesn't seem to allow us to specify DBPROP_INIT_PROMPT if we include any properties from DBPROPSET_SSCE_DBINIT 
+    rgdbpDataSourcePropSet[0].guidPropertySet = DBPROPSET_DBINIT;
+    rgdbpDataSourcePropSet[0].rgProperties = rgdbpDataSourceProp;
+    rgdbpDataSourcePropSet[0].cProperties = _countof(rgdbpDataSourceProp);
+    rgdbpDataSourceSsceProp[0].dwPropertyID = DBPROP_SSCE_MAX_DATABASE_SIZE;
+    rgdbpDataSourceSsceProp[0].dwOptions = DBPROPOPTIONS_REQUIRED;
+    rgdbpDataSourceSsceProp[0].vValue.vt = VT_I4;
+    rgdbpDataSourceSsceProp[0].vValue.lVal = MAX_SQLCE_DATABASE_SIZE;
+    rgdbpDataSourcePropSet[1].guidPropertySet = DBPROPSET_SSCE_DBINIT;
+    rgdbpDataSourcePropSet[1].rgProperties = rgdbpDataSourceSsceProp;
+    rgdbpDataSourcePropSet[1].cProperties = _countof(rgdbpDataSourceSsceProp);
+    hr = pNewSceDatabaseInternal->pIDBProperties->SetProperties(_countof(rgdbpDataSourcePropSet), rgdbpDataSourcePropSet);
+    ExitOnFailure(hr, "Failed to set initial properties to open database");
+    hr = pNewSceDatabaseInternal->pIDBInitialize->Initialize();
+    ExitOnFailure(hr, "Failed to open database: %ls", sczFile);
+    hr = pNewSceDatabaseInternal->pIDBInitialize->QueryInterface(IID_IDBCreateSession, reinterpret_cast<void **>(&pNewSceDatabaseInternal->pIDBCreateSession));
+    ExitOnFailure(hr, "Failed to get IDBCreateSession interface");
+    hr = pNewSceDatabaseInternal->pIDBCreateSession->CreateSession(NULL, IID_ISessionProperties, reinterpret_cast<IUnknown **>(&pNewSceDatabaseInternal->pISessionProperties));
+    ExitOnFailure(hr, "Failed to get ISessionProperties interface");
+    hr = SetSessionProperties(pNewSceDatabaseInternal->pISessionProperties);
+    ExitOnFailure(hr, "Failed to set session properties");
+    hr = pNewSceDatabaseInternal->pISessionProperties->QueryInterface(IID_IOpenRowset, reinterpret_cast<void **>(&pNewSceDatabaseInternal->pIOpenRowset));
+    ExitOnFailure(hr, "Failed to get IOpenRowset interface");
+    hr = pNewSceDatabaseInternal->pISessionProperties->QueryInterface(IID_ITransactionLocal, reinterpret_cast<void **>(&pNewSceDatabaseInternal->pITransactionLocal));
+    ExitOnFailure(hr, "Failed to get ITransactionLocal interface");
+    hr = GetDatabaseSchemaInfo(pNewSceDatabase, &sczSchemaType, &dwVersionFound);
+    ExitOnFailure(hr, "Failed to find schema version of database");
+    if (CSTR_EQUAL != ::CompareStringW(LOCALE_INVARIANT, 0, sczSchemaType, -1, wzExpectedSchemaType, -1))
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_BAD_FILE_TYPE);
+        ExitOnRootFailure(hr, "Tried to open wrong database type - expected type %ls, found type %ls", wzExpectedSchemaType, sczSchemaType);
+    }
+    else if (dwVersionFound != dwExpectedVersion)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_PRODUCT_VERSION);
+        ExitOnRootFailure(hr, "Tried to open wrong database schema version - expected version %u, found version %u", dwExpectedVersion, dwVersionFound);
+    }
+    *ppDatabase = pNewSceDatabase;
+    pNewSceDatabase = NULL;
+LExit:
+    ReleaseBSTR(rgdbpDataSourceProp[0].vValue.bstrVal);
+    ReleaseStr(sczSchemaType);
+    ReleaseDatabase(pNewSceDatabase);
+    return hr;
+}
+extern "C" HRESULT DAPI SceEnsureDatabase(
+    __in_z LPCWSTR sczFile,
+    __in_z_opt LPCWSTR wzSqlCeDllPath,
+    __in LPCWSTR wzSchemaType,
+    __in DWORD dwExpectedVersion,
+    __in SCE_DATABASE_SCHEMA *pdsSchema,
+    __out SCE_DATABASE **ppDatabase
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_DATABASE *pDatabase = NULL;
+    if (FileExistsEx(sczFile, NULL))
+    {
+        hr = SceOpenDatabase(sczFile, wzSqlCeDllPath, wzSchemaType, dwExpectedVersion, &pDatabase, FALSE);
+        ExitOnFailure(hr, "Failed to open database while ensuring database exists: %ls", sczFile);
+    }
+    else
+    {
+        hr = SceCreateDatabase(sczFile, wzSqlCeDllPath, &pDatabase);
+        ExitOnFailure(hr, "Failed to create database while ensuring database exists: %ls", sczFile);
+        hr = SetDatabaseSchemaInfo(pDatabase, wzSchemaType, dwExpectedVersion);
+        ExitOnFailure(hr, "Failed to set schema version of database");
+    }
+    hr = EnsureSchema(pDatabase, pdsSchema);
+    ExitOnFailure(hr, "Failed to ensure schema is correct in database: %ls", sczFile);
+    // Keep a pointer to the schema in the SCE_DATABASE object for future reference
+    pDatabase->pdsSchema = pdsSchema;
+    *ppDatabase = pDatabase;
+    pDatabase = NULL;
+LExit:
+    ReleaseDatabase(pDatabase);
+    return hr;
+}
+extern "C" HRESULT DAPI SceIsTableEmpty(
+    __in SCE_DATABASE *pDatabase,
+    __in DWORD dwTableIndex,
+    __out BOOL *pfEmpty
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_ROW_HANDLE row = NULL;
+    hr = SceGetFirstRow(pDatabase, dwTableIndex, &row);
+    if (E_NOTFOUND == hr)
+    {
+        *pfEmpty = TRUE;
+        ExitFunction1(hr = S_OK);
+    }
+    ExitOnFailure(hr, "Failed to get first row while checking if table is empty");
+    *pfEmpty = FALSE;
+LExit:
+    ReleaseSceRow(row);
+    return hr;
+}
+extern "C" HRESULT DAPI SceGetFirstRow(
+    __in SCE_DATABASE *pDatabase,
+    __in DWORD dwTableIndex,
+    __out_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE *pRowHandle
+    )
+{
+    HRESULT hr = S_OK;
+    DBCOUNTITEM cRowsObtained = 0;
+    HROW hRow = DB_NULL_HROW;
+    HROW *phRow = &hRow;
+    SCE_ROW *pRow = NULL;
+    SCE_TABLE_SCHEMA *pTable = &(pDatabase->pdsSchema->rgTables[dwTableIndex]);
+    hr = pTable->pIRowset->RestartPosition(DB_NULL_HCHAPTER);
+    ExitOnFailure(hr, "Failed to reset IRowset position to beginning");
+    hr = pTable->pIRowset->GetNextRows(DB_NULL_HCHAPTER, 0, 1, &cRowsObtained, &phRow);
+    if (DB_S_ENDOFROWSET == hr)
+    {
+        ExitFunction1(hr = E_NOTFOUND);
+    }
+    ExitOnFailure(hr, "Failed to get next first row");
+    pRow = reinterpret_cast<SCE_ROW *>(MemAlloc(sizeof(SCE_ROW), TRUE));
+    ExitOnNull(pRow, hr, E_OUTOFMEMORY, "Failed to allocate SCE_ROW struct");
+    pRow->pDatabaseInternal = reinterpret_cast<SCE_DATABASE_INTERNAL *>(pDatabase->sdbHandle);
+    pRow->hRow = hRow;
+    pRow->pTableSchema = pTable;
+    pRow->pIRowset = pTable->pIRowset;
+    pRow->pIRowset->AddRef();
+    *pRowHandle = reinterpret_cast<SCE_ROW_HANDLE>(pRow);
+LExit:
+    return hr;
+}
+HRESULT DAPI SceGetNextRow(
+    __in SCE_DATABASE *pDatabase,
+    __in DWORD dwTableIndex,
+    __out_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE *pRowHandle
+    )
+{
+    HRESULT hr = S_OK;
+    DBCOUNTITEM cRowsObtained = 0;
+    HROW hRow = DB_NULL_HROW;
+    HROW *phRow = &hRow;
+    SCE_ROW *pRow = NULL;
+    SCE_TABLE_SCHEMA *pTable = &(pDatabase->pdsSchema->rgTables[dwTableIndex]);
+    hr = pTable->pIRowset->GetNextRows(DB_NULL_HCHAPTER, 0, 1, &cRowsObtained, &phRow);
+    if (DB_S_ENDOFROWSET == hr)
+    {
+        ExitFunction1(hr = E_NOTFOUND);
+    }
+    ExitOnFailure(hr, "Failed to get next first row");
+    pRow = reinterpret_cast<SCE_ROW *>(MemAlloc(sizeof(SCE_ROW), TRUE));
+    ExitOnNull(pRow, hr, E_OUTOFMEMORY, "Failed to allocate SCE_ROW struct");
+    pRow->pDatabaseInternal = reinterpret_cast<SCE_DATABASE_INTERNAL *>(pDatabase->sdbHandle);
+    pRow->hRow = hRow;
+    pRow->pTableSchema = pTable;
+    pRow->pIRowset = pTable->pIRowset;
+    pRow->pIRowset->AddRef();
+    *pRowHandle = reinterpret_cast<SCE_ROW_HANDLE>(pRow);
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI SceBeginTransaction(
+    __in SCE_DATABASE *pDatabase
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_DATABASE_INTERNAL *pDatabaseInternal = reinterpret_cast<SCE_DATABASE_INTERNAL *>(pDatabase->sdbHandle);
+    if (pDatabaseInternal->fTransactionBadState)
+    {
+        // We're in a hosed transaction state - we can't start a new one
+        ExitFunction1(hr = HRESULT_FROM_WIN32(ERROR_RECOVERY_FAILURE));
+    }
+    ::InterlockedIncrement(&pDatabaseInternal->dwTransactionRefcount);
+    if (1 == pDatabaseInternal->dwTransactionRefcount)
+    {
+        hr = pDatabaseInternal->pITransactionLocal->StartTransaction(ISOLATIONLEVEL_SERIALIZABLE, 0, NULL, NULL);
+        ExitOnFailure(hr, "Failed to start transaction");
+    }
+LExit:
+    if (FAILED(hr))
+    {
+        ::InterlockedDecrement(&pDatabaseInternal->dwTransactionRefcount);
+    }
+    return hr;
+}
+extern "C" HRESULT DAPI SceCommitTransaction(
+    __in SCE_DATABASE *pDatabase
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_DATABASE_INTERNAL *pDatabaseInternal = reinterpret_cast<SCE_DATABASE_INTERNAL *>(pDatabase->sdbHandle);
+    Assert(0 < pDatabaseInternal->dwTransactionRefcount);
+    ::InterlockedDecrement(&pDatabaseInternal->dwTransactionRefcount);
+    if (0 == pDatabaseInternal->dwTransactionRefcount)
+    {
+        if (pDatabaseInternal->fRollbackTransaction)
+        {
+            hr = pDatabaseInternal->pITransactionLocal->Abort(NULL, FALSE, FALSE);
+            ExitOnFailure(hr, "Failed to abort transaction");
+        }
+        else
+        {
+            hr = pDatabaseInternal->pITransactionLocal->Commit(FALSE, XACTTC_SYNC, 0);
+            ExitOnFailure(hr, "Failed to commit transaction");
+        }
+        if (pDatabaseInternal->fPendingChanges)
+        {
+            pDatabaseInternal->fPendingChanges = FALSE;
+            pDatabaseInternal->fChanges = TRUE;
+        }
+        pDatabaseInternal->fRollbackTransaction = FALSE;
+    }
+LExit:
+    // If we tried to commit and failed, the caller should subsequently call rollback
+    if (FAILED(hr))
+    {
+        ::InterlockedIncrement(&pDatabaseInternal->dwTransactionRefcount);
+    }
+    return hr;
+}
+extern "C" HRESULT DAPI SceRollbackTransaction(
+    __in SCE_DATABASE *pDatabase
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_DATABASE_INTERNAL *pDatabaseInternal = reinterpret_cast<SCE_DATABASE_INTERNAL *>(pDatabase->sdbHandle);
+    Assert(0 < pDatabaseInternal->dwTransactionRefcount);
+    ::InterlockedDecrement(&pDatabaseInternal->dwTransactionRefcount);
+    if (0 == pDatabaseInternal->dwTransactionRefcount)
+    {
+        hr = pDatabaseInternal->pITransactionLocal->Abort(NULL, FALSE, FALSE);
+        ExitOnFailure(hr, "Failed to abort transaction");
+        pDatabaseInternal->fPendingChanges = FALSE;
+        pDatabaseInternal->fRollbackTransaction = FALSE;
+    }
+    else
+    {
+        pDatabaseInternal->fRollbackTransaction = TRUE;
+    }
+LExit:
+    // We're just in a bad state now. Don't increment the transaction refcount (what is the user going to do - call us again?)
+    // but mark the database as bad so the user gets an error if they try to start a new transaction.
+    if (FAILED(hr))
+    {
+        TraceError(hr, "Failed to rollback transaction");
+        pDatabaseInternal->fTransactionBadState = TRUE;
+    }
+    return hr;
+}
+extern "C" HRESULT DAPI SceDeleteRow(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE *pRowHandle
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_ROW *pRow = reinterpret_cast<SCE_ROW *>(*pRowHandle);
+    IRowsetChange *pIRowsetChange = NULL;
+    DBROWSTATUS rowStatus = DBROWSTATUS_S_OK;
+    hr = pRow->pIRowset->QueryInterface(IID_IRowsetChange, reinterpret_cast<void **>(&pIRowsetChange));
+    ExitOnFailure(hr, "Failed to get IRowsetChange interface");
+    hr = pIRowsetChange->DeleteRows(DB_NULL_HCHAPTER, 1, &pRow->hRow, &rowStatus);
+    ExitOnFailure(hr, "Failed to delete row with status: %u", rowStatus);
+    ReleaseNullSceRow(*pRowHandle);
+LExit:
+    ReleaseObject(pIRowsetChange);
+    return hr;
+}
+extern "C" HRESULT DAPI ScePrepareInsert(
+    __in SCE_DATABASE *pDatabase,
+    __in DWORD dwTableIndex,
+    __out_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE *pRowHandle
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_ROW *pRow = NULL;
+    pRow = reinterpret_cast<SCE_ROW *>(MemAlloc(sizeof(SCE_ROW), TRUE));
+    ExitOnNull(pRow, hr, E_OUTOFMEMORY, "Failed to allocate SCE_ROW struct");
+    pRow->pDatabaseInternal = reinterpret_cast<SCE_DATABASE_INTERNAL *>(pDatabase->sdbHandle);
+    pRow->hRow = DB_NULL_HROW;
+    pRow->pTableSchema = &(pDatabase->pdsSchema->rgTables[dwTableIndex]);
+    pRow->pIRowset = pRow->pTableSchema->pIRowset;
+    pRow->pIRowset->AddRef();
+    pRow->fInserting = TRUE;
+    *pRowHandle = reinterpret_cast<SCE_ROW_HANDLE>(pRow);
+    pRow = NULL;
+LExit:
+    ReleaseSceRow(pRow);
+    return hr;
+}
+extern "C" HRESULT DAPI SceFinishUpdate(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowHandle
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_ROW *pRow = reinterpret_cast<SCE_ROW *>(rowHandle);
+    IAccessor *pIAccessor = NULL;
+    IRowsetChange *pIRowsetChange = NULL;
+    DBBINDSTATUS *rgBindStatus = NULL;
+    HACCESSOR hAccessor = DB_NULL_HACCESSOR;
+    HROW hRow = DB_NULL_HROW;
+    hr = pRow->pIRowset->QueryInterface(IID_IAccessor, reinterpret_cast<void **>(&pIAccessor));
+    ExitOnFailure(hr, "Failed to get IAccessor interface");
+// This can be used when stepping through the debugger to see bind failures
+#ifdef DEBUG
+    if (0 < pRow->dwBindingIndex)
+    {
+        hr = MemEnsureArraySize(reinterpret_cast<void **>(&rgBindStatus), pRow->dwBindingIndex, sizeof(DBBINDSTATUS), 0);
+        ExitOnFailure(hr, "Failed to ensure binding status array size");
+    }
+#endif
+    hr = pIAccessor->CreateAccessor(DBACCESSOR_ROWDATA, pRow->dwBindingIndex, pRow->rgBinding, 0, &hAccessor, rgBindStatus);
+    ExitOnFailure(hr, "Failed to create accessor");
+    hr = pRow->pIRowset->QueryInterface(IID_IRowsetChange, reinterpret_cast<void **>(&pIRowsetChange));
+    ExitOnFailure(hr, "Failed to get IRowsetChange interface");
+    if (pRow->fInserting)
+    {
+        hr = pIRowsetChange->InsertRow(DB_NULL_HCHAPTER, hAccessor, pRow->pbData, &hRow);
+        ExitOnFailure(hr, "Failed to insert new row");
+        pRow->hRow = hRow;
+        ReleaseNullObject(pRow->pIRowset);
+        pRow->pIRowset = pRow->pTableSchema->pIRowset;
+        pRow->pIRowset->AddRef();
+    }
+    else
+    {
+        hr = pIRowsetChange->SetData(pRow->hRow, hAccessor, pRow->pbData);
+        ExitOnFailure(hr, "Failed to update existing row");
+    }
+    if (0 < pRow->pDatabaseInternal->dwTransactionRefcount)
+    {
+        pRow->pDatabaseInternal->fPendingChanges = TRUE;
+    }
+    else
+    {
+        pRow->pDatabaseInternal->fChanges = TRUE;
+    }
+LExit:
+    if (DB_NULL_HACCESSOR != hAccessor)
+    {
+        pIAccessor->ReleaseAccessor(hAccessor, NULL);
+    }
+    ReleaseMem(rgBindStatus);
+    ReleaseObject(pIAccessor);
+    ReleaseObject(pIRowsetChange);
+    return hr;
+}
+extern "C" HRESULT DAPI SceSetColumnBinary(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowHandle,
+    __in DWORD dwColumnIndex,
+    __in_bcount(cbBuffer) const BYTE* pbBuffer,
+    __in SIZE_T cbBuffer
+    )
+{
+    HRESULT hr = S_OK;
+    size_t cbAllocSize = 0;
+    SCE_ROW *pRow = reinterpret_cast<SCE_ROW *>(rowHandle);
+    hr = ::SizeTMult(sizeof(DBBINDING), pRow->pTableSchema->cColumns, &cbAllocSize);
+    ExitOnFailure(hr, "Overflow while calculating allocation size for DBBINDING to set binary, columns: %u", pRow->pTableSchema->cColumns);
+    if (NULL == pRow->rgBinding)
+    {
+        pRow->rgBinding = static_cast<DBBINDING *>(MemAlloc(cbAllocSize, TRUE));
+        ExitOnNull(pRow->rgBinding, hr, E_OUTOFMEMORY, "Failed to allocate DBBINDINGs for sce row writer");
+    }
+    hr = SetColumnValue(pRow->pTableSchema, dwColumnIndex, pbBuffer, cbBuffer, &pRow->rgBinding[pRow->dwBindingIndex++], &pRow->cbOffset, &pRow->pbData);
+    ExitOnFailure(hr, "Failed to set column value as binary");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI SceSetColumnDword(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowHandle,
+    __in DWORD dwColumnIndex,
+    __in const DWORD dwValue
+    )
+{
+    HRESULT hr = S_OK;
+    size_t cbAllocSize = 0;
+    SCE_ROW *pRow = reinterpret_cast<SCE_ROW *>(rowHandle);
+    hr = ::SizeTMult(sizeof(DBBINDING), pRow->pTableSchema->cColumns, &cbAllocSize);
+    ExitOnFailure(hr, "Overflow while calculating allocation size for DBBINDING to set dword, columns: %u", pRow->pTableSchema->cColumns);
+    if (NULL == pRow->rgBinding)
+    {
+        pRow->rgBinding = static_cast<DBBINDING *>(MemAlloc(cbAllocSize, TRUE));
+        ExitOnNull(pRow->rgBinding, hr, E_OUTOFMEMORY, "Failed to allocate DBBINDINGs for sce row writer");
+    }
+    hr = SetColumnValue(pRow->pTableSchema, dwColumnIndex, reinterpret_cast<const BYTE *>(&dwValue), 4, &pRow->rgBinding[pRow->dwBindingIndex++], &pRow->cbOffset, &pRow->pbData);
+    ExitOnFailure(hr, "Failed to set column value as binary");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI SceSetColumnQword(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowHandle,
+    __in DWORD dwColumnIndex,
+    __in const DWORD64 qwValue
+    )
+{
+    HRESULT hr = S_OK;
+    size_t cbAllocSize = 0;
+    SCE_ROW *pRow = reinterpret_cast<SCE_ROW *>(rowHandle);
+    hr = ::SizeTMult(sizeof(DBBINDING), pRow->pTableSchema->cColumns, &cbAllocSize);
+    ExitOnFailure(hr, "Overflow while calculating allocation size for DBBINDING to set qword, columns: %u", pRow->pTableSchema->cColumns);
+    if (NULL == pRow->rgBinding)
+    {
+        pRow->rgBinding = static_cast<DBBINDING *>(MemAlloc(cbAllocSize, TRUE));
+        ExitOnNull(pRow->rgBinding, hr, E_OUTOFMEMORY, "Failed to allocate DBBINDINGs for sce row writer");
+    }
+    hr = SetColumnValue(pRow->pTableSchema, dwColumnIndex, reinterpret_cast<const BYTE *>(&qwValue), 8, &pRow->rgBinding[pRow->dwBindingIndex++], &pRow->cbOffset, &pRow->pbData);
+    ExitOnFailure(hr, "Failed to set column value as qword");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI SceSetColumnBool(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowHandle,
+    __in DWORD dwColumnIndex,
+    __in const BOOL fValue
+    )
+{
+    HRESULT hr = S_OK;
+    size_t cbAllocSize = 0;
+    short int sValue = fValue ? 0xFFFF : 0x0000;
+    SCE_ROW *pRow = reinterpret_cast<SCE_ROW *>(rowHandle);
+    hr = ::SizeTMult(sizeof(DBBINDING), pRow->pTableSchema->cColumns, &cbAllocSize);
+    ExitOnFailure(hr, "Overflow while calculating allocation size for DBBINDING to set bool, columns: %u", pRow->pTableSchema->cColumns);
+    if (NULL == pRow->rgBinding)
+    {
+        pRow->rgBinding = static_cast<DBBINDING *>(MemAlloc(cbAllocSize, TRUE));
+        ExitOnNull(pRow->rgBinding, hr, E_OUTOFMEMORY, "Failed to allocate DBBINDINGs for sce row writer");
+    }
+    hr = SetColumnValue(pRow->pTableSchema, dwColumnIndex, reinterpret_cast<const BYTE *>(&sValue), 2, &pRow->rgBinding[pRow->dwBindingIndex++], &pRow->cbOffset, &pRow->pbData);
+    ExitOnFailure(hr, "Failed to set column value as binary");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI SceSetColumnString(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowHandle,
+    __in DWORD dwColumnIndex,
+    __in_z_opt LPCWSTR wzValue
+    )
+{
+    HRESULT hr = S_OK;
+    size_t cbAllocSize = 0;
+    SCE_ROW *pRow = reinterpret_cast<SCE_ROW *>(rowHandle);
+    SIZE_T cbSize = (NULL == wzValue) ? 0 : ((lstrlenW(wzValue) + 1) * sizeof(WCHAR));
+    hr = ::SizeTMult(sizeof(DBBINDING), pRow->pTableSchema->cColumns, &cbAllocSize);
+    ExitOnFailure(hr, "Overflow while calculating allocation size for DBBINDING to set string, columns: %u", pRow->pTableSchema->cColumns);
+    if (NULL == pRow->rgBinding)
+    {
+        pRow->rgBinding = static_cast<DBBINDING *>(MemAlloc(cbAllocSize, TRUE));
+        ExitOnNull(pRow->rgBinding, hr, E_OUTOFMEMORY, "Failed to allocate DBBINDINGs for sce row writer");
+    }
+    hr = SetColumnValue(pRow->pTableSchema, dwColumnIndex, reinterpret_cast<const BYTE *>(wzValue), cbSize, &pRow->rgBinding[pRow->dwBindingIndex++], &pRow->cbOffset, &pRow->pbData);
+    ExitOnFailure(hr, "Failed to set column value as string: %ls", wzValue);
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI SceSetColumnNull(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowHandle,
+    __in DWORD dwColumnIndex
+    )
+{
+    HRESULT hr = S_OK;
+    size_t cbAllocSize = 0;
+    SCE_ROW *pRow = reinterpret_cast<SCE_ROW *>(rowHandle);
+    hr = ::SizeTMult(sizeof(DBBINDING), pRow->pTableSchema->cColumns, &cbAllocSize);
+    ExitOnFailure(hr, "Overflow while calculating allocation size for DBBINDING to set empty, columns: %u", pRow->pTableSchema->cColumns);
+    if (NULL == pRow->rgBinding)
+    {
+        pRow->rgBinding = static_cast<DBBINDING *>(MemAlloc(cbAllocSize, TRUE));
+        ExitOnNull(pRow->rgBinding, hr, E_OUTOFMEMORY, "Failed to allocate DBBINDINGs for sce row writer");
+    }
+    hr = SetColumnValue(pRow->pTableSchema, dwColumnIndex, NULL, 0, &pRow->rgBinding[pRow->dwBindingIndex++], &pRow->cbOffset, &pRow->pbData);
+    ExitOnFailure(hr, "Failed to set column value as empty value");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI SceSetColumnSystemTime(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowHandle,
+    __in DWORD dwColumnIndex,
+    __in const SYSTEMTIME *pst
+    )
+{
+    HRESULT hr = S_OK;
+    size_t cbAllocSize = 0;
+    DBTIMESTAMP dbTimeStamp = { };
+    SCE_ROW *pRow = reinterpret_cast<SCE_ROW *>(rowHandle);
+    hr = ::SizeTMult(sizeof(DBBINDING), pRow->pTableSchema->cColumns, &cbAllocSize);
+    ExitOnFailure(hr, "Overflow while calculating allocation size for DBBINDING to set systemtime, columns: %u", pRow->pTableSchema->cColumns);
+    if (NULL == pRow->rgBinding)
+    {
+        pRow->rgBinding = static_cast<DBBINDING *>(MemAlloc(cbAllocSize, TRUE));
+        ExitOnNull(pRow->rgBinding, hr, E_OUTOFMEMORY, "Failed to allocate DBBINDINGs for sce row writer");
+    }
+    dbTimeStamp.year = pst->wYear;
+    dbTimeStamp.month = pst->wMonth;
+    dbTimeStamp.day = pst->wDay;
+    dbTimeStamp.hour = pst->wHour;
+    dbTimeStamp.minute = pst->wMinute;
+    dbTimeStamp.second = pst->wSecond;
+    // Don't use .fraction because milliseconds are not reliable in SQL CE. They are rounded to the nearest 1/300th of a second,
+    // and it is not supported (or at least I can't figure out how) to query for an exact timestamp if milliseconds
+    // are involved (even when rounded the way SQL CE returns them).
+    hr = SetColumnValue(pRow->pTableSchema, dwColumnIndex, reinterpret_cast<const BYTE *>(&dbTimeStamp), sizeof(dbTimeStamp), &pRow->rgBinding[pRow->dwBindingIndex++], &pRow->cbOffset, &pRow->pbData);
+    ExitOnFailure(hr, "Failed to set column value as DBTIMESTAMP");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI SceGetColumnBinary(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowReadHandle,
+    __in DWORD dwColumnIndex,
+    __out_opt BYTE **ppbBuffer,
+    __inout SIZE_T *pcbBuffer
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_ROW *pRow = reinterpret_cast<SCE_ROW *>(rowReadHandle);
+    hr = GetColumnValue(pRow, dwColumnIndex, ppbBuffer, pcbBuffer);
+    if (E_NOTFOUND == hr)
+    {
+        ExitFunction();
+    }
+    ExitOnFailure(hr, "Failed to get binary data out of column");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI SceGetColumnDword(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowReadHandle,
+    __in DWORD dwColumnIndex,
+    __out DWORD *pdwValue
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_ROW *pRow = reinterpret_cast<SCE_ROW *>(rowReadHandle);
+    hr = GetColumnValueFixed(pRow, dwColumnIndex, 4, reinterpret_cast<BYTE *>(pdwValue));
+    if (E_NOTFOUND == hr)
+    {
+        ExitFunction();
+    }
+    ExitOnFailure(hr, "Failed to get dword data out of column");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI SceGetColumnQword(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowReadHandle,
+    __in DWORD dwColumnIndex,
+    __in DWORD64 *pqwValue
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_ROW *pRow = reinterpret_cast<SCE_ROW *>(rowReadHandle);
+    hr = GetColumnValueFixed(pRow, dwColumnIndex, 8, reinterpret_cast<BYTE *>(pqwValue));
+    if (E_NOTFOUND == hr)
+    {
+        ExitFunction();
+    }
+    ExitOnFailure(hr, "Failed to get qword data out of column");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI SceGetColumnBool(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowReadHandle,
+    __in DWORD dwColumnIndex,
+    __out BOOL *pfValue
+    )
+{
+    HRESULT hr = S_OK;
+    short int sValue = 0;
+    SCE_ROW *pRow = reinterpret_cast<SCE_ROW *>(rowReadHandle);
+    hr = GetColumnValueFixed(pRow, dwColumnIndex, 2, reinterpret_cast<BYTE *>(&sValue));
+    if (E_NOTFOUND == hr)
+    {
+        ExitFunction();
+    }
+    ExitOnFailure(hr, "Failed to get data out of column");
+    if (sValue == 0x0000)
+    {
+        *pfValue = FALSE;
+    }
+    else
+    {
+        *pfValue = TRUE;
+    }
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI SceGetColumnString(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowReadHandle,
+    __in DWORD dwColumnIndex,
+    __out_z LPWSTR *psczValue
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_ROW *pRow = reinterpret_cast<SCE_ROW *>(rowReadHandle);
+    SIZE_T cbSize = 0;
+    hr = GetColumnValue(pRow, dwColumnIndex, reinterpret_cast<BYTE **>(psczValue), &cbSize);
+    if (E_NOTFOUND == hr)
+    {
+        ExitFunction();
+    }
+    ExitOnFailure(hr, "Failed to get string data out of column");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI SceGetColumnSystemTime(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowReadHandle,
+    __in DWORD dwColumnIndex,
+    __out SYSTEMTIME *pst
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_ROW *pRow = reinterpret_cast<SCE_ROW *>(rowReadHandle);
+    DBTIMESTAMP dbTimeStamp = { };
+    hr = GetColumnValueFixed(pRow, dwColumnIndex, sizeof(dbTimeStamp), reinterpret_cast<BYTE *>(&dbTimeStamp));
+    if (E_NOTFOUND == hr)
+    {
+        ExitFunction();
+    }
+    ExitOnFailure(hr, "Failed to get string data out of column");
+    pst->wYear = dbTimeStamp.year;
+    pst->wMonth = dbTimeStamp.month;
+    pst->wDay = dbTimeStamp.day;
+    pst->wHour = dbTimeStamp.hour;
+    pst->wMinute = dbTimeStamp.minute;
+    pst->wSecond = dbTimeStamp.second;
+LExit:
+    return hr;
+}
+extern "C" void DAPI SceCloseTable(
+    __in SCE_TABLE_SCHEMA *pTable
+    )
+{
+    ReleaseNullObject(pTable->pIRowsetChange);
+    ReleaseNullObject(pTable->pIRowset);
+}
+extern "C" BOOL DAPI SceDatabaseChanged(
+    __in SCE_DATABASE *pDatabase
+    )
+{
+    SCE_DATABASE_INTERNAL *pDatabaseInternal = reinterpret_cast<SCE_DATABASE_INTERNAL *>(pDatabase->sdbHandle);
+    return pDatabaseInternal->fChanges;
+}
+void DAPI SceResetDatabaseChanged(
+    __in SCE_DATABASE *pDatabase
+    )
+{
+    SCE_DATABASE_INTERNAL *pDatabaseInternal = reinterpret_cast<SCE_DATABASE_INTERNAL *>(pDatabase->sdbHandle);
+    pDatabaseInternal->fChanges = FALSE;
+}
+extern "C" HRESULT DAPI SceCloseDatabase(
+    __in SCE_DATABASE *pDatabase
+    )
+{
+    HRESULT hr = S_OK;
+    ReleaseDatabase(pDatabase);
+    return hr;
+}
+extern "C" HRESULT DAPI SceBeginQuery(
+    __in SCE_DATABASE *pDatabase,
+    __in DWORD dwTableIndex,
+    __in DWORD dwIndex,
+    __deref_out_bcount(SCE_QUERY_HANDLE_BYTES) SCE_QUERY_HANDLE *psqhHandle
+    )
+{
+    HRESULT hr = S_OK;
+    size_t cbAllocSize = 0;
+    SCE_QUERY *psq = static_cast<SCE_QUERY*>(MemAlloc(sizeof(SCE_QUERY), TRUE));
+    ExitOnNull(psq, hr, E_OUTOFMEMORY, "Failed to allocate new sce query");
+    psq->pTableSchema = &(pDatabase->pdsSchema->rgTables[dwTableIndex]);
+    psq->pIndexSchema = &(psq->pTableSchema->rgIndexes[dwIndex]);
+    psq->pDatabaseInternal = reinterpret_cast<SCE_DATABASE_INTERNAL *>(pDatabase->sdbHandle);
+    hr = ::SizeTMult(sizeof(DBBINDING), psq->pTableSchema->cColumns, &cbAllocSize);
+    ExitOnFailure(hr, "Overflow while calculating allocation size for DBBINDING to begin query, columns: %u", psq->pTableSchema->cColumns);
+    psq->rgBinding = static_cast<DBBINDING *>(MemAlloc(cbAllocSize, TRUE));
+    ExitOnNull(psq, hr, E_OUTOFMEMORY, "Failed to allocate DBBINDINGs for new sce query");
+    *psqhHandle = static_cast<SCE_QUERY_HANDLE>(psq);
+    psq = NULL;
+LExit:
+    ReleaseSceQuery(psq);
+    return hr;
+}
+HRESULT DAPI SceSetQueryColumnBinary(
+    __in_bcount(SCE_QUERY_RESULTS_BYTES) SCE_QUERY_HANDLE sqhHandle,
+    __in_bcount(cbBuffer) const BYTE* pbBuffer,
+    __in SIZE_T cbBuffer
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_QUERY *pQuery = reinterpret_cast<SCE_QUERY *>(sqhHandle);
+    hr = SetColumnValue(pQuery->pTableSchema, pQuery->pIndexSchema->rgColumns[pQuery->dwBindingIndex], pbBuffer, cbBuffer, &pQuery->rgBinding[pQuery->dwBindingIndex], &pQuery->cbOffset, &pQuery->pbData);
+    ExitOnFailure(hr, "Failed to set query column value as binary of size: %u", cbBuffer);
+    ++(pQuery->dwBindingIndex);
+LExit:
+    return hr;
+}
+HRESULT DAPI SceSetQueryColumnDword(
+    __in_bcount(SCE_QUERY_RESULTS_BYTES) SCE_QUERY_HANDLE sqhHandle,
+    __in const DWORD dwValue
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_QUERY *pQuery = reinterpret_cast<SCE_QUERY *>(sqhHandle);
+    hr = SetColumnValue(pQuery->pTableSchema, pQuery->pIndexSchema->rgColumns[pQuery->dwBindingIndex], reinterpret_cast<const BYTE *>(&dwValue), 4, &pQuery->rgBinding[pQuery->dwBindingIndex], &pQuery->cbOffset, &pQuery->pbData);
+    ExitOnFailure(hr, "Failed to set query column value as dword");
+    ++(pQuery->dwBindingIndex);
+LExit:
+    return hr;
+}
+HRESULT DAPI SceSetQueryColumnQword(
+    __in_bcount(SCE_QUERY_RESULTS_BYTES) SCE_QUERY_HANDLE sqhHandle,
+    __in const DWORD64 qwValue
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_QUERY *pQuery = reinterpret_cast<SCE_QUERY *>(sqhHandle);
+    hr = SetColumnValue(pQuery->pTableSchema, pQuery->pIndexSchema->rgColumns[pQuery->dwBindingIndex], reinterpret_cast<const BYTE *>(&qwValue), 8, &pQuery->rgBinding[pQuery->dwBindingIndex], &pQuery->cbOffset, &pQuery->pbData);
+    ExitOnFailure(hr, "Failed to set query column value as qword");
+    ++(pQuery->dwBindingIndex);
+LExit:
+    return hr;
+}
+HRESULT DAPI SceSetQueryColumnBool(
+    __in_bcount(SCE_QUERY_RESULTS_BYTES) SCE_QUERY_HANDLE sqhHandle,
+    __in const BOOL fValue
+    )
+{
+    HRESULT hr = S_OK;
+    short int sValue = fValue ? 1 : 0;
+    SCE_QUERY *pQuery = reinterpret_cast<SCE_QUERY *>(sqhHandle);
+    hr = SetColumnValue(pQuery->pTableSchema, pQuery->pIndexSchema->rgColumns[pQuery->dwBindingIndex], reinterpret_cast<const BYTE *>(&sValue), 2, &pQuery->rgBinding[pQuery->dwBindingIndex], &pQuery->cbOffset, &pQuery->pbData);
+    ExitOnFailure(hr, "Failed to set query column value as boolean");
+    ++(pQuery->dwBindingIndex);
+LExit:
+    return hr;
+}
+HRESULT DAPI SceSetQueryColumnString(
+    __in_bcount(SCE_QUERY_RESULTS_BYTES) SCE_QUERY_HANDLE sqhHandle,
+    __in_z_opt LPCWSTR wzString
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_QUERY *pQuery = reinterpret_cast<SCE_QUERY *>(sqhHandle);
+    SIZE_T cbSize = (NULL == wzString) ? 0 : ((lstrlenW(wzString) + 1) * sizeof(WCHAR));
+    hr = SetColumnValue(pQuery->pTableSchema, pQuery->pIndexSchema->rgColumns[pQuery->dwBindingIndex], reinterpret_cast<const BYTE *>(wzString), cbSize, &pQuery->rgBinding[pQuery->dwBindingIndex], &pQuery->cbOffset, &pQuery->pbData);
+    ExitOnFailure(hr, "Failed to set query column value as string");
+    ++(pQuery->dwBindingIndex);
+LExit:
+    return hr;
+}
+HRESULT DAPI SceSetQueryColumnSystemTime(
+    __in_bcount(SCE_QUERY_RESULTS_BYTES) SCE_QUERY_HANDLE sqhHandle,
+    __in const SYSTEMTIME *pst
+    )
+{
+    HRESULT hr = S_OK;
+    DBTIMESTAMP dbTimeStamp = { };
+    SCE_QUERY *pQuery = reinterpret_cast<SCE_QUERY *>(sqhHandle);
+    dbTimeStamp.year = pst->wYear;
+    dbTimeStamp.month = pst->wMonth;
+    dbTimeStamp.day = pst->wDay;
+    dbTimeStamp.hour = pst->wHour;
+    dbTimeStamp.minute = pst->wMinute;
+    dbTimeStamp.second = pst->wSecond;
+    hr = SetColumnValue(pQuery->pTableSchema, pQuery->pIndexSchema->rgColumns[pQuery->dwBindingIndex], reinterpret_cast<const BYTE *>(&dbTimeStamp), sizeof(dbTimeStamp), &pQuery->rgBinding[pQuery->dwBindingIndex], &pQuery->cbOffset, &pQuery->pbData);
+    ExitOnFailure(hr, "Failed to set query column value as DBTIMESTAMP");
+    ++(pQuery->dwBindingIndex);
+LExit:
+    return hr;
+}
+HRESULT DAPI SceSetQueryColumnEmpty(
+    __in_bcount(SCE_QUERY_RESULTS_BYTES) SCE_QUERY_HANDLE sqhHandle
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_QUERY *pQuery = reinterpret_cast<SCE_QUERY *>(sqhHandle);
+    hr = SetColumnValue(pQuery->pTableSchema, pQuery->pIndexSchema->rgColumns[pQuery->dwBindingIndex], NULL, 0, &pQuery->rgBinding[pQuery->dwBindingIndex], &pQuery->cbOffset, &pQuery->pbData);
+    ExitOnFailure(hr, "Failed to set query column value as empty value");
+    ++(pQuery->dwBindingIndex);
+LExit:
+    return hr;
+}
+HRESULT DAPI SceRunQueryExact(
+    __in_bcount(SCE_QUERY_RESULTS_BYTES) SCE_QUERY_HANDLE *psqhHandle,
+    __out_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE *pRowHandle
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_QUERY_RESULTS *pQueryResults = NULL;
+    hr = RunQuery(FALSE, *psqhHandle, &pQueryResults);
+    if (E_NOTFOUND == hr)
+    {
+        ExitFunction();
+    }
+    ExitOnFailure(hr, "Failed to run query exact");
+    hr = SceGetNextResultRow(reinterpret_cast<SCE_QUERY_RESULTS_HANDLE>(pQueryResults), pRowHandle);
+    if (E_NOTFOUND == hr)
+    {
+        ExitFunction();
+    }
+    ExitOnFailure(hr, "Failed to get next row out of results");
+LExit:
+    ReleaseNullSceQuery(*psqhHandle);
+    ReleaseSceQueryResults(pQueryResults);
+    return hr;
+}
+extern "C" HRESULT DAPI SceRunQueryRange(
+    __in_bcount(SCE_QUERY_BYTES) SCE_QUERY_HANDLE *psqhHandle,
+    __deref_out_bcount(SCE_QUERY_RESULTS_BYTES) SCE_QUERY_RESULTS_HANDLE *psqrhHandle
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_QUERY_RESULTS **ppQueryResults = reinterpret_cast<SCE_QUERY_RESULTS **>(psqrhHandle);
+    hr = RunQuery(TRUE, *psqhHandle, ppQueryResults);
+    if (E_NOTFOUND == hr)
+    {
+        ExitFunction();
+    }
+    ExitOnFailure(hr, "Failed to run query for range");
+LExit:
+    ReleaseNullSceQuery(*psqhHandle);
+    return hr;
+}
+extern "C" HRESULT DAPI SceGetNextResultRow(
+    __in_bcount(SCE_QUERY_RESULTS_BYTES) SCE_QUERY_RESULTS_HANDLE sqrhHandle,
+    __out_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE *pRowHandle
+    )
+{
+    HRESULT hr = S_OK;
+    HROW hRow = DB_NULL_HROW;
+    HROW *phRow = &hRow;
+    DBCOUNTITEM cRowsObtained = 0;
+    SCE_ROW *pRow = NULL;
+    SCE_QUERY_RESULTS *pQueryResults = reinterpret_cast<SCE_QUERY_RESULTS *>(sqrhHandle);
+    Assert(pRowHandle && (*pRowHandle == NULL));
+    hr = pQueryResults->pIRowset->GetNextRows(DB_NULL_HCHAPTER, 0, 1, &cRowsObtained, &phRow);
+    if (DB_S_ENDOFROWSET == hr)
+    {
+        ExitFunction1(hr = E_NOTFOUND);
+    }
+    ExitOnFailure(hr, "Failed to get next first row");
+    pRow = reinterpret_cast<SCE_ROW *>(MemAlloc(sizeof(SCE_ROW), TRUE));
+    ExitOnNull(pRow, hr, E_OUTOFMEMORY, "Failed to allocate SCE_ROW struct");
+    pRow->pDatabaseInternal = reinterpret_cast<SCE_DATABASE_INTERNAL *>(pQueryResults->pDatabaseInternal);
+    pRow->hRow = hRow;
+    pRow->pTableSchema = pQueryResults->pTableSchema;
+    pRow->pIRowset = pQueryResults->pIRowset;
+    pRow->pIRowset->AddRef();
+    *pRowHandle = reinterpret_cast<SCE_ROW_HANDLE>(pRow);
+    pRow = NULL;
+    hRow = DB_NULL_HROW;
+LExit:
+    if (DB_NULL_HROW != hRow)
+    {
+        pQueryResults->pIRowset->ReleaseRows(1, &hRow, NULL, NULL, NULL);
+    }
+    ReleaseSceRow(pRow);
+    return hr;
+}
+extern "C" void DAPI SceFreeRow(
+    __in_bcount(SCE_ROW_HANDLE_BYTES) SCE_ROW_HANDLE rowHandle
+    )
+{
+    SCE_ROW *pRow = reinterpret_cast<SCE_ROW *>(rowHandle);
+    if (DB_NULL_HROW != pRow->hRow)
+    {
+        pRow->pIRowset->ReleaseRows(1, &pRow->hRow, NULL, NULL, NULL);
+    }
+    ReleaseObject(pRow->pIRowset);
+    ReleaseMem(pRow->rgBinding);
+    ReleaseMem(pRow->pbData);
+    ReleaseMem(pRow);
+}
+void DAPI SceFreeQuery(
+    __in_bcount(SCE_QUERY_RESULTS_BYTES) SCE_QUERY_HANDLE sqhHandle
+    )
+{
+    SCE_QUERY *pQuery = reinterpret_cast<SCE_QUERY *>(sqhHandle);
+    ReleaseMem(pQuery->rgBinding);
+    ReleaseMem(pQuery->pbData);
+    ReleaseMem(pQuery);
+}
+void DAPI SceFreeQueryResults(
+    __in_bcount(SCE_QUERY_RESULTS_BYTES) SCE_QUERY_RESULTS_HANDLE sqrhHandle
+    )
+{
+    SCE_QUERY_RESULTS *pQueryResults = reinterpret_cast<SCE_QUERY_RESULTS *>(sqrhHandle);
+    ReleaseObject(pQueryResults->pIRowset);
+    ReleaseMem(pQueryResults);
+}
+// internal function definitions
+static HRESULT CreateSqlCe(
+    __in_z_opt LPCWSTR wzSqlCeDllPath,
+    __out IDBInitialize **ppIDBInitialize,
+    __out_opt HMODULE *phSqlCeDll
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczPath = NULL;
+    LPWSTR sczDirectory = NULL;
+    LPWSTR sczDllFullPath = NULL;
+    if (NULL == wzSqlCeDllPath)
+    {
+        hr = CoCreateInstance(CLSID_SQLSERVERCE, 0, CLSCTX_INPROC_SERVER, IID_IDBInitialize, reinterpret_cast<void **>(ppIDBInitialize));
+        ExitOnFailure(hr, "Failed to get IDBInitialize interface");
+    }
+    else
+    {
+        // First try loading DLL from the path of our EXE
+        hr = PathForCurrentProcess(&sczPath, NULL);
+        ExitOnFailure(hr, "Failed to get path for current process");
+        hr = PathGetDirectory(sczPath, &sczDirectory);
+        ExitOnFailure(hr, "Failed to get directory of current process");
+        hr = PathConcat(sczDirectory, wzSqlCeDllPath, &sczDllFullPath);
+        ExitOnFailure(hr, "Failed to concatenate current directory and DLL filename");
+        *phSqlCeDll = ::LoadLibraryW(sczDllFullPath);
+        // If that failed, fallback to loading from current path
+        if (NULL == *phSqlCeDll)
+        {
+            hr = DirGetCurrent(&sczDirectory);
+            ExitOnFailure(hr, "Failed to get current directory");
+            hr = PathConcat(sczDirectory, wzSqlCeDllPath, &sczDllFullPath);
+            ExitOnFailure(hr, "Failed to concatenate current directory and DLL filename");
+            *phSqlCeDll = ::LoadLibraryW(sczDllFullPath);
+            ExitOnNullWithLastError(*phSqlCeDll, hr, "Failed to open Sql CE DLL: %ls", sczDllFullPath);
+        }
+        HRESULT (WINAPI *pfnGetFactory)(REFCLSID, REFIID, void**);
+        pfnGetFactory = (HRESULT (WINAPI *)(REFCLSID, REFIID, void**))GetProcAddress(*phSqlCeDll, "DllGetClassObject");
+        IClassFactory* pFactory = NULL;
+        hr = pfnGetFactory(CLSID_SQLSERVERCE, IID_IClassFactory, (void**)&pFactory);
+        ExitOnFailure(hr, "Failed to get factory for IID_IDBInitialize from DLL: %ls", sczDllFullPath);
+        ExitOnNull(pFactory, hr, E_UNEXPECTED, "GetFactory returned success, but pFactory was NULL");
+        hr = pFactory->CreateInstance(NULL, IID_IDBInitialize, (void**)ppIDBInitialize);
+        pFactory->Release();
+    }
+LExit:
+    ReleaseStr(sczPath);
+    ReleaseStr(sczDirectory);
+    ReleaseStr(sczDllFullPath);
+    return hr;
+}
+static HRESULT RunQuery(
+    __in BOOL fRange,
+    __in_bcount(SCE_QUERY_BYTES) SCE_QUERY_HANDLE psqhHandle,
+    __deref_out_bcount(SCE_QUERY_RESULTS_BYTES) SCE_QUERY_RESULTS **ppQueryResults
+    )
+{
+    HRESULT hr = S_OK;
+    DBID tableID = { };
+    DBID indexID = { };
+    IAccessor *pIAccessor = NULL;
+    IRowsetIndex *pIRowsetIndex = NULL;
+    IRowset *pIRowset = NULL;
+    HACCESSOR hAccessor = DB_NULL_HACCESSOR;
+    SCE_QUERY *pQuery = reinterpret_cast<SCE_QUERY *>(psqhHandle);
+    SCE_QUERY_RESULTS *pQueryResults = NULL;
+    DBPROPSET rgdbpIndexPropSet[1];
+    DBPROP rgdbpIndexProp[1];
+    rgdbpIndexPropSet[0].cProperties     = 1;
+    rgdbpIndexPropSet[0].guidPropertySet = DBPROPSET_ROWSET;
+    rgdbpIndexPropSet[0].rgProperties    = rgdbpIndexProp;
+    rgdbpIndexProp[0].dwPropertyID       = DBPROP_IRowsetIndex;
+    rgdbpIndexProp[0].dwOptions          = DBPROPOPTIONS_REQUIRED;
+    rgdbpIndexProp[0].colid              = DB_NULLID;
+    rgdbpIndexProp[0].vValue.vt          = VT_BOOL;
+    rgdbpIndexProp[0].vValue.boolVal     = VARIANT_TRUE;
+    tableID.eKind = DBKIND_NAME;
+    tableID.uName.pwszName = const_cast<WCHAR *>(pQuery->pTableSchema->wzName);
+    indexID.eKind = DBKIND_NAME;
+    indexID.uName.pwszName = const_cast<WCHAR *>(pQuery->pIndexSchema->wzName);
+    hr = pQuery->pDatabaseInternal->pIOpenRowset->OpenRowset(NULL, &tableID, &indexID, IID_IRowsetIndex, _countof(rgdbpIndexPropSet), rgdbpIndexPropSet, (IUnknown**) &pIRowsetIndex);
+    ExitOnFailure(hr, "Failed to open IRowsetIndex");
+    hr = pIRowsetIndex->QueryInterface(IID_IRowset, reinterpret_cast<void **>(&pIRowset));
+    ExitOnFailure(hr, "Failed to get IRowset interface from IRowsetIndex");
+    hr = pIRowset->QueryInterface(IID_IAccessor, reinterpret_cast<void **>(&pIAccessor));
+    ExitOnFailure(hr, "Failed to get IAccessor interface");
+    hr = pIAccessor->CreateAccessor(DBACCESSOR_ROWDATA, pQuery->dwBindingIndex, pQuery->rgBinding, 0, &hAccessor, NULL);
+    ExitOnFailure(hr, "Failed to create accessor");
+    if (!fRange)
+    {
+        hr = pIRowsetIndex->Seek(hAccessor, pQuery->dwBindingIndex, pQuery->pbData, DBSEEK_FIRSTEQ);
+        if (DB_E_NOTFOUND == hr)
+        {
+            ExitFunction1(hr = E_NOTFOUND);
+        }
+        ExitOnFailure(hr, "Failed to seek to record");
+    }
+    else
+    {
+        // If ALL columns in the index were specified, do a full key match
+        if (pQuery->dwBindingIndex == pQuery->pIndexSchema->cColumns)
+        {
+            hr = pIRowsetIndex->SetRange(hAccessor, pQuery->dwBindingIndex, pQuery->pbData, 0, NULL, DBRANGE_MATCH);
+        }
+        else
+        {
+            // Otherwise, just match the specified keys.
+            // We really want to use DBRANGE_MATCH_N_SHIFT here, but SQL CE doesn't appear to support it
+            // So instead, we set the start and end to the same partial key, and then allow inclusive matching
+            // This appears to accomplish the same thing
+            hr = pIRowsetIndex->SetRange(hAccessor, pQuery->dwBindingIndex, pQuery->pbData, pQuery->dwBindingIndex, pQuery->pbData, 0);
+        }
+        if (DB_E_NOTFOUND == hr || E_NOTFOUND == hr)
+        {
+            ExitFunction1(hr = E_NOTFOUND);
+        }
+        ExitOnFailure(hr, "Failed to set range to find records");
+    }
+    pQueryResults = reinterpret_cast<SCE_QUERY_RESULTS *>(MemAlloc(sizeof(SCE_QUERY_RESULTS), TRUE));
+    ExitOnNull(pQueryResults, hr, E_OUTOFMEMORY, "Failed to allocate query results struct");
+    pQueryResults->pDatabaseInternal = pQuery->pDatabaseInternal;
+    pQueryResults->pTableSchema = pQuery->pTableSchema;
+    pQueryResults->pIRowset = pIRowset;
+    pIRowset = NULL;
+    *ppQueryResults = pQueryResults;
+    pQueryResults = NULL;
+LExit:
+    if (DB_NULL_HACCESSOR != hAccessor)
+    {
+        pIAccessor->ReleaseAccessor(hAccessor, NULL);
+    }
+    ReleaseObject(pIAccessor);
+    ReleaseObject(pIRowset);
+    ReleaseObject(pIRowsetIndex);
+    ReleaseMem(pQueryResults);
+    ReleaseSceQueryResults(pQueryResults);
+    return hr;
+}
+static HRESULT FillOutColumnDescFromSchema(
+    __in const SCE_COLUMN_SCHEMA *pColumnSchema,
+    __out DBCOLUMNDESC *pColumnDesc
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD dwColumnProperties = 0;
+    DWORD dwColumnPropertyIndex = 0;
+    BOOL fFixedSize = FALSE;
+    pColumnDesc->dbcid.eKind = DBKIND_NAME;
+    pColumnDesc->dbcid.uName.pwszName = (WCHAR *)pColumnSchema->wzName;
+    pColumnDesc->wType = pColumnSchema->dbtColumnType;
+    pColumnDesc->ulColumnSize = pColumnSchema->dwLength;
+    if (0 == pColumnDesc->ulColumnSize && (DBTYPE_WSTR == pColumnDesc->wType || DBTYPE_BYTES == pColumnDesc->wType))
+    {
+        fFixedSize = FALSE;
+    }
+    else
+    {
+        fFixedSize = TRUE;
+    }
+    dwColumnProperties = 1;
+    if (pColumnSchema->fAutoIncrement)
+    {
+        ++dwColumnProperties;
+    }
+    if (!pColumnSchema->fNullable)
+    {
+        ++dwColumnProperties;
+    }
+    if (0 < dwColumnProperties)
+    {
+        pColumnDesc->cPropertySets = 1;
+        pColumnDesc->rgPropertySets = reinterpret_cast<DBPROPSET *>(MemAlloc(sizeof(DBPROPSET), TRUE));
+        ExitOnNull(pColumnDesc->rgPropertySets, hr, E_OUTOFMEMORY, "Failed to allocate propset object while setting up column parameters");
+        pColumnDesc->rgPropertySets[0].cProperties = dwColumnProperties;
+        pColumnDesc->rgPropertySets[0].guidPropertySet = DBPROPSET_COLUMN;
+        pColumnDesc->rgPropertySets[0].rgProperties = reinterpret_cast<DBPROP *>(MemAlloc(sizeof(DBPROP) * dwColumnProperties, TRUE));
+        dwColumnPropertyIndex = 0;
+        if (pColumnSchema->fAutoIncrement)
+        {
+            pColumnDesc->rgPropertySets[0].rgProperties[dwColumnPropertyIndex].dwPropertyID = DBPROP_COL_AUTOINCREMENT;
+            pColumnDesc->rgPropertySets[0].rgProperties[dwColumnPropertyIndex].dwOptions = DBPROPOPTIONS_REQUIRED;
+            pColumnDesc->rgPropertySets[0].rgProperties[dwColumnPropertyIndex].colid = DB_NULLID;
+            pColumnDesc->rgPropertySets[0].rgProperties[dwColumnPropertyIndex].vValue.vt = VT_BOOL;
+            pColumnDesc->rgPropertySets[0].rgProperties[dwColumnPropertyIndex].vValue.boolVal = VARIANT_TRUE;
+            ++dwColumnPropertyIndex;
+        }
+        if (!pColumnSchema->fNullable)
+        {
+            pColumnDesc->rgPropertySets[0].rgProperties[dwColumnPropertyIndex].dwPropertyID = DBPROP_COL_NULLABLE;
+            pColumnDesc->rgPropertySets[0].rgProperties[dwColumnPropertyIndex].dwOptions = DBPROPOPTIONS_REQUIRED;
+            pColumnDesc->rgPropertySets[0].rgProperties[dwColumnPropertyIndex].colid = DB_NULLID;
+            pColumnDesc->rgPropertySets[0].rgProperties[dwColumnPropertyIndex].vValue.vt = VT_BOOL;
+            pColumnDesc->rgPropertySets[0].rgProperties[dwColumnPropertyIndex].vValue.boolVal = VARIANT_FALSE;
+            ++dwColumnPropertyIndex;
+        }
+        pColumnDesc->rgPropertySets[0].rgProperties[dwColumnPropertyIndex].dwPropertyID = DBPROP_COL_FIXEDLENGTH;
+        pColumnDesc->rgPropertySets[0].rgProperties[dwColumnPropertyIndex].dwOptions = DBPROPOPTIONS_REQUIRED;
+        pColumnDesc->rgPropertySets[0].rgProperties[dwColumnPropertyIndex].colid = DB_NULLID;
+        pColumnDesc->rgPropertySets[0].rgProperties[dwColumnPropertyIndex].vValue.vt = VT_BOOL;
+        pColumnDesc->rgPropertySets[0].rgProperties[dwColumnPropertyIndex].vValue.boolVal = fFixedSize ? VARIANT_TRUE : VARIANT_FALSE;
+        ++dwColumnPropertyIndex;
+    }
+LExit:
+    return hr;
+}
+static HRESULT EnsureSchema(
+    __in SCE_DATABASE *pDatabase,
+    __in SCE_DATABASE_SCHEMA *pdsSchema
+    )
+{
+    HRESULT hr = S_OK;
+    size_t cbAllocSize = 0;
+    BOOL fInTransaction = FALSE;
+    BOOL fSchemaNeedsSetup = TRUE;
+    DBID tableID = { };
+    DBID indexID = { };
+    DBPROPSET rgdbpIndexPropSet[1];
+    DBPROPSET rgdbpRowSetPropSet[1];
+    DBPROP rgdbpIndexProp[1];
+    DBPROP rgdbpRowSetProp[1];
+    DBCOLUMNDESC *rgColumnDescriptions = NULL;
+    DBINDEXCOLUMNDESC *rgIndexColumnDescriptions = NULL;
+    DWORD cIndexColumnDescriptions = 0;
+    DWORD dwTableColumnIndex = 0;
+    SCE_DATABASE_INTERNAL *pDatabaseInternal = reinterpret_cast<SCE_DATABASE_INTERNAL *>(pDatabase->sdbHandle);
+    ITableDefinition *pTableDefinition = NULL;
+    IIndexDefinition *pIndexDefinition = NULL;
+    IRowsetIndex *pIRowsetIndex = NULL;
+    rgdbpRowSetPropSet[0].cProperties = 1;
+    rgdbpRowSetPropSet[0].guidPropertySet = DBPROPSET_ROWSET;
+    rgdbpRowSetPropSet[0].rgProperties = rgdbpRowSetProp;
+    rgdbpRowSetProp[0].dwPropertyID = DBPROP_IRowsetChange;
+    rgdbpRowSetProp[0].dwOptions = DBPROPOPTIONS_REQUIRED;
+    rgdbpRowSetProp[0].colid = DB_NULLID;
+    rgdbpRowSetProp[0].vValue.vt = VT_BOOL;
+    rgdbpRowSetProp[0].vValue.boolVal = VARIANT_TRUE;
+    rgdbpIndexPropSet[0].cProperties = 1;
+    rgdbpIndexPropSet[0].guidPropertySet = DBPROPSET_INDEX;
+    rgdbpIndexPropSet[0].rgProperties = rgdbpIndexProp;
+    rgdbpIndexProp[0].dwPropertyID = DBPROP_INDEX_NULLS;
+    rgdbpIndexProp[0].dwOptions = DBPROPOPTIONS_REQUIRED;
+    rgdbpIndexProp[0].colid = DB_NULLID;
+    rgdbpIndexProp[0].vValue.vt = VT_I4;
+    rgdbpIndexProp[0].vValue.lVal = DBPROPVAL_IN_DISALLOWNULL;
+    hr = pDatabaseInternal->pISessionProperties->QueryInterface(IID_ITableDefinition, reinterpret_cast<void **>(&pTableDefinition));
+    ExitOnFailure(hr, "Failed to get ITableDefinition for table creation");
+    hr = pDatabaseInternal->pISessionProperties->QueryInterface(IID_IIndexDefinition, reinterpret_cast<void **>(&pIndexDefinition));
+    ExitOnFailure(hr, "Failed to get IIndexDefinition for index creation");
+    hr = SceBeginTransaction(pDatabase);
+    ExitOnFailure(hr, "Failed to start transaction for ensuring schema");
+    fInTransaction = TRUE;
+    for (DWORD dwTable = 0; dwTable < pdsSchema->cTables; ++dwTable)
+    {
+        tableID.eKind = DBKIND_NAME;
+        tableID.uName.pwszName = const_cast<WCHAR *>(pdsSchema->rgTables[dwTable].wzName);
+        // Fill out each column description struct as appropriate, to be used for creating the table, or confirming the table's columns all exist
+        rgColumnDescriptions = static_cast<DBCOLUMNDESC *>(MemAlloc(sizeof(DBCOLUMNDESC) * pdsSchema->rgTables[dwTable].cColumns, TRUE));
+        ExitOnNull(rgColumnDescriptions, hr, E_OUTOFMEMORY, "Failed to allocate column description array while creating table");
+        for (DWORD i = 0; i < pdsSchema->rgTables[dwTable].cColumns; ++i)
+        {
+            hr = FillOutColumnDescFromSchema(pdsSchema->rgTables[dwTable].rgColumns + i, rgColumnDescriptions + i);
+            ExitOnFailure(hr, "Failed to fill out column description from schema");
+        }
+        // First try to open the table - or if it doesn't exist, create it
+        hr = pDatabaseInternal->pIOpenRowset->OpenRowset(NULL, &tableID, NULL, IID_IRowset, _countof(rgdbpRowSetPropSet), rgdbpRowSetPropSet, reinterpret_cast<IUnknown **>(&pdsSchema->rgTables[dwTable].pIRowset));
+        if (DB_E_NOTABLE == hr)
+        {
+            // The table doesn't exist, so let's create it
+            hr = pTableDefinition->CreateTable(NULL, &tableID, pdsSchema->rgTables[dwTable].cColumns, rgColumnDescriptions, IID_IUnknown, _countof(rgdbpRowSetPropSet), rgdbpRowSetPropSet, NULL, NULL);
+            ExitOnFailure(hr, "Failed to create table: %ls", pdsSchema->rgTables[dwTable].wzName);
+        }
+        else
+        {
+            ExitOnFailure(hr, "Failed to open table %ls while ensuring schema", tableID.uName.pwszName);
+            // Close any rowset we opened
+            ReleaseNullObject(pdsSchema->rgTables[dwTable].pIRowset);
+            // If it does exist, make sure all columns are in the table
+            // Only nullable columns can be added to an existing table
+            for (DWORD i = 1; i < pdsSchema->rgTables[dwTable].cColumns; ++i)
+            {
+                if (pdsSchema->rgTables[dwTable].rgColumns[i].fNullable)
+                hr = pTableDefinition->AddColumn(&tableID, rgColumnDescriptions + i, NULL);
+                if (DB_E_DUPLICATECOLUMNID == hr)
+                {
+                    hr = S_OK;
+                }
+                ExitOnFailure(hr, "Failed to add column %ls", pdsSchema->rgTables[dwTable].rgColumns[i].wzName);
+            }
+        }
+#pragma prefast(push)
+#pragma prefast(disable:26010)
+        hr = EnsureLocalColumnConstraints(pTableDefinition, &tableID, pdsSchema->rgTables + dwTable);
+#pragma prefast(pop)
+        ExitOnFailure(hr, "Failed to ensure local column constraints for table: %ls", pdsSchema->rgTables[dwTable].wzName);
+        for (DWORD i = 0; i < pdsSchema->rgTables[dwTable].cColumns; ++i)
+        {
+            if (NULL != rgColumnDescriptions[i].rgPropertySets)
+            {
+                ReleaseMem(rgColumnDescriptions[i].rgPropertySets[0].rgProperties);
+                ReleaseMem(rgColumnDescriptions[i].rgPropertySets);
+            }
+        }
+        ReleaseNullMem(rgColumnDescriptions);
+        if (0 < pdsSchema->rgTables[dwTable].cIndexes)
+        {
+            // Now create indexes for the table
+            for (DWORD dwIndex = 0; dwIndex < pdsSchema->rgTables[dwTable].cIndexes; ++dwIndex)
+            {
+                indexID.eKind = DBKIND_NAME;
+                indexID.uName.pwszName = pdsSchema->rgTables[dwTable].rgIndexes[dwIndex].wzName;
+                // Check if the index exists
+                hr = pDatabaseInternal->pIOpenRowset->OpenRowset(NULL, &tableID, &indexID, IID_IRowsetIndex, 0, NULL, (IUnknown**) &pIRowsetIndex);
+                if (SUCCEEDED(hr))
+                {
+                    // TODO: If one with the same name exists, check if the schema actually matches
+                    ReleaseNullObject(pIRowsetIndex);
+                    continue;
+                }
+                hr = S_OK;
+                hr = ::SizeTMult(sizeof(DBINDEXCOLUMNDESC), pdsSchema->rgTables[dwTable].rgIndexes[dwIndex].cColumns, &cbAllocSize);
+                ExitOnFailure(hr, "Overflow while calculating allocation size for DBINDEXCOLUMNDESC, columns: %u", pdsSchema->rgTables[dwTable].rgIndexes[dwIndex].cColumns);
+                rgIndexColumnDescriptions = reinterpret_cast<DBINDEXCOLUMNDESC *>(MemAlloc(cbAllocSize, TRUE));
+                ExitOnNull(rgIndexColumnDescriptions, hr, E_OUTOFMEMORY, "Failed to allocate structure to hold index column descriptions");
+                cIndexColumnDescriptions = pdsSchema->rgTables[dwTable].rgIndexes[dwIndex].cColumns;
+                for (DWORD dwColumnIndex = 0; dwColumnIndex < cIndexColumnDescriptions; ++dwColumnIndex)
+                {
+                    dwTableColumnIndex = pdsSchema->rgTables[dwTable].rgIndexes[dwIndex].rgColumns[dwColumnIndex];
+                    rgIndexColumnDescriptions[dwColumnIndex].pColumnID = reinterpret_cast<DBID *>(MemAlloc(sizeof(DBID), TRUE));
+                    rgIndexColumnDescriptions[dwColumnIndex].pColumnID->eKind = DBKIND_NAME;
+                    rgIndexColumnDescriptions[dwColumnIndex].pColumnID->uName.pwszName = const_cast<LPOLESTR>(pdsSchema->rgTables[dwTable].rgColumns[dwTableColumnIndex].wzName);
+                    rgIndexColumnDescriptions[dwColumnIndex].eIndexColOrder = pdsSchema->rgTables[dwTable].rgColumns[dwTableColumnIndex].fDescending ? DBINDEX_COL_ORDER_DESC  : DBINDEX_COL_ORDER_ASC;
+                }
+                hr = pIndexDefinition->CreateIndex(&tableID, &indexID, static_cast<DBORDINAL>(pdsSchema->rgTables[dwTable].rgIndexes[dwIndex].cColumns), rgIndexColumnDescriptions, 1, rgdbpIndexPropSet, NULL);
+                if (DB_E_DUPLICATEINDEXID == hr)
+                {
+                    // If the index already exists, no worries
+                    hr = S_OK;
+                }
+                ExitOnFailure(hr, "Failed to create index named %ls into table named %ls", pdsSchema->rgTables[dwTable].rgIndexes[dwIndex].wzName, pdsSchema->rgTables[dwTable].wzName);
+                for (DWORD i = 0; i < cIndexColumnDescriptions; ++i)
+                {
+                    ReleaseMem(rgIndexColumnDescriptions[i].pColumnID);
+                }
+                cIndexColumnDescriptions = 0;
+                ReleaseNullMem(rgIndexColumnDescriptions);
+            }
+        }
+    }
+    // Now once all tables have been created, create foreign key relationships
+    if (fSchemaNeedsSetup)
+    {
+        for (DWORD dwTable = 0; dwTable < pdsSchema->cTables; ++dwTable)
+        {
+            tableID.eKind = DBKIND_NAME;
+            tableID.uName.pwszName = const_cast<WCHAR *>(pdsSchema->rgTables[dwTable].wzName);
+            // Setup any constraints for the table's columns
+            hr = EnsureForeignColumnConstraints(pTableDefinition, &tableID, pdsSchema->rgTables + dwTable, pdsSchema);
+            ExitOnFailure(hr, "Failed to ensure foreign column constraints for table: %ls", pdsSchema->rgTables[dwTable].wzName);
+        }
+    }
+    hr = SceCommitTransaction(pDatabase);
+    ExitOnFailure(hr, "Failed to commit transaction for ensuring schema");
+    fInTransaction = FALSE;
+    hr = OpenSchema(pDatabase, pdsSchema);
+    ExitOnFailure(hr, "Failed to open schema");
+LExit:
+    ReleaseObject(pTableDefinition);
+    ReleaseObject(pIndexDefinition);
+    ReleaseObject(pIRowsetIndex);
+    if (fInTransaction)
+    {
+        SceRollbackTransaction(pDatabase);
+    }
+    for (DWORD i = 0; i < cIndexColumnDescriptions; ++i)
+    {
+        ReleaseMem(rgIndexColumnDescriptions[i].pColumnID);
+    }
+    ReleaseMem(rgIndexColumnDescriptions);
+    ReleaseMem(rgColumnDescriptions);
+    return hr;
+}
+static HRESULT OpenSchema(
+    __in SCE_DATABASE *pDatabase,
+    __in SCE_DATABASE_SCHEMA *pdsSchema
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_DATABASE_INTERNAL *pDatabaseInternal = reinterpret_cast<SCE_DATABASE_INTERNAL *>(pDatabase->sdbHandle);
+    DBID tableID = { };
+    DBPROPSET rgdbpRowSetPropSet[1];
+    DBPROP rgdbpRowSetProp[1];
+    rgdbpRowSetPropSet[0].cProperties = 1;
+    rgdbpRowSetPropSet[0].guidPropertySet = DBPROPSET_ROWSET;
+    rgdbpRowSetPropSet[0].rgProperties = rgdbpRowSetProp;
+    rgdbpRowSetProp[0].dwPropertyID = DBPROP_IRowsetChange;
+    rgdbpRowSetProp[0].dwOptions = DBPROPOPTIONS_REQUIRED;
+    rgdbpRowSetProp[0].colid = DB_NULLID;
+    rgdbpRowSetProp[0].vValue.vt = VT_BOOL;
+    rgdbpRowSetProp[0].vValue.boolVal = VARIANT_TRUE;
+    // Finally, open all tables
+    for (DWORD dwTable = 0; dwTable < pdsSchema->cTables; ++dwTable)
+    {
+        tableID.eKind = DBKIND_NAME;
+        tableID.uName.pwszName = const_cast<WCHAR *>(pdsSchema->rgTables[dwTable].wzName);
+        // And finally, open the table's standard interfaces
+        hr = pDatabaseInternal->pIOpenRowset->OpenRowset(NULL, &tableID, NULL, IID_IRowset, _countof(rgdbpRowSetPropSet), rgdbpRowSetPropSet, reinterpret_cast<IUnknown **>(&pdsSchema->rgTables[dwTable].pIRowset));
+        ExitOnFailure(hr, "Failed to open table %u named %ls after ensuring all indexes and constraints are created", dwTable, pdsSchema->rgTables[dwTable].wzName);
+        hr = pdsSchema->rgTables[dwTable].pIRowset->QueryInterface(IID_IRowsetChange, reinterpret_cast<void **>(&pdsSchema->rgTables[dwTable].pIRowsetChange));
+        ExitOnFailure(hr, "Failed to get IRowsetChange object for table: %ls", pdsSchema->rgTables[dwTable].wzName);
+    }
+LExit:
+    return hr;
+}
+static HRESULT SetColumnValue(
+    __in const SCE_TABLE_SCHEMA *pTableSchema,
+    __in DWORD dwColumnIndex,
+    __in_bcount_opt(cbSize) const BYTE *pbData,
+    __in SIZE_T cbSize,
+    __inout DBBINDING *pBinding,
+    __inout SIZE_T *pcbOffset,
+    __inout BYTE **ppbBuffer
+    )
+{
+    HRESULT hr = S_OK;
+    size_t cbNewOffset = *pcbOffset;
+    pBinding->iOrdinal = dwColumnIndex + 1; // Skip bookmark column
+    pBinding->dwMemOwner = DBMEMOWNER_CLIENTOWNED;
+    pBinding->dwPart = DBPART_VALUE | DBPART_LENGTH | DBPART_STATUS;
+    pBinding->obLength = cbNewOffset;
+    hr = ::SizeTAdd(cbNewOffset, sizeof(DBBYTEOFFSET), &cbNewOffset);
+    ExitOnFailure(hr, "Failed to add sizeof(DBBYTEOFFSET) to alloc size while setting column value");
+    pBinding->obValue = cbNewOffset;
+    hr = ::SizeTAdd(cbNewOffset, cbSize, &cbNewOffset);
+    ExitOnFailure(hr, "Failed to add %u to alloc size while setting column value", cbSize);
+    pBinding->obStatus = cbNewOffset;
+    pBinding->eParamIO = DBPARAMIO_INPUT;
+    hr = ::SizeTAdd(cbNewOffset, sizeof(DBSTATUS), &cbNewOffset);
+    ExitOnFailure(hr, "Failed to add sizeof(DBSTATUS) to alloc size while setting column value");
+    pBinding->wType = pTableSchema->rgColumns[dwColumnIndex].dbtColumnType;
+    pBinding->cbMaxLen = static_cast<DBBYTEOFFSET>(cbSize);
+    if (NULL == *ppbBuffer)
+    {
+        *ppbBuffer = reinterpret_cast<BYTE *>(MemAlloc(cbNewOffset, TRUE));
+        ExitOnNull(*ppbBuffer, hr, E_OUTOFMEMORY, "Failed to allocate buffer while setting row string");
+    }
+    else
+    {
+        *ppbBuffer = reinterpret_cast<BYTE *>(MemReAlloc(*ppbBuffer, cbNewOffset, TRUE));
+        ExitOnNull(*ppbBuffer, hr, E_OUTOFMEMORY, "Failed to reallocate buffer while setting row string");
+    }
+    *(reinterpret_cast<DBBYTEOFFSET *>(*ppbBuffer + *pcbOffset)) = static_cast<DBBYTEOFFSET>(cbSize);
+    *pcbOffset += sizeof(DBBYTEOFFSET);
+    memcpy(*ppbBuffer + *pcbOffset, pbData, cbSize);
+    *pcbOffset += cbSize;
+    if (NULL == pbData)
+    {
+        *(reinterpret_cast<DBSTATUS *>(*ppbBuffer + *pcbOffset)) = DBSTATUS_S_ISNULL;
+    }
+    *pcbOffset += sizeof(DBSTATUS);
+LExit:
+    return hr;
+}
+static HRESULT GetColumnValue(
+    __in SCE_ROW *pRow,
+    __in DWORD dwColumnIndex,
+    __out_opt BYTE **ppbData,
+    __out SIZE_T *pcbSize
+    )
+{
+    HRESULT hr = S_OK;
+    const SCE_TABLE_SCHEMA *pTable = pRow->pTableSchema;
+    IAccessor *pIAccessor = NULL;
+    HACCESSOR hAccessorLength = DB_NULL_HACCESSOR;
+    HACCESSOR hAccessorValue = DB_NULL_HACCESSOR;
+    DWORD dwDataSize = 0;
+    void *pvRawData = NULL;
+    DBBINDING dbBinding = { };
+    DBBINDSTATUS dbBindStatus = DBBINDSTATUS_OK;
+    dbBinding.iOrdinal = dwColumnIndex + 1;
+    dbBinding.dwMemOwner = DBMEMOWNER_CLIENTOWNED;
+    dbBinding.dwPart = DBPART_LENGTH;
+    dbBinding.wType = pTable->rgColumns[dwColumnIndex].dbtColumnType;
+    pRow->pIRowset->QueryInterface(IID_IAccessor, reinterpret_cast<void **>(&pIAccessor));
+    ExitOnFailure(hr, "Failed to get IAccessor interface");
+    hr = pIAccessor->CreateAccessor(DBACCESSOR_ROWDATA, 1, &dbBinding, 0, &hAccessorLength, &dbBindStatus);
+    ExitOnFailure(hr, "Failed to create accessor");
+    hr = pRow->pIRowset->GetData(pRow->hRow, hAccessorLength, reinterpret_cast<void *>(&dwDataSize));
+    ExitOnFailure(hr, "Failed to get size of data");
+    // For variable-length columns, zero data returned means NULL
+    if (0 == dwDataSize)
+    {
+        ExitFunction1(hr = E_NOTFOUND);
+    }
+    if (NULL != ppbData)
+    {
+        dbBinding.dwPart = DBPART_VALUE;
+        dbBinding.cbMaxLen = dwDataSize;
+        hr = pIAccessor->CreateAccessor(DBACCESSOR_ROWDATA, 1, &dbBinding, 0, &hAccessorValue, &dbBindStatus);
+        ExitOnFailure(hr, "Failed to create accessor");
+        if (DBBINDSTATUS_OK != dbBindStatus)
+        {
+            hr = E_INVALIDARG;
+            ExitOnFailure(hr, "Bad bind status while creating accessor to get value");
+        }
+        if (DBTYPE_WSTR == dbBinding.wType)
+        {
+            hr = StrAlloc(reinterpret_cast<LPWSTR *>(&pvRawData), dwDataSize / sizeof(WCHAR));
+            ExitOnFailure(hr, "Failed to allocate space for string data while reading column %u", dwColumnIndex);
+        }
+        else
+        {
+            pvRawData = MemAlloc(dwDataSize, TRUE);
+            ExitOnNull(pvRawData, hr, E_OUTOFMEMORY, "Failed to allocate space for data while reading column %u", dwColumnIndex);
+        }
+        hr = pRow->pIRowset->GetData(pRow->hRow, hAccessorValue, pvRawData);
+        ExitOnFailure(hr, "Failed to read data value");
+        ReleaseMem(*ppbData);
+        *ppbData = reinterpret_cast<BYTE *>(pvRawData);
+        pvRawData = NULL;
+    }
+    *pcbSize = dwDataSize;
+LExit:
+    ReleaseMem(pvRawData);
+    if (DB_NULL_HACCESSOR != hAccessorLength)
+    {
+        pIAccessor->ReleaseAccessor(hAccessorLength, NULL);
+    }
+    if (DB_NULL_HACCESSOR != hAccessorValue)
+    {
+        pIAccessor->ReleaseAccessor(hAccessorValue, NULL);
+    }
+    ReleaseObject(pIAccessor);
+    return hr;
+}
+static HRESULT GetColumnValueFixed(
+    __in SCE_ROW *pRow,
+    __in DWORD dwColumnIndex,
+    __in DWORD cbSize,
+    __out BYTE *pbData
+    )
+{
+    HRESULT hr = S_OK;
+    const SCE_TABLE_SCHEMA *pTable = pRow->pTableSchema;
+    IAccessor *pIAccessor = NULL;
+    HACCESSOR hAccessorLength = DB_NULL_HACCESSOR;
+    HACCESSOR hAccessorValue = DB_NULL_HACCESSOR;
+    DWORD dwDataSize = 0;
+    DBBINDSTATUS dbBindStatus = DBBINDSTATUS_OK;
+    DBBINDING dbBinding = { };
+    dbBinding.iOrdinal = dwColumnIndex + 1;
+    dbBinding.dwMemOwner = DBMEMOWNER_CLIENTOWNED;
+    dbBinding.dwPart = DBPART_LENGTH;
+    dbBinding.wType = pTable->rgColumns[dwColumnIndex].dbtColumnType;
+    pRow->pIRowset->QueryInterface(IID_IAccessor, reinterpret_cast<void **>(&pIAccessor));
+    ExitOnFailure(hr, "Failed to get IAccessor interface");
+    hr = pIAccessor->CreateAccessor(DBACCESSOR_ROWDATA, 1, &dbBinding, 0, &hAccessorLength, &dbBindStatus);
+    ExitOnFailure(hr, "Failed to create accessor");
+    if (DBBINDSTATUS_OK != dbBindStatus)
+    {
+        hr = E_INVALIDARG;
+        ExitOnFailure(hr, "Bad bind status while creating accessor to get length of value");
+    }
+    hr = pRow->pIRowset->GetData(pRow->hRow, hAccessorLength, reinterpret_cast<void *>(&dwDataSize));
+    ExitOnFailure(hr, "Failed to get size of data");
+    if (0 == dwDataSize)
+    {
+        ExitFunction1(hr = E_NOTFOUND);
+    }
+    dbBinding.dwPart = DBPART_VALUE;
+    dbBinding.cbMaxLen = cbSize;
+    hr = pIAccessor->CreateAccessor(DBACCESSOR_ROWDATA, 1, &dbBinding, 0, &hAccessorValue, &dbBindStatus);
+    ExitOnFailure(hr, "Failed to create accessor");
+    if (DBBINDSTATUS_OK != dbBindStatus)
+    {
+        hr = E_INVALIDARG;
+        ExitOnFailure(hr, "Bad bind status while creating accessor to get value");
+    }
+    hr = pRow->pIRowset->GetData(pRow->hRow, hAccessorValue, reinterpret_cast<void *>(pbData));
+    ExitOnFailure(hr, "Failed to read data value");
+LExit:
+    if (DB_NULL_HACCESSOR != hAccessorLength)
+    {
+        pIAccessor->ReleaseAccessor(hAccessorLength, NULL);
+    }
+    if (DB_NULL_HACCESSOR != hAccessorValue)
+    {
+        pIAccessor->ReleaseAccessor(hAccessorValue, NULL);
+    }
+    ReleaseObject(pIAccessor);
+    return hr;
+}
+static HRESULT EnsureLocalColumnConstraints(
+    __in ITableDefinition *pTableDefinition,
+    __in DBID *pTableID,
+    __in SCE_TABLE_SCHEMA *pTableSchema
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_COLUMN_SCHEMA *pCurrentColumn = NULL;
+    DBCONSTRAINTDESC dbcdConstraint = { };
+    DBID dbConstraintID = { };
+    DBID dbLocalColumnID = { };
+    ITableDefinitionWithConstraints *pTableDefinitionWithConstraints = NULL;
+    hr = pTableDefinition->QueryInterface(IID_ITableDefinitionWithConstraints, reinterpret_cast<void **>(&pTableDefinitionWithConstraints));
+    ExitOnFailure(hr, "Failed to query for ITableDefinitionWithConstraints interface in order to create column constraints");
+    for (DWORD i = 0; i < pTableSchema->cColumns; ++i)
+    {
+        pCurrentColumn = pTableSchema->rgColumns + i;
+        // Add a primary key constraint for this column, if one exists
+        if (pCurrentColumn->fPrimaryKey)
+        {
+            // Setup DBID for new constraint
+            dbConstraintID.eKind = DBKIND_NAME;
+            dbConstraintID.uName.pwszName = const_cast<LPOLESTR>(L"PrimaryKey");
+            dbcdConstraint.pConstraintID = &dbConstraintID;
+            dbcdConstraint.ConstraintType = DBCONSTRAINTTYPE_PRIMARYKEY;
+            dbLocalColumnID.eKind = DBKIND_NAME;
+            dbLocalColumnID.uName.pwszName = const_cast<LPOLESTR>(pCurrentColumn->wzName);
+            dbcdConstraint.cColumns = 1;
+            dbcdConstraint.rgColumnList = &dbLocalColumnID;
+            dbcdConstraint.pReferencedTableID = NULL;
+            dbcdConstraint.cForeignKeyColumns = 0;
+            dbcdConstraint.rgForeignKeyColumnList = NULL;
+            dbcdConstraint.pwszConstraintText = NULL;
+            dbcdConstraint.UpdateRule = DBUPDELRULE_NOACTION;
+            dbcdConstraint.DeleteRule = DBUPDELRULE_NOACTION;
+            dbcdConstraint.MatchType = DBMATCHTYPE_NONE;
+            dbcdConstraint.Deferrability = 0;
+            dbcdConstraint.cReserved = 0;
+            dbcdConstraint.rgReserved = NULL;
+            hr = pTableDefinitionWithConstraints->AddConstraint(pTableID, &dbcdConstraint);
+            if (DB_E_DUPLICATECONSTRAINTID == hr)
+            {
+                hr = S_OK;
+            }
+            ExitOnFailure(hr, "Failed to add primary key constraint for column %ls, table %ls", pCurrentColumn->wzName, pTableSchema->wzName);
+        }
+    }
+LExit:
+    ReleaseObject(pTableDefinitionWithConstraints);
+    return hr;
+}
+static HRESULT EnsureForeignColumnConstraints(
+    __in ITableDefinition *pTableDefinition,
+    __in DBID *pTableID,
+    __in SCE_TABLE_SCHEMA *pTableSchema,
+    __in SCE_DATABASE_SCHEMA *pDatabaseSchema
+    )
+{
+    HRESULT hr = S_OK;
+    SCE_COLUMN_SCHEMA *pCurrentColumn = NULL;
+    DBCONSTRAINTDESC dbcdConstraint = { };
+    DBID dbConstraintID = { };
+    DBID dbLocalColumnID = { };
+    DBID dbForeignTableID = { };
+    DBID dbForeignColumnID = { };
+    ITableDefinitionWithConstraints *pTableDefinitionWithConstraints = NULL;
+    hr = pTableDefinition->QueryInterface(IID_ITableDefinitionWithConstraints, reinterpret_cast<void **>(&pTableDefinitionWithConstraints));
+    ExitOnFailure(hr, "Failed to query for ITableDefinitionWithConstraints interface in order to create column constraints");
+    for (DWORD i = 0; i < pTableSchema->cColumns; ++i)
+    {
+        pCurrentColumn = pTableSchema->rgColumns + i;
+        // Add a foreign key constraint for this column, if one exists
+        if (NULL != pCurrentColumn->wzRelationName)
+        {
+            // Setup DBID for new constraint
+            dbConstraintID.eKind = DBKIND_NAME;
+            dbConstraintID.uName.pwszName = const_cast<LPOLESTR>(pCurrentColumn->wzRelationName);
+            dbcdConstraint.pConstraintID = &dbConstraintID;
+            dbcdConstraint.ConstraintType = DBCONSTRAINTTYPE_FOREIGNKEY;
+            dbForeignColumnID.eKind = DBKIND_NAME;
+            dbForeignColumnID.uName.pwszName = const_cast<LPOLESTR>(pDatabaseSchema->rgTables[pCurrentColumn->dwForeignKeyTable].rgColumns[pCurrentColumn->dwForeignKeyColumn].wzName);
+            dbcdConstraint.cColumns = 1;
+            dbcdConstraint.rgColumnList = &dbForeignColumnID;
+            dbForeignTableID.eKind = DBKIND_NAME;
+            dbForeignTableID.uName.pwszName = const_cast<LPOLESTR>(pDatabaseSchema->rgTables[pCurrentColumn->dwForeignKeyTable].wzName);
+            dbcdConstraint.pReferencedTableID = &dbForeignTableID;
+            dbLocalColumnID.eKind = DBKIND_NAME;
+            dbLocalColumnID.uName.pwszName = const_cast<LPOLESTR>(pCurrentColumn->wzName);
+            dbcdConstraint.cForeignKeyColumns = 1;
+            dbcdConstraint.rgForeignKeyColumnList = &dbLocalColumnID;
+            dbcdConstraint.pwszConstraintText = NULL;
+            dbcdConstraint.UpdateRule = DBUPDELRULE_NOACTION;
+            dbcdConstraint.DeleteRule = DBUPDELRULE_NOACTION;
+            dbcdConstraint.MatchType = DBMATCHTYPE_FULL;
+            dbcdConstraint.Deferrability = 0;
+            dbcdConstraint.cReserved = 0;
+            dbcdConstraint.rgReserved = NULL;
+            hr = pTableDefinitionWithConstraints->AddConstraint(pTableID, &dbcdConstraint);
+            if (DB_E_DUPLICATECONSTRAINTID == hr)
+            {
+                hr = S_OK;
+            }
+            ExitOnFailure(hr, "Failed to add constraint named: %ls to table: %ls", pCurrentColumn->wzRelationName, pTableSchema->wzName);
+        }
+    }
+LExit:
+    ReleaseObject(pTableDefinitionWithConstraints);
+    return hr;
+}
+static HRESULT SetSessionProperties(
+    __in ISessionProperties *pISessionProperties
+    )
+{
+    HRESULT hr = S_OK;
+    DBPROP rgdbpDataSourceProp[1];
+    DBPROPSET rgdbpDataSourcePropSet[1];
+    rgdbpDataSourceProp[0].dwPropertyID = DBPROP_SSCE_TRANSACTION_COMMIT_MODE;
+    rgdbpDataSourceProp[0].dwOptions = DBPROPOPTIONS_REQUIRED;
+    rgdbpDataSourceProp[0].vValue.vt = VT_I4;
+    rgdbpDataSourceProp[0].vValue.lVal = DBPROPVAL_SSCE_TCM_FLUSH; 
+        
+    rgdbpDataSourcePropSet[0].guidPropertySet = DBPROPSET_SSCE_SESSION;
+    rgdbpDataSourcePropSet[0].rgProperties = rgdbpDataSourceProp;
+    rgdbpDataSourcePropSet[0].cProperties = 1;
+    hr = pISessionProperties->SetProperties(1, rgdbpDataSourcePropSet);
+    ExitOnFailure(hr, "Failed to set session properties");
+LExit:
+    return hr;
+}
+static HRESULT GetDatabaseSchemaInfo(
+    __in SCE_DATABASE *pDatabase,
+    __out LPWSTR *psczSchemaType,
+    __out DWORD *pdwVersion
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczSchemaType = NULL;
+    DWORD dwVersionFound = 0;
+    SCE_TABLE_SCHEMA schemaTable = SCE_INTERNAL_VERSION_TABLE_SCHEMA[0];
+    SCE_DATABASE_SCHEMA fullSchema = { 1, &schemaTable};
+    // Database object with our alternate schema
+    SCE_DATABASE database = { pDatabase->sdbHandle, &fullSchema };
+    SCE_ROW_HANDLE sceRow = NULL;
+    hr = OpenSchema(pDatabase, &fullSchema);
+    ExitOnFailure(hr, "Failed to ensure internal version schema");
+    hr = SceGetFirstRow(&database, 0, &sceRow);
+    ExitOnFailure(hr, "Failed to get first row in internal version schema table");
+    hr = SceGetColumnString(sceRow, 0, &sczSchemaType);
+    ExitOnFailure(hr, "Failed to get internal schematype");
+    hr = SceGetColumnDword(sceRow, 1, &dwVersionFound);
+    ExitOnFailure(hr, "Failed to get internal version");
+    *psczSchemaType = sczSchemaType;
+    sczSchemaType = NULL;
+    *pdwVersion = dwVersionFound;
+LExit:
+    SceCloseTable(&schemaTable); // ignore failure
+    ReleaseStr(sczSchemaType);
+    ReleaseSceRow(sceRow);
+    return hr;
+}
+static HRESULT SetDatabaseSchemaInfo(
+    __in SCE_DATABASE *pDatabase,
+    __in LPCWSTR wzSchemaType,
+    __in DWORD dwVersion
+    )
+{
+    HRESULT hr = S_OK;
+    BOOL fInSceTransaction = FALSE;
+    SCE_TABLE_SCHEMA schemaTable = SCE_INTERNAL_VERSION_TABLE_SCHEMA[0];
+    SCE_DATABASE_SCHEMA fullSchema = { 1, &schemaTable};
+    // Database object with our alternate schema
+    SCE_DATABASE database = { pDatabase->sdbHandle, &fullSchema };
+    SCE_ROW_HANDLE sceRow = NULL;
+    hr = EnsureSchema(pDatabase, &fullSchema);
+    ExitOnFailure(hr, "Failed to ensure internal version schema");
+    hr = SceBeginTransaction(&database);
+    ExitOnFailure(hr, "Failed to begin transaction");
+    fInSceTransaction = TRUE;
+    hr = SceGetFirstRow(&database, 0, &sceRow);
+    if (E_NOTFOUND == hr)
+    {
+        hr = ScePrepareInsert(&database, 0, &sceRow);
+        ExitOnFailure(hr, "Failed to insert only row into internal version schema table");
+    }
+    else
+    {
+        ExitOnFailure(hr, "Failed to get first row in internal version schema table");
+    }
+    hr = SceSetColumnString(sceRow, 0, wzSchemaType);
+    ExitOnFailure(hr, "Failed to set internal schematype to: %ls", wzSchemaType);
+    hr = SceSetColumnDword(sceRow, 1, dwVersion);
+    ExitOnFailure(hr, "Failed to set internal version to: %u", dwVersion);
+    hr = SceFinishUpdate(sceRow);
+    ExitOnFailure(hr, "Failed to insert first row in internal version schema table");
+    hr = SceCommitTransaction(&database);
+    ExitOnFailure(hr, "Failed to commit transaction");
+    fInSceTransaction = FALSE;
+LExit:
+    SceCloseTable(&schemaTable); // ignore failure
+    ReleaseSceRow(sceRow);
+    if (fInSceTransaction)
+    {
+        SceRollbackTransaction(&database);
+    }
+    return hr;
+}
+static void ReleaseDatabase(
+    SCE_DATABASE *pDatabase
+    )
+{
+    if (NULL != pDatabase)
+    {
+        if (NULL != pDatabase->pdsSchema)
+        {
+            for (DWORD i = 0; i < pDatabase->pdsSchema->cTables; ++i)
+            {
+                SceCloseTable(pDatabase->pdsSchema->rgTables + i);
+            }
+        }
+        if (NULL != pDatabase->sdbHandle)
+        {
+            ReleaseDatabaseInternal(reinterpret_cast<SCE_DATABASE_INTERNAL *>(pDatabase->sdbHandle));
+        }
+    }
+    ReleaseMem(pDatabase);
+}
+static void ReleaseDatabaseInternal(
+    SCE_DATABASE_INTERNAL *pDatabaseInternal
+    )
+{
+    HRESULT hr = S_OK;
+    if (NULL != pDatabaseInternal)
+    {
+        ReleaseObject(pDatabaseInternal->pITransactionLocal);
+        ReleaseObject(pDatabaseInternal->pIOpenRowset);
+        ReleaseObject(pDatabaseInternal->pISessionProperties);
+        ReleaseObject(pDatabaseInternal->pIDBCreateSession);
+        ReleaseObject(pDatabaseInternal->pIDBProperties);
+        if (NULL != pDatabaseInternal->pIDBInitialize)
+        {
+            hr = pDatabaseInternal->pIDBInitialize->Uninitialize();
+            if (FAILED(hr))
+            {
+                TraceError(hr, "Failed to call uninitialize on IDBInitialize");
+            }
+            ReleaseObject(pDatabaseInternal->pIDBInitialize);
+        }
+        if (NULL != pDatabaseInternal->hSqlCeDll)
+        {
+            if (!::FreeLibrary(pDatabaseInternal->hSqlCeDll))
+            {
+                hr = HRESULT_FROM_WIN32(::GetLastError());
+                TraceError(hr, "Failed to free sql ce dll");
+            }
+        }
+    }
+    // If there was a temp file we copied to (for read-only databases), delete it after close
+    if (NULL != pDatabaseInternal->sczTempDbFile)
+    {
+        hr = FileEnsureDelete(pDatabaseInternal->sczTempDbFile);
+        if (FAILED(hr))
+        {
+            TraceError(hr, "Failed to delete temporary database file (copied here because the database was opened as read-only): %ls", pDatabaseInternal->sczTempDbFile);
+        }
+        ReleaseStr(pDatabaseInternal->sczTempDbFile);
+    }
+    ReleaseMem(pDatabaseInternal);
+}
+#endif // end SKIP_SCE_COMPILE
diff --git a/src/libs/dutil/WixToolset.DUtil/shelutil.cpp b/src/libs/dutil/WixToolset.DUtil/shelutil.cpp
new file mode 100644
index 00000000..2eb9a52a
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/shelutil.cpp
@@ -0,0 +1,342 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define ShelExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_SHELUTIL, x, s, __VA_ARGS__)
+#define ShelExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_SHELUTIL, x, s, __VA_ARGS__)
+#define ShelExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_SHELUTIL, x, s, __VA_ARGS__)
+#define ShelExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_SHELUTIL, x, s, __VA_ARGS__)
+#define ShelExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_SHELUTIL, x, s, __VA_ARGS__)
+#define ShelExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_SHELUTIL, x, s, __VA_ARGS__)
+#define ShelExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_SHELUTIL, p, x, e, s, __VA_ARGS__)
+#define ShelExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_SHELUTIL, p, x, s, __VA_ARGS__)
+#define ShelExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_SHELUTIL, p, x, e, s, __VA_ARGS__)
+#define ShelExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_SHELUTIL, p, x, s, __VA_ARGS__)
+#define ShelExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_SHELUTIL, e, x, s, __VA_ARGS__)
+#define ShelExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_SHELUTIL, g, x, s, __VA_ARGS__)
+static PFN_SHELLEXECUTEEXW vpfnShellExecuteExW = ::ShellExecuteExW;
+static HRESULT GetDesktopShellView(
+    __in REFIID riid,
+    __out void **ppv
+    );
+static HRESULT GetShellDispatchFromView(
+    __in IShellView *psv,
+    __in REFIID riid,
+    __out void **ppv
+    );
+/********************************************************************
+ ShelFunctionOverride - overrides the shell functions. Typically used
+                       for unit testing.
+*********************************************************************/
+extern "C" void DAPI ShelFunctionOverride(
+    __in_opt PFN_SHELLEXECUTEEXW pfnShellExecuteExW
+    )
+{
+    vpfnShellExecuteExW = pfnShellExecuteExW ? pfnShellExecuteExW : ::ShellExecuteExW;
+}
+/********************************************************************
+ ShelExec() - executes a target.
+*******************************************************************/
+extern "C" HRESULT DAPI ShelExec(
+    __in_z LPCWSTR wzTargetPath,
+    __in_z_opt LPCWSTR wzParameters,
+    __in_z_opt LPCWSTR wzVerb,
+    __in_z_opt LPCWSTR wzWorkingDirectory,
+    __in int nShowCmd,
+    __in_opt HWND hwndParent,
+    __out_opt HANDLE* phProcess
+    )
+{
+    HRESULT hr = S_OK;
+    SHELLEXECUTEINFOW shExecInfo = {};
+    shExecInfo.cbSize = sizeof(SHELLEXECUTEINFO);
+    shExecInfo.fMask = SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI | SEE_MASK_NOCLOSEPROCESS;
+    shExecInfo.hwnd = hwndParent;
+    shExecInfo.lpVerb = wzVerb;
+    shExecInfo.lpFile = wzTargetPath;
+    shExecInfo.lpParameters = wzParameters;
+    shExecInfo.lpDirectory = wzWorkingDirectory;
+    shExecInfo.nShow = nShowCmd;
+    if (!vpfnShellExecuteExW(&shExecInfo))
+    {
+        ShelExitWithLastError(hr, "ShellExecEx failed with return code: %d", Dutil_er);
+    }
+    if (phProcess)
+    {
+        *phProcess = shExecInfo.hProcess;
+        shExecInfo.hProcess = NULL;
+    }
+LExit:
+    ReleaseHandle(shExecInfo.hProcess);
+    return hr;
+}
+/********************************************************************
+ ShelExecUnelevated() - executes a target unelevated.
+*******************************************************************/
+extern "C" HRESULT DAPI ShelExecUnelevated(
+    __in_z LPCWSTR wzTargetPath,
+    __in_z_opt LPCWSTR wzParameters,
+    __in_z_opt LPCWSTR wzVerb,
+    __in_z_opt LPCWSTR wzWorkingDirectory,
+    __in int nShowCmd
+    )
+{
+    HRESULT hr = S_OK;
+    BSTR bstrTargetPath = NULL;
+    VARIANT vtParameters = { };
+    VARIANT vtVerb = { };
+    VARIANT vtWorkingDirectory = { };
+    VARIANT vtShow = { };
+    IShellView* psv = NULL;
+    IShellDispatch2* psd = NULL;
+    bstrTargetPath = ::SysAllocString(wzTargetPath);
+    ShelExitOnNull(bstrTargetPath, hr, E_OUTOFMEMORY, "Failed to allocate target path BSTR.");
+    if (wzParameters && *wzParameters)
+    {
+        vtParameters.vt = VT_BSTR;
+        vtParameters.bstrVal = ::SysAllocString(wzParameters);
+        ShelExitOnNull(bstrTargetPath, hr, E_OUTOFMEMORY, "Failed to allocate parameters BSTR.");
+    }
+    if (wzVerb && *wzVerb)
+    {
+        vtVerb.vt = VT_BSTR;
+        vtVerb.bstrVal = ::SysAllocString(wzVerb);
+        ShelExitOnNull(bstrTargetPath, hr, E_OUTOFMEMORY, "Failed to allocate verb BSTR.");
+    }
+    if (wzWorkingDirectory && *wzWorkingDirectory)
+    {
+        vtWorkingDirectory.vt = VT_BSTR;
+        vtWorkingDirectory.bstrVal = ::SysAllocString(wzWorkingDirectory);
+        ShelExitOnNull(bstrTargetPath, hr, E_OUTOFMEMORY, "Failed to allocate working directory BSTR.");
+    }
+    vtShow.vt = VT_INT;
+    vtShow.intVal = nShowCmd;
+    hr = GetDesktopShellView(IID_PPV_ARGS(&psv));
+    ShelExitOnFailure(hr, "Failed to get desktop shell view.");
+    hr = GetShellDispatchFromView(psv, IID_PPV_ARGS(&psd));
+    ShelExitOnFailure(hr, "Failed to get shell dispatch from view.");
+    hr = psd->ShellExecute(bstrTargetPath, vtParameters, vtWorkingDirectory, vtVerb, vtShow);
+    if (S_FALSE == hr)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_CANCELLED);
+    }
+    ShelExitOnRootFailure(hr, "Failed to launch unelevate executable: %ls", bstrTargetPath);
+LExit:
+    ReleaseObject(psd);
+    ReleaseObject(psv);
+    ReleaseBSTR(vtWorkingDirectory.bstrVal);
+    ReleaseBSTR(vtVerb.bstrVal);
+    ReleaseBSTR(vtParameters.bstrVal);
+    ReleaseBSTR(bstrTargetPath);
+    return hr;
+}
+/********************************************************************
+ ShelGetFolder() - gets a folder by CSIDL.
+*******************************************************************/
+extern "C" HRESULT DAPI ShelGetFolder(
+    __out_z LPWSTR* psczFolderPath,
+    __in int csidlFolder
+    )
+{
+    HRESULT hr = S_OK;
+    WCHAR wzPath[MAX_PATH];
+    hr = ::SHGetFolderPathW(NULL, csidlFolder | CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, wzPath);
+    ShelExitOnFailure(hr, "Failed to get folder path for CSIDL: %d", csidlFolder);
+    hr = StrAllocString(psczFolderPath, wzPath, 0);
+    ShelExitOnFailure(hr, "Failed to copy shell folder path: %ls", wzPath);
+    hr = PathBackslashTerminate(psczFolderPath);
+    ShelExitOnFailure(hr, "Failed to backslash terminate shell folder path: %ls", *psczFolderPath);
+LExit:
+    return hr;
+}
+/********************************************************************
+ ShelGetKnownFolder() - gets a folder by KNOWNFOLDERID.
+ Note: return E_NOTIMPL if called on pre-Vista operating systems.
+*******************************************************************/
+#ifndef REFKNOWNFOLDERID
+#define REFKNOWNFOLDERID REFGUID
+#endif
+#ifndef KF_FLAG_CREATE
+#define KF_FLAG_CREATE              0x00008000  // Make sure that the folder already exists or create it and apply security specified in folder definition
+#endif
+EXTERN_C typedef HRESULT (STDAPICALLTYPE *PFN_SHGetKnownFolderPath)(
+    REFKNOWNFOLDERID rfid,
+    DWORD dwFlags,
+    HANDLE hToken,
+    PWSTR *ppszPath
+    );
+extern "C" HRESULT DAPI ShelGetKnownFolder(
+    __out_z LPWSTR* psczFolderPath,
+    __in REFKNOWNFOLDERID rfidFolder
+    )
+{
+    HRESULT hr = S_OK;
+    HMODULE hShell32Dll = NULL;
+    PFN_SHGetKnownFolderPath pfn = NULL;
+    LPWSTR pwzPath = NULL;
+    hr = LoadSystemLibrary(L"shell32.dll", &hShell32Dll);
+    if (E_MODNOTFOUND == hr)
+    {
+        TraceError(hr, "Failed to load shell32.dll");
+        ExitFunction1(hr = E_NOTIMPL);
+    }
+    ShelExitOnFailure(hr, "Failed to load shell32.dll.");
+    pfn = reinterpret_cast<PFN_SHGetKnownFolderPath>(::GetProcAddress(hShell32Dll, "SHGetKnownFolderPath"));
+    ShelExitOnNull(pfn, hr, E_NOTIMPL, "Failed to find SHGetKnownFolderPath entry point.");
+    hr = pfn(rfidFolder, KF_FLAG_CREATE, NULL, &pwzPath);
+    ShelExitOnFailure(hr, "Failed to get known folder path.");
+    hr = StrAllocString(psczFolderPath, pwzPath, 0);
+    ShelExitOnFailure(hr, "Failed to copy shell folder path: %ls", pwzPath);
+    hr = PathBackslashTerminate(psczFolderPath);
+    ShelExitOnFailure(hr, "Failed to backslash terminate shell folder path: %ls", *psczFolderPath);
+LExit:
+    if (pwzPath)
+    {
+        ::CoTaskMemFree(pwzPath);
+    }
+    if (hShell32Dll)
+    {
+        ::FreeLibrary(hShell32Dll);
+    }
+    return hr;
+}
+// Internal functions.
+static HRESULT GetDesktopShellView(
+    __in REFIID riid,
+    __out void **ppv
+    )
+{
+    HRESULT hr = S_OK;
+    IShellWindows* psw = NULL;
+    HWND hwnd = NULL;
+    IDispatch* pdisp = NULL;
+    VARIANT vEmpty = {}; // VT_EMPTY
+    IShellBrowser* psb = NULL;
+    IShellFolder* psf = NULL;
+    IShellView* psv = NULL;
+    // use the shell view for the desktop using the shell windows automation to find the 
+    // desktop web browser and then grabs its view
+    // returns IShellView, IFolderView and related interfaces
+    hr = ::CoCreateInstance(CLSID_ShellWindows, NULL, CLSCTX_LOCAL_SERVER, IID_PPV_ARGS(&psw));
+    ShelExitOnFailure(hr, "Failed to get shell view.");
+    hr = psw->FindWindowSW(&vEmpty, &vEmpty, SWC_DESKTOP, (long*)&hwnd, SWFO_NEEDDISPATCH, &pdisp);
+    if (S_OK == hr)
+    {
+        hr = IUnknown_QueryService(pdisp, SID_STopLevelBrowser, IID_PPV_ARGS(&psb));
+        ShelExitOnFailure(hr, "Failed to get desktop window.");
+        hr = psb->QueryActiveShellView(&psv);
+        ShelExitOnFailure(hr, "Failed to get active shell view.");
+        hr = psv->QueryInterface(riid, ppv);
+        ShelExitOnFailure(hr, "Failed to query for the desktop shell view.");
+    }
+    else if (S_FALSE == hr)
+    {
+        //Windows XP
+        hr = SHGetDesktopFolder(&psf);
+        ShelExitOnFailure(hr, "Failed to get desktop folder.");
+        hr = psf->CreateViewObject(NULL, IID_IShellView, ppv);
+        ShelExitOnFailure(hr, "Failed to query for the desktop shell view.");
+    }
+    else
+    {
+        ShelExitOnFailure(hr, "Failed to get desktop window.");
+    }
+LExit:
+    ReleaseObject(psv);
+    ReleaseObject(psb);
+    ReleaseObject(psf);
+    ReleaseObject(pdisp);
+    ReleaseObject(psw);
+    return hr;
+}
+static HRESULT GetShellDispatchFromView(
+    __in IShellView *psv,
+    __in REFIID riid,
+    __out void **ppv
+    )
+{
+    HRESULT hr = S_OK;
+    IDispatch *pdispBackground = NULL;
+    IShellFolderViewDual *psfvd = NULL;
+    IDispatch *pdisp = NULL;
+    // From a shell view object, gets its automation interface and from that get the shell
+    // application object that implements IShellDispatch2 and related interfaces.
+    hr = psv->GetItemObject(SVGIO_BACKGROUND, IID_PPV_ARGS(&pdispBackground));
+    ShelExitOnFailure(hr, "Failed to get the automation interface for shell.");
+    hr = pdispBackground->QueryInterface(IID_PPV_ARGS(&psfvd));
+    ShelExitOnFailure(hr, "Failed to get shell folder view dual.");
+    hr = psfvd->get_Application(&pdisp);
+    ShelExitOnFailure(hr, "Failed to application object.");
+    hr = pdisp->QueryInterface(riid, ppv);
+    ShelExitOnFailure(hr, "Failed to get IShellDispatch2.");
+LExit:
+    ReleaseObject(pdisp);
+    ReleaseObject(psfvd);
+    ReleaseObject(pdispBackground);
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/sqlutil.cpp b/src/libs/dutil/WixToolset.DUtil/sqlutil.cpp
new file mode 100644
index 00000000..782c7088
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/sqlutil.cpp
@@ -0,0 +1,1002 @@
+// 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.
+#include "precomp.h"
+// okay, this may look a little weird, but sqlutil.h cannot be in the 
+// pre-compiled header because we need to #define these things so the
+// correct GUID's get pulled into this object file
+#include <initguid.h>
+#define DBINITCONSTANTS
+#include "sqlutil.h"
+//Please note that only SQL native client 11 has TLS1.2 support
+#define _SQLNCLI_OLEDB_DEPRECATE_WARNING
+#if !defined(SQLNCLI_VER)
+#define SQLNCLI_VER 1100
+#endif
+#if SQLNCLI_VER >= 1100
+#if defined(_SQLNCLI_OLEDB_) || !defined(_SQLNCLI_ODBC_)
+#define SQLNCLI_CLSID                           CLSID_SQLNCLI11
+#endif // defined(_SQLNCLI_OLEDB_) || !defined(_SQLNCLI_ODBC_)
+extern const GUID OLEDBDECLSPEC _SQLNCLI_OLEDB_DEPRECATE_WARNING CLSID_SQLNCLI11 = { 0x397C2819L,0x8272,0x4532,{ 0xAD,0x3A,0xFB,0x5E,0x43,0xBE,0xAA,0x39 } };
+#endif  // SQLNCLI_VER >= 1100
+// Exit macros
+#define SqlExitTrace(x, s, ...) ExitTraceSource(DUTIL_SOURCE_SQLUTIL, x, s, __VA_ARGS__)
+#define SqlExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_SQLUTIL, x, s, __VA_ARGS__)
+#define SqlExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_SQLUTIL, x, s, __VA_ARGS__)
+#define SqlExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_SQLUTIL, x, s, __VA_ARGS__)
+#define SqlExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_SQLUTIL, x, s, __VA_ARGS__)
+#define SqlExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_SQLUTIL, x, s, __VA_ARGS__)
+#define SqlExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_SQLUTIL, x, s, __VA_ARGS__)
+#define SqlExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_SQLUTIL, p, x, e, s, __VA_ARGS__)
+#define SqlExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_SQLUTIL, p, x, s, __VA_ARGS__)
+#define SqlExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_SQLUTIL, p, x, e, s, __VA_ARGS__)
+#define SqlExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_SQLUTIL, p, x, s, __VA_ARGS__)
+#define SqlExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_SQLUTIL, e, x, s, __VA_ARGS__)
+#define SqlExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_SQLUTIL, g, x, s, __VA_ARGS__)
+// private prototypes
+static HRESULT InitializeDatabaseConnection(
+    __in REFCLSID rclsid,
+    __in_z LPCSTR szFriendlyClsidName,
+    __in DBPROPSET rgdbpsetInit[],
+    __in_ecount(rgdbpsetInit) DWORD cdbpsetInit,
+    __out IDBCreateSession** ppidbSession
+    );
+HRESULT DumpErrorRecords();
+static HRESULT FileSpecToString(
+    __in const SQL_FILESPEC* psf,
+    __out LPWSTR* ppwz
+    );
+static HRESULT EscapeSqlIdentifier(
+    __in_z LPCWSTR wzDatabase,
+    __deref_out_z LPWSTR* ppwz
+    );
+/********************************************************************
+ SqlConnectDatabase - establishes a connection to a database
+ NOTE: wzInstance is optional
+       if fIntegratedAuth is set then wzUser and wzPassword are ignored
+********************************************************************/
+extern "C" HRESULT DAPI SqlConnectDatabase(
+    __in_z LPCWSTR wzServer,
+    __in_z LPCWSTR wzInstance,
+    __in_z LPCWSTR wzDatabase,
+    __in BOOL fIntegratedAuth,
+    __in_z LPCWSTR wzUser,
+    __in_z LPCWSTR wzPassword,
+    __out IDBCreateSession** ppidbSession
+    )
+{
+    Assert(wzServer && wzDatabase && *wzDatabase && ppidbSession);
+    HRESULT hr = S_OK;
+    LPWSTR pwzServerInstance = NULL;
+    DBPROP rgdbpInit[4] = { };
+    DBPROPSET rgdbpsetInit[1] = { };
+    ULONG cProperties = 0;
+    // if there is an instance
+    if (wzInstance && *wzInstance)
+    {
+        hr = StrAllocFormatted(&pwzServerInstance, L"%s\\%s", wzServer, wzInstance);
+    }
+    else
+    {
+        hr = StrAllocString(&pwzServerInstance, wzServer, 0);
+    }
+    SqlExitOnFailure(hr, "failed to allocate memory for the server instance");
+    // server[\instance]
+    rgdbpInit[cProperties].dwPropertyID = DBPROP_INIT_DATASOURCE;
+    rgdbpInit[cProperties].dwOptions = DBPROPOPTIONS_REQUIRED;
+    rgdbpInit[cProperties].colid = DB_NULLID;
+    ::VariantInit(&rgdbpInit[cProperties].vValue);
+    rgdbpInit[cProperties].vValue.vt = VT_BSTR;
+    rgdbpInit[cProperties].vValue.bstrVal = ::SysAllocString(pwzServerInstance);
+    ++cProperties;
+    // database
+    rgdbpInit[cProperties].dwPropertyID = DBPROP_INIT_CATALOG;
+    rgdbpInit[cProperties].dwOptions = DBPROPOPTIONS_REQUIRED;
+    rgdbpInit[cProperties].colid = DB_NULLID;
+    ::VariantInit(&rgdbpInit[cProperties].vValue);
+    rgdbpInit[cProperties].vValue.vt = VT_BSTR;
+    rgdbpInit[cProperties].vValue.bstrVal= ::SysAllocString(wzDatabase);
+    ++cProperties;
+    if (fIntegratedAuth)
+    {
+        // username
+        rgdbpInit[cProperties].dwPropertyID = DBPROP_AUTH_INTEGRATED; 
+        rgdbpInit[cProperties].dwOptions = DBPROPOPTIONS_REQUIRED;
+        rgdbpInit[cProperties].colid = DB_NULLID;
+        ::VariantInit(&rgdbpInit[cProperties].vValue);
+        rgdbpInit[cProperties].vValue.vt = VT_BSTR;
+        rgdbpInit[cProperties].vValue.bstrVal = ::SysAllocString(L"SSPI");   // default windows authentication
+        ++cProperties;
+    }
+    else
+    {
+        // username
+        rgdbpInit[cProperties].dwPropertyID = DBPROP_AUTH_USERID; 
+        rgdbpInit[cProperties].dwOptions = DBPROPOPTIONS_REQUIRED;
+        rgdbpInit[cProperties].colid = DB_NULLID;
+        ::VariantInit(&rgdbpInit[cProperties].vValue);
+        rgdbpInit[cProperties].vValue.vt = VT_BSTR;
+        rgdbpInit[cProperties].vValue.bstrVal = ::SysAllocString(wzUser);
+        ++cProperties;
+        // password
+        rgdbpInit[cProperties].dwPropertyID = DBPROP_AUTH_PASSWORD;
+        rgdbpInit[cProperties].dwOptions = DBPROPOPTIONS_REQUIRED;
+        rgdbpInit[cProperties].colid = DB_NULLID;
+        ::VariantInit(&rgdbpInit[cProperties].vValue);
+        rgdbpInit[cProperties].vValue.vt = VT_BSTR;
+        rgdbpInit[cProperties].vValue.bstrVal = ::SysAllocString(wzPassword);
+        ++cProperties;
+    }
+    // put the properties into a set
+    rgdbpsetInit[0].guidPropertySet = DBPROPSET_DBINIT;
+    rgdbpsetInit[0].rgProperties = rgdbpInit;
+    rgdbpsetInit[0].cProperties = cProperties;
+    // obtain access to the SQL Native Client provider
+    hr = InitializeDatabaseConnection(SQLNCLI_CLSID, "SQL Native Client", rgdbpsetInit, countof(rgdbpsetInit), ppidbSession);
+    if (FAILED(hr))
+    {
+        SqlExitTrace(hr, "Could not initialize SQL Native Client, falling back to SQL OLE DB...");
+        // try OLE DB but if that fails return original error failure
+        HRESULT hr2 = InitializeDatabaseConnection(CLSID_SQLOLEDB, "SQL OLE DB", rgdbpsetInit, countof(rgdbpsetInit), ppidbSession);
+        if (FAILED(hr2))
+        {
+            SqlExitTrace(hr2, "Could not initialize SQL OLE DB either, giving up.");
+        }
+        else
+        {
+            hr = S_OK;
+        }
+    }
+LExit:
+    for (; 0 < cProperties; cProperties--)
+    {
+        ::VariantClear(&rgdbpInit[cProperties - 1].vValue);
+    }
+    ReleaseStr(pwzServerInstance);
+    return hr;
+}
+/********************************************************************
+ SqlStartTransaction - Starts a new transaction that must be ended
+*********************************************************************/
+extern "C" HRESULT DAPI SqlStartTransaction(
+    __in IDBCreateSession* pidbSession,
+    __out IDBCreateCommand** ppidbCommand,
+    __out ITransaction** ppit
+    )
+{
+    Assert(pidbSession && ppit);
+    HRESULT hr = S_OK;
+    hr = pidbSession->CreateSession(NULL, IID_IDBCreateCommand, (IUnknown**)ppidbCommand);
+    SqlExitOnFailure(hr, "unable to create command from session");
+    hr = (*ppidbCommand)->QueryInterface(IID_ITransactionLocal, (LPVOID*)ppit);
+    SqlExitOnFailure(hr, "Unable to QueryInterface session to get ITransactionLocal");
+    hr = ((ITransactionLocal*)*ppit)->StartTransaction(ISOLATIONLEVEL_SERIALIZABLE, 0, NULL, NULL);
+LExit:
+    return hr;
+}
+/********************************************************************
+ SqlEndTransaction - Ends the transaction
+ NOTE: if fCommit, will commit the transaction, otherwise rolls back
+*********************************************************************/
+extern "C" HRESULT DAPI SqlEndTransaction(
+    __in ITransaction* pit,
+    __in BOOL fCommit
+    )
+{
+    Assert(pit);
+    HRESULT hr = S_OK;
+    if (fCommit)
+    {
+        hr = pit->Commit(FALSE, XACTTC_SYNC, 0);
+        SqlExitOnFailure(hr, "commit of transaction failed");
+    }
+    else
+    {
+        hr = pit->Abort(NULL, FALSE, FALSE);
+        SqlExitOnFailure(hr, "abort of transaction failed");
+    }
+LExit:
+    return hr;
+}
+/********************************************************************
+ SqlDatabaseExists - determines if database exists
+ NOTE: wzInstance is optional
+       if fIntegratedAuth is set then wzUser and wzPassword are ignored
+       returns S_OK if database exist
+       returns S_FALSE if database does not exist
+       returns E_* on error
+********************************************************************/
+extern "C" HRESULT DAPI SqlDatabaseExists(
+    __in_z LPCWSTR wzServer,
+    __in_z LPCWSTR wzInstance,
+    __in_z LPCWSTR wzDatabase,
+    __in BOOL fIntegratedAuth,
+    __in_z LPCWSTR wzUser,
+    __in_z LPCWSTR wzPassword,
+    __out_opt BSTR* pbstrErrorDescription
+    )
+{
+    Assert(wzServer && wzDatabase && *wzDatabase);
+    HRESULT hr = S_OK;
+    IDBCreateSession* pidbSession = NULL;
+    hr = SqlConnectDatabase(wzServer, wzInstance, L"master", fIntegratedAuth, wzUser, wzPassword, &pidbSession);
+    SqlExitOnFailure(hr, "failed to connect to 'master' database on server %ls", wzServer);
+    hr = SqlSessionDatabaseExists(pidbSession, wzDatabase, pbstrErrorDescription);
+LExit:
+    ReleaseObject(pidbSession);
+    return hr;
+}
+/********************************************************************
+ SqlSessionDatabaseExists - determines if database exists
+ NOTE: pidbSession must be connected to master database
+       returns S_OK if database exist
+       returns S_FALSE if database does not exist
+       returns E_* on error
+********************************************************************/
+extern "C" HRESULT DAPI SqlSessionDatabaseExists(
+    __in IDBCreateSession* pidbSession,
+    __in_z LPCWSTR wzDatabase,
+    __out_opt BSTR* pbstrErrorDescription
+    )
+{
+    Assert(pidbSession && wzDatabase && *wzDatabase);
+    HRESULT hr = S_OK;
+    LPWSTR pwzQuery = NULL;
+    IRowset* pirs = NULL;
+    DBCOUNTITEM cRows = 0;
+    HROW rghRows[1];
+    HROW* prow = rghRows;
+    //
+    // query to see if the database exists
+    //
+    hr = StrAllocFormatted(&pwzQuery, L"SELECT name FROM sysdatabases WHERE name='%s'", wzDatabase);
+    SqlExitOnFailure(hr, "failed to allocate query string to ensure database exists");
+    hr = SqlSessionExecuteQuery(pidbSession, pwzQuery, &pirs, NULL, pbstrErrorDescription);
+    SqlExitOnFailure(hr, "failed to get database list from 'master' database");
+    Assert(pirs);
+    //
+    // check to see if the database was returned
+    //
+    hr = pirs->GetNextRows(DB_NULL_HCHAPTER, 0, 1, &cRows, &prow);
+    SqlExitOnFailure(hr, "failed to get row with database name");
+    // succeeded but no database
+    if ((DB_S_ENDOFROWSET == hr) || (0 == cRows))
+    {
+        hr = S_FALSE;
+    }
+LExit:
+    ReleaseObject(pirs);
+    ReleaseStr(pwzQuery);
+    return hr;
+}
+/********************************************************************
+ SqlDatabaseEnsureExists - creates a database if it does not exist
+ NOTE: wzInstance is optional
+       if fIntegratedAuth is set then wzUser and wzPassword are ignored
+********************************************************************/
+extern "C" HRESULT DAPI SqlDatabaseEnsureExists(
+    __in_z LPCWSTR wzServer, 
+    __in_z LPCWSTR wzInstance, 
+    __in_z LPCWSTR wzDatabase, 
+    __in BOOL fIntegratedAuth, 
+    __in_z LPCWSTR wzUser, 
+    __in_z LPCWSTR wzPassword,
+    __in_opt const SQL_FILESPEC* psfDatabase,
+    __in_opt const SQL_FILESPEC* psfLog,
+    __out_opt BSTR* pbstrErrorDescription
+    )
+{
+    Assert(wzServer && wzDatabase && *wzDatabase);
+    HRESULT hr = S_OK;
+    IDBCreateSession* pidbSession = NULL;
+    //
+    // connect to the master database to create the new database
+    //
+    hr = SqlConnectDatabase(wzServer, wzInstance, L"master", fIntegratedAuth, wzUser, wzPassword, &pidbSession);
+    SqlExitOnFailure(hr, "failed to connect to 'master' database on server %ls", wzServer);
+    hr = SqlSessionDatabaseEnsureExists(pidbSession, wzDatabase, psfDatabase, psfLog, pbstrErrorDescription);
+    SqlExitOnFailure(hr, "failed to create database: %ls", wzDatabase);
+    Assert(S_OK == hr);
+LExit:
+    ReleaseObject(pidbSession);
+    return hr;
+}
+/********************************************************************
+ SqlSessionDatabaseEnsureExists - creates a database if it does not exist
+ NOTE: pidbSession must be connected to the master database
+********************************************************************/
+extern "C" HRESULT DAPI SqlSessionDatabaseEnsureExists(
+    __in IDBCreateSession* pidbSession,
+    __in_z LPCWSTR wzDatabase,
+    __in_opt const SQL_FILESPEC* psfDatabase,
+    __in_opt const SQL_FILESPEC* psfLog,
+    __out_opt BSTR* pbstrErrorDescription
+    )
+{
+    Assert(pidbSession && wzDatabase && *wzDatabase);
+    HRESULT hr = S_OK;
+    hr = SqlSessionDatabaseExists(pidbSession, wzDatabase, pbstrErrorDescription);
+    SqlExitOnFailure(hr, "failed to determine if exists, database: %ls", wzDatabase);
+    if (S_FALSE == hr)
+    {
+        hr = SqlSessionCreateDatabase(pidbSession, wzDatabase, psfDatabase, psfLog, pbstrErrorDescription);
+        SqlExitOnFailure(hr, "failed to create database: %ls", wzDatabase);
+    }
+    // else database already exists, return S_FALSE
+    Assert(S_OK == hr);
+LExit:
+    return hr;
+}
+/********************************************************************
+ SqlCreateDatabase - creates a database on the server
+ NOTE: wzInstance is optional
+       if fIntegratedAuth is set then wzUser and wzPassword are ignored
+********************************************************************/
+extern "C" HRESULT DAPI SqlCreateDatabase(
+    __in_z LPCWSTR wzServer,
+    __in_z LPCWSTR wzInstance,
+    __in_z LPCWSTR wzDatabase,
+    __in BOOL fIntegratedAuth,
+    __in_z LPCWSTR wzUser,
+    __in_z LPCWSTR wzPassword,
+    __in_opt const SQL_FILESPEC* psfDatabase,
+    __in_opt const SQL_FILESPEC* psfLog,
+    __out_opt BSTR* pbstrErrorDescription
+    )
+{
+    Assert(wzServer && wzDatabase && *wzDatabase);
+    HRESULT hr = S_OK;
+    IDBCreateSession* pidbSession = NULL;
+    //
+    // connect to the master database to create the new database
+    //
+    hr = SqlConnectDatabase(wzServer, wzInstance, L"master", fIntegratedAuth, wzUser, wzPassword, &pidbSession);
+    SqlExitOnFailure(hr, "failed to connect to 'master' database on server %ls", wzServer);
+    hr = SqlSessionCreateDatabase(pidbSession, wzDatabase, psfDatabase, psfLog, pbstrErrorDescription);
+    SqlExitOnFailure(hr, "failed to create database: %ls", wzDatabase);
+    Assert(S_OK == hr);
+LExit:
+    ReleaseObject(pidbSession);
+    return hr;
+}
+/********************************************************************
+ SqlSessionCreateDatabase - creates a database on the server
+ NOTE: pidbSession must be connected to the master database
+********************************************************************/
+extern "C" HRESULT DAPI SqlSessionCreateDatabase(
+    __in IDBCreateSession* pidbSession,
+    __in_z LPCWSTR wzDatabase,
+    __in_opt const SQL_FILESPEC* psfDatabase,
+    __in_opt const SQL_FILESPEC* psfLog,
+    __out_opt BSTR* pbstrErrorDescription
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR pwzDbFile = NULL;
+    LPWSTR pwzLogFile = NULL;
+    LPWSTR pwzQuery = NULL;
+    LPWSTR pwzDatabaseEscaped = NULL;
+    if (psfDatabase)
+    {
+        hr = FileSpecToString(psfDatabase, &pwzDbFile);
+        SqlExitOnFailure(hr, "failed to convert db filespec to string");
+    }
+    if (psfLog)
+    {
+        hr = FileSpecToString(psfLog, &pwzLogFile);
+        SqlExitOnFailure(hr, "failed to convert log filespec to string");
+    }
+    hr = EscapeSqlIdentifier(wzDatabase, &pwzDatabaseEscaped);
+    SqlExitOnFailure(hr, "failed to escape database string");
+    hr = StrAllocFormatted(&pwzQuery, L"CREATE DATABASE %s %s%s %s%s", pwzDatabaseEscaped, pwzDbFile ? L"ON " : L"", pwzDbFile ? pwzDbFile : L"", pwzLogFile ? L"LOG ON " : L"", pwzLogFile ? pwzLogFile : L"");
+    SqlExitOnFailure(hr, "failed to allocate query to create database: %ls", pwzDatabaseEscaped);    
+    hr = SqlSessionExecuteQuery(pidbSession, pwzQuery, NULL, NULL, pbstrErrorDescription);
+    SqlExitOnFailure(hr, "failed to create database: %ls, Query: %ls", pwzDatabaseEscaped, pwzQuery);
+LExit:
+    ReleaseStr(pwzQuery);
+    ReleaseStr(pwzLogFile);
+    ReleaseStr(pwzDbFile);
+    ReleaseStr(pwzDatabaseEscaped);
+    return hr;
+}
+/********************************************************************
+ SqlDropDatabase - removes a database from a server if it exists
+ NOTE: wzInstance is optional
+       if fIntegratedAuth is set then wzUser and wzPassword are ignored
+********************************************************************/
+extern "C" HRESULT DAPI SqlDropDatabase(
+    __in_z LPCWSTR wzServer,
+    __in_z LPCWSTR wzInstance,
+    __in_z LPCWSTR wzDatabase,
+    __in BOOL fIntegratedAuth,
+    __in_z LPCWSTR wzUser,
+    __in_z LPCWSTR wzPassword,
+    __out_opt BSTR* pbstrErrorDescription
+    )
+{
+    Assert(wzServer && wzDatabase && *wzDatabase);
+    HRESULT hr = S_OK;
+    IDBCreateSession* pidbSession = NULL;
+    //
+    // connect to the master database to search for wzDatabase
+    //
+    hr = SqlConnectDatabase(wzServer, wzInstance, L"master", fIntegratedAuth, wzUser, wzPassword, &pidbSession);
+    SqlExitOnFailure(hr, "Failed to connect to 'master' database");
+    hr = SqlSessionDropDatabase(pidbSession, wzDatabase, pbstrErrorDescription);
+LExit:
+    ReleaseObject(pidbSession);
+    return hr;
+}
+/********************************************************************
+ SqlSessionDropDatabase - removes a database from a server if it exists
+ NOTE: pidbSession must be connected to the master database
+********************************************************************/
+extern "C" HRESULT DAPI SqlSessionDropDatabase(
+    __in IDBCreateSession* pidbSession,
+    __in_z LPCWSTR wzDatabase,
+    __out_opt BSTR* pbstrErrorDescription
+    )
+{
+    Assert(pidbSession && wzDatabase && *wzDatabase);
+    HRESULT hr = S_OK;
+    LPWSTR pwzQuery = NULL;
+    LPWSTR pwzDatabaseEscaped = NULL;
+    hr = SqlSessionDatabaseExists(pidbSession, wzDatabase, pbstrErrorDescription);
+    SqlExitOnFailure(hr, "failed to determine if exists, database: %ls", wzDatabase);
+    
+    hr = EscapeSqlIdentifier(wzDatabase, &pwzDatabaseEscaped);
+    SqlExitOnFailure(hr, "failed to escape database string");
+    if (S_OK == hr)
+    {
+        hr = StrAllocFormatted(&pwzQuery, L"DROP DATABASE %s", pwzDatabaseEscaped);
+        SqlExitOnFailure(hr, "failed to allocate query to drop database: %ls", pwzDatabaseEscaped);
+        hr = SqlSessionExecuteQuery(pidbSession, pwzQuery, NULL, NULL, pbstrErrorDescription);
+        SqlExitOnFailure(hr, "Failed to drop database");
+    }
+LExit:
+    ReleaseStr(pwzQuery);
+    ReleaseStr(pwzDatabaseEscaped);
+    return hr;
+}
+/********************************************************************
+ SqlSessionExecuteQuery - executes a query and returns the results if desired
+ NOTE: ppirs and pcRoes and pbstrErrorDescription are optional
+********************************************************************/
+extern "C" HRESULT DAPI SqlSessionExecuteQuery(
+    __in IDBCreateSession* pidbSession, 
+    __in __sql_command LPCWSTR wzSql, 
+    __out_opt IRowset** ppirs,
+    __out_opt DBROWCOUNT* pcRows,
+    __out_opt BSTR* pbstrErrorDescription
+    )
+{
+    Assert(pidbSession);
+    HRESULT hr = S_OK;
+    IDBCreateCommand* pidbCommand = NULL;
+    ICommandText* picmdText = NULL;
+    ICommand* picmd = NULL;
+    DBROWCOUNT cRows = 0;
+    if (pcRows)
+    {
+        *pcRows = NULL;
+    }
+    //
+    // create the command
+    //
+    hr = pidbSession->CreateSession(NULL, IID_IDBCreateCommand, (IUnknown**)&pidbCommand);
+    SqlExitOnFailure(hr, "failed to create database session");
+    hr = pidbCommand->CreateCommand(NULL, IID_ICommand, (IUnknown**)&picmd);
+    SqlExitOnFailure(hr, "failed to create command to execute session");
+    //
+    // set the sql text into the command
+    //
+    hr = picmd->QueryInterface(IID_ICommandText, (LPVOID*)&picmdText);
+    SqlExitOnFailure(hr, "failed to get command text object for command");
+    hr = picmdText->SetCommandText(DBGUID_DEFAULT , wzSql);
+    SqlExitOnFailure(hr, "failed to set SQL string: %ls", wzSql);
+    //
+    // execute the command
+    //
+    hr = picmd->Execute(NULL, (ppirs) ? IID_IRowset : IID_NULL, NULL, &cRows, reinterpret_cast<IUnknown**>(ppirs));
+    SqlExitOnFailure(hr, "failed to execute SQL string: %ls", wzSql);
+    if (DB_S_ERRORSOCCURRED == hr)
+    {
+        hr = E_FAIL;
+    }
+    if (pcRows)
+    {
+        *pcRows = cRows;
+    }
+LExit:
+    if (FAILED(hr) && picmd && pbstrErrorDescription)
+    {
+        HRESULT hrGetErrors = SqlGetErrorInfo(picmd, IID_ICommandText, 0x409, NULL, pbstrErrorDescription); // TODO: use current locale instead of always American-English
+        if (FAILED(hrGetErrors))
+        {
+            ReleaseBSTR(*pbstrErrorDescription);
+        }
+    }
+    ReleaseObject(picmd);
+    ReleaseObject(picmdText);
+    ReleaseObject(pidbCommand);
+    return hr;
+}
+/********************************************************************
+ SqlCommandExecuteQuery - executes a SQL command and returns the results if desired
+ NOTE: ppirs and pcRoes are optional
+********************************************************************/
+extern "C" HRESULT DAPI SqlCommandExecuteQuery(
+    __in IDBCreateCommand* pidbCommand, 
+    __in __sql_command LPCWSTR wzSql, 
+    __out IRowset** ppirs,
+    __out DBROWCOUNT* pcRows
+    )
+{
+    Assert(pidbCommand);
+    HRESULT hr = S_OK;
+    ICommandText* picmdText = NULL;
+    ICommand* picmd = NULL;
+    DBROWCOUNT cRows = 0;
+    if (pcRows)
+    {
+        *pcRows = NULL;
+    }
+    //
+    // create the command
+    //
+    hr = pidbCommand->CreateCommand(NULL, IID_ICommand, (IUnknown**)&picmd);
+    SqlExitOnFailure(hr, "failed to create command to execute session");
+    //
+    // set the sql text into the command
+    //
+    hr = picmd->QueryInterface(IID_ICommandText, (LPVOID*)&picmdText);
+    SqlExitOnFailure(hr, "failed to get command text object for command");
+    hr = picmdText->SetCommandText(DBGUID_DEFAULT , wzSql);
+    SqlExitOnFailure(hr, "failed to set SQL string: %ls", wzSql);
+    //
+    // execute the command
+    //
+    hr = picmd->Execute(NULL, (ppirs) ? IID_IRowset : IID_NULL, NULL, &cRows, reinterpret_cast<IUnknown**>(ppirs));
+    SqlExitOnFailure(hr, "failed to execute SQL string: %ls", wzSql);
+    if (DB_S_ERRORSOCCURRED == hr)
+    {
+        hr = E_FAIL;
+    }
+    if (pcRows)
+    {
+        *pcRows = cRows;
+    }
+LExit:
+    ReleaseObject(picmd);
+    ReleaseObject(picmdText);
+    return hr;
+}
+/********************************************************************
+ SqlGetErrorInfo - gets error information from the last SQL function call
+ NOTE: pbstrErrorSource and pbstrErrorDescription are optional
+********************************************************************/
+extern "C" HRESULT DAPI SqlGetErrorInfo(
+    __in IUnknown* pObjectWithError,
+    __in REFIID IID_InterfaceWithError,
+    __in DWORD dwLocaleId,
+    __out_opt BSTR* pbstrErrorSource,
+    __out_opt BSTR* pbstrErrorDescription
+    )
+{
+    HRESULT hr = S_OK;
+    Assert(pObjectWithError);
+    // interfaces needed to extract error information out
+    ISupportErrorInfo* pISupportErrorInfo = NULL;
+    IErrorInfo* pIErrorInfoAll = NULL;
+    IErrorRecords* pIErrorRecords = NULL;
+    IErrorInfo* pIErrorInfoRecord = NULL;
+    // only ask for error information if the interface supports it.
+    hr = pObjectWithError->QueryInterface(IID_ISupportErrorInfo,(void**)&pISupportErrorInfo);
+    SqlExitOnFailure(hr, "No error information was found for object.");
+    hr = pISupportErrorInfo->InterfaceSupportsErrorInfo(IID_InterfaceWithError);
+    SqlExitOnFailure(hr, "InterfaceWithError is not supported for object with error");
+    // ignore the return of GetErrorInfo it can succeed and return a NULL pointer in pIErrorInfoAll anyway
+    hr = ::GetErrorInfo(0, &pIErrorInfoAll);
+    SqlExitOnFailure(hr, "failed to get error info");
+    if (S_OK == hr && pIErrorInfoAll)
+    {
+        // see if it's a valid OLE DB IErrorInfo interface that exposes a list of records
+        hr = pIErrorInfoAll->QueryInterface(IID_IErrorRecords, (void**)&pIErrorRecords);
+        if (SUCCEEDED(hr))
+        {
+            ULONG cErrors = 0;
+            pIErrorRecords->GetRecordCount(&cErrors);
+            // get the error information for each record
+            for (ULONG i = 0; i < cErrors; ++i)
+            {
+                hr = pIErrorRecords->GetErrorInfo(i, dwLocaleId, &pIErrorInfoRecord);
+                if (SUCCEEDED(hr))
+                {
+                    if (pbstrErrorSource)
+                    {
+                        pIErrorInfoRecord->GetSource(pbstrErrorSource);
+                    }
+                    if (pbstrErrorDescription)
+                    {
+                        pIErrorInfoRecord->GetDescription(pbstrErrorDescription);
+                    }
+                    ReleaseNullObject(pIErrorInfoRecord);
+                    break; // TODO: return more than one error in the future!
+                }
+            }
+            ReleaseNullObject(pIErrorRecords);
+        }
+        else // we have a simple error record
+        {
+            if (pbstrErrorSource)
+            {
+                pIErrorInfoAll->GetSource(pbstrErrorSource);
+            }
+            if (pbstrErrorDescription)
+            {
+                pIErrorInfoAll->GetDescription(pbstrErrorDescription);
+            }
+        }
+    }
+    else
+    {
+        hr = E_NOMOREITEMS;
+    }
+LExit:
+    ReleaseObject(pIErrorInfoRecord);
+    ReleaseObject(pIErrorRecords);
+    ReleaseObject(pIErrorInfoAll);
+    ReleaseObject(pISupportErrorInfo);
+    return hr;
+}
+//
+// private
+//
+static HRESULT InitializeDatabaseConnection(
+    __in REFCLSID rclsid,
+    __in_z LPCSTR szFriendlyClsidName,
+    __in DBPROPSET rgdbpsetInit[],
+    __in_ecount(rgdbpsetInit) DWORD cdbpsetInit,
+    __out IDBCreateSession** ppidbSession
+)
+{
+    Unused(szFriendlyClsidName); // only used in DEBUG builds
+    HRESULT hr = S_OK;
+    IDBInitialize* pidbInitialize = NULL;
+    IDBProperties* pidbProperties = NULL;
+    hr = ::CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, IID_IDBInitialize, (LPVOID*)&pidbInitialize);
+    SqlExitOnFailure(hr, "failed to initialize %s", szFriendlyClsidName);
+    // create and set the property set
+    hr = pidbInitialize->QueryInterface(IID_IDBProperties, (LPVOID*)&pidbProperties);
+    SqlExitOnFailure(hr, "failed to get IID_IDBProperties for %s", szFriendlyClsidName);
+    hr = pidbProperties->SetProperties(cdbpsetInit, rgdbpsetInit);
+    SqlExitOnFailure(hr, "failed to set properties for %s", szFriendlyClsidName);
+    // initialize connection to datasource
+    hr = pidbInitialize->Initialize();
+    if (FAILED(hr))
+    {
+        DumpErrorRecords();
+    }
+    SqlExitOnFailure(hr, "failed to initialize connection for %s", szFriendlyClsidName);
+    hr = pidbInitialize->QueryInterface(IID_IDBCreateSession, (LPVOID*)ppidbSession);
+    SqlExitOnFailure(hr, "failed to query for connection session for %s", szFriendlyClsidName);
+LExit:
+    ReleaseObject(pidbProperties);
+    ReleaseObject(pidbInitialize);
+    return hr;
+}
+HRESULT DumpErrorRecords()
+{
+    HRESULT hr = S_OK;
+    IErrorInfo* pIErrorInfo = NULL;
+    IErrorRecords* pIErrorRecords = NULL;
+    IErrorInfo* pIErrorInfoRecord = NULL;
+    BSTR bstrDescription = NULL;
+    ULONG i = 0;
+    ULONG cRecords = 0;
+    ERRORINFO ErrorInfo = { };
+    // Get IErrorInfo pointer from OLE.  
+    hr = ::GetErrorInfo(0, &pIErrorInfo);
+    if (FAILED(hr))
+    {
+        ExitFunction();
+    }
+    // QI for IID_IErrorRecords.  
+    hr = pIErrorInfo->QueryInterface(IID_IErrorRecords, (void**)&pIErrorRecords);
+    if (FAILED(hr))
+    {
+        ExitFunction();
+    }
+    // Get error record count.  
+    hr = pIErrorRecords->GetRecordCount(&cRecords);
+    if (FAILED(hr))
+    {
+        ExitFunction();
+    }
+    // Loop through the error records.
+    for (i = 0; i < cRecords; i++)
+    {
+        // Get pIErrorInfo from pIErrorRecords.
+        hr = pIErrorRecords->GetErrorInfo(i, 1033, &pIErrorInfoRecord);
+        if (SUCCEEDED(hr))
+        {
+            // Get error description and source.
+            hr = pIErrorInfoRecord->GetDescription(&bstrDescription);
+            // Retrieve the ErrorInfo structures.
+            hr = pIErrorRecords->GetBasicErrorInfo(i, &ErrorInfo);
+            SqlExitTrace(ErrorInfo.hrError, "SQL error %lu/%lu: %ls", i + 1, cRecords, bstrDescription);
+            ReleaseNullObject(pIErrorInfoRecord);
+            ReleaseNullBSTR(bstrDescription);
+        }
+    }
+LExit:
+    ReleaseNullBSTR(bstrDescription);
+    ReleaseObject(pIErrorInfoRecord);
+    ReleaseObject(pIErrorRecords);
+    ReleaseObject(pIErrorInfo);
+    return hr;
+}
+/********************************************************************
+ FileSpecToString
+*********************************************************************/
+static HRESULT FileSpecToString(
+    __in const SQL_FILESPEC* psf,
+    __out LPWSTR* ppwz
+    )
+{
+    Assert(psf && ppwz);
+    HRESULT hr = S_OK;
+    LPWSTR pwz = NULL;
+    hr = StrAllocString(&pwz, L"(", 1024);
+    SqlExitOnFailure(hr, "failed to allocate string for database file info");
+    SqlExitOnNull(*psf->wzName, hr, E_INVALIDARG, "logical name not specified in database file info");
+    SqlExitOnNull(*psf->wzFilename, hr, E_INVALIDARG, "filename not specified in database file info");
+    hr = StrAllocFormatted(&pwz, L"%sNAME=%s", pwz, psf->wzName);
+    SqlExitOnFailure(hr, "failed to format database file info name: %ls", psf->wzName);
+    hr = StrAllocFormatted(&pwz, L"%s, FILENAME='%s'", pwz, psf->wzFilename);
+    SqlExitOnFailure(hr, "failed to format database file info filename: %ls", psf->wzFilename);
+    if (0 != psf->wzSize[0])
+    {
+        hr = StrAllocFormatted(&pwz, L"%s, SIZE=%s", pwz, psf->wzSize);
+        SqlExitOnFailure(hr, "failed to format database file info size: %ls", psf->wzSize);
+    }
+    if (0 != psf->wzMaxSize[0])
+    {
+        hr = StrAllocFormatted(&pwz, L"%s, MAXSIZE=%s", pwz, psf->wzMaxSize);
+        SqlExitOnFailure(hr, "failed to format database file info maxsize: %ls", psf->wzMaxSize);
+    }
+    if (0 != psf->wzGrow[0])
+    {
+        hr = StrAllocFormatted(&pwz, L"%s, FILEGROWTH=%s", pwz, psf->wzGrow);
+        SqlExitOnFailure(hr, "failed to format database file info growth: %ls", psf->wzGrow);
+    }
+    hr = StrAllocFormatted(&pwz, L"%s)", pwz);
+    SqlExitOnFailure(hr, "failed to allocate string for file spec");
+    *ppwz = pwz;
+    pwz = NULL;  // null here so it doesn't get freed below
+LExit:
+    ReleaseStr(pwz);
+    return hr;
+}
+static HRESULT EscapeSqlIdentifier(
+    __in_z LPCWSTR wzIdentifier,
+    __deref_out_z LPWSTR* ppwz
+    )
+{
+    Assert(ppwz);
+    HRESULT hr = S_OK;
+    LPWSTR pwz = NULL;
+    if (wzIdentifier == NULL)
+    {
+        //Just ignore a NULL identifier and clear out the result
+        ReleaseNullStr(*ppwz);
+        ExitFunction();
+    }
+    int cchIdentifier = lstrlenW(wzIdentifier);
+    //If an empty string or already escaped just copy
+    if (cchIdentifier == 0 || (wzIdentifier[0] == '[' && wzIdentifier[cchIdentifier-1] == ']'))
+    {
+        hr = StrAllocString(&pwz, wzIdentifier, 0);
+        SqlExitOnFailure(hr, "failed to format database name: %ls", wzIdentifier);
+    }
+    else
+    {
+        //escape it
+        hr = StrAllocFormatted(&pwz, L"[%s]", wzIdentifier);
+        SqlExitOnFailure(hr, "failed to format escaped database name: %ls", wzIdentifier);
+    }
+    *ppwz = pwz;
+    pwz = NULL;  // null here so it doesn't get freed below
+LExit:
+    ReleaseStr(pwz);
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/srputil.cpp b/src/libs/dutil/WixToolset.DUtil/srputil.cpp
new file mode 100644
index 00000000..e44536cc
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/srputil.cpp
@@ -0,0 +1,252 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define SrpExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_SRPUTIL, x, s, __VA_ARGS__)
+#define SrpExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_SRPUTIL, x, s, __VA_ARGS__)
+#define SrpExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_SRPUTIL, x, s, __VA_ARGS__)
+#define SrpExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_SRPUTIL, x, s, __VA_ARGS__)
+#define SrpExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_SRPUTIL, x, s, __VA_ARGS__)
+#define SrpExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_SRPUTIL, x, s, __VA_ARGS__)
+#define SrpExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_SRPUTIL, p, x, e, s, __VA_ARGS__)
+#define SrpExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_SRPUTIL, p, x, s, __VA_ARGS__)
+#define SrpExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_SRPUTIL, p, x, e, s, __VA_ARGS__)
+#define SrpExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_SRPUTIL, p, x, s, __VA_ARGS__)
+#define SrpExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_SRPUTIL, e, x, s, __VA_ARGS__)
+#define SrpExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_SRPUTIL, g, x, s, __VA_ARGS__)
+typedef BOOL (WINAPI *PFN_SETRESTOREPTW)(
+    __in PRESTOREPOINTINFOW pRestorePtSpec,
+    __out PSTATEMGRSTATUS pSMgrStatus
+    );
+static PFN_SETRESTOREPTW vpfnSRSetRestorePointW = NULL;
+static HMODULE vhSrClientDll = NULL;
+static HRESULT InitializeComSecurity();
+DAPI_(HRESULT) SrpInitialize(
+    __in BOOL fInitializeComSecurity
+    )
+{
+    HRESULT hr = S_OK;
+    hr = LoadSystemLibrary(L"srclient.dll", &vhSrClientDll);
+    if (FAILED(hr))
+    {
+        ExitFunction1(hr = E_NOTIMPL);
+    }
+    vpfnSRSetRestorePointW = reinterpret_cast<PFN_SETRESTOREPTW>(::GetProcAddress(vhSrClientDll, "SRSetRestorePointW"));
+    SrpExitOnNullWithLastError(vpfnSRSetRestorePointW, hr, "Failed to find set restore point proc address.");
+    // If allowed, initialize COM security to enable NetworkService,
+    // LocalService and System to make callbacks to the process
+    // calling System Restore. This is required for any process
+    // that calls SRSetRestorePoint.
+    if (fInitializeComSecurity)
+    {
+        hr = InitializeComSecurity();
+        SrpExitOnFailure(hr, "Failed to initialize security for COM to talk to system restore.");
+    }
+LExit:
+    if (FAILED(hr) && vhSrClientDll)
+    {
+        SrpUninitialize();
+    }
+    return hr;
+}
+DAPI_(void) SrpUninitialize()
+{
+    if (vhSrClientDll)
+    {
+        ::FreeLibrary(vhSrClientDll);
+        vhSrClientDll = NULL;
+        vpfnSRSetRestorePointW = NULL;
+    }
+}
+DAPI_(HRESULT) SrpCreateRestorePoint(
+    __in_z LPCWSTR wzApplicationName,
+    __in SRP_ACTION action
+    )
+{
+    HRESULT hr = S_OK;
+    RESTOREPOINTINFOW restorePoint = { };
+    STATEMGRSTATUS status = { };
+    if (!vpfnSRSetRestorePointW)
+    {
+        ExitFunction1(hr = E_NOTIMPL);
+    }
+    restorePoint.dwEventType = BEGIN_SYSTEM_CHANGE;
+    restorePoint.dwRestorePtType = (SRP_ACTION_INSTALL == action) ? APPLICATION_INSTALL : (SRP_ACTION_UNINSTALL == action) ? APPLICATION_UNINSTALL : MODIFY_SETTINGS;
+    ::StringCbCopyW(restorePoint.szDescription, sizeof(restorePoint.szDescription), wzApplicationName);
+    if (!vpfnSRSetRestorePointW(&restorePoint, &status))
+    {
+        SrpExitOnWin32Error(status.nStatus, hr, "Failed to create system restore point.");
+    }
+LExit:
+    return hr;
+}
+// internal functions.
+static HRESULT InitializeComSecurity()
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    SECURITY_DESCRIPTOR sd = {0};
+    EXPLICIT_ACCESS ea[5] = {0};
+    ACL* pAcl = NULL;
+    ULONGLONG rgSidBA[(SECURITY_MAX_SID_SIZE+sizeof(ULONGLONG)-1)/sizeof(ULONGLONG)]={0};
+    ULONGLONG rgSidLS[(SECURITY_MAX_SID_SIZE+sizeof(ULONGLONG)-1)/sizeof(ULONGLONG)]={0};
+    ULONGLONG rgSidNS[(SECURITY_MAX_SID_SIZE+sizeof(ULONGLONG)-1)/sizeof(ULONGLONG)]={0};
+    ULONGLONG rgSidPS[(SECURITY_MAX_SID_SIZE+sizeof(ULONGLONG)-1)/sizeof(ULONGLONG)]={0};
+    ULONGLONG rgSidSY[(SECURITY_MAX_SID_SIZE+sizeof(ULONGLONG)-1)/sizeof(ULONGLONG)]={0};
+    DWORD cbSid = 0;
+    // Create the security descriptor explicitly as follows because
+    // CoInitializeSecurity() will not accept the relative security descriptors
+    // returned by ConvertStringSecurityDescriptorToSecurityDescriptor().
+    //
+    // The result is a security descriptor that is equivalent to the following 
+    // security descriptor definition language (SDDL) string:
+    //
+    //   O:BAG:BAD:(A;;0x1;;;LS)(A;;0x1;;;NS)(A;;0x1;;;PS)(A;;0x1;;;SY)(A;;0x1;;;BA)
+    //
+ 
+    // Initialize the security descriptor.
+    if (!::InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION))
+    {
+        SrpExitWithLastError(hr, "Failed to initialize security descriptor for system restore.");
+    }
+    // Create an administrator group security identifier (SID).
+    cbSid = sizeof(rgSidBA);
+    if (!::CreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, rgSidBA, &cbSid))
+    {
+        SrpExitWithLastError(hr, "Failed to create administrator SID for system restore.");
+    }
+    // Create a local service security identifier (SID).
+    cbSid = sizeof(rgSidLS);
+    if (!::CreateWellKnownSid(WinLocalServiceSid, NULL, rgSidLS, &cbSid))
+    {
+        SrpExitWithLastError(hr, "Failed to create local service SID for system restore.");
+    }
+    // Create a network service security identifier (SID).
+    cbSid = sizeof(rgSidNS);
+    if (!::CreateWellKnownSid(WinNetworkServiceSid, NULL, rgSidNS, &cbSid))
+    {
+        SrpExitWithLastError(hr, "Failed to create network service SID for system restore.");
+    }
+    // Create a personal account security identifier (SID).
+    cbSid = sizeof(rgSidPS);
+    if (!::CreateWellKnownSid(WinSelfSid, NULL, rgSidPS, &cbSid))
+    {
+        SrpExitWithLastError(hr, "Failed to create self SID for system restore.");
+    }
+    // Create a local service security identifier (SID).
+    cbSid = sizeof(rgSidSY);
+    if (!::CreateWellKnownSid(WinLocalSystemSid, NULL, rgSidSY, &cbSid))
+    {
+        SrpExitWithLastError(hr, "Failed to create local system SID for system restore.");
+    }
+    // Setup the access control entries (ACE) for COM. COM_RIGHTS_EXECUTE and
+    // COM_RIGHTS_EXECUTE_LOCAL are the minimum access rights required.
+    ea[0].grfAccessPermissions = COM_RIGHTS_EXECUTE | COM_RIGHTS_EXECUTE_LOCAL;
+    ea[0].grfAccessMode = SET_ACCESS;
+    ea[0].grfInheritance = NO_INHERITANCE;
+    ea[0].Trustee.pMultipleTrustee = NULL;
+    ea[0].Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
+    ea[0].Trustee.TrusteeForm = TRUSTEE_IS_SID;
+    ea[0].Trustee.TrusteeType = TRUSTEE_IS_GROUP;
+    ea[0].Trustee.ptstrName = (LPTSTR)rgSidBA;
+    ea[1].grfAccessPermissions = COM_RIGHTS_EXECUTE | COM_RIGHTS_EXECUTE_LOCAL;
+    ea[1].grfAccessMode = SET_ACCESS;
+    ea[1].grfInheritance = NO_INHERITANCE;
+    ea[1].Trustee.pMultipleTrustee = NULL;
+    ea[1].Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
+    ea[1].Trustee.TrusteeForm = TRUSTEE_IS_SID;
+    ea[1].Trustee.TrusteeType = TRUSTEE_IS_GROUP;
+    ea[1].Trustee.ptstrName = (LPTSTR)rgSidLS;
+    ea[2].grfAccessPermissions = COM_RIGHTS_EXECUTE | COM_RIGHTS_EXECUTE_LOCAL;
+    ea[2].grfAccessMode = SET_ACCESS;
+    ea[2].grfInheritance = NO_INHERITANCE;
+    ea[2].Trustee.pMultipleTrustee = NULL;
+    ea[2].Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
+    ea[2].Trustee.TrusteeForm = TRUSTEE_IS_SID;
+    ea[2].Trustee.TrusteeType = TRUSTEE_IS_GROUP;
+    ea[2].Trustee.ptstrName = (LPTSTR)rgSidNS;
+    ea[3].grfAccessPermissions = COM_RIGHTS_EXECUTE | COM_RIGHTS_EXECUTE_LOCAL;
+    ea[3].grfAccessMode = SET_ACCESS;
+    ea[3].grfInheritance = NO_INHERITANCE;
+    ea[3].Trustee.pMultipleTrustee = NULL;
+    ea[3].Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
+    ea[3].Trustee.TrusteeForm = TRUSTEE_IS_SID;
+    ea[3].Trustee.TrusteeType = TRUSTEE_IS_GROUP;
+    ea[3].Trustee.ptstrName = (LPTSTR)rgSidPS;
+    ea[4].grfAccessPermissions = COM_RIGHTS_EXECUTE | COM_RIGHTS_EXECUTE_LOCAL;
+    ea[4].grfAccessMode = SET_ACCESS;
+    ea[4].grfInheritance = NO_INHERITANCE;
+    ea[4].Trustee.pMultipleTrustee = NULL;
+    ea[4].Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
+    ea[4].Trustee.TrusteeForm = TRUSTEE_IS_SID;
+    ea[4].Trustee.TrusteeType = TRUSTEE_IS_GROUP;
+    ea[4].Trustee.ptstrName = (LPTSTR)rgSidSY;
+    // Create an access control list (ACL) using this ACE list.
+    er = ::SetEntriesInAcl(countof(ea), ea, NULL, &pAcl);
+    SrpExitOnWin32Error(er, hr, "Failed to create ACL for system restore.");
+    // Set the security descriptor owner to Administrators.
+    if (!::SetSecurityDescriptorOwner(&sd, rgSidBA, FALSE))
+    {
+        SrpExitWithLastError(hr, "Failed to set administrators owner for system restore.");
+    }
+    // Set the security descriptor group to Administrators.
+    if (!::SetSecurityDescriptorGroup(&sd, rgSidBA, FALSE))
+    {
+        SrpExitWithLastError(hr, "Failed to set administrators group access for system restore.");
+    }
+    // Set the discretionary access control list (DACL) to the ACL.
+    if (!::SetSecurityDescriptorDacl(&sd, TRUE, pAcl, FALSE))
+    {
+        SrpExitWithLastError(hr, "Failed to set DACL for system restore.");
+    }
+    // Note that an explicit security descriptor is being passed in.
+    hr= ::CoInitializeSecurity(&sd, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_PKT_PRIVACY, RPC_C_IMP_LEVEL_IDENTIFY, NULL, EOAC_DISABLE_AAA | EOAC_NO_CUSTOM_MARSHAL, NULL);
+    SrpExitOnFailure(hr, "Failed to initialize COM security for system restore.");
+LExit:
+    if (pAcl)
+    {
+        ::LocalFree(pAcl);
+    }
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/strutil.cpp b/src/libs/dutil/WixToolset.DUtil/strutil.cpp
new file mode 100644
index 00000000..550d6169
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/strutil.cpp
@@ -0,0 +1,2824 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define StrExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_STRUTIL, x, s, __VA_ARGS__)
+#define StrExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_STRUTIL, x, s, __VA_ARGS__)
+#define StrExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_STRUTIL, x, s, __VA_ARGS__)
+#define StrExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_STRUTIL, x, s, __VA_ARGS__)
+#define StrExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_STRUTIL, x, s, __VA_ARGS__)
+#define StrExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_STRUTIL, x, s, __VA_ARGS__)
+#define StrExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_STRUTIL, p, x, e, s, __VA_ARGS__)
+#define StrExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_STRUTIL, p, x, s, __VA_ARGS__)
+#define StrExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_STRUTIL, p, x, e, s, __VA_ARGS__)
+#define StrExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_STRUTIL, p, x, s, __VA_ARGS__)
+#define StrExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_STRUTIL, e, x, s, __VA_ARGS__)
+#define StrExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_STRUTIL, g, x, s, __VA_ARGS__)
+#define ARRAY_GROWTH_SIZE 5
+// Forward declarations.
+static HRESULT AllocHelper(
+    __deref_out_ecount_part(cch, 0) LPWSTR* ppwz,
+    __in SIZE_T cch,
+    __in BOOL fZeroOnRealloc
+    );
+static HRESULT AllocStringHelper(
+    __deref_out_ecount_z(cchSource + 1) LPWSTR* ppwz,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource,
+    __in BOOL fZeroOnRealloc
+    );
+static HRESULT AllocConcatHelper(
+    __deref_out_z LPWSTR* ppwz,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource,
+    __in BOOL fZeroOnRealloc
+    );
+static HRESULT AllocFormattedArgsHelper(
+    __deref_out_z LPWSTR* ppwz,
+    __in BOOL fZeroOnRealloc,
+    __in __format_string LPCWSTR wzFormat,
+    __in va_list args
+    );
+static HRESULT StrAllocStringMapInvariant(
+    __deref_out_z LPWSTR* pscz,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource,
+    __in DWORD dwMapFlags
+    );
+/********************************************************************
+StrAlloc - allocates or reuses dynamic string memory
+NOTE: caller is responsible for freeing ppwz even if function fails
+********************************************************************/
+extern "C" HRESULT DAPI StrAlloc(
+    __deref_out_ecount_part(cch, 0) LPWSTR* ppwz,
+    __in SIZE_T cch
+    )
+{
+    return AllocHelper(ppwz, cch, FALSE);
+}
+/********************************************************************
+StrAllocSecure - allocates or reuses dynamic string memory
+If the memory needs to reallocated, calls SecureZeroMemory on the
+original block of memory after it is moved.
+NOTE: caller is responsible for freeing ppwz even if function fails
+********************************************************************/
+extern "C" HRESULT DAPI StrAllocSecure(
+    __deref_out_ecount_part(cch, 0) LPWSTR* ppwz,
+    __in SIZE_T cch
+    )
+{
+    return AllocHelper(ppwz, cch, TRUE);
+}
+/********************************************************************
+AllocHelper - allocates or reuses dynamic string memory
+If fZeroOnRealloc is true and the memory needs to reallocated, 
+calls SecureZeroMemory on original block of memory after it is moved.
+NOTE: caller is responsible for freeing ppwz even if function fails
+********************************************************************/
+static HRESULT AllocHelper(
+    __deref_out_ecount_part(cch, 0) LPWSTR* ppwz,
+    __in SIZE_T cch,
+    __in BOOL fZeroOnRealloc
+    )
+{
+    Assert(ppwz && cch);
+    HRESULT hr = S_OK;
+    LPWSTR pwz = NULL;
+    if (cch >= MAXDWORD / sizeof(WCHAR))
+    {
+        hr = E_OUTOFMEMORY;
+        StrExitOnFailure(hr, "Not enough memory to allocate string of size: %u", cch);
+    }
+    if (*ppwz)
+    {
+        if (fZeroOnRealloc)
+        {
+            LPVOID pvNew = NULL;
+            hr = MemReAllocSecure(*ppwz, sizeof(WCHAR)* cch, FALSE, &pvNew);
+            StrExitOnFailure(hr, "Failed to reallocate string");
+            pwz = static_cast<LPWSTR>(pvNew);
+        }
+        else
+        {
+            pwz = static_cast<LPWSTR>(MemReAlloc(*ppwz, sizeof(WCHAR)* cch, FALSE));
+        }
+    }
+    else
+    {
+        pwz = static_cast<LPWSTR>(MemAlloc(sizeof(WCHAR) * cch, TRUE));
+    }
+    StrExitOnNull(pwz, hr, E_OUTOFMEMORY, "failed to allocate string, len: %u", cch);
+    *ppwz = pwz;
+LExit:
+    return hr;
+}
+/********************************************************************
+StrTrimCapacity - Frees any unnecessary memory associated with a string.
+                  Purely used for optimization, generally only when a string
+                  has been changing size, and will no longer grow.
+NOTE: caller is responsible for freeing ppwz even if function fails
+********************************************************************/
+HRESULT DAPI StrTrimCapacity(
+    __deref_out_z LPWSTR* ppwz
+    )
+{
+    Assert(ppwz);
+    HRESULT hr = S_OK;
+    SIZE_T cchLen = 0;
+    hr = ::StringCchLengthW(*ppwz, STRSAFE_MAX_CCH, reinterpret_cast<UINT_PTR*>(&cchLen));
+    StrExitOnRootFailure(hr, "Failed to calculate length of string");
+    ++cchLen; // Add 1 for null-terminator
+    hr = StrAlloc(ppwz, cchLen);
+    StrExitOnFailure(hr, "Failed to reallocate string");
+LExit:
+    return hr;
+}
+/********************************************************************
+StrTrimWhitespace - allocates or reuses dynamic string memory and copies
+                    in an existing string, excluding whitespace
+NOTE: caller is responsible for freeing ppwz even if function fails
+********************************************************************/
+HRESULT DAPI StrTrimWhitespace(
+    __deref_out_z LPWSTR* ppwz,
+    __in_z LPCWSTR wzSource
+    )
+{
+    HRESULT hr = S_OK;
+    size_t i = 0;
+    LPWSTR sczResult = NULL;
+    // Ignore beginning whitespace
+    while (L' ' == *wzSource || L'\t' == *wzSource)
+    {
+        wzSource++;
+    }
+    hr = ::StringCchLengthW(wzSource, STRSAFE_MAX_CCH, &i);
+    StrExitOnRootFailure(hr, "Failed to get length of string");
+    // Overwrite ending whitespace with null characters
+    if (0 < i)
+    {
+        // start from the last non-null-terminator character in the array
+        for (i = i - 1; i > 0; --i)
+        {
+            if (L' ' != wzSource[i] && L'\t' != wzSource[i])
+            {
+                break;
+            }
+        }
+        ++i;
+    }
+    hr = StrAllocString(&sczResult, wzSource, i);
+    StrExitOnFailure(hr, "Failed to copy result string");
+    // Output result
+    *ppwz = sczResult;
+    sczResult = NULL;
+LExit:
+    ReleaseStr(sczResult);
+    return hr;
+}
+/********************************************************************
+StrAnsiAlloc - allocates or reuses dynamic ANSI string memory
+NOTE: caller is responsible for freeing ppsz even if function fails
+********************************************************************/
+extern "C" HRESULT DAPI StrAnsiAlloc(
+    __deref_out_ecount_part(cch, 0) LPSTR* ppsz,
+    __in SIZE_T cch
+    )
+{
+    Assert(ppsz && cch);
+    HRESULT hr = S_OK;
+    LPSTR psz = NULL;
+    if (cch >= MAXDWORD / sizeof(WCHAR))
+    {
+        hr = E_OUTOFMEMORY;
+        StrExitOnFailure(hr, "Not enough memory to allocate string of size: %u", cch);
+    }
+    if (*ppsz)
+    {
+        psz = static_cast<LPSTR>(MemReAlloc(*ppsz, sizeof(CHAR) * cch, FALSE));
+    }
+    else
+    {
+        psz = static_cast<LPSTR>(MemAlloc(sizeof(CHAR) * cch, TRUE));
+    }
+    StrExitOnNull(psz, hr, E_OUTOFMEMORY, "failed to allocate string, len: %u", cch);
+    *ppsz = psz;
+LExit:
+    return hr;
+}
+/********************************************************************
+StrAnsiTrimCapacity - Frees any unnecessary memory associated with a string.
+                  Purely used for optimization, generally only when a string
+                  has been changing size, and will no longer grow.
+NOTE: caller is responsible for freeing ppwz even if function fails
+********************************************************************/
+HRESULT DAPI StrAnsiTrimCapacity(
+    __deref_out_z LPSTR* ppz
+    )
+{
+    Assert(ppz);
+    HRESULT hr = S_OK;
+    SIZE_T cchLen = 0;
+#pragma prefast(push)
+#pragma prefast(disable:25068)
+    hr = ::StringCchLengthA(*ppz, STRSAFE_MAX_CCH, reinterpret_cast<UINT_PTR*>(&cchLen));
+#pragma prefast(pop)
+    StrExitOnFailure(hr, "Failed to calculate length of string");
+    ++cchLen; // Add 1 for null-terminator
+    hr = StrAnsiAlloc(ppz, cchLen);
+    StrExitOnFailure(hr, "Failed to reallocate string");
+LExit:
+    return hr;
+}
+/********************************************************************
+StrAnsiTrimWhitespace - allocates or reuses dynamic string memory and copies
+                    in an existing string, excluding whitespace
+NOTE: caller is responsible for freeing ppz even if function fails
+********************************************************************/
+HRESULT DAPI StrAnsiTrimWhitespace(
+    __deref_out_z LPSTR* ppz,
+    __in_z LPCSTR szSource
+    )
+{
+    HRESULT hr = S_OK;
+    size_t i = 0;
+    LPSTR sczResult = NULL;
+    // Ignore beginning whitespace
+    while (' ' == *szSource || '\t' == *szSource)
+    {
+        szSource++;
+    }
+    hr = ::StringCchLengthA(szSource, STRSAFE_MAX_CCH, &i);
+    StrExitOnRootFailure(hr, "Failed to get length of string");
+    // Overwrite ending whitespace with null characters
+    if (0 < i)
+    {
+        // start from the last non-null-terminator character in the array
+        for (i = i - 1; i > 0; --i)
+        {
+            if (L' ' != szSource[i] && L'\t' != szSource[i])
+            {
+                break;
+            }
+        }
+        ++i;
+    }
+    hr = StrAnsiAllocStringAnsi(&sczResult, szSource, i);
+    StrExitOnFailure(hr, "Failed to copy result string");
+    // Output result
+    *ppz = sczResult;
+    sczResult = NULL;
+LExit:
+    ReleaseStr(sczResult);
+    return hr;
+}
+/********************************************************************
+StrAllocString - allocates or reuses dynamic string memory and copies in an existing string
+NOTE: caller is responsible for freeing ppwz even if function fails
+NOTE: cchSource does not have to equal the length of wzSource
+NOTE: if cchSource == 0, length of wzSource is used instead
+********************************************************************/
+extern "C" HRESULT DAPI StrAllocString(
+    __deref_out_ecount_z(cchSource+1) LPWSTR* ppwz,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource
+    )
+{
+    return AllocStringHelper(ppwz, wzSource, cchSource, FALSE);
+}
+/********************************************************************
+StrAllocStringSecure - allocates or reuses dynamic string memory and 
+copies in an existing string. If the memory needs to reallocated, 
+calls SecureZeroMemory on original block of memory after it is moved.
+NOTE: caller is responsible for freeing ppwz even if function fails
+NOTE: cchSource does not have to equal the length of wzSource
+NOTE: if cchSource == 0, length of wzSource is used instead
+********************************************************************/
+extern "C" HRESULT DAPI StrAllocStringSecure(
+    __deref_out_ecount_z(cchSource + 1) LPWSTR* ppwz,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource
+    )
+{
+    return AllocStringHelper(ppwz, wzSource, cchSource, TRUE);
+}
+/********************************************************************
+AllocStringHelper - allocates or reuses dynamic string memory and copies in an existing string
+If fZeroOnRealloc is true and the memory needs to reallocated, 
+calls SecureZeroMemory on original block of memory after it is moved.
+NOTE: caller is responsible for freeing ppwz even if function fails
+NOTE: cchSource does not have to equal the length of wzSource
+NOTE: if cchSource == 0, length of wzSource is used instead
+********************************************************************/
+static HRESULT AllocStringHelper(
+    __deref_out_ecount_z(cchSource + 1) LPWSTR* ppwz,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource,
+    __in BOOL fZeroOnRealloc
+    )
+{
+    Assert(ppwz && wzSource); // && *wzSource);
+    HRESULT hr = S_OK;
+    SIZE_T cch = 0;
+    if (*ppwz)
+    {
+        cch = MemSize(*ppwz);  // get the count in bytes so we can check if it failed (returns -1)
+        if (-1 == cch)
+        {
+            hr = E_INVALIDARG;
+            StrExitOnFailure(hr, "failed to get size of destination string");
+        }
+        cch /= sizeof(WCHAR);  //convert the count in bytes to count in characters
+    }
+    if (0 == cchSource && wzSource)
+    {
+        hr = ::StringCchLengthW(wzSource, STRSAFE_MAX_CCH, reinterpret_cast<size_t*>(&cchSource));
+        StrExitOnRootFailure(hr, "failed to get length of source string");
+    }
+    SIZE_T cchNeeded;
+    hr = ::ULongPtrAdd(cchSource, 1, &cchNeeded); // add one for the null terminator
+    StrExitOnRootFailure(hr, "source string is too long");
+    if (cch < cchNeeded)
+    {
+        cch = cchNeeded;
+        hr = AllocHelper(ppwz, cch, fZeroOnRealloc);
+        StrExitOnFailure(hr, "failed to allocate string from string.");
+    }
+    // copy everything (the NULL terminator will be included)
+    hr = ::StringCchCopyNExW(*ppwz, cch, wzSource, cchSource, NULL, NULL, STRSAFE_FILL_BEHIND_NULL);
+LExit:
+    return hr;
+}
+/********************************************************************
+StrAnsiAllocString - allocates or reuses dynamic ANSI string memory and copies in an existing string
+NOTE: caller is responsible for freeing ppsz even if function fails
+NOTE: cchSource must equal the length of wzSource (not including the NULL terminator)
+NOTE: if cchSource == 0, length of wzSource is used instead
+********************************************************************/
+extern "C" HRESULT DAPI StrAnsiAllocString(
+    __deref_out_ecount_z(cchSource+1) LPSTR* ppsz,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource,
+    __in UINT uiCodepage
+    )
+{
+    Assert(ppsz && wzSource);
+    HRESULT hr = S_OK;
+    LPSTR psz = NULL;
+    SIZE_T cch = 0;
+    SIZE_T cchDest = cchSource; // at least enough
+    if (*ppsz)
+    {
+        cch = MemSize(*ppsz);  // get the count in bytes so we can check if it failed (returns -1)
+        if (-1 == cch)
+        {
+            hr = E_INVALIDARG;
+            StrExitOnFailure(hr, "failed to get size of destination string");
+        }
+        cch /= sizeof(CHAR);  //convert the count in bytes to count in characters
+    }
+    if (0 == cchSource)
+    {
+        cchDest = ::WideCharToMultiByte(uiCodepage, 0, wzSource, -1, NULL, 0, NULL, NULL);
+        if (0 == cchDest)
+        {
+            StrExitWithLastError(hr, "failed to get required size for conversion to ANSI: %ls", wzSource);
+        }
+        --cchDest; // subtract one because WideChageToMultiByte includes space for the NULL terminator that we track below
+    }
+    else if (L'\0' == wzSource[cchSource - 1]) // if the source already had a null terminator, don't count that in the character count because we track it below
+    {
+        cchDest = cchSource - 1;
+    }
+    if (cch < cchDest + 1)
+    {
+        cch = cchDest + 1;   // add one for the NULL terminator
+        if (cch >= MAXDWORD / sizeof(WCHAR))
+        {
+            hr = E_OUTOFMEMORY;
+            StrExitOnFailure(hr, "Not enough memory to allocate string of size: %u", cch);
+        }
+        if (*ppsz)
+        {
+            psz = static_cast<LPSTR>(MemReAlloc(*ppsz, sizeof(CHAR) * cch, TRUE));
+        }
+        else
+        {
+            psz = static_cast<LPSTR>(MemAlloc(sizeof(CHAR) * cch, TRUE));
+        }
+        StrExitOnNull(psz, hr, E_OUTOFMEMORY, "failed to allocate string, len: %u", cch);
+        *ppsz = psz;
+    }
+    if (0 == ::WideCharToMultiByte(uiCodepage, 0, wzSource, 0 == cchSource ? -1 : (int)cchSource, *ppsz, (int)cch, NULL, NULL))
+    {
+        StrExitWithLastError(hr, "failed to convert to ansi: %ls", wzSource);
+    }
+    (*ppsz)[cchDest] = L'\0';
+LExit:
+    return hr;
+}
+/********************************************************************
+StrAllocStringAnsi - allocates or reuses dynamic string memory and copies in an existing ANSI string
+NOTE: caller is responsible for freeing ppwz even if function fails
+NOTE: cchSource must equal the length of wzSource (not including the NULL terminator)
+NOTE: if cchSource == 0, length of wzSource is used instead
+********************************************************************/
+extern "C" HRESULT DAPI StrAllocStringAnsi(
+    __deref_out_ecount_z(cchSource+1) LPWSTR* ppwz,
+    __in_z LPCSTR szSource,
+    __in SIZE_T cchSource,
+    __in UINT uiCodepage
+    )
+{
+    Assert(ppwz && szSource);
+    HRESULT hr = S_OK;
+    LPWSTR pwz = NULL;
+    SIZE_T cch = 0;
+    SIZE_T cchDest = cchSource;  // at least enough
+    if (*ppwz)
+    {
+        cch = MemSize(*ppwz);  // get the count in bytes so we can check if it failed (returns -1)
+        if (-1 == cch)
+        {
+            hr = E_INVALIDARG;
+            StrExitOnFailure(hr, "failed to get size of destination string");
+        }
+        cch /= sizeof(WCHAR);  //convert the count in bytes to count in characters
+    }
+    if (0 == cchSource)
+    {
+        cchDest = ::MultiByteToWideChar(uiCodepage, 0, szSource, -1, NULL, 0);
+        if (0 == cchDest)
+        {
+            StrExitWithLastError(hr, "failed to get required size for conversion to unicode: %s", szSource);
+        }
+        --cchDest; //subtract one because MultiByteToWideChar includes space for the NULL terminator that we track below
+    }
+    else if (L'\0' == szSource[cchSource - 1]) // if the source already had a null terminator, don't count that in the character count because we track it below
+    {
+        cchDest = cchSource - 1;
+    }
+    if (cch < cchDest + 1)
+    {
+        cch = cchDest + 1;
+        if (cch >= MAXDWORD / sizeof(WCHAR))
+        {
+            hr = E_OUTOFMEMORY;
+            StrExitOnFailure(hr, "Not enough memory to allocate string of size: %u", cch);
+        }
+        if (*ppwz)
+        {
+            pwz = static_cast<LPWSTR>(MemReAlloc(*ppwz, sizeof(WCHAR) * cch, TRUE));
+        }
+        else
+        {
+            pwz = static_cast<LPWSTR>(MemAlloc(sizeof(WCHAR) * cch, TRUE));
+        }
+        StrExitOnNull(pwz, hr, E_OUTOFMEMORY, "failed to allocate string, len: %u", cch);
+        *ppwz = pwz;
+    }
+    if (0 == ::MultiByteToWideChar(uiCodepage, 0, szSource, 0 == cchSource ? -1 : (int)cchSource, *ppwz, (int)cch))
+    {
+        StrExitWithLastError(hr, "failed to convert to unicode: %s", szSource);
+    }
+    (*ppwz)[cchDest] = L'\0';
+LExit:
+    return hr;
+}
+/********************************************************************
+StrAnsiAllocStringAnsi - allocates or reuses dynamic string memory and copies in an existing string
+NOTE: caller is responsible for freeing ppsz even if function fails
+NOTE: cchSource does not have to equal the length of wzSource
+NOTE: if cchSource == 0, length of wzSource is used instead
+********************************************************************/
+HRESULT DAPI StrAnsiAllocStringAnsi(
+    __deref_out_ecount_z(cchSource+1) LPSTR* ppsz,
+    __in_z LPCSTR szSource,
+    __in SIZE_T cchSource
+    )
+{
+    Assert(ppsz && szSource); // && *szSource);
+    HRESULT hr = S_OK;
+    SIZE_T cch = 0;
+    if (*ppsz)
+    {
+        cch = MemSize(*ppsz);  // get the count in bytes so we can check if it failed (returns -1)
+        if (-1 == cch)
+        {
+            hr = E_INVALIDARG;
+            StrExitOnRootFailure(hr, "failed to get size of destination string");
+        }
+        cch /= sizeof(CHAR);  //convert the count in bytes to count in characters
+    }
+    if (0 == cchSource && szSource)
+    {
+        hr = ::StringCchLengthA(szSource, STRSAFE_MAX_CCH, reinterpret_cast<size_t*>(&cchSource));
+        StrExitOnRootFailure(hr, "failed to get length of source string");
+    }
+    SIZE_T cchNeeded;
+    hr = ::ULongPtrAdd(cchSource, 1, &cchNeeded); // add one for the null terminator
+    StrExitOnRootFailure(hr, "source string is too long");
+    if (cch < cchNeeded)
+    {
+        cch = cchNeeded;
+        hr = StrAnsiAlloc(ppsz, cch);
+        StrExitOnFailure(hr, "failed to allocate string from string.");
+    }
+    // copy everything (the NULL terminator will be included)
+#pragma prefast(push)
+#pragma prefast(disable:25068)
+    hr = ::StringCchCopyNExA(*ppsz, cch, szSource, cchSource, NULL, NULL, STRSAFE_FILL_BEHIND_NULL);
+#pragma prefast(pop)
+LExit:
+    return hr;
+}
+/********************************************************************
+StrAllocPrefix - allocates or reuses dynamic string memory and 
+                 prefixes a string
+NOTE: caller is responsible for freeing ppwz even if function fails
+NOTE: cchPrefix does not have to equal the length of wzPrefix
+NOTE: if cchPrefix == 0, length of wzPrefix is used instead
+********************************************************************/
+extern "C" HRESULT DAPI StrAllocPrefix(
+    __deref_out_z LPWSTR* ppwz,
+    __in_z LPCWSTR wzPrefix,
+    __in SIZE_T cchPrefix
+    )
+{
+    Assert(ppwz && wzPrefix);
+    HRESULT hr = S_OK;
+    SIZE_T cch = 0;
+    SIZE_T cchLen = 0;
+    if (*ppwz)
+    {
+        cch = MemSize(*ppwz);  // get the count in bytes so we can check if it failed (returns -1)
+        if (-1 == cch)
+        {
+            hr = E_INVALIDARG;
+            StrExitOnFailure(hr, "failed to get size of destination string");
+        }
+        cch /= sizeof(WCHAR);  //convert the count in bytes to count in characters
+        hr = ::StringCchLengthW(*ppwz, STRSAFE_MAX_CCH, reinterpret_cast<UINT_PTR*>(&cchLen));
+        StrExitOnFailure(hr, "Failed to calculate length of string");
+    }
+    Assert(cchLen <= cch);
+    if (0 == cchPrefix)
+    {
+        hr = ::StringCchLengthW(wzPrefix, STRSAFE_MAX_CCH, reinterpret_cast<UINT_PTR*>(&cchPrefix));
+        StrExitOnFailure(hr, "Failed to calculate length of string");
+    }
+    if (cch - cchLen < cchPrefix + 1)
+    {
+        cch = cchPrefix + cchLen + 1;
+        hr = StrAlloc(ppwz, cch);
+        StrExitOnFailure(hr, "failed to allocate string from string: %ls", wzPrefix);
+    }
+    if (*ppwz)
+    {
+        SIZE_T cb = cch * sizeof(WCHAR);
+        SIZE_T cbPrefix = cchPrefix * sizeof(WCHAR);
+        memmove(*ppwz + cchPrefix, *ppwz, cb - cbPrefix);
+        memcpy(*ppwz, wzPrefix, cbPrefix);
+    }
+    else
+    {
+        hr = E_UNEXPECTED;
+        StrExitOnFailure(hr, "for some reason our buffer is still null");
+    }
+LExit:
+    return hr;
+}
+/********************************************************************
+StrAllocConcat - allocates or reuses dynamic string memory and adds an existing string
+NOTE: caller is responsible for freeing ppwz even if function fails
+NOTE: cchSource does not have to equal the length of wzSource
+NOTE: if cchSource == 0, length of wzSource is used instead
+********************************************************************/
+extern "C" HRESULT DAPI StrAllocConcat(
+    __deref_out_z LPWSTR* ppwz,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource
+    )
+{
+    return AllocConcatHelper(ppwz, wzSource, cchSource, FALSE);
+}
+/********************************************************************
+StrAllocConcatSecure - allocates or reuses dynamic string memory and 
+adds an existing string. If the memory needs to reallocated, calls 
+SecureZeroMemory on the original block of memory after it is moved.
+NOTE: caller is responsible for freeing ppwz even if function fails
+NOTE: cchSource does not have to equal the length of wzSource
+NOTE: if cchSource == 0, length of wzSource is used instead
+********************************************************************/
+extern "C" HRESULT DAPI StrAllocConcatSecure(
+    __deref_out_z LPWSTR* ppwz,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource
+    )
+{
+    return AllocConcatHelper(ppwz, wzSource, cchSource, TRUE);
+}
+/********************************************************************
+AllocConcatHelper - allocates or reuses dynamic string memory and adds an existing string
+If fZeroOnRealloc is true and the memory needs to reallocated, 
+calls SecureZeroMemory on original block of memory after it is moved.
+NOTE: caller is responsible for freeing ppwz even if function fails
+NOTE: cchSource does not have to equal the length of wzSource
+NOTE: if cchSource == 0, length of wzSource is used instead
+********************************************************************/
+static HRESULT AllocConcatHelper(
+    __deref_out_z LPWSTR* ppwz,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource,
+    __in BOOL fZeroOnRealloc
+    )
+{
+    Assert(ppwz && wzSource); // && *wzSource);
+    HRESULT hr = S_OK;
+    SIZE_T cch = 0;
+    SIZE_T cchLen = 0;
+    if (*ppwz)
+    {
+        cch = MemSize(*ppwz);  // get the count in bytes so we can check if it failed (returns -1)
+        if (-1 == cch)
+        {
+            hr = E_INVALIDARG;
+            StrExitOnFailure(hr, "failed to get size of destination string");
+        }
+        cch /= sizeof(WCHAR);  //convert the count in bytes to count in characters
+        hr = ::StringCchLengthW(*ppwz, STRSAFE_MAX_CCH, reinterpret_cast<UINT_PTR*>(&cchLen));
+        StrExitOnFailure(hr, "Failed to calculate length of string");
+    }
+    Assert(cchLen <= cch);
+    if (0 == cchSource)
+    {
+        hr = ::StringCchLengthW(wzSource, STRSAFE_MAX_CCH, reinterpret_cast<UINT_PTR*>(&cchSource));
+        StrExitOnFailure(hr, "Failed to calculate length of string");
+    }
+    if (cch - cchLen < cchSource + 1)
+    {
+        cch = (cchSource + cchLen + 1) * 2;
+        hr = AllocHelper(ppwz, cch, fZeroOnRealloc);
+        StrExitOnFailure(hr, "failed to allocate string from string: %ls", wzSource);
+    }
+    if (*ppwz)
+    {
+        hr = ::StringCchCatNExW(*ppwz, cch, wzSource, cchSource, NULL, NULL, STRSAFE_FILL_BEHIND_NULL);
+    }
+    else
+    {
+        hr = E_UNEXPECTED;
+        StrExitOnFailure(hr, "for some reason our buffer is still null");
+    }
+LExit:
+    return hr;
+}
+/********************************************************************
+StrAnsiAllocConcat - allocates or reuses dynamic string memory and adds an existing string
+NOTE: caller is responsible for freeing ppz even if function fails
+NOTE: cchSource does not have to equal the length of pzSource
+NOTE: if cchSource == 0, length of pzSource is used instead
+********************************************************************/
+extern "C" HRESULT DAPI StrAnsiAllocConcat(
+    __deref_out_z LPSTR* ppz,
+    __in_z LPCSTR pzSource,
+    __in SIZE_T cchSource
+    )
+{
+    Assert(ppz && pzSource); // && *pzSource);
+    HRESULT hr = S_OK;
+    SIZE_T cch = 0;
+    SIZE_T cchLen = 0;
+    if (*ppz)
+    {
+        cch = MemSize(*ppz);  // get the count in bytes so we can check if it failed (returns -1)
+        if (-1 == cch)
+        {
+            hr = E_INVALIDARG;
+            StrExitOnFailure(hr, "failed to get size of destination string");
+        }
+        cch /= sizeof(CHAR);  // convert the count in bytes to count in characters
+#pragma prefast(push)
+#pragma prefast(disable:25068)
+        hr = ::StringCchLengthA(*ppz, STRSAFE_MAX_CCH, reinterpret_cast<UINT_PTR*>(&cchLen));
+#pragma prefast(pop)
+        StrExitOnFailure(hr, "Failed to calculate length of string");
+    }
+    Assert(cchLen <= cch);
+    if (0 == cchSource)
+    {
+#pragma prefast(push)
+#pragma prefast(disable:25068)
+        hr = ::StringCchLengthA(pzSource, STRSAFE_MAX_CCH, reinterpret_cast<UINT_PTR*>(&cchSource));
+#pragma prefast(pop)
+        StrExitOnFailure(hr, "Failed to calculate length of string");
+    }
+    if (cch - cchLen < cchSource + 1)
+    {
+        cch = (cchSource + cchLen + 1) * 2;
+        hr = StrAnsiAlloc(ppz, cch);
+        StrExitOnFailure(hr, "failed to allocate string from string: %hs", pzSource);
+    }
+    if (*ppz)
+    {
+#pragma prefast(push)
+#pragma prefast(disable:25068)
+        hr = ::StringCchCatNExA(*ppz, cch, pzSource, cchSource, NULL, NULL, STRSAFE_FILL_BEHIND_NULL);
+#pragma prefast(pop)
+    }
+    else
+    {
+        hr = E_UNEXPECTED;
+        StrExitOnFailure(hr, "for some reason our buffer is still null");
+    }
+LExit:
+    return hr;
+}
+/********************************************************************
+StrAllocFormatted - allocates or reuses dynamic string memory and formats it
+NOTE: caller is responsible for freeing ppwz even if function fails
+********************************************************************/
+extern "C" HRESULT __cdecl StrAllocFormatted(
+    __deref_out_z LPWSTR* ppwz,
+    __in __format_string LPCWSTR wzFormat,
+    ...
+    )
+{
+    Assert(ppwz && wzFormat && *wzFormat);
+    HRESULT hr = S_OK;
+    va_list args;
+    va_start(args, wzFormat);
+    hr = StrAllocFormattedArgs(ppwz, wzFormat, args);
+    va_end(args);
+    return hr;
+}
+/********************************************************************
+StrAllocConcatFormatted - allocates or reuses dynamic string memory
+and adds a formatted string
+NOTE: caller is responsible for freeing ppwz even if function fails
+********************************************************************/
+extern "C" HRESULT __cdecl StrAllocConcatFormatted(
+    __deref_out_z LPWSTR* ppwz,
+    __in __format_string LPCWSTR wzFormat,
+    ...
+    )
+{
+    Assert(ppwz && wzFormat && *wzFormat);
+    HRESULT hr = S_OK;
+    LPWSTR sczFormatted = NULL;
+    va_list args;
+    va_start(args, wzFormat);
+    hr = StrAllocFormattedArgs(&sczFormatted, wzFormat, args);
+    va_end(args);
+    StrExitOnFailure(hr, "Failed to allocate formatted string");
+    hr = StrAllocConcat(ppwz, sczFormatted, 0);
+LExit:
+    ReleaseStr(sczFormatted);
+    return hr;
+}
+/********************************************************************
+StrAllocConcatFormattedSecure - allocates or reuses dynamic string
+memory and adds a formatted string. If the memory needs to be
+reallocated, calls SecureZeroMemory on original block of memory after
+it is moved.
+NOTE: caller is responsible for freeing ppwz even if function fails
+********************************************************************/
+extern "C" HRESULT __cdecl StrAllocConcatFormattedSecure(
+    __deref_out_z LPWSTR* ppwz,
+    __in __format_string LPCWSTR wzFormat,
+    ...
+    )
+{
+    Assert(ppwz && wzFormat && *wzFormat);
+    HRESULT hr = S_OK;
+    LPWSTR sczFormatted = NULL;
+    va_list args;
+    va_start(args, wzFormat);
+    hr = StrAllocFormattedArgsSecure(&sczFormatted, wzFormat, args);
+    va_end(args);
+    StrExitOnFailure(hr, "Failed to allocate formatted string");
+    hr = StrAllocConcatSecure(ppwz, sczFormatted, 0);
+LExit:
+    ReleaseStr(sczFormatted);
+    return hr;
+}
+/********************************************************************
+StrAllocFormattedSecure - allocates or reuses dynamic string memory 
+and formats it. If the memory needs to be reallocated,
+calls SecureZeroMemory on original block of memory after it is moved.
+NOTE: caller is responsible for freeing ppwz even if function fails
+********************************************************************/
+extern "C" HRESULT __cdecl StrAllocFormattedSecure(
+    __deref_out_z LPWSTR* ppwz,
+    __in __format_string LPCWSTR wzFormat,
+    ...
+    )
+{
+    Assert(ppwz && wzFormat && *wzFormat);
+    HRESULT hr = S_OK;
+    va_list args;
+    va_start(args, wzFormat);
+    hr = StrAllocFormattedArgsSecure(ppwz, wzFormat, args);
+    va_end(args);
+    return hr;
+}
+/********************************************************************
+StrAnsiAllocFormatted - allocates or reuses dynamic ANSI string memory and formats it
+NOTE: caller is responsible for freeing ppsz even if function fails
+********************************************************************/
+extern "C" HRESULT DAPI StrAnsiAllocFormatted(
+    __deref_out_z LPSTR* ppsz,
+    __in __format_string LPCSTR szFormat,
+    ...
+    )
+{
+    Assert(ppsz && szFormat && *szFormat);
+    HRESULT hr = S_OK;
+    va_list args;
+    va_start(args, szFormat);
+    hr = StrAnsiAllocFormattedArgs(ppsz, szFormat, args);
+    va_end(args);
+    return hr;
+}
+/********************************************************************
+StrAllocFormattedArgs - allocates or reuses dynamic string memory 
+and formats it with the passed in args
+NOTE: caller is responsible for freeing ppwz even if function fails
+********************************************************************/
+extern "C" HRESULT DAPI StrAllocFormattedArgs(
+    __deref_out_z LPWSTR* ppwz,
+    __in __format_string LPCWSTR wzFormat,
+    __in va_list args
+    )
+{
+    return AllocFormattedArgsHelper(ppwz, FALSE, wzFormat, args);
+}
+/********************************************************************
+StrAllocFormattedArgsSecure - allocates or reuses dynamic string memory
+and formats it with the passed in args.
+If the memory needs to reallocated, calls SecureZeroMemory on the 
+original block of memory after it is moved.
+NOTE: caller is responsible for freeing ppwz even if function fails
+********************************************************************/
+extern "C" HRESULT DAPI StrAllocFormattedArgsSecure(
+    __deref_out_z LPWSTR* ppwz,
+    __in __format_string LPCWSTR wzFormat,
+    __in va_list args
+    )
+{
+    return AllocFormattedArgsHelper(ppwz, TRUE, wzFormat, args);
+}
+/********************************************************************
+AllocFormattedArgsHelper - allocates or reuses dynamic string memory
+and formats it with the passed in args.
+If fZeroOnRealloc is true and the memory needs to reallocated, 
+calls SecureZeroMemory on original block of memory after it is moved.
+NOTE: caller is responsible for freeing ppwz even if function fails
+********************************************************************/
+static HRESULT AllocFormattedArgsHelper(
+    __deref_out_z LPWSTR* ppwz,
+    __in BOOL fZeroOnRealloc,
+    __in __format_string LPCWSTR wzFormat,
+    __in va_list args
+    )
+{
+    Assert(ppwz && wzFormat && *wzFormat);
+    HRESULT hr = S_OK;
+    SIZE_T cch = 0;
+    LPWSTR pwzOriginal = NULL;
+    SIZE_T cbOriginal = 0;
+    size_t cchOriginal = 0;
+    if (*ppwz)
+    {
+        cbOriginal = MemSize(*ppwz);  // get the count in bytes so we can check if it failed (returns -1)
+        if (-1 == cbOriginal)
+        {
+            hr = E_INVALIDARG;
+            StrExitOnRootFailure(hr, "failed to get size of destination string");
+        }
+        cch = cbOriginal / sizeof(WCHAR);  //convert the count in bytes to count in characters
+        hr = ::StringCchLengthW(*ppwz, STRSAFE_MAX_CCH, &cchOriginal);
+        StrExitOnRootFailure(hr, "failed to get length of original string");
+    }
+    if (0 == cch)   // if there is no space in the string buffer
+    {
+        cch = 256;
+        hr = AllocHelper(ppwz, cch, fZeroOnRealloc);
+        StrExitOnFailure(hr, "failed to allocate string to format: %ls", wzFormat);
+    }
+    // format the message (grow until it fits or there is a failure)
+    do
+    {
+        hr = ::StringCchVPrintfW(*ppwz, cch, wzFormat, args);
+        if (STRSAFE_E_INSUFFICIENT_BUFFER == hr)
+        {
+            if (!pwzOriginal)
+            {
+                // this allows you to pass the original string as a formatting argument and not crash
+                // save the original string and free it after the printf is complete
+                pwzOriginal = *ppwz;
+                *ppwz = NULL;
+                // StringCchVPrintfW starts writing to the string...
+                // NOTE: this hack only works with sprintf(&pwz, "%s ...", pwz, ...);
+                pwzOriginal[cchOriginal] = 0;
+            }
+            cch *= 2;
+            hr = AllocHelper(ppwz, cch, fZeroOnRealloc);
+            StrExitOnFailure(hr, "failed to allocate string to format: %ls", wzFormat);
+            hr = S_FALSE;
+        }
+    } while (S_FALSE == hr);
+    StrExitOnRootFailure(hr, "failed to format string");
+LExit:
+    if (pwzOriginal && fZeroOnRealloc)
+    {
+        SecureZeroMemory(pwzOriginal, cbOriginal);
+    }
+    ReleaseStr(pwzOriginal);
+    return hr;
+}
+/********************************************************************
+StrAnsiAllocFormattedArgs - allocates or reuses dynamic ANSI string memory 
+and formats it with the passed in args
+NOTE: caller is responsible for freeing ppsz even if function fails
+********************************************************************/
+extern "C" HRESULT DAPI StrAnsiAllocFormattedArgs(
+    __deref_out_z LPSTR* ppsz,
+    __in __format_string LPCSTR szFormat,
+    __in va_list args
+    )
+{
+    Assert(ppsz && szFormat && *szFormat);
+    HRESULT hr = S_OK;
+    SIZE_T cch = *ppsz ? MemSize(*ppsz) / sizeof(CHAR) : 0;
+    LPSTR pszOriginal = NULL;
+    size_t cchOriginal = 0;
+    if (*ppsz)
+    {
+        cch = MemSize(*ppsz);  // get the count in bytes so we can check if it failed (returns -1)
+        if (-1 == cch)
+        {
+            hr = E_INVALIDARG;
+            StrExitOnRootFailure(hr, "failed to get size of destination string");
+        }
+        cch /= sizeof(CHAR);  //convert the count in bytes to count in characters
+        hr = ::StringCchLengthA(*ppsz, STRSAFE_MAX_CCH, &cchOriginal);
+        StrExitOnRootFailure(hr, "failed to get length of original string");
+    }
+    if (0 == cch)   // if there is no space in the string buffer
+    {
+        cch = 256;
+        hr = StrAnsiAlloc(ppsz, cch);
+        StrExitOnFailure(hr, "failed to allocate string to format: %s", szFormat);
+    }
+    // format the message (grow until it fits or there is a failure)
+    do
+    {
+#pragma prefast(push)
+#pragma prefast(disable:25068) // We intentionally don't use the unicode API here
+        hr = ::StringCchVPrintfA(*ppsz, cch, szFormat, args);
+#pragma prefast(pop)
+        if (STRSAFE_E_INSUFFICIENT_BUFFER == hr)
+        {
+            if (!pszOriginal)
+            {
+                // this allows you to pass the original string as a formatting argument and not crash
+                // save the original string and free it after the printf is complete
+                pszOriginal = *ppsz;
+                *ppsz = NULL;
+                // StringCchVPrintfW starts writing to the string...
+                // NOTE: this hack only works with sprintf(&pwz, "%s ...", pwz, ...);
+                pszOriginal[cchOriginal] = 0;
+            }
+            cch *= 2;
+            hr = StrAnsiAlloc(ppsz, cch);
+            StrExitOnFailure(hr, "failed to allocate string to format: %hs", szFormat);
+            hr = S_FALSE;
+        }
+    } while (S_FALSE == hr);
+    StrExitOnRootFailure(hr, "failed to format string");
+LExit:
+    ReleaseStr(pszOriginal);
+    return hr;
+}
+/********************************************************************
+StrAllocFromError - returns the string for a particular error.
+********************************************************************/
+extern "C" HRESULT DAPI StrAllocFromError(
+    __inout LPWSTR *ppwzMessage,
+    __in HRESULT hrError,
+    __in_opt HMODULE hModule,
+    ...
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD dwFlags = FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_MAX_WIDTH_MASK | FORMAT_MESSAGE_FROM_SYSTEM;
+    LPVOID pvMessage = NULL;
+    DWORD cchMessage = 0;
+    if (hModule)
+    {
+        dwFlags |= FORMAT_MESSAGE_FROM_HMODULE;
+    }
+    va_list args;
+    va_start(args, hModule);
+    cchMessage = ::FormatMessageW(dwFlags, static_cast<LPCVOID>(hModule), hrError, 0, reinterpret_cast<LPWSTR>(&pvMessage), 0, &args);
+    va_end(args);
+    if (0 == cchMessage)
+    {
+        StrExitWithLastError(hr, "Failed to format message for error: 0x%x", hrError);
+    }
+    hr = StrAllocString(ppwzMessage, reinterpret_cast<LPCWSTR>(pvMessage), cchMessage);
+    StrExitOnFailure(hr, "Failed to allocate string for message.");
+LExit:
+    if (pvMessage)
+    {
+        ::LocalFree(pvMessage);
+    }
+    return hr;
+}
+/********************************************************************
+StrMaxLength - returns maximum number of characters that can be stored in dynamic string p
+NOTE:  assumes Unicode string
+********************************************************************/
+extern "C" HRESULT DAPI StrMaxLength(
+    __in LPCVOID p,
+    __out SIZE_T* pcch
+    )
+{
+    Assert(pcch);
+    HRESULT hr = S_OK;
+    if (p)
+    {
+        *pcch = MemSize(p);   // get size of entire buffer
+        if (-1 == *pcch)
+        {
+            ExitFunction1(hr = E_FAIL);
+        }
+        *pcch /= sizeof(WCHAR);   // reduce to count of characters
+    }
+    else
+    {
+        *pcch = 0;
+    }
+    Assert(S_OK == hr);
+LExit:
+    return hr;
+}
+/********************************************************************
+StrSize - returns count of bytes in dynamic string p
+********************************************************************/
+extern "C" HRESULT DAPI StrSize(
+    __in LPCVOID p,
+    __out SIZE_T* pcb
+    )
+{
+    Assert(p && pcb);
+    HRESULT hr = S_OK;
+    *pcb = MemSize(p);
+    if (-1 == *pcb)
+    {
+        hr = E_FAIL;
+    }
+    return hr;
+}
+/********************************************************************
+StrFree - releases dynamic string memory allocated by any StrAlloc*() functions
+********************************************************************/
+extern "C" HRESULT DAPI StrFree(
+    __in LPVOID p
+    )
+{
+    Assert(p);
+    HRESULT hr = MemFree(p);
+    StrExitOnFailure(hr, "failed to free string");
+LExit:
+    return hr;
+}
+/****************************************************************************
+StrReplaceStringAll - Replaces wzOldSubString in ppOriginal with a wzNewSubString.
+Replaces all instances.
+****************************************************************************/
+extern "C" HRESULT DAPI StrReplaceStringAll(
+    __inout LPWSTR* ppwzOriginal,
+    __in_z LPCWSTR wzOldSubString,
+    __in_z LPCWSTR wzNewSubString
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD dwStartIndex = 0;
+    do
+    {
+        hr = StrReplaceString(ppwzOriginal, &dwStartIndex, wzOldSubString, wzNewSubString);
+        StrExitOnFailure(hr, "Failed to replace substring");
+    }
+    while (S_OK == hr);
+    hr = (0 == dwStartIndex) ? S_FALSE : S_OK;
+LExit:
+    return hr;
+}
+/****************************************************************************
+StrReplaceString - Replaces wzOldSubString in ppOriginal with a wzNewSubString.
+Search for old substring starts at dwStartIndex.  Does only 1 replace.
+****************************************************************************/
+extern "C" HRESULT DAPI StrReplaceString(
+    __inout LPWSTR* ppwzOriginal,
+    __inout DWORD* pdwStartIndex,
+    __in_z LPCWSTR wzOldSubString,
+    __in_z LPCWSTR wzNewSubString
+    )
+{
+    Assert(ppwzOriginal && wzOldSubString && wzNewSubString);
+    HRESULT hr = S_FALSE;
+    LPCWSTR wzSubLocation = NULL;
+    LPWSTR pwzBuffer = NULL;
+    size_t cchOldSubString = 0;
+    size_t cchNewSubString = 0;
+    if (!*ppwzOriginal)
+    {
+        ExitFunction();
+    }
+    wzSubLocation = wcsstr(*ppwzOriginal + *pdwStartIndex, wzOldSubString);
+    if (!wzSubLocation)
+    {
+        ExitFunction();
+    }
+    if (wzOldSubString)
+    {
+        hr = ::StringCchLengthW(wzOldSubString, STRSAFE_MAX_CCH, &cchOldSubString);
+        StrExitOnRootFailure(hr, "Failed to get old string length.");
+    }
+    if (wzNewSubString)
+    {
+        hr = ::StringCchLengthW(wzNewSubString, STRSAFE_MAX_CCH, &cchNewSubString);
+        StrExitOnRootFailure(hr, "Failed to get new string length.");
+    }
+    hr = ::PtrdiffTToDWord(wzSubLocation - *ppwzOriginal, pdwStartIndex);
+    StrExitOnRootFailure(hr, "Failed to diff pointers.");
+    hr = StrAllocString(&pwzBuffer, *ppwzOriginal, wzSubLocation - *ppwzOriginal);
+    StrExitOnFailure(hr, "Failed to duplicate string.");
+    pwzBuffer[wzSubLocation - *ppwzOriginal] = '\0';
+    hr = StrAllocConcat(&pwzBuffer, wzNewSubString, 0);
+    StrExitOnFailure(hr, "Failed to append new string.");
+    hr = StrAllocConcat(&pwzBuffer, wzSubLocation + cchOldSubString, 0);
+    StrExitOnFailure(hr, "Failed to append post string.");
+    hr = StrFree(*ppwzOriginal);
+    StrExitOnFailure(hr, "Failed to free original string.");
+    *ppwzOriginal = pwzBuffer;
+    *pdwStartIndex = *pdwStartIndex + static_cast<DWORD>(cchNewSubString);
+    hr = S_OK;
+LExit:
+    return hr;
+}
+static inline BYTE HexCharToByte(
+    __in WCHAR wc
+    )
+{
+    Assert(L'0' <= wc && wc <= L'9' || L'a' <= wc && wc <= L'f' || L'A' <= wc && wc <= L'F');  // make sure wc is a hex character
+    BYTE b;
+    if (L'0' <= wc && wc <= L'9')
+    {
+        b = (BYTE)(wc - L'0');
+    }
+    else if ('a' <= wc && wc <= 'f')
+    {
+        b = (BYTE)(wc - L'0' - (L'a' - L'9' - 1));
+    }
+    else  // must be (L'A' <= wc && wc <= L'F')
+    {
+        b = (BYTE)(wc - L'0' - (L'A' - L'9' - 1));
+    }
+    Assert(0 <= b && b <= 15);
+    return b;
+}
+/****************************************************************************
+StrHexEncode - converts an array of bytes to a text string
+NOTE: wzDest must have space for cbSource * 2 + 1 characters
+****************************************************************************/
+extern "C" HRESULT DAPI StrHexEncode(
+    __in_ecount(cbSource) const BYTE* pbSource,
+    __in SIZE_T cbSource,
+    __out_ecount(cchDest) LPWSTR wzDest,
+    __in SIZE_T cchDest
+    )
+{
+    Assert(pbSource && wzDest);
+    HRESULT hr = S_OK;
+    DWORD i;
+    BYTE b;
+    if (cchDest < 2 * cbSource + 1)
+    {
+        ExitFunction1(hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER));
+    }
+    for (i = 0; i < cbSource; ++i)
+    {
+        b = (*pbSource) >> 4;
+        *(wzDest++) = (WCHAR)(L'0' + b + ((b < 10) ? 0 : L'A'-L'9'-1));
+        b = (*pbSource) & 0xF;
+        *(wzDest++) = (WCHAR)(L'0' + b + ((b < 10) ? 0 : L'A'-L'9'-1));
+        ++pbSource;
+    }
+    *wzDest = 0;
+LExit:
+    return hr;
+}
+/****************************************************************************
+StrAllocHexEncode - converts an array of bytes to an allocated text string
+****************************************************************************/
+HRESULT DAPI StrAllocHexEncode(
+    __in_ecount(cbSource) const BYTE* pbSource,
+    __in SIZE_T cbSource,
+    __deref_out_ecount_z(2*(cbSource+1)) LPWSTR* ppwzDest
+    )
+{
+    HRESULT hr = S_OK;
+    SIZE_T cchSource = sizeof(WCHAR) * (cbSource + 1);
+    hr = StrAlloc(ppwzDest, cchSource);
+    StrExitOnFailure(hr, "Failed to allocate hex string.");
+    hr = StrHexEncode(pbSource, cbSource, *ppwzDest, cchSource);
+    StrExitOnFailure(hr, "Failed to encode hex string.");
+LExit:
+    return hr;
+}
+/****************************************************************************
+StrHexDecode - converts a string of text to array of bytes
+NOTE: wzSource must contain even number of characters
+****************************************************************************/
+extern "C" HRESULT DAPI StrHexDecode(
+    __in_z LPCWSTR wzSource,
+    __out_bcount(cbDest) BYTE* pbDest,
+    __in SIZE_T cbDest
+    )
+{
+    Assert(wzSource && pbDest);
+    HRESULT hr = S_OK;
+    size_t cchSource = 0;
+    size_t i = 0;
+    BYTE b = 0;
+    hr = ::StringCchLengthW(wzSource, STRSAFE_MAX_CCH, &cchSource);
+    StrExitOnRootFailure(hr, "Failed to get length of hex string: %ls", wzSource);
+    Assert(0 == cchSource % 2);
+    if (cbDest < cchSource / 2)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+        StrExitOnRootFailure(hr, "Insufficient buffer to decode string '%ls' len: %Iu into %Iu bytes.", wzSource, cchSource, cbDest);
+    }
+    for (i = 0; i < cchSource / 2; ++i)
+    {
+        b = HexCharToByte(*wzSource++);
+        (*pbDest) = b << 4;
+        b = HexCharToByte(*wzSource++);
+        (*pbDest) |= b & 0xF;
+        ++pbDest;
+    }
+LExit:
+    return hr;
+}
+/****************************************************************************
+StrAllocHexDecode - allocates a byte array hex-converted from string of text
+NOTE: wzSource must contain even number of characters
+****************************************************************************/
+extern "C" HRESULT DAPI StrAllocHexDecode(
+    __in_z LPCWSTR wzSource,
+    __out_bcount(*pcbDest) BYTE** ppbDest,
+    __out_opt DWORD* pcbDest
+    )
+{
+    Assert(wzSource && *wzSource && ppbDest);
+    HRESULT hr = S_OK;
+    size_t cch = 0;
+    BYTE* pb = NULL;
+    DWORD cb = 0;
+    hr = ::StringCchLengthW(wzSource, STRSAFE_MAX_CCH, &cch);
+    StrExitOnFailure(hr, "Failed to calculate length of source string.");
+    if (cch % 2)
+    {
+        hr = E_INVALIDARG;
+        StrExitOnFailure(hr, "Invalid source parameter, string must be even length or it cannot be decoded.");
+    }
+    cb = static_cast<DWORD>(cch / 2);
+    pb = static_cast<BYTE*>(MemAlloc(cb, TRUE));
+    StrExitOnNull(pb, hr, E_OUTOFMEMORY, "Failed to allocate memory for hex decode.");
+    hr = StrHexDecode(wzSource, pb, cb);
+    StrExitOnFailure(hr, "Failed to decode source string.");
+    *ppbDest = pb;
+    pb = NULL;
+    if (pcbDest)
+    {
+        *pcbDest = cb;
+    }
+LExit:
+    ReleaseMem(pb);
+    return hr;
+}
+/****************************************************************************
+Base85 encoding/decoding data
+****************************************************************************/
+const WCHAR Base85EncodeTable[] = L"!%'()*+,-./0123456789:;?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_abcdefghijklmnopqrstuvwxyz{|}~";
+const BYTE Base85DecodeTable[256] =
+{
+    85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+    85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+    85,  0, 85, 85, 85,  1, 85,  2,  3,  4,  5,  6,  7,  8,  9, 10,
+    11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 85, 85, 85, 23,
+    24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+    40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 85, 52, 53, 54,
+    85, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+    70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
+    85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+    85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+    85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+    85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+    85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+    85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+    85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+    85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, 85
+};
+const UINT Base85PowerTable[4] = { 1, 85, 85*85, 85*85*85 };
+/****************************************************************************
+StrAllocBase85Encode - converts an array of bytes into an XML compatible string
+****************************************************************************/
+extern "C" HRESULT DAPI StrAllocBase85Encode(
+    __in_bcount_opt(cbSource) const BYTE* pbSource,
+    __in SIZE_T cbSource,
+    __deref_out_z LPWSTR* pwzDest
+    )
+{
+    HRESULT hr = S_OK;
+    SIZE_T cchDest = 0;
+    LPWSTR wzDest;
+    DWORD_PTR iSource = 0;
+    DWORD_PTR iDest = 0;
+    if (!pwzDest || !pbSource)
+    {
+        return E_INVALIDARG;
+    }
+    // calc actual size of output
+    cchDest = cbSource / 4;
+    cchDest += cchDest * 4;
+    if (cbSource & 3)
+    {
+        cchDest += (cbSource & 3) + 1;
+    }
+    ++cchDest; // add room for null terminator
+    hr = StrAlloc(pwzDest, cchDest);
+    StrExitOnFailure(hr, "failed to allocate destination string");
+    wzDest = *pwzDest;
+    // first, encode full words
+    for (iSource = 0, iDest = 0; (iSource + 4 < cbSource) && (iDest + 5 < cchDest); iSource += 4, iDest += 5)
+    {
+        DWORD n = pbSource[iSource] + (pbSource[iSource + 1] << 8) + (pbSource[iSource + 2] << 16) + (pbSource[iSource + 3] << 24);
+        DWORD k = n / 85;
+        //Assert(0 <= (n - k * 85) && (n - k * 85) < countof(Base85EncodeTable));
+        wzDest[iDest] = Base85EncodeTable[n - k * 85];
+        n = k / 85;
+        //Assert(0 <= (k - n * 85) && (k - n * 85) < countof(Base85EncodeTable));
+        wzDest[iDest + 1] = Base85EncodeTable[k - n * 85];
+        k = n / 85;
+        //Assert(0 <= (n - k * 85) && (n - k * 85) < countof(Base85EncodeTable));
+        wzDest[iDest + 2] = Base85EncodeTable[n - k * 85];
+        n = k / 85;
+        //Assert(0 <= (k - n * 85) && (k - n * 85) < countof(Base85EncodeTable));
+        wzDest[iDest + 3] = Base85EncodeTable[k - n * 85];
+        __assume(n <= DWORD_MAX / 85 / 85 / 85 / 85);
+        //Assert(0 <= n && n < countof(Base85EncodeTable));
+        wzDest[iDest + 4] = Base85EncodeTable[n];
+    }
+    // encode any remaining bytes
+    if (iSource < cbSource)
+    {
+        DWORD n = 0;
+        for (DWORD i = 0; iSource + i < cbSource; ++i)
+        {
+            n += pbSource[iSource + i] << (i << 3);
+        }
+        for (/* iSource already initialized */; iSource < cbSource && iDest < cchDest; ++iSource, ++iDest)
+        {
+            DWORD k = n / 85;
+            //Assert(0 <= (n - k * 85) && (n - k * 85) < countof(Base85EncodeTable));
+            wzDest[iDest] = Base85EncodeTable[n - k * 85];
+            n = k;
+        }
+        wzDest[iDest] = Base85EncodeTable[n];
+        ++iDest;
+    }
+    Assert(iSource == cbSource);
+    Assert(iDest == cchDest - 1);
+    wzDest[iDest] = L'\0';
+    hr = S_OK;
+LExit:
+    return hr;
+}
+/****************************************************************************
+StrAllocBase85Decode - converts a string of text to array of bytes
+NOTE: Use MemFree() to release the allocated stream of bytes
+****************************************************************************/
+extern "C" HRESULT DAPI StrAllocBase85Decode(
+    __in_z LPCWSTR wzSource,
+    __deref_out_bcount(*pcbDest) BYTE** ppbDest,
+    __out SIZE_T* pcbDest
+    )
+{
+    HRESULT hr = S_OK;
+    size_t cchSource = 0;
+    DWORD_PTR i, n, k;
+    BYTE* pbDest = 0;
+    SIZE_T cbDest = 0;
+    if (!wzSource || !ppbDest || !pcbDest)
+    {
+        ExitFunction1(hr = E_INVALIDARG);
+    }
+    hr = ::StringCchLengthW(wzSource, STRSAFE_MAX_CCH, &cchSource);
+    StrExitOnRootFailure(hr, "failed to get length of base 85 string: %ls", wzSource);
+    // evaluate size of output and check it
+    k = cchSource / 5;
+    cbDest = k << 2;
+    k = cchSource - k * 5;
+    if (k)
+    {
+        if (1 == k)
+        {
+            // decode error -- encoded size cannot equal 1 mod 5
+            return E_UNEXPECTED;
+        }
+        cbDest += k - 1;
+    }
+    *ppbDest = static_cast<BYTE*>(MemAlloc(cbDest, FALSE));
+    StrExitOnNull(*ppbDest, hr, E_OUTOFMEMORY, "failed allocate memory to decode the string");
+    pbDest = *ppbDest;
+    *pcbDest = cbDest;
+    // decode full words first
+    while (5 <= cchSource)
+    {
+        k = Base85DecodeTable[wzSource[0]];
+        if (85 == k)
+        {
+            // illegal symbol
+            return E_UNEXPECTED;
+        }
+        n = k;
+        k = Base85DecodeTable[wzSource[1]];
+        if (85 == k)
+        {
+            // illegal symbol
+            return E_UNEXPECTED;
+        }
+        n += k * 85;
+        k = Base85DecodeTable[wzSource[2]];
+        if (85 == k)
+        {
+            // illegal symbol
+            return E_UNEXPECTED;
+        }
+        n += k * (85 * 85);
+        k = Base85DecodeTable[wzSource[3]];
+        if (85 == k)
+        {
+            // illegal symbol
+            return E_UNEXPECTED;
+        }
+        n += k * (85 * 85 * 85);
+        k = Base85DecodeTable[wzSource[4]];
+        if (85 == k)
+        {
+            // illegal symbol
+            return E_UNEXPECTED;
+        }
+        k *= (85 * 85 * 85 * 85);
+        // if (k + n > (1u << 32)) <=> (k > ~n) then decode error
+        if (k > ~n)
+        {
+            // overflow
+            return E_UNEXPECTED;
+        }
+        n += k;
+        pbDest[0] = (BYTE) n;
+        pbDest[1] = (BYTE) (n >> 8);
+        pbDest[2] = (BYTE) (n >> 16);
+        pbDest[3] = (BYTE) (n >> 24);
+        wzSource += 5;
+        pbDest += 4;
+        cchSource -= 5;
+    }
+    if (cchSource)
+    {
+        n = 0;
+        for (i = 0; i < cchSource; ++i)
+        {
+            k = Base85DecodeTable[wzSource[i]];
+            if (85 == k)
+            {
+                // illegal symbol
+                return E_UNEXPECTED;
+            }
+            n += k * Base85PowerTable[i];
+        }
+        for (i = 1; i < cchSource; ++i)
+        {
+            *pbDest++ = (BYTE)n;
+            n >>= 8;
+        }
+        if (0 != n)
+        {
+            // decode error
+            return E_UNEXPECTED;
+        }
+    }
+    hr = S_OK;
+LExit:
+    return hr;
+}
+/****************************************************************************
+MultiSzLen - calculates the length of a MULTISZ string including all nulls
+including the double null terminator at the end of the MULTISZ.
+NOTE: returns 0 if the multisz in not properly terminated with two nulls
+****************************************************************************/
+extern "C" HRESULT DAPI MultiSzLen(
+    __in_ecount(*pcch) __nullnullterminated LPCWSTR pwzMultiSz,
+    __out SIZE_T* pcch
+)
+{
+    Assert(pcch);
+    HRESULT hr = S_OK;
+    LPCWSTR wz = pwzMultiSz;
+    DWORD_PTR dwMaxSize = 0;
+    hr = StrMaxLength(pwzMultiSz, &dwMaxSize);
+    StrExitOnFailure(hr, "failed to get the max size of a string while calculating MULTISZ length");
+    *pcch = 0;
+    while (*pcch < dwMaxSize)
+    {
+        if (L'\0' == *wz && L'\0' == *(wz + 1))
+        {
+            break;
+        }
+        ++wz;
+        *pcch = *pcch + 1;
+    }
+    // Add two for the last 2 NULLs (that we looked ahead at)
+    *pcch = *pcch + 2;
+    // If we've walked off the end then the length is 0
+    if (*pcch > dwMaxSize)
+    {
+        *pcch = 0;
+    }
+LExit:
+    return hr;
+}
+/****************************************************************************
+MultiSzPrepend - prepends a string onto the front of a MUTLISZ
+****************************************************************************/
+extern "C" HRESULT DAPI MultiSzPrepend(
+    __deref_inout_ecount(*pcchMultiSz) __nullnullterminated LPWSTR* ppwzMultiSz,
+    __inout_opt SIZE_T* pcchMultiSz,
+    __in __nullnullterminated LPCWSTR pwzInsert
+    )
+{
+    Assert(ppwzMultiSz && pwzInsert && *pwzInsert);
+    HRESULT hr =S_OK;
+    LPWSTR pwzResult = NULL;
+    SIZE_T cchResult = 0;
+    SIZE_T cchInsert = 0;
+    SIZE_T cchMultiSz = 0;
+    // Get the lengths of the MULTISZ (and prime it if it's not initialized)
+    if (pcchMultiSz && 0 != *pcchMultiSz)
+    {
+        cchMultiSz = *pcchMultiSz;
+    }
+    else
+    {
+        hr = MultiSzLen(*ppwzMultiSz, &cchMultiSz);
+        StrExitOnFailure(hr, "failed to get length of multisz");
+    }
+    hr = ::StringCchLengthW(pwzInsert, STRSAFE_MAX_CCH, reinterpret_cast<size_t*>(&cchInsert));
+    StrExitOnRootFailure(hr, "failed to get length of insert string");
+    cchResult = cchInsert + cchMultiSz + 1;
+    // Allocate the result buffer
+    hr = StrAlloc(&pwzResult, cchResult + 1);
+    StrExitOnFailure(hr, "failed to allocate result string");
+ 
+    // Prepend
+    hr = ::StringCchCopyW(pwzResult, cchResult, pwzInsert);
+    StrExitOnRootFailure(hr, "failed to copy prepend string: %ls", pwzInsert);
+    // If there was no MULTISZ, double null terminate our result, otherwise, copy the MULTISZ in
+    if (0 == cchMultiSz)
+    {
+        pwzResult[cchResult] = L'\0';
+        ++cchResult;
+    }
+    else
+    {
+        // Copy the rest
+        ::CopyMemory(pwzResult + cchInsert + 1, *ppwzMultiSz, cchMultiSz * sizeof(WCHAR));
+        // Free the old buffer
+        ReleaseNullStr(*ppwzMultiSz);
+    }
+    // Set the result
+    *ppwzMultiSz = pwzResult;
+    if (pcchMultiSz)
+    {
+        *pcchMultiSz = cchResult;
+    }
+    pwzResult = NULL;
+LExit:
+    ReleaseNullStr(pwzResult);
+    return hr;
+}
+/****************************************************************************
+MultiSzFindSubstring - case insensitive find of a string in a MULTISZ that contains the
+specified sub string and returns the index of the
+string in the MULTISZ, the address, neither, or both
+NOTE: returns S_FALSE if the string is not found
+****************************************************************************/
+extern "C" HRESULT DAPI MultiSzFindSubstring(
+    __in __nullnullterminated LPCWSTR pwzMultiSz,
+    __in __nullnullterminated LPCWSTR pwzSubstring,
+    __out_opt DWORD_PTR* pdwIndex,
+    __deref_opt_out __nullnullterminated LPCWSTR* ppwzFoundIn
+    )
+{
+    Assert(pwzMultiSz && *pwzMultiSz && pwzSubstring && *pwzSubstring);
+    HRESULT hr = S_FALSE; // Assume we won't find it (the glass is half empty)
+    LPCWSTR wz = pwzMultiSz;
+    DWORD_PTR dwIndex = 0;
+    SIZE_T cchMultiSz = 0;
+    SIZE_T cchProgress = 0;
+    hr = MultiSzLen(pwzMultiSz, &cchMultiSz);
+    StrExitOnFailure(hr, "failed to get the length of a MULTISZ string");
+    // Find the string containing the sub string
+    hr = S_OK;
+    while (NULL == wcsistr(wz, pwzSubstring))
+    {
+        // Slide through to the end of the current string
+        while (L'\0' != *wz && cchProgress < cchMultiSz)
+        {
+            ++wz;
+            ++cchProgress;
+        }
+        // If we're done, we're done
+        if (L'\0' == *(wz + 1) || cchProgress >= cchMultiSz)
+        {
+            hr = S_FALSE;
+            break;
+        }
+        // Move on to the next string
+        ++wz;
+        ++dwIndex;
+    }
+    Assert(S_OK == hr || S_FALSE == hr);
+    // If we found it give them what they want
+    if (S_OK == hr)
+    {
+        if (pdwIndex)
+        {
+            *pdwIndex = dwIndex;
+        }
+        if (ppwzFoundIn)
+        {
+            *ppwzFoundIn = wz;
+        }
+    }
+LExit:
+    return hr;
+}
+/****************************************************************************
+MultiSzFindString - finds a string in a MULTISZ and returns the index of
+the string in the MULTISZ, the address or both
+NOTE: returns S_FALSE if the string is not found
+****************************************************************************/
+extern "C" HRESULT DAPI MultiSzFindString(
+    __in __nullnullterminated LPCWSTR pwzMultiSz,
+    __in __nullnullterminated LPCWSTR pwzString,
+    __out_opt DWORD_PTR* pdwIndex,
+    __deref_opt_out __nullnullterminated LPCWSTR* ppwzFound
+    )
+{
+    Assert(pwzMultiSz && *pwzMultiSz && pwzString && *pwzString && (pdwIndex || ppwzFound));
+    HRESULT hr = S_FALSE; // Assume we won't find it
+    LPCWSTR wz = pwzMultiSz;
+    DWORD_PTR dwIndex = 0;
+    SIZE_T cchMutliSz = 0;
+    SIZE_T cchProgress = 0;
+    hr = MultiSzLen(pwzMultiSz, &cchMutliSz);
+    StrExitOnFailure(hr, "failed to get the length of a MULTISZ string");
+    // Find the string
+    hr = S_OK;
+    while (0 != lstrcmpW(wz, pwzString))
+    {
+        // Slide through to the end of the current string
+        while (L'\0' != *wz && cchProgress < cchMutliSz)
+        {
+            ++wz;
+            ++cchProgress;
+        }
+        // If we're done, we're done
+        if (L'\0' == *(wz + 1) || cchProgress >= cchMutliSz)
+        {
+            hr = S_FALSE;
+            break;
+        }
+        // Move on to the next string
+        ++wz;
+        ++dwIndex;
+    }
+    Assert(S_OK == hr || S_FALSE == hr);
+    // If we found it give them what they want
+    if (S_OK == hr)
+    {
+        if (pdwIndex)
+        {
+            *pdwIndex = dwIndex;
+        }
+        if (ppwzFound)
+        {
+            *ppwzFound = wz;
+        }
+    }
+LExit:
+    return hr;
+}
+/****************************************************************************
+MultiSzRemoveString - removes string from a MULTISZ at the specified
+index
+NOTE: does an in place removal without shrinking the memory allocation
+NOTE: returns S_FALSE if the MULTISZ has fewer strings than dwIndex
+****************************************************************************/
+extern "C" HRESULT DAPI MultiSzRemoveString(
+    __deref_inout __nullnullterminated LPWSTR* ppwzMultiSz,
+    __in DWORD_PTR dwIndex
+    )
+{
+    Assert(ppwzMultiSz && *ppwzMultiSz);
+    HRESULT hr = S_OK;
+    LPCWSTR wz = *ppwzMultiSz;
+    LPCWSTR wzNext = NULL;
+    DWORD_PTR dwCurrentIndex = 0;
+    SIZE_T cchMultiSz = 0;
+    SIZE_T cchProgress = 0;
+    hr = MultiSzLen(*ppwzMultiSz, &cchMultiSz);
+    StrExitOnFailure(hr, "failed to get the length of a MULTISZ string");
+    // Find the index we want to remove
+    hr = S_OK;
+    while (dwCurrentIndex < dwIndex)
+    {
+        // Slide through to the end of the current string
+        while (L'\0' != *wz && cchProgress < cchMultiSz)
+        {
+            ++wz;
+            ++cchProgress;
+        }
+        // If we're done, we're done
+        if (L'\0' == *(wz + 1) || cchProgress >= cchMultiSz)
+        {
+            hr = S_FALSE;
+            break;
+        }
+        // Move on to the next string
+        ++wz;
+        ++cchProgress;
+        ++dwCurrentIndex;
+    }
+    Assert(S_OK == hr || S_FALSE == hr);
+    // If we found the index to be removed
+    if (S_OK == hr)
+    {
+        wzNext = wz;
+        // Slide through to the end of the current string
+        while (L'\0' != *wzNext && cchProgress < cchMultiSz)
+        {
+            ++wzNext;
+            ++cchProgress;
+        }
+        // Something weird has happened if we're past the end of the MULTISZ
+        if (cchProgress > cchMultiSz)
+        {
+            hr = E_UNEXPECTED;
+            StrExitOnFailure(hr, "failed to move past the string to be removed from MULTISZ");
+        }
+        // Move on to the next character
+        ++wzNext;
+        ++cchProgress;
+        ::MoveMemory((LPVOID)wz, (LPVOID)wzNext, (cchMultiSz - cchProgress) * sizeof(WCHAR));
+    }
+LExit:
+    return hr;
+}
+/****************************************************************************
+MultiSzInsertString - inserts new string at the specified index
+****************************************************************************/
+extern "C" HRESULT DAPI MultiSzInsertString(
+    __deref_inout __nullnullterminated LPWSTR* ppwzMultiSz,
+    __inout_opt SIZE_T* pcchMultiSz,
+    __in DWORD_PTR dwIndex,
+    __in_z LPCWSTR pwzInsert
+    )
+{
+    Assert(ppwzMultiSz && pwzInsert && *pwzInsert);
+    HRESULT hr = S_OK;
+    LPCWSTR wz = *ppwzMultiSz;
+    DWORD_PTR dwCurrentIndex = 0;
+    SIZE_T cchProgress = 0;
+    LPWSTR pwzResult = NULL;
+    SIZE_T cchResult = 0;
+    SIZE_T cchString = 0;
+    SIZE_T cchMultiSz = 0;
+    hr = ::StringCchLengthW(pwzInsert, STRSAFE_MAX_CCH, reinterpret_cast<size_t*>(&cchString));
+    StrExitOnRootFailure(hr, "failed to get length of insert string");
+    if (pcchMultiSz && 0 != *pcchMultiSz)
+    {
+        cchMultiSz = *pcchMultiSz;
+    }
+    else
+    {
+        hr = MultiSzLen(*ppwzMultiSz, &cchMultiSz);
+        StrExitOnFailure(hr, "failed to get the length of a MULTISZ string");
+    }
+    // Find the index we want to insert at
+    hr = S_OK;
+    while (dwCurrentIndex < dwIndex)
+    {
+        // Slide through to the end of the current string
+        while (L'\0' != *wz && cchProgress < cchMultiSz)
+        {
+            ++wz;
+            ++cchProgress;
+        }
+        // If we're done, we're done
+        if ((dwCurrentIndex + 1 != dwIndex && L'\0' == *(wz + 1)) || cchProgress >= cchMultiSz)
+        {
+            hr = HRESULT_FROM_WIN32(ERROR_OBJECT_NOT_FOUND);
+            StrExitOnRootFailure(hr, "requested to insert into an invalid index: %u in a MULTISZ", dwIndex);
+        }
+        // Move on to the next string
+        ++wz;
+        ++cchProgress;
+        ++dwCurrentIndex;
+    }
+    //
+    // Insert the string
+    //
+    cchResult = cchMultiSz + cchString + 1;
+    hr = StrAlloc(&pwzResult, cchResult);
+    StrExitOnFailure(hr, "failed to allocate result string for MULTISZ insert");
+    // Copy the part before the insert
+    ::CopyMemory(pwzResult, *ppwzMultiSz, cchProgress * sizeof(WCHAR));
+    // Copy the insert part
+    ::CopyMemory(pwzResult + cchProgress, pwzInsert, (cchString + 1) * sizeof(WCHAR));
+    // Copy the part after the insert
+    ::CopyMemory(pwzResult + cchProgress + cchString + 1, wz, (cchMultiSz - cchProgress) * sizeof(WCHAR));
+    // Free the old buffer
+    ReleaseNullStr(*ppwzMultiSz);
+    // Set the result
+    *ppwzMultiSz = pwzResult;
+    // If they wanted the resulting length, let 'em have it
+    if (pcchMultiSz)
+    {
+        *pcchMultiSz = cchResult;
+    }
+    pwzResult = NULL;
+LExit:
+    ReleaseStr(pwzResult);
+    return hr;
+}
+/****************************************************************************
+MultiSzReplaceString - replaces string at the specified index with a new one
+****************************************************************************/
+extern "C" HRESULT DAPI MultiSzReplaceString(
+    __deref_inout __nullnullterminated LPWSTR* ppwzMultiSz,
+    __in DWORD_PTR dwIndex,
+    __in_z LPCWSTR pwzString
+    )
+{
+    Assert(ppwzMultiSz && pwzString && *pwzString);
+    HRESULT hr = S_OK;
+    hr = MultiSzRemoveString(ppwzMultiSz, dwIndex);
+    StrExitOnFailure(hr, "failed to remove string from MULTISZ at the specified index: %u", dwIndex);
+    hr = MultiSzInsertString(ppwzMultiSz, NULL, dwIndex, pwzString);
+    StrExitOnFailure(hr, "failed to insert string into MULTISZ at the specified index: %u", dwIndex);
+LExit:
+    return hr;
+}
+/****************************************************************************
+wcsistr - case insensitive find a substring
+****************************************************************************/
+extern "C" LPCWSTR DAPI wcsistr(
+    __in_z LPCWSTR wzString,
+    __in_z LPCWSTR wzCharSet
+    )
+{
+    LPCWSTR wzSource = wzString;
+    LPCWSTR wzSearch = NULL;
+    SIZE_T cchSourceIndex = 0;
+    // Walk through wzString (the source string) one character at a time
+    while (*wzSource)
+    {
+        cchSourceIndex = 0;
+        wzSearch = wzCharSet;
+        // Look ahead in the source string until we get a full match or we hit the end of the source
+        while (L'\0' != wzSource[cchSourceIndex] && L'\0' != *wzSearch && towlower(wzSource[cchSourceIndex]) == towlower(*wzSearch))
+        {
+            ++cchSourceIndex;
+            ++wzSearch;
+        }
+        // If we found it, return the point that we found it at
+        if (L'\0' == *wzSearch)
+        {
+            return wzSource;
+        }
+        // Walk ahead one character
+        ++wzSource;
+    }
+    return NULL;
+}
+/****************************************************************************
+StrStringToInt16 - converts a string to a signed 16-bit integer.
+****************************************************************************/
+extern "C" HRESULT DAPI StrStringToInt16(
+    __in_z LPCWSTR wzIn,
+    __in DWORD cchIn,
+    __out SHORT* psOut
+    )
+{
+    HRESULT hr = S_OK;
+    LONGLONG ll = 0;
+    hr = StrStringToInt64(wzIn, cchIn, &ll);
+    StrExitOnFailure(hr, "Failed to parse int64.");
+    if (SHORT_MAX < ll || SHORT_MIN > ll)
+    {
+        ExitFunction1(hr = DISP_E_OVERFLOW);
+    }
+    *psOut = (SHORT)ll;
+LExit:
+    return hr;
+}
+/****************************************************************************
+StrStringToUInt16 - converts a string to an unsigned 16-bit integer.
+****************************************************************************/
+extern "C" HRESULT DAPI StrStringToUInt16(
+    __in_z LPCWSTR wzIn,
+    __in DWORD cchIn,
+    __out USHORT* pusOut
+    )
+{
+    HRESULT hr = S_OK;
+    ULONGLONG ull = 0;
+    hr = StrStringToUInt64(wzIn, cchIn, &ull);
+    StrExitOnFailure(hr, "Failed to parse uint64.");
+    if (USHORT_MAX < ull)
+    {
+        ExitFunction1(hr = DISP_E_OVERFLOW);
+    }
+    *pusOut = (USHORT)ull;
+LExit:
+    return hr;
+}
+/****************************************************************************
+StrStringToInt32 - converts a string to a signed 32-bit integer.
+****************************************************************************/
+extern "C" HRESULT DAPI StrStringToInt32(
+    __in_z LPCWSTR wzIn,
+    __in DWORD cchIn,
+    __out INT* piOut
+    )
+{
+    HRESULT hr = S_OK;
+    LONGLONG ll = 0;
+    hr = StrStringToInt64(wzIn, cchIn, &ll);
+    StrExitOnFailure(hr, "Failed to parse int64.");
+    if (INT_MAX < ll || INT_MIN > ll)
+    {
+        ExitFunction1(hr = DISP_E_OVERFLOW);
+    }
+    *piOut = (INT)ll;
+LExit:
+    return hr;
+}
+/****************************************************************************
+StrStringToUInt32 - converts a string to an unsigned 32-bit integer.
+****************************************************************************/
+extern "C" HRESULT DAPI StrStringToUInt32(
+    __in_z LPCWSTR wzIn,
+    __in DWORD cchIn,
+    __out UINT* puiOut
+    )
+{
+    HRESULT hr = S_OK;
+    ULONGLONG ull = 0;
+    hr = StrStringToUInt64(wzIn, cchIn, &ull);
+    StrExitOnFailure(hr, "Failed to parse uint64.");
+    if (UINT_MAX < ull)
+    {
+        ExitFunction1(hr = DISP_E_OVERFLOW);
+    }
+    *puiOut = (UINT)ull;
+LExit:
+    return hr;
+}
+/****************************************************************************
+StrStringToInt64 - converts a string to a signed 64-bit integer.
+****************************************************************************/
+extern "C" HRESULT DAPI StrStringToInt64(
+    __in_z LPCWSTR wzIn,
+    __in DWORD cchIn,
+    __out LONGLONG* pllOut
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD i = 0;
+    INT iSign = 1;
+    INT nDigit = 0;
+    LARGE_INTEGER liValue = { };
+    size_t cchString = 0;
+    // get string length if not provided
+    if (0 >= cchIn)
+    {
+        hr = ::StringCchLengthW(wzIn, STRSAFE_MAX_CCH, &cchString);
+        StrExitOnRootFailure(hr, "Failed to get length of string.");
+        cchIn = (DWORD)cchString;
+        if (0 >= cchIn)
+        {
+            ExitFunction1(hr = E_INVALIDARG);
+        }
+    }
+    // check sign
+    if (L'-' == wzIn[0])
+    {
+        if (1 >= cchIn)
+        {
+            ExitFunction1(hr = E_INVALIDARG);
+        }
+        i = 1;
+        iSign = -1;
+    }
+    // read digits
+    while (i < cchIn)
+    {
+        nDigit = wzIn[i] - L'0';
+        if (0 > nDigit || 9 < nDigit)
+        {
+            ExitFunction1(hr = E_INVALIDARG);
+        }
+        liValue.QuadPart = liValue.QuadPart * 10 + nDigit * iSign;
+        if ((liValue.HighPart ^ iSign) & INT_MIN)
+        {
+            ExitFunction1(hr = DISP_E_OVERFLOW);
+        }
+        ++i;
+    }
+    *pllOut = liValue.QuadPart;
+LExit:
+    return hr;
+}
+/****************************************************************************
+StrStringToUInt64 - converts a string to an unsigned 64-bit integer.
+****************************************************************************/
+extern "C" HRESULT DAPI StrStringToUInt64(
+    __in_z LPCWSTR wzIn,
+    __in DWORD cchIn,
+    __out ULONGLONG* pullOut
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD i = 0;
+    DWORD nDigit = 0;
+    ULONGLONG ullValue = 0;
+    ULONGLONG ull = 0;
+    size_t cchString = 0;
+    // get string length if not provided
+    if (0 >= cchIn)
+    {
+        hr = ::StringCchLengthW(wzIn, STRSAFE_MAX_CCH, &cchString);
+        StrExitOnRootFailure(hr, "Failed to get length of string.");
+        cchIn = (DWORD)cchString;
+        if (0 >= cchIn)
+        {
+            ExitFunction1(hr = E_INVALIDARG);
+        }
+    }
+    // read digits
+    while (i < cchIn)
+    {
+        nDigit = wzIn[i] - L'0';
+        if (9 < nDigit)
+        {
+            ExitFunction1(hr = E_INVALIDARG);
+        }
+        ull = (ULONGLONG)(ullValue * 10 + nDigit);
+        if (ull < ullValue)
+        {
+            ExitFunction1(hr = DISP_E_OVERFLOW);
+        }
+        ullValue = ull;
+        ++i;
+    }
+    *pullOut = ullValue;
+LExit:
+    return hr;
+}
+/****************************************************************************
+StrStringToUpper - alters the given string in-place to be entirely uppercase
+****************************************************************************/
+void DAPI StrStringToUpper(
+    __inout_z LPWSTR wzIn
+    )
+{
+    ::CharUpperBuffW(wzIn, lstrlenW(wzIn));
+}
+/****************************************************************************
+StrStringToLower - alters the given string in-place to be entirely lowercase
+****************************************************************************/
+void DAPI StrStringToLower(
+    __inout_z LPWSTR wzIn
+    )
+{
+    ::CharLowerBuffW(wzIn, lstrlenW(wzIn));
+}
+/****************************************************************************
+StrAllocStringToUpperInvariant - creates an upper-case copy of a string.
+****************************************************************************/
+extern "C" HRESULT DAPI StrAllocStringToUpperInvariant(
+    __deref_out_z LPWSTR* pscz,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource
+    )
+{
+    return StrAllocStringMapInvariant(pscz, wzSource, cchSource, LCMAP_UPPERCASE);
+}
+/****************************************************************************
+StrAllocStringToLowerInvariant - creates an lower-case copy of a string.
+****************************************************************************/
+extern "C" HRESULT DAPI StrAllocStringToLowerInvariant(
+    __deref_out_z LPWSTR* pscz,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource
+    )
+{
+    return StrAllocStringMapInvariant(pscz, wzSource, cchSource, LCMAP_LOWERCASE);
+}
+/****************************************************************************
+StrArrayAllocString - Allocates a string array.
+****************************************************************************/
+extern "C" HRESULT DAPI StrArrayAllocString(
+    __deref_inout_ecount_opt(*pcStrArray) LPWSTR **prgsczStrArray,
+    __inout LPUINT pcStrArray,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource
+    )
+{
+    HRESULT hr = S_OK;
+    UINT cNewStrArray;
+    hr = ::UIntAdd(*pcStrArray, 1, &cNewStrArray);
+    StrExitOnFailure(hr, "Failed to increment the string array element count.");
+    hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(prgsczStrArray), cNewStrArray, sizeof(LPWSTR), ARRAY_GROWTH_SIZE);
+    StrExitOnFailure(hr, "Failed to allocate memory for the string array.");
+    hr = StrAllocString(&(*prgsczStrArray)[*pcStrArray], wzSource, cchSource);
+    StrExitOnFailure(hr, "Failed to allocate and assign the string.");
+    *pcStrArray = cNewStrArray;
+LExit:
+    return hr;
+}
+/****************************************************************************
+StrArrayFree - Frees a string array.
+Use ReleaseNullStrArray to nullify the arguments.
+****************************************************************************/
+extern "C" HRESULT DAPI StrArrayFree(
+    __in_ecount(cStrArray) LPWSTR *rgsczStrArray,
+    __in UINT cStrArray
+    )
+{
+    HRESULT hr = S_OK;
+    for (UINT i = 0; i < cStrArray; ++i)
+    {
+        if (NULL != rgsczStrArray[i])
+        {
+            hr = StrFree(rgsczStrArray[i]);
+            StrExitOnFailure(hr, "Failed to free the string at index %u.", i);
+        }
+    }
+    hr = MemFree(rgsczStrArray);
+    StrExitOnFailure(hr, "Failed to free memory for the string array.");
+LExit:
+    return hr;
+}
+/****************************************************************************
+StrSplitAllocArray - Splits a string into an array.
+****************************************************************************/
+extern "C" HRESULT DAPI StrSplitAllocArray(
+    __deref_inout_ecount_opt(*pcStrArray) LPWSTR **prgsczStrArray,
+    __inout LPUINT pcStrArray,
+    __in_z LPCWSTR wzSource,
+    __in_z LPCWSTR wzDelim
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczCopy = NULL;
+    LPWSTR wzContext = NULL;
+    // Copy wzSource so it is not modified.
+    hr = StrAllocString(&sczCopy, wzSource, 0);
+    StrExitOnFailure(hr, "Failed to copy the source string.");
+    for (LPCWSTR wzToken = ::wcstok_s(sczCopy, wzDelim, &wzContext); wzToken; wzToken = ::wcstok_s(NULL, wzDelim, &wzContext))
+    {
+        hr = StrArrayAllocString(prgsczStrArray, pcStrArray, wzToken, 0);
+        StrExitOnFailure(hr, "Failed to add the string to the string array.");
+    }
+LExit:
+    ReleaseStr(sczCopy);
+    return hr;
+}
+/****************************************************************************
+StrAllocStringMapInvariant - helper function for the ToUpper and ToLower.
+Note: Assumes source and destination buffers will be the same.
+****************************************************************************/
+static HRESULT StrAllocStringMapInvariant(
+    __deref_out_z LPWSTR* pscz,
+    __in_z LPCWSTR wzSource,
+    __in SIZE_T cchSource,
+    __in DWORD dwMapFlags
+    )
+{
+    HRESULT hr = S_OK;
+    hr = StrAllocString(pscz, wzSource, cchSource);
+    StrExitOnFailure(hr, "Failed to allocate a copy of the source string.");
+    if (0 == cchSource)
+    {
+        // Need the actual string size for LCMapString. This includes the null-terminator
+        // but LCMapString doesn't care either way.
+        hr = ::StringCchLengthW(*pscz, INT_MAX, reinterpret_cast<size_t*>(&cchSource));
+        StrExitOnRootFailure(hr, "Failed to get the length of the string.");
+    }
+    else if (INT_MAX < cchSource)
+    {
+        StrExitOnRootFailure(hr = E_INVALIDARG, "Source string is too long: %Iu", cchSource);
+    }
+    // Convert the copy of the string to upper or lower case in-place.
+    if (0 == ::LCMapStringW(LOCALE_INVARIANT, dwMapFlags, *pscz, static_cast<int>(cchSource), *pscz, static_cast<int>(cchSource)))
+    {
+        StrExitWithLastError(hr, "Failed to convert the string case.");
+    }
+LExit:
+    return hr;
+}
+/****************************************************************************
+StrSecureZeroString - zeroes out string to the make sure the contents
+don't remain in memory.
+****************************************************************************/
+extern "C" DAPI_(HRESULT) StrSecureZeroString(
+    __in LPWSTR pwz
+    )
+{
+    HRESULT hr = S_OK;
+    SIZE_T cch;
+    if (pwz)
+    {
+        cch = MemSize(pwz);
+        if (-1 == cch)
+        {
+            hr = E_INVALIDARG;
+            StrExitOnFailure(hr, "Failed to get size of string");
+        }
+        else
+        {
+            SecureZeroMemory(pwz, cch);
+        }
+    }
+    
+LExit:
+    return hr;
+}
+/****************************************************************************
+StrSecureZeroFreeString - zeroes out string to the make sure the contents
+don't remain in memory, then frees the string.
+****************************************************************************/
+extern "C" DAPI_(HRESULT) StrSecureZeroFreeString(
+    __in LPWSTR pwz
+    )
+{
+    HRESULT hr = S_OK;
+    hr = StrSecureZeroString(pwz);
+    ReleaseStr(pwz);
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/svcutil.cpp b/src/libs/dutil/WixToolset.DUtil/svcutil.cpp
new file mode 100644
index 00000000..1a39bfee
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/svcutil.cpp
@@ -0,0 +1,59 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define SvcExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_SVCUTIL, x, s, __VA_ARGS__)
+#define SvcExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_SVCUTIL, x, s, __VA_ARGS__)
+#define SvcExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_SVCUTIL, x, s, __VA_ARGS__)
+#define SvcExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_SVCUTIL, x, s, __VA_ARGS__)
+#define SvcExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_SVCUTIL, x, s, __VA_ARGS__)
+#define SvcExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_SVCUTIL, x, s, __VA_ARGS__)
+#define SvcExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_SVCUTIL, p, x, e, s, __VA_ARGS__)
+#define SvcExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_SVCUTIL, p, x, s, __VA_ARGS__)
+#define SvcExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_SVCUTIL, p, x, e, s, __VA_ARGS__)
+#define SvcExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_SVCUTIL, p, x, s, __VA_ARGS__)
+#define SvcExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_SVCUTIL, e, x, s, __VA_ARGS__)
+#define SvcExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_SVCUTIL, g, x, s, __VA_ARGS__)
+/********************************************************************
+SvcQueryConfig - queries the configuration of a service
+********************************************************************/
+extern "C" HRESULT DAPI SvcQueryConfig(
+    __in SC_HANDLE sch,
+    __out QUERY_SERVICE_CONFIGW** ppConfig
+    )
+{
+    HRESULT hr = S_OK;
+    QUERY_SERVICE_CONFIGW* pConfig = NULL;
+    DWORD cbConfig = 0;
+    if (!::QueryServiceConfigW(sch, NULL, 0, &cbConfig))
+    {
+        DWORD er = ::GetLastError();
+        if (ERROR_INSUFFICIENT_BUFFER == er)
+        {
+            pConfig = static_cast<QUERY_SERVICE_CONFIGW*>(MemAlloc(cbConfig, TRUE));
+            SvcExitOnNull(pConfig, hr, E_OUTOFMEMORY, "Failed to allocate memory to get configuration.");
+            if (!::QueryServiceConfigW(sch, pConfig, cbConfig, &cbConfig))
+            {
+                SvcExitWithLastError(hr, "Failed to read service configuration.");
+            }
+        }
+        else
+        {
+            SvcExitOnWin32Error(er, hr, "Failed to query service configuration.");
+        }
+    }
+    *ppConfig = pConfig;
+    pConfig = NULL;
+LExit:
+    ReleaseMem(pConfig);
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/thmutil.cpp b/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
new file mode 100644
index 00000000..d200a0ea
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/thmutil.cpp
@@ -0,0 +1,5709 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define ThmExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_THMUTIL, x, s, __VA_ARGS__)
+#define ThmExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_THMUTIL, x, s, __VA_ARGS__)
+#define ThmExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_THMUTIL, x, s, __VA_ARGS__)
+#define ThmExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_THMUTIL, x, s, __VA_ARGS__)
+#define ThmExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_THMUTIL, x, s, __VA_ARGS__)
+#define ThmExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_THMUTIL, x, s, __VA_ARGS__)
+#define ThmExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_THMUTIL, p, x, e, s, __VA_ARGS__)
+#define ThmExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_THMUTIL, p, x, s, __VA_ARGS__)
+#define ThmExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_THMUTIL, p, x, e, s, __VA_ARGS__)
+#define ThmExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_THMUTIL, p, x, s, __VA_ARGS__)
+#define ThmExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_THMUTIL, e, x, s, __VA_ARGS__)
+#define ThmExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_THMUTIL, g, x, s, __VA_ARGS__)
+// from CommCtrl.h
+#ifndef BS_COMMANDLINK
+#define BS_COMMANDLINK          0x0000000EL
+#endif
+#ifndef BCM_SETNOTE
+#define BCM_SETNOTE         (BCM_FIRST + 0x0009)
+#endif
+#ifndef BCM_SETSHIELD
+#define BCM_SETSHIELD       (BCM_FIRST + 0x000C)
+#endif
+#ifndef LWS_NOPREFIX
+#define LWS_NOPREFIX        0x0004
+#endif
+const DWORD THEME_INVALID_ID = 0xFFFFFFFF;
+const COLORREF THEME_INVISIBLE_COLORREF = 0xFFFFFFFF;
+const DWORD GROW_FONT_INSTANCES = 3;
+const DWORD GROW_WINDOW_TEXT = 250;
+const LPCWSTR THEME_WC_HYPERLINK = L"ThemeHyperLink";
+const LPCWSTR THEME_WC_PANEL = L"ThemePanel";
+const LPCWSTR THEME_WC_STATICOWNERDRAW = L"ThemeStaticOwnerDraw";
+static Gdiplus::GdiplusStartupInput vgsi;
+static Gdiplus::GdiplusStartupOutput vgso = { };
+static ULONG_PTR vgdiToken = 0;
+static ULONG_PTR vgdiHookToken = 0;
+static HMODULE vhHyperlinkRegisteredModule = NULL;
+static HMODULE vhPanelRegisteredModule = NULL;
+static HMODULE vhStaticOwnerDrawRegisteredModule = NULL;
+static WNDPROC vpfnStaticOwnerDrawBaseWndProc = NULL;
+static HMODULE vhModuleMsftEdit = NULL;
+static HMODULE vhModuleRichEd = NULL;
+static HCURSOR vhCursorHand = NULL;
+enum INTERNAL_CONTROL_STYLE
+{
+    INTERNAL_CONTROL_STYLE_HIDE_WHEN_DISABLED = 0x0001,
+    INTERNAL_CONTROL_STYLE_FILESYSTEM_AUTOCOMPLETE = 0x0002,
+    INTERNAL_CONTROL_STYLE_DISABLED = 0x0004,
+    INTERNAL_CONTROL_STYLE_HIDDEN = 0x0008,
+    INTERNAL_CONTROL_STYLE_OWNER_DRAW = 0x0010,
+};
+struct MEMBUFFER_FOR_RICHEDIT
+{
+    BYTE* rgbData;
+    DWORD cbData;
+    DWORD iData;
+};
+// prototypes
+static HRESULT RegisterWindowClasses(
+    __in_opt HMODULE hModule
+    );
+static HRESULT ParseTheme(
+    __in_opt HMODULE hModule,
+    __in_opt LPCWSTR wzRelativePath,
+    __in IXMLDOMDocument* pixd,
+    __out THEME** ppTheme
+    );
+static HRESULT ParseImage(
+    __in_opt HMODULE hModule,
+    __in_z_opt LPCWSTR wzRelativePath,
+    __in IXMLDOMNode* pElement,
+    __out HBITMAP* phImage
+    );
+static HRESULT ParseIcon(
+    __in_opt HMODULE hModule,
+    __in_z_opt LPCWSTR wzRelativePath,
+    __in IXMLDOMNode* pElement,
+    __out HICON* phIcon
+    );
+static HRESULT ParseWindow(
+    __in_opt HMODULE hModule,
+    __in_opt LPCWSTR wzRelativePath,
+    __in IXMLDOMElement* pElement,
+    __in THEME* pTheme
+    );
+static HRESULT GetFontColor(
+    __in IXMLDOMNode* pixn,
+    __in_z LPCWSTR wzAttributeName,
+    __out COLORREF* pColorRef,
+    __out DWORD* pdwSystemColor
+    );
+static HRESULT ParseFonts(
+    __in IXMLDOMElement* pElement,
+    __in THEME* pTheme
+    );
+static HRESULT ParsePages(
+    __in_opt HMODULE hModule,
+    __in_opt LPCWSTR wzRelativePath,
+    __in IXMLDOMNode* pElement,
+    __in THEME* pTheme
+    );
+static HRESULT ParseImageLists(
+    __in_opt HMODULE hModule,
+    __in_opt LPCWSTR wzRelativePath,
+    __in IXMLDOMNode* pElement,
+    __in THEME* pTheme
+    );
+static HRESULT ParseControls(
+    __in_opt HMODULE hModule,
+    __in_opt LPCWSTR wzRelativePath,
+    __in IXMLDOMNode* pElement,
+    __in THEME* pTheme,
+    __in_opt THEME_CONTROL* pParentControl,
+    __in_opt THEME_PAGE* pPage
+    );
+static HRESULT ParseControl(
+    __in_opt HMODULE hModule,
+    __in_opt LPCWSTR wzRelativePath,
+    __in IXMLDOMNode* pixn,
+    __in THEME* pTheme,
+    __in THEME_CONTROL* pControl,
+    __in BOOL fSkipDimensions,
+    __in_opt THEME_PAGE* pPage
+    );
+static HRESULT ParseActions(
+    __in IXMLDOMNode* pixn,
+    __in THEME_CONTROL* pControl
+    );
+static HRESULT ParseColumns(
+    __in IXMLDOMNode* pixn,
+    __in THEME_CONTROL* pControl
+    );
+static HRESULT ParseRadioButtons(
+    __in_opt HMODULE hModule,
+    __in_opt LPCWSTR wzRelativePath,
+    __in IXMLDOMNode* pixn,
+    __in THEME* pTheme,
+    __in_opt THEME_CONTROL* pParentControl,
+    __in THEME_PAGE* pPage
+    );
+static HRESULT ParseTabs(
+    __in IXMLDOMNode* pixn,
+    __in THEME_CONTROL* pControl
+    );
+static HRESULT ParseText(
+    __in IXMLDOMNode* pixn,
+    __in THEME_CONTROL* pControl,
+    __inout BOOL* pfAnyChildren
+);
+static HRESULT ParseTooltips(
+    __in IXMLDOMNode* pixn,
+    __in THEME_CONTROL* pControl,
+    __inout BOOL* pfAnyChildren
+    );
+static HRESULT ParseNotes(
+    __in IXMLDOMNode* pixn,
+    __in THEME_CONTROL* pControl,
+    __out BOOL* pfAnyChildren
+    );
+static HRESULT StopBillboard(
+    __in THEME* pTheme,
+    __in DWORD dwControl
+    );
+static HRESULT StartBillboard(
+    __in THEME* pTheme,
+    __in DWORD dwControl
+    );
+static HRESULT EnsureFontInstance(
+    __in THEME* pTheme,
+    __in THEME_FONT* pFont,
+    __out THEME_FONT_INSTANCE** ppFontInstance
+    );
+static HRESULT FindImageList(
+    __in THEME* pTheme,
+    __in_z LPCWSTR wzImageListName,
+    __out HIMAGELIST *phImageList
+    );
+static HRESULT LoadControls(
+    __in THEME* pTheme,
+    __in_opt THEME_CONTROL* pParentControl,
+    __in_ecount_opt(cAssignControlIds) const THEME_ASSIGN_CONTROL_ID* rgAssignControlIds,
+    __in DWORD cAssignControlIds
+    );
+static HRESULT ShowControl(
+    __in THEME* pTheme,
+    __in THEME_CONTROL* pControl,
+    __in int nCmdShow,
+    __in BOOL fSaveEditboxes,
+    __in THEME_SHOW_PAGE_REASON reason,
+    __in DWORD dwPageId,
+    __out_opt HWND* phwndFocus
+    );
+static HRESULT ShowControls(
+    __in THEME* pTheme,
+    __in_opt const THEME_CONTROL* pParentControl,
+    __in int nCmdShow,
+    __in BOOL fSaveEditboxes,
+    __in THEME_SHOW_PAGE_REASON reason,
+    __in DWORD dwPageId
+    );
+static HRESULT DrawButton(
+    __in THEME* pTheme,
+    __in DRAWITEMSTRUCT* pdis,
+    __in const THEME_CONTROL* pControl
+    );
+static void DrawControlText(
+    __in THEME* pTheme,
+    __in DRAWITEMSTRUCT* pdis,
+    __in const THEME_CONTROL* pControl,
+    __in BOOL fCentered,
+    __in BOOL fDrawFocusRect
+    );
+static HRESULT DrawHyperlink(
+    __in THEME* pTheme,
+    __in DRAWITEMSTRUCT* pdis,
+    __in const THEME_CONTROL* pControl
+    );
+static HRESULT DrawImage(
+    __in THEME* pTheme,
+    __in DRAWITEMSTRUCT* pdis,
+    __in const THEME_CONTROL* pControl
+    );
+static HRESULT DrawProgressBar(
+    __in THEME* pTheme,
+    __in DRAWITEMSTRUCT* pdis,
+    __in const THEME_CONTROL* pControl
+    );
+static BOOL DrawHoverControl(
+    __in THEME* pTheme,
+    __in BOOL fHover
+    );
+static DWORD CALLBACK RichEditStreamFromFileHandleCallback(
+    __in DWORD_PTR dwCookie,
+    __in_bcount(cb) LPBYTE pbBuff,
+    __in LONG cb,
+    __in LONG *pcb
+    );
+static DWORD CALLBACK RichEditStreamFromMemoryCallback(
+    __in DWORD_PTR dwCookie,
+    __in_bcount(cb) LPBYTE pbBuff,
+    __in LONG cb,
+    __in LONG *pcb
+    );
+static void FreeFontInstance(
+    __in THEME_FONT_INSTANCE* pFontInstance
+    );
+static void FreeFont(
+    __in THEME_FONT* pFont
+    );
+static void FreePage(
+    __in THEME_PAGE* pPage
+    );
+static void FreeControl(
+    __in THEME_CONTROL* pControl
+    );
+static void FreeConditionalText(
+    __in THEME_CONDITIONAL_TEXT* pConditionalText
+    );
+static void FreeImageList(
+    __in THEME_IMAGELIST* pImageList
+    );
+static void FreeAction(
+    __in THEME_ACTION* pAction
+    );
+static void FreeColumn(
+    __in THEME_COLUMN* pColumn
+    );
+static void FreeTab(
+    __in THEME_TAB* pTab
+    );
+static void CALLBACK OnBillboardTimer(
+    __in THEME* pTheme,
+    __in HWND hwnd,
+    __in UINT_PTR idEvent
+    );
+static void OnBrowseDirectory(
+    __in THEME* pTheme,
+    __in HWND hWnd,
+    __in const THEME_ACTION* pAction
+    );
+static BOOL OnButtonClicked(
+    __in THEME* pTheme,
+    __in HWND hWnd,
+    __in const THEME_CONTROL* pControl
+    );
+static BOOL OnDpiChanged(
+    __in THEME* pTheme,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    );
+static void OnNcCreate(
+    __in THEME* pTheme,
+    __in HWND hWnd,
+    __in LPARAM lParam
+    );
+static HRESULT OnRichEditEnLink(
+    __in LPARAM lParam,
+    __in HWND hWndRichEdit,
+    __in HWND hWnd
+    );
+static BOOL ControlIsType(
+    __in const THEME* pTheme,
+    __in DWORD dwControl,
+    __in THEME_CONTROL_TYPE type
+    );
+static const THEME_CONTROL* FindControlFromHWnd(
+    __in const THEME* pTheme,
+    __in HWND hWnd,
+    __in_opt const THEME_CONTROL* pParentControl = NULL
+    );
+static void GetControlDimensions(
+    __in const THEME_CONTROL* pControl,
+    __in const RECT* prcParent,
+    __out int* piWidth,
+    __out int* piHeight,
+    __out int* piX,
+    __out int* piY
+    );
+// Using iWidth as total width of listview, base width of columns, and "Expands" flag on columns
+// calculates final width of each column (storing result in each column's nWidth value)
+static HRESULT SizeListViewColumns(
+    __inout THEME_CONTROL* pControl
+    );
+static LRESULT CALLBACK ControlGroupDefWindowProc(
+    __in_opt THEME* pTheme,
+    __in HWND hWnd,
+    __in UINT uMsg,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    );
+static LRESULT CALLBACK PanelWndProc(
+    __in HWND hWnd,
+    __in UINT uMsg,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    );
+static LRESULT CALLBACK StaticOwnerDrawWndProc(
+    __in HWND hWnd,
+    __in UINT uMsg,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    );
+static HRESULT LocalizeControls(
+    __in DWORD cControls,
+    __in THEME_CONTROL* rgControls,
+    __in const WIX_LOCALIZATION *pWixLoc
+    );
+static HRESULT LocalizeControl(
+    __in THEME_CONTROL* pControl,
+    __in const WIX_LOCALIZATION *pWixLoc
+    );
+static HRESULT LoadControlsString(
+    __in DWORD cControls,
+    __in THEME_CONTROL* rgControls,
+    __in HMODULE hResModule
+    );
+static HRESULT LoadControlString(
+    __in THEME_CONTROL* pControl,
+    __in HMODULE hResModule
+    );
+static void ResizeControls(
+    __in DWORD cControls,
+    __in THEME_CONTROL* rgControls,
+    __in const RECT* prcParent
+    );
+static void ResizeControl(
+    __in THEME_CONTROL* pControl,
+    __in const RECT* prcParent
+    );
+static void ScaleThemeFromWindow(
+    __in THEME* pTheme,
+    __in UINT nDpi,
+    __in int x,
+    __in int y
+    );
+static void ScaleTheme(
+    __in THEME* pTheme,
+    __in UINT nDpi,
+    __in int x,
+    __in int y,
+    __in DWORD dwStyle,
+    __in BOOL fMenu,
+    __in DWORD dwExStyle
+    );
+static void ScaleControls(
+    __in THEME* pTheme,
+    __in DWORD cControls,
+    __in THEME_CONTROL* rgControls,
+    __in UINT nDpi
+    );
+static void ScaleControl(
+    __in THEME* pTheme,
+    __in THEME_CONTROL* pControl,
+    __in UINT nDpi
+    );
+static void GetControls(
+    __in THEME* pTheme,
+    __in_opt THEME_CONTROL* pParentControl,
+    __out DWORD** ppcControls,
+    __out THEME_CONTROL*** pprgControls
+    );
+static void GetControls(
+    __in const THEME* pTheme,
+    __in_opt const THEME_CONTROL* pParentControl,
+    __out DWORD& cControls,
+    __out THEME_CONTROL*& rgControls
+    );
+static void UnloadControls(
+    __in DWORD cControls,
+    __in THEME_CONTROL* rgControls
+    );
+// Public functions.
+DAPI_(HRESULT) ThemeInitialize(
+    __in_opt HMODULE hModule
+    )
+{
+    HRESULT hr = S_OK;
+    INITCOMMONCONTROLSEX icex = { };
+    DpiuInitialize();
+    hr = XmlInitialize();
+    ThmExitOnFailure(hr, "Failed to initialize XML.");
+    hr = RegisterWindowClasses(hModule);
+    ThmExitOnFailure(hr, "Failed to register theme window classes.");
+    // Initialize GDI+ and common controls.
+    vgsi.SuppressBackgroundThread = TRUE;
+    hr = GdipInitialize(&vgsi, &vgdiToken, &vgso);
+    ThmExitOnFailure(hr, "Failed to initialize GDI+.");
+    icex.dwSize = sizeof(INITCOMMONCONTROLSEX);
+    icex.dwICC = ICC_STANDARD_CLASSES | ICC_PROGRESS_CLASS | ICC_LISTVIEW_CLASSES | ICC_TREEVIEW_CLASSES | ICC_TAB_CLASSES | ICC_LINK_CLASS;
+    ::InitCommonControlsEx(&icex);
+    (*vgso.NotificationHook)(&vgdiHookToken);
+LExit:
+    return hr;
+}
+DAPI_(void) ThemeUninitialize()
+{
+    if (vhModuleMsftEdit)
+    {
+        ::FreeLibrary(vhModuleMsftEdit);
+        vhModuleMsftEdit = NULL;
+    }
+    if (vhModuleRichEd)
+    {
+        ::FreeLibrary(vhModuleRichEd);
+        vhModuleRichEd = NULL;
+    }
+    if (vhHyperlinkRegisteredModule)
+    {
+        ::UnregisterClassW(THEME_WC_HYPERLINK, vhHyperlinkRegisteredModule);
+        vhHyperlinkRegisteredModule = NULL;
+    }
+    if (vhPanelRegisteredModule)
+    {
+        ::UnregisterClassW(THEME_WC_PANEL, vhPanelRegisteredModule);
+        vhPanelRegisteredModule = NULL;
+    }
+    if (vhStaticOwnerDrawRegisteredModule)
+    {
+        ::UnregisterClassW(THEME_WC_STATICOWNERDRAW, vhStaticOwnerDrawRegisteredModule);
+        vhStaticOwnerDrawRegisteredModule = NULL;
+        vpfnStaticOwnerDrawBaseWndProc = NULL;
+    }
+    if (vgdiToken)
+    {
+        GdipUninitialize(vgdiToken);
+        vgdiToken = 0;
+    }
+    XmlUninitialize();
+    DpiuUninitialize();
+}
+DAPI_(HRESULT) ThemeLoadFromFile(
+    __in_z LPCWSTR wzThemeFile,
+    __out THEME** ppTheme
+    )
+{
+    HRESULT hr = S_OK;
+    IXMLDOMDocument* pixd = NULL;
+    LPWSTR sczRelativePath = NULL;
+    hr = XmlLoadDocumentFromFile(wzThemeFile, &pixd);
+    ThmExitOnFailure(hr, "Failed to load theme resource as XML document.");
+    hr = PathGetDirectory(wzThemeFile, &sczRelativePath);
+    ThmExitOnFailure(hr, "Failed to get relative path from theme file.");
+    hr = ParseTheme(NULL, sczRelativePath, pixd, ppTheme);
+    ThmExitOnFailure(hr, "Failed to parse theme.");
+LExit:
+    ReleaseStr(sczRelativePath);
+    ReleaseObject(pixd);
+    return hr;
+}
+DAPI_(HRESULT) ThemeLoadFromResource(
+    __in_opt HMODULE hModule,
+    __in_z LPCSTR szResource,
+    __out THEME** ppTheme
+    )
+{
+    HRESULT hr = S_OK;
+    LPVOID pvResource = NULL;
+    DWORD cbResource = 0;
+    LPWSTR sczXml = NULL;
+    IXMLDOMDocument* pixd = NULL;
+    hr = ResReadData(hModule, szResource, &pvResource, &cbResource);
+    ThmExitOnFailure(hr, "Failed to read theme from resource.");
+    hr = StrAllocStringAnsi(&sczXml, reinterpret_cast<LPCSTR>(pvResource), cbResource, CP_UTF8);
+    ThmExitOnFailure(hr, "Failed to convert XML document data from UTF-8 to unicode string.");
+    hr = XmlLoadDocument(sczXml, &pixd);
+    ThmExitOnFailure(hr, "Failed to load theme resource as XML document.");
+    hr = ParseTheme(hModule, NULL, pixd, ppTheme);
+    ThmExitOnFailure(hr, "Failed to parse theme.");
+LExit:
+    ReleaseObject(pixd);
+    ReleaseStr(sczXml);
+    return hr;
+}
+DAPI_(void) ThemeFree(
+    __in THEME* pTheme
+    )
+{
+    if (pTheme)
+    {
+        for (DWORD i = 0; i < pTheme->cFonts; ++i)
+        {
+            FreeFont(pTheme->rgFonts + i);
+        }
+        for (DWORD i = 0; i < pTheme->cPages; ++i)
+        {
+            FreePage(pTheme->rgPages + i);
+        }
+        for (DWORD i = 0; i < pTheme->cImageLists; ++i)
+        {
+            FreeImageList(pTheme->rgImageLists + i);
+        }
+        for (DWORD i = 0; i < pTheme->cControls; ++i)
+        {
+            FreeControl(pTheme->rgControls + i);
+        }
+        ReleaseMem(pTheme->rgControls);
+        ReleaseMem(pTheme->rgPages);
+        ReleaseMem(pTheme->rgFonts);
+        if (pTheme->hImage)
+        {
+            ::DeleteBitmap(pTheme->hImage);
+        }
+        ReleaseStr(pTheme->sczCaption);
+        ReleaseMem(pTheme);
+    }
+}
+DAPI_(HRESULT) ThemeRegisterVariableCallbacks(
+    __in THEME* pTheme,
+    __in_opt PFNTHM_EVALUATE_VARIABLE_CONDITION pfnEvaluateCondition,
+    __in_opt PFNTHM_FORMAT_VARIABLE_STRING pfnFormatString,
+    __in_opt PFNTHM_GET_VARIABLE_NUMERIC pfnGetNumericVariable,
+    __in_opt PFNTHM_SET_VARIABLE_NUMERIC pfnSetNumericVariable,
+    __in_opt PFNTHM_GET_VARIABLE_STRING pfnGetStringVariable,
+    __in_opt PFNTHM_SET_VARIABLE_STRING pfnSetStringVariable,
+    __in_opt LPVOID pvContext
+    )
+{
+    HRESULT hr = S_OK;
+    ThmExitOnNull(pTheme, hr, S_FALSE, "Theme must be loaded first.");
+    pTheme->pfnEvaluateCondition = pfnEvaluateCondition;
+    pTheme->pfnFormatString = pfnFormatString;
+    pTheme->pfnGetNumericVariable = pfnGetNumericVariable;
+    pTheme->pfnSetNumericVariable = pfnSetNumericVariable;
+    pTheme->pfnGetStringVariable = pfnGetStringVariable;
+    pTheme->pfnSetStringVariable = pfnSetStringVariable;
+    pTheme->pvVariableContext = pvContext;
+LExit:
+    return hr;
+}
+DAPI_(HRESULT) ThemeCreateParentWindow(
+    __in THEME* pTheme,
+    __in DWORD dwExStyle,
+    __in LPCWSTR szClassName,
+    __in LPCWSTR szWindowName,
+    __in DWORD dwStyle,
+    __in int x,
+    __in int y,
+    __in_opt HWND hwndParent,
+    __in_opt HINSTANCE hInstance,
+    __in_opt LPVOID lpParam,
+    __in THEME_WINDOW_INITIAL_POSITION initialPosition,
+    __out_opt HWND* phWnd
+    )
+{
+    HRESULT hr = S_OK;
+    DPIU_MONITOR_CONTEXT* pMonitorContext = NULL;
+    POINT pt = { };
+    RECT* pMonitorRect = NULL;
+    HMENU hMenu = NULL;
+    HWND hWnd = NULL;
+    if (pTheme->hwndParent)
+    {
+        ThmExitOnFailure(hr = E_INVALIDSTATE, "ThemeCreateParentWindow called after the theme was loaded.");
+    }
+    if (THEME_WINDOW_INITIAL_POSITION_CENTER_MONITOR_FROM_COORDINATES == initialPosition)
+    {
+        pt.x = x;
+        pt.y = y;
+        hr = DpiuGetMonitorContextFromPoint(&pt, &pMonitorContext);
+        if (SUCCEEDED(hr))
+        {
+            pMonitorRect = &pMonitorContext->mi.rcWork;
+            if (pMonitorContext->nDpi != pTheme->nDpi)
+            {
+                ScaleTheme(pTheme, pMonitorContext->nDpi, pMonitorRect->left, pMonitorRect->top, dwStyle, NULL != hMenu, dwExStyle);
+            }
+            x = pMonitorRect->left + (pMonitorRect->right - pMonitorRect->left - pTheme->nWindowWidth) / 2;
+            y = pMonitorRect->top + (pMonitorRect->bottom - pMonitorRect->top - pTheme->nWindowHeight) / 2;
+        }
+        else
+        {
+            hr = S_OK;
+            x = CW_USEDEFAULT;
+            y = CW_USEDEFAULT;
+        }
+    }
+    hWnd = ::CreateWindowExW(dwExStyle, szClassName, szWindowName, dwStyle, x, y, pTheme->nWindowWidth, pTheme->nWindowHeight, hwndParent, hMenu, hInstance, lpParam);
+    ThmExitOnNullWithLastError(hWnd, hr, "Failed to create theme parent window.");
+    ThmExitOnNull(pTheme->hwndParent, hr, E_INVALIDSTATE, "Theme parent window is not set, make sure ThemeDefWindowProc is called for WM_NCCREATE.");
+    AssertSz(hWnd == pTheme->hwndParent, "Theme parent window does not equal newly created window.");
+    if (phWnd)
+    {
+        *phWnd = hWnd;
+    }
+LExit:
+    ReleaseMem(pMonitorContext);
+    return hr;
+}
+DAPI_(HRESULT) ThemeLoadControls(
+    __in THEME* pTheme,
+    __in_ecount_opt(cAssignControlIds) const THEME_ASSIGN_CONTROL_ID* rgAssignControlIds,
+    __in DWORD cAssignControlIds
+    )
+{
+    HRESULT hr = S_OK;
+    if (!pTheme->hwndParent)
+    {
+        ThmExitOnFailure(hr = E_INVALIDSTATE, "ThemeLoadControls called before theme parent window created.");
+    }
+    hr = LoadControls(pTheme, NULL, rgAssignControlIds, cAssignControlIds);
+LExit:
+    return hr;
+}
+DAPI_(void) ThemeUnloadControls(
+    __in THEME* pTheme
+    )
+{
+    UnloadControls(pTheme->cControls, pTheme->rgControls);
+    pTheme->hwndHover = NULL;
+    pTheme->hwndParent = NULL;
+}
+DAPI_(HRESULT) ThemeLocalize(
+    __in THEME *pTheme,
+    __in const WIX_LOCALIZATION *pWixLoc
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczCaption = NULL;
+    hr = LocLocalizeString(pWixLoc, &pTheme->sczCaption);
+    ThmExitOnFailure(hr, "Failed to localize theme caption.");
+    if (pTheme->pfnFormatString)
+    {
+        hr = pTheme->pfnFormatString(pTheme->sczCaption, &sczCaption, pTheme->pvVariableContext);
+        if (SUCCEEDED(hr))
+        {
+            hr = ThemeUpdateCaption(pTheme, sczCaption);
+        }
+    }
+    hr = LocalizeControls(pTheme->cControls, pTheme->rgControls, pWixLoc);
+LExit:
+    ReleaseStr(sczCaption);
+    
+    return hr;
+}
+/********************************************************************
+ ThemeLoadStrings - Loads string resources.
+ Must be called after loading a theme and before calling
+ ThemeLoadControls.
+*******************************************************************/
+DAPI_(HRESULT) ThemeLoadStrings(
+    __in THEME* pTheme,
+    __in HMODULE hResModule
+    )
+{
+    HRESULT hr = S_OK;
+    ThmExitOnNull(pTheme, hr, S_FALSE, "Theme must be loaded first.");
+    if (UINT_MAX != pTheme->uStringId)
+    {
+        hr = ResReadString(hResModule, pTheme->uStringId, &pTheme->sczCaption);
+        ThmExitOnFailure(hr, "Failed to load theme caption.");
+    }
+    hr = LoadControlsString(pTheme->cControls, pTheme->rgControls, hResModule);
+LExit:
+    return hr;
+}
+DAPI_(HRESULT) ThemeLoadRichEditFromFile(
+    __in THEME* pTheme,
+    __in DWORD dwControl,
+    __in_z LPCWSTR wzFileName,
+    __in HMODULE hModule
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczFile = NULL;
+    HANDLE hFile = INVALID_HANDLE_VALUE;
+    HWND hWnd = ::GetDlgItem(pTheme->hwndParent, dwControl);
+    hr = PathRelativeToModule(&sczFile, wzFileName, hModule);
+    ThmExitOnFailure(hr, "Failed to read resource data.");
+    hFile = ::CreateFileW(sczFile, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL);
+    if (INVALID_HANDLE_VALUE == hFile)
+    {
+        ThmExitWithLastError(hr, "Failed to open RTF file.");
+    }
+    else
+    {
+        LONGLONG llRtfSize;
+        hr = FileSizeByHandle(hFile, &llRtfSize);
+        if (SUCCEEDED(hr))
+        {
+            ::SendMessageW(hWnd, EM_EXLIMITTEXT, 0, static_cast<LPARAM>(llRtfSize));
+        }
+        EDITSTREAM es = { };
+        es.pfnCallback = RichEditStreamFromFileHandleCallback;
+        es.dwCookie = reinterpret_cast<DWORD_PTR>(hFile);
+        ::SendMessageW(hWnd, EM_STREAMIN, SF_RTF, reinterpret_cast<LPARAM>(&es));
+        hr = es.dwError;
+        ThmExitOnFailure(hr, "Failed to update RTF stream.");
+    }
+LExit:
+    ReleaseStr(sczFile);
+    ReleaseFile(hFile);
+    return hr;
+}
+DAPI_(HRESULT) ThemeLoadRichEditFromResource(
+    __in THEME* pTheme,
+    __in DWORD dwControl,
+    __in_z LPCSTR szResourceName,
+    __in HMODULE hModule
+    )
+{
+    HWND hWnd = ::GetDlgItem(pTheme->hwndParent, dwControl);
+    return ThemeLoadRichEditFromResourceToHWnd(hWnd, szResourceName, hModule);
+}
+DAPI_(HRESULT) ThemeLoadRichEditFromResourceToHWnd(
+    __in HWND hWnd,
+    __in_z LPCSTR szResourceName,
+    __in HMODULE hModule
+    )
+{
+    HRESULT hr = S_OK;
+    MEMBUFFER_FOR_RICHEDIT buffer = { };
+    EDITSTREAM es = { };
+    hr = ResReadData(hModule, szResourceName, reinterpret_cast<LPVOID*>(&buffer.rgbData), &buffer.cbData);
+    ThmExitOnFailure(hr, "Failed to read resource data.");
+    es.pfnCallback = RichEditStreamFromMemoryCallback;
+    es.dwCookie = reinterpret_cast<DWORD_PTR>(&buffer);
+    ::SendMessageW(hWnd, EM_STREAMIN, SF_RTF, reinterpret_cast<LPARAM>(&es));
+    hr = es.dwError;
+    ThmExitOnFailure(hr, "Failed to update RTF stream.");
+LExit:
+    return hr;
+}
+DAPI_(BOOL) ThemeHandleKeyboardMessage(
+    __in_opt THEME* pTheme,
+    __in HWND /*hWnd*/,
+    __in MSG* pMsg
+    )
+{
+    return pTheme ? ::IsDialogMessageW(pTheme->hwndParent, pMsg) : FALSE;
+}
+extern "C" LRESULT CALLBACK ThemeDefWindowProc(
+    __in_opt THEME* pTheme,
+    __in HWND hWnd,
+    __in UINT uMsg,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    )
+{
+    RECT rcParent = { };
+    RECT *pRect = NULL;
+    if (pTheme)
+    {
+        switch (uMsg)
+        {
+        case WM_NCCREATE:
+            if (pTheme->hwndParent)
+            {
+                AssertSz(FALSE, "WM_NCCREATE called multiple times");
+            }
+            else
+            {
+                OnNcCreate(pTheme, hWnd, lParam);
+            }
+            break;
+        case WM_NCHITTEST:
+            if (pTheme->dwStyle & WS_POPUP)
+            {
+                return HTCAPTION; // allow pop-up windows to be moved by grabbing any non-control.
+            }
+            break;
+        case WM_DPICHANGED:
+            if (OnDpiChanged(pTheme, wParam, lParam))
+            {
+                return 0;
+            }
+            break;
+        case WM_SIZING:
+            if (pTheme->fAutoResize)
+            {
+                pRect = reinterpret_cast<RECT *>(lParam);
+                if (pRect->right - pRect->left < pTheme->nMinimumWidth)
+                {
+                    if (wParam == WMSZ_BOTTOMLEFT || wParam == WMSZ_LEFT || wParam == WMSZ_TOPLEFT)
+                    {
+                        pRect->left = pRect->right - pTheme->nMinimumWidth;
+                    }
+                    else
+                    {
+                        pRect->right = pRect->left + pTheme->nMinimumWidth;
+                    }
+                }
+                if (pRect->bottom - pRect->top < pTheme->nMinimumHeight)
+                {
+                    if (wParam == WMSZ_BOTTOM || wParam == WMSZ_BOTTOMLEFT || wParam == WMSZ_BOTTOMRIGHT)
+                    {
+                        pRect->bottom = pRect->top + pTheme->nMinimumHeight;
+                    }
+                    else
+                    {
+                        pRect->top = pRect->bottom - pTheme->nMinimumHeight;
+                    }
+                }
+                return TRUE;
+            }
+            break;
+        case WM_SIZE:
+            if (pTheme->fAutoResize || pTheme->fForceResize)
+            {
+                pTheme->fForceResize = FALSE;
+                ::GetClientRect(pTheme->hwndParent, &rcParent);
+                ResizeControls(pTheme->cControls, pTheme->rgControls, &rcParent);
+                return 0;
+            }
+            break;
+        }
+    }
+    return ControlGroupDefWindowProc(pTheme, hWnd, uMsg, wParam, lParam);
+}
+DAPI_(void) ThemeGetPageIds(
+    __in const THEME* pTheme,
+    __in_ecount(cGetPages) LPCWSTR* rgwzFindNames,
+    __inout_ecount(cGetPages) DWORD* rgdwPageIds,
+    __in DWORD cGetPages
+    )
+{
+    for (DWORD i = 0; i < cGetPages; ++i)
+    {
+        LPCWSTR wzFindName = rgwzFindNames[i];
+        for (DWORD j = 0; j < pTheme->cPages; ++j)
+        {
+            LPCWSTR wzPageName = pTheme->rgPages[j].sczName;
+            if (wzPageName && CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, wzPageName, -1, wzFindName, -1))
+            {
+                rgdwPageIds[i] = j + 1; // add one to make the page ids 1-based (so zero is invalid).
+                break;
+            }
+        }
+    }
+}
+DAPI_(THEME_PAGE*) ThemeGetPage(
+    __in const THEME* pTheme,
+    __in DWORD dwPage
+    )
+{
+    DWORD iPage = dwPage - 1;
+    THEME_PAGE* pPage = NULL;
+    if (iPage < pTheme->cPages)
+    {
+        pPage = pTheme->rgPages + iPage;
+    }
+    return pPage;
+}
+DAPI_(HRESULT) ThemeShowPage(
+    __in THEME* pTheme,
+    __in DWORD dwPage,
+    __in int nCmdShow
+    )
+{
+    return ThemeShowPageEx(pTheme, dwPage, nCmdShow, THEME_SHOW_PAGE_REASON_DEFAULT);
+}
+DAPI_(HRESULT) ThemeShowPageEx(
+    __in THEME* pTheme,
+    __in DWORD dwPage,
+    __in int nCmdShow,
+    __in THEME_SHOW_PAGE_REASON reason
+    )
+{
+    HRESULT hr = S_OK;
+    BOOL fHide = SW_HIDE == nCmdShow;
+    BOOL fSaveEditboxes = FALSE;
+    THEME_SAVEDVARIABLE* pSavedVariable = NULL;
+    THEME_PAGE* pPage = ThemeGetPage(pTheme, dwPage);
+    if (pPage)
+    {
+        if (fHide)
+        {
+            switch (reason)
+            {
+            case THEME_SHOW_PAGE_REASON_DEFAULT:
+                // Set the variables in the loop below.
+                fSaveEditboxes = TRUE;
+                break;
+            case THEME_SHOW_PAGE_REASON_CANCEL:
+                if (pPage->cSavedVariables && pTheme->pfnSetStringVariable)
+                {
+                    // Best effort to cancel any changes to the variables.
+                    for (DWORD v = 0; v < pPage->cSavedVariables; ++v)
+                    {
+                        pSavedVariable = pPage->rgSavedVariables + v;
+                        if (pSavedVariable->wzName)
+                        {
+                            pTheme->pfnSetStringVariable(pSavedVariable->wzName, pSavedVariable->sczValue, FALSE, pTheme->pvVariableContext);
+                        }
+                    }
+                }
+                break;
+            }
+            if (THEME_SHOW_PAGE_REASON_REFRESH != reason)
+            {
+                pPage->cSavedVariables = 0;
+                if (pPage->rgSavedVariables)
+                {
+                    SecureZeroMemory(pPage->rgSavedVariables, MemSize(pPage->rgSavedVariables));
+                }
+            }
+            pTheme->dwCurrentPageId = 0;
+        }
+        else
+        {
+            if (THEME_SHOW_PAGE_REASON_REFRESH == reason)
+            {
+                fSaveEditboxes = TRUE;
+            }
+            else
+            {
+                hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&pPage->rgSavedVariables), pPage->cControlIndices, sizeof(THEME_SAVEDVARIABLE), pPage->cControlIndices);
+                ThmExitOnFailure(hr, "Failed to allocate memory for saved variables.");
+                SecureZeroMemory(pPage->rgSavedVariables, MemSize(pPage->rgSavedVariables));
+                pPage->cSavedVariables = pPage->cControlIndices;
+                // Save the variables in the loop below.
+            }
+            pTheme->dwCurrentPageId = dwPage;
+        }
+    }
+    hr = ShowControls(pTheme, NULL, nCmdShow, fSaveEditboxes, reason, dwPage);
+    ThmExitOnFailure(hr, "Failed to show page controls.");
+LExit:
+    return hr;
+}
+DAPI_(BOOL) ThemeControlExists(
+    __in const THEME* pTheme,
+    __in DWORD dwControl
+    )
+{
+    BOOL fExists = FALSE;
+    HWND hWnd = ::GetDlgItem(pTheme->hwndParent, dwControl);
+    if (hWnd)
+    {
+        const THEME_CONTROL* pControl = FindControlFromHWnd(pTheme, hWnd);
+        fExists = (pControl && hWnd == pControl->hWnd);
+    }
+    return fExists;
+}
+DAPI_(void) ThemeControlEnable(
+    __in THEME* pTheme,
+    __in DWORD dwControl,
+    __in BOOL fEnable
+    )
+{
+    HWND hWnd = ::GetDlgItem(pTheme->hwndParent, dwControl);
+    THEME_CONTROL* pControl = const_cast<THEME_CONTROL*>(FindControlFromHWnd(pTheme, hWnd));
+    if (pControl)
+    {
+        pControl->dwInternalStyle = fEnable ? (pControl->dwInternalStyle & ~INTERNAL_CONTROL_STYLE_DISABLED) : (pControl->dwInternalStyle | INTERNAL_CONTROL_STYLE_DISABLED);
+        ::EnableWindow(hWnd, fEnable);
+        if (pControl->dwInternalStyle & INTERNAL_CONTROL_STYLE_HIDE_WHEN_DISABLED)
+        {
+            ::ShowWindow(hWnd, fEnable ? SW_SHOW : SW_HIDE);
+        }
+    }
+}
+DAPI_(BOOL) ThemeControlEnabled(
+    __in THEME* pTheme,
+    __in DWORD dwControl
+    )
+{
+    HWND hWnd = ::GetDlgItem(pTheme->hwndParent, dwControl);
+    const THEME_CONTROL* pControl = FindControlFromHWnd(pTheme, hWnd);
+    return pControl && !(pControl->dwInternalStyle & INTERNAL_CONTROL_STYLE_DISABLED);
+}
+DAPI_(void) ThemeControlElevates(
+    __in THEME* pTheme,
+    __in DWORD dwControl,
+    __in BOOL fElevates
+    )
+{
+    HWND hWnd = ::GetDlgItem(pTheme->hwndParent, dwControl);
+    ::SendMessageW(hWnd, BCM_SETSHIELD, 0, fElevates);
+}
+DAPI_(void) ThemeShowControl(
+    __in THEME* pTheme,
+    __in DWORD dwControl,
+    __in int nCmdShow
+    )
+{
+    HWND hWnd = ::GetDlgItem(pTheme->hwndParent, dwControl);
+    ::ShowWindow(hWnd, nCmdShow);
+    // Save the control's visible state.
+    THEME_CONTROL* pControl = const_cast<THEME_CONTROL*>(FindControlFromHWnd(pTheme, hWnd));
+    if (pControl)
+    {
+        pControl->dwInternalStyle = (SW_HIDE == nCmdShow) ? (pControl->dwInternalStyle | INTERNAL_CONTROL_STYLE_HIDDEN) : (pControl->dwInternalStyle & ~INTERNAL_CONTROL_STYLE_HIDDEN);
+    }
+}
+DAPI_(void) ThemeShowControlEx(
+    __in THEME* pTheme,
+    __in DWORD dwControl,
+    __in int nCmdShow
+    )
+{
+    HWND hWnd = ::GetDlgItem(pTheme->hwndParent, dwControl);
+    THEME_CONTROL* pControl = const_cast<THEME_CONTROL*>(FindControlFromHWnd(pTheme, hWnd));
+    if (pControl)
+    {
+        ShowControl(pTheme, pControl, nCmdShow, THEME_CONTROL_TYPE_EDITBOX == pControl->type, THEME_SHOW_PAGE_REASON_REFRESH, 0, NULL);
+    }
+}
+DAPI_(BOOL) ThemeControlVisible(
+    __in THEME* pTheme,
+    __in DWORD dwControl
+    )
+{
+    HWND hWnd = ::GetDlgItem(pTheme->hwndParent, dwControl);
+    return ::IsWindowVisible(hWnd);
+}
+DAPI_(BOOL) ThemePostControlMessage(
+    __in THEME* pTheme,
+    __in DWORD dwControl,
+    __in UINT Msg,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    )
+{
+    HRESULT hr = S_OK;
+    UINT er = ERROR_SUCCESS;
+    HWND hWnd = ::GetDlgItem(pTheme->hwndParent, dwControl);
+    if (!::PostMessageW(hWnd, Msg, wParam, lParam))
+    {
+        er = ::GetLastError();
+        hr = HRESULT_FROM_WIN32(er);
+    }
+    return SUCCEEDED(hr);
+}
+DAPI_(LRESULT) ThemeSendControlMessage(
+    __in const THEME* pTheme,
+    __in DWORD dwControl,
+    __in UINT Msg,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    )
+{
+    HWND hWnd = ::GetDlgItem(pTheme->hwndParent, dwControl);
+    return ::SendMessageW(hWnd, Msg, wParam, lParam);
+}
+DAPI_(HRESULT) ThemeDrawBackground(
+    __in THEME* pTheme,
+    __in PAINTSTRUCT* pps
+    )
+{
+    HRESULT hr = S_FALSE;
+    if (pTheme->hImage && 0 <= pTheme->nSourceX && 0 <= pTheme->nSourceY && pps->fErase)
+    {
+        HDC hdcMem = ::CreateCompatibleDC(pps->hdc);
+        HBITMAP hDefaultBitmap = static_cast<HBITMAP>(::SelectObject(hdcMem, pTheme->hImage));
+        DWORD dwSourceWidth = pTheme->nDefaultDpiWidth;
+        DWORD dwSourceHeight = pTheme->nDefaultDpiHeight;
+        ::StretchBlt(pps->hdc, 0, 0, pTheme->nWidth, pTheme->nHeight, hdcMem, pTheme->nSourceX, pTheme->nSourceY, dwSourceWidth, dwSourceHeight, SRCCOPY);
+        ::SelectObject(hdcMem, hDefaultBitmap);
+        ::DeleteDC(hdcMem);
+        hr = S_OK;
+    }
+    return hr;
+}
+DAPI_(HRESULT) ThemeDrawControl(
+    __in THEME* pTheme,
+    __in DRAWITEMSTRUCT* pdis
+    )
+{
+    HRESULT hr = S_OK;
+    const THEME_CONTROL* pControl = FindControlFromHWnd(pTheme, pdis->hwndItem);
+    AssertSz(pControl, "Expected control window from owner draw window.");
+    AssertSz(pControl->hWnd == pdis->hwndItem, "Expected control window to match owner draw window.");
+    AssertSz(pControl->nWidth < 1 || pControl->nWidth == pdis->rcItem.right - pdis->rcItem.left, "Expected control window width to match owner draw window width.");
+    AssertSz(pControl->nHeight < 1 || pControl->nHeight == pdis->rcItem.bottom - pdis->rcItem.top, "Expected control window height to match owner draw window height.");
+    switch (pControl->type)
+    {
+    case THEME_CONTROL_TYPE_BUTTON:
+        hr = DrawButton(pTheme, pdis, pControl);
+        ThmExitOnFailure(hr, "Failed to draw button.");
+        break;
+    case THEME_CONTROL_TYPE_HYPERLINK:
+        hr = DrawHyperlink(pTheme, pdis, pControl);
+        ThmExitOnFailure(hr, "Failed to draw hyperlink.");
+        break;
+    case THEME_CONTROL_TYPE_IMAGE:
+        hr = DrawImage(pTheme, pdis, pControl);
+        ThmExitOnFailure(hr, "Failed to draw image.");
+        break;
+    case THEME_CONTROL_TYPE_PROGRESSBAR:
+        hr = DrawProgressBar(pTheme, pdis, pControl);
+        ThmExitOnFailure(hr, "Failed to draw progress bar.");
+        break;
+    default:
+        hr = E_UNEXPECTED;
+        ThmExitOnRootFailure(hr, "Did not specify an owner draw control to draw.");
+    }
+LExit:
+    return hr;
+}
+DAPI_(BOOL) ThemeHoverControl(
+    __in THEME* pTheme,
+    __in HWND hwndParent,
+    __in HWND hwndControl
+    )
+{
+    BOOL fHovered = FALSE;
+    if (hwndControl != pTheme->hwndHover)
+    {
+        if (pTheme->hwndHover && pTheme->hwndHover != hwndParent)
+        {
+            DrawHoverControl(pTheme, FALSE);
+        }
+        pTheme->hwndHover = hwndControl;
+        if (pTheme->hwndHover && pTheme->hwndHover != hwndParent)
+        {
+            fHovered = DrawHoverControl(pTheme, TRUE);
+        }
+    }
+    return fHovered;
+}
+DAPI_(BOOL) ThemeIsControlChecked(
+    __in THEME* pTheme,
+    __in DWORD dwControl
+    )
+{
+    HWND hWnd = ::GetDlgItem(pTheme->hwndParent, dwControl);
+    return BST_CHECKED == ::SendMessageW(hWnd, BM_GETCHECK, 0, 0);
+}
+DAPI_(BOOL) ThemeSetControlColor(
+    __in THEME* pTheme,
+    __in HDC hdc,
+    __in HWND hWnd,
+    __out HBRUSH* phBackgroundBrush
+    )
+{
+    THEME_FONT* pFont = NULL;
+    BOOL fHasBackground = FALSE;
+    *phBackgroundBrush = NULL;
+    if (hWnd == pTheme->hwndParent)
+    {
+        pFont = (THEME_INVALID_ID == pTheme->dwFontId) ? NULL : pTheme->rgFonts + pTheme->dwFontId;
+    }
+    else
+    {
+        const THEME_CONTROL* pControl = FindControlFromHWnd(pTheme, hWnd);
+        pFont = (!pControl || THEME_INVALID_ID == pControl->dwFontId) ? NULL : pTheme->rgFonts + pControl->dwFontId;
+    }
+    if (pFont)
+    {
+        if (pFont->hForeground)
+        {
+            ::SetTextColor(hdc, pFont->crForeground);
+        }
+        if (pFont->hBackground)
+        {
+            ::SetBkColor(hdc, pFont->crBackground);
+            *phBackgroundBrush = pFont->hBackground;
+            fHasBackground = TRUE;
+        }
+        else
+        {
+            ::SetBkMode(hdc, TRANSPARENT);
+            *phBackgroundBrush = static_cast<HBRUSH>(::GetStockObject(NULL_BRUSH));
+            fHasBackground = TRUE;
+        }
+    }
+    return fHasBackground;
+}
+DAPI_(HRESULT) ThemeSetProgressControl(
+    __in THEME* pTheme,
+    __in DWORD dwControl,
+    __in DWORD dwProgressPercentage
+    )
+{
+    HRESULT hr = E_NOTFOUND;
+    HWND hWnd = ::GetDlgItem(pTheme->hwndParent, dwControl);
+    if (hWnd)
+    {
+        THEME_CONTROL* pControl = const_cast<THEME_CONTROL*>(FindControlFromHWnd(pTheme, hWnd));
+        if (pControl && THEME_CONTROL_TYPE_PROGRESSBAR == pControl->type)
+        {
+            DWORD dwCurrentProgress = LOWORD(pControl->dwData);
+            if (dwCurrentProgress != dwProgressPercentage)
+            {
+                DWORD dwColor = HIWORD(pControl->dwData);
+                pControl->dwData = MAKEDWORD(dwProgressPercentage, dwColor);
+                if (pControl->dwInternalStyle & INTERNAL_CONTROL_STYLE_OWNER_DRAW)
+                {
+                    if (!::InvalidateRect(hWnd, NULL, FALSE))
+                    {
+                        ThmExitWithLastError(hr, "Failed to invalidate progress bar window.");
+                    }
+                }
+                else
+                {
+                    ::SendMessageW(hWnd, PBM_SETPOS, dwProgressPercentage, 0);
+                }
+                hr = S_OK;
+            }
+            else
+            {
+                hr = S_FALSE;
+            }
+        }
+    }
+LExit:
+    return hr;
+}
+DAPI_(HRESULT) ThemeSetProgressControlColor(
+    __in THEME* pTheme,
+    __in DWORD dwControl,
+    __in DWORD dwColorIndex
+    )
+{
+    HRESULT hr = S_FALSE;
+    HWND hWnd = ::GetDlgItem(pTheme->hwndParent, dwControl);
+    if (hWnd)
+    {
+        THEME_CONTROL* pControl = const_cast<THEME_CONTROL*>(FindControlFromHWnd(pTheme, hWnd));
+        // Only set color on owner draw progress bars.
+        if (pControl && (pControl->dwInternalStyle & INTERNAL_CONTROL_STYLE_OWNER_DRAW))
+        {
+            DWORD dwCurrentColor = HIWORD(pControl->dwData);
+            if (dwCurrentColor != dwColorIndex)
+            {
+                DWORD dwCurrentProgress =  LOWORD(pControl->dwData);
+                pControl->dwData = MAKEDWORD(dwCurrentProgress, dwColorIndex);
+                if (!::InvalidateRect(hWnd, NULL, FALSE))
+                {
+                    ThmExitWithLastError(hr, "Failed to invalidate progress bar window.");
+                }
+                hr = S_OK;
+            }
+        }
+    }
+LExit:
+    return hr;
+}
+DAPI_(HRESULT) ThemeSetTextControl(
+    __in const THEME* pTheme,
+    __in DWORD dwControl,
+    __in_z_opt LPCWSTR wzText
+    )
+{
+    return ThemeSetTextControlEx(pTheme, dwControl, FALSE, wzText);
+}
+DAPI_(HRESULT) ThemeSetTextControlEx(
+    __in const THEME* pTheme,
+    __in DWORD dwControl,
+    __in BOOL fUpdate,
+    __in_z_opt LPCWSTR wzText
+    )
+{
+    HRESULT hr = S_OK;
+    HWND hWnd = ::GetDlgItem(pTheme->hwndParent, dwControl);
+    if (hWnd)
+    {
+        if (fUpdate)
+        {
+            ::ShowWindow(hWnd, SW_HIDE);
+        }
+        if (!::SetWindowTextW(hWnd, wzText))
+        {
+            ThmExitWithLastError(hr, "Failed to set control text.");
+        }
+        if (fUpdate)
+        {
+            ::ShowWindow(hWnd, SW_SHOW);
+        }
+    }
+LExit:
+    return hr;
+}
+DAPI_(HRESULT) ThemeGetTextControl(
+    __in const THEME* pTheme,
+    __in DWORD dwControl,
+    __inout_z LPWSTR* psczText
+    )
+{
+    HRESULT hr = S_OK;
+    HWND hWnd = ::GetDlgItem(pTheme->hwndParent, dwControl);
+    SIZE_T cbSize = 0;
+    DWORD cchText = 0;
+    DWORD cchTextRead = 0;
+    // Ensure the string has room for at least one character.
+    hr = StrMaxLength(*psczText, &cbSize);
+    ThmExitOnFailure(hr, "Failed to get text buffer length.");
+    cchText = (DWORD)min(DWORD_MAX, cbSize);
+    if (!cchText)
+    {
+        cchText = GROW_WINDOW_TEXT;
+        hr = StrAlloc(psczText, cchText);
+        ThmExitOnFailure(hr, "Failed to grow text buffer.");
+    }
+    // Read (and keep growing buffer) until we finally read less than there
+    // is room in the buffer.
+    for (;;)
+    {
+        cchTextRead = ::GetWindowTextW(hWnd, *psczText, cchText);
+        if (cchTextRead + 1 < cchText)
+        {
+            break;
+        }
+        else
+        {
+            cchText = cchTextRead + GROW_WINDOW_TEXT;
+            hr = StrAlloc(psczText, cchText);
+            ThmExitOnFailure(hr, "Failed to grow text buffer again.");
+        }
+    }
+LExit:
+    return hr;
+}
+DAPI_(HRESULT) ThemeUpdateCaption(
+    __in THEME* pTheme,
+    __in_z LPCWSTR wzCaption
+    )
+{
+    HRESULT hr = S_OK;
+    hr = StrAllocString(&pTheme->sczCaption, wzCaption, 0);
+    ThmExitOnFailure(hr, "Failed to update theme caption.");
+LExit:
+    return hr;
+}
+DAPI_(void) ThemeSetFocus(
+    __in THEME* pTheme,
+    __in DWORD dwControl
+    )
+{
+    HWND hwndFocus = ::GetDlgItem(pTheme->hwndParent, dwControl); 
+    if (hwndFocus && !ThemeControlEnabled(pTheme, dwControl)) 
+    { 
+        hwndFocus = ::GetNextDlgTabItem(pTheme->hwndParent, hwndFocus, FALSE); 
+    }
+    if (hwndFocus) 
+    { 
+        ::SetFocus(hwndFocus); 
+    }
+}
+DAPI_(void) ThemeShowChild(
+    __in THEME* pTheme,
+    __in THEME_CONTROL* pParentControl,
+    __in DWORD dwIndex
+    )
+{
+    // show one child, hide the rest
+    for (DWORD i = 0; i < pParentControl->cControls; ++i)
+    {
+        THEME_CONTROL* pControl = pParentControl->rgControls + i;
+        ShowControl(pTheme, pControl, dwIndex == i ? SW_SHOW : SW_HIDE, FALSE, THEME_SHOW_PAGE_REASON_DEFAULT, 0, NULL);
+    }
+}
+// Internal functions.
+static HRESULT RegisterWindowClasses(
+    __in_opt HMODULE hModule
+    )
+{
+    HRESULT hr = S_OK;
+    WNDCLASSW wcHyperlink = { };
+    WNDCLASSW wcPanel = { };
+    WNDCLASSW wcStaticOwnerDraw = { };
+    WNDPROC pfnStaticOwnerDrawBaseWndProc = NULL;
+    vhCursorHand = ::LoadCursorA(NULL, IDC_HAND);
+    // Base the theme hyperlink class on a button but give it the "hand" icon.
+    if (!::GetClassInfoW(NULL, WC_BUTTONW, &wcHyperlink))
+    {
+        ThmExitWithLastError(hr, "Failed to get button window class.");
+    }
+    wcHyperlink.lpszClassName = THEME_WC_HYPERLINK;
+#pragma prefast(push)
+#pragma prefast(disable:25068)
+    wcHyperlink.hCursor = vhCursorHand;
+#pragma prefast(pop)
+    if (!::RegisterClassW(&wcHyperlink))
+    {
+        ThmExitWithLastError(hr, "Failed to get button window class.");
+    }
+    vhHyperlinkRegisteredModule = hModule;
+    // Panel is its own do-nothing class.
+    wcPanel.lpfnWndProc = PanelWndProc;
+    wcPanel.hInstance = hModule;
+    wcPanel.hCursor = ::LoadCursorW(NULL, (LPCWSTR) IDC_ARROW);
+    wcPanel.lpszClassName = THEME_WC_PANEL;
+    if (!::RegisterClassW(&wcPanel))
+    {
+        ThmExitWithLastError(hr, "Failed to register window.");
+    }
+    vhPanelRegisteredModule = hModule;
+    if (!::GetClassInfoW(NULL, WC_STATICW, &wcStaticOwnerDraw))
+    {
+        ThmExitWithLastError(hr, "Failed to get static window class.");
+    }
+    pfnStaticOwnerDrawBaseWndProc = wcStaticOwnerDraw.lpfnWndProc;
+    wcStaticOwnerDraw.lpfnWndProc = StaticOwnerDrawWndProc;
+    wcStaticOwnerDraw.hInstance = hModule;
+    wcStaticOwnerDraw.lpszClassName = THEME_WC_STATICOWNERDRAW;
+    if (!::RegisterClassW(&wcStaticOwnerDraw))
+    {
+        ThmExitWithLastError(hr, "Failed to register OwnerDraw window class.");
+    }
+    vhStaticOwnerDrawRegisteredModule = hModule;
+    vpfnStaticOwnerDrawBaseWndProc = pfnStaticOwnerDrawBaseWndProc;
+LExit:
+    return hr;
+}
+static HRESULT ParseTheme(
+    __in_opt HMODULE hModule,
+    __in_opt LPCWSTR wzRelativePath,
+    __in IXMLDOMDocument* pixd,
+    __out THEME** ppTheme
+    )
+{
+    static WORD wThemeId = 0;
+    HRESULT hr = S_OK;
+    THEME* pTheme = NULL;
+    IXMLDOMElement *pThemeElement = NULL;
+    hr = pixd->get_documentElement(&pThemeElement);
+    ThmExitOnFailure(hr, "Failed to get theme element.");
+    pTheme = static_cast<THEME*>(MemAlloc(sizeof(THEME), TRUE));
+    ThmExitOnNull(pTheme, hr, E_OUTOFMEMORY, "Failed to allocate memory for theme.");
+    pTheme->wId = ++wThemeId;
+    pTheme->nDpi = USER_DEFAULT_SCREEN_DPI;
+    // Parse the optional background resource image.
+    hr = ParseImage(hModule, wzRelativePath, pThemeElement, &pTheme->hImage);
+    ThmExitOnFailure(hr, "Failed while parsing theme image.");
+    // Parse the fonts.
+    hr = ParseFonts(pThemeElement, pTheme);
+    ThmExitOnFailure(hr, "Failed to parse theme fonts.");
+    // Parse the window element.
+    hr = ParseWindow(hModule, wzRelativePath, pThemeElement, pTheme);
+    ThmExitOnFailure(hr, "Failed to parse theme window element.");
+    *ppTheme = pTheme;
+    pTheme = NULL;
+LExit:
+    ReleaseObject(pThemeElement);
+    if (pTheme)
+    {
+        ThemeFree(pTheme);
+    }
+    return hr;
+}
+static HRESULT ParseImage(
+    __in_opt HMODULE hModule,
+    __in_z_opt LPCWSTR wzRelativePath,
+    __in IXMLDOMNode* pElement,
+    __out HBITMAP* phImage
+    )
+{
+    HRESULT hr = S_OK;
+    BSTR bstr = NULL;
+    LPWSTR sczImageFile = NULL;
+    int iResourceId = 0;
+    Gdiplus::Bitmap* pBitmap = NULL;
+    *phImage = NULL;
+    hr = XmlGetAttribute(pElement, L"ImageResource", &bstr);
+    ThmExitOnFailure(hr, "Failed to get image resource attribute.");
+    if (S_OK == hr)
+    {
+        iResourceId = wcstol(bstr, NULL, 10);
+        hr = GdipBitmapFromResource(hModule, MAKEINTRESOURCE(iResourceId), &pBitmap);
+        // Don't fail.
+    }
+    ReleaseNullBSTR(bstr);
+    // Parse the optional background image from a given file.
+    if (!pBitmap)
+    {
+        hr = XmlGetAttribute(pElement, L"ImageFile", &bstr);
+        ThmExitOnFailure(hr, "Failed to get image file attribute.");
+        if (S_OK == hr)
+        {
+            if (wzRelativePath)
+            {
+                hr = PathConcat(wzRelativePath, bstr, &sczImageFile);
+                ThmExitOnFailure(hr, "Failed to combine image file path.");
+            }
+            else
+            {
+                hr = PathRelativeToModule(&sczImageFile, bstr, hModule);
+                ThmExitOnFailure(hr, "Failed to get image filename.");
+            }
+            hr = GdipBitmapFromFile(sczImageFile, &pBitmap);
+            // Don't fail.
+        }
+    }
+    // If there is an image, convert it into a bitmap handle.
+    if (pBitmap)
+    {
+        Gdiplus::Color black;
+        Gdiplus::Status gs = pBitmap->GetHBITMAP(black, phImage);
+        ThmExitOnGdipFailure(gs, hr, "Failed to convert GDI+ bitmap into HBITMAP.");
+    }
+    hr = S_OK;
+LExit:
+    if (pBitmap)
+    {
+        delete pBitmap;
+    }
+    ReleaseStr(sczImageFile);
+    ReleaseBSTR(bstr);
+    return hr;
+}
+static HRESULT ParseIcon(
+    __in_opt HMODULE hModule,
+    __in_z_opt LPCWSTR wzRelativePath,
+    __in IXMLDOMNode* pElement,
+    __out HICON* phIcon
+    )
+{
+    HRESULT hr = S_OK;
+    BSTR bstr = NULL;
+    LPWSTR sczImageFile = NULL;
+    int iResourceId = 0;
+    *phIcon = NULL;
+    hr = XmlGetAttribute(pElement, L"IconResource", &bstr);
+    ThmExitOnFailure(hr, "Failed to get icon resource attribute.");
+    if (S_OK == hr)
+    {
+        iResourceId = wcstol(bstr, NULL, 10);
+        *phIcon = reinterpret_cast<HICON>(::LoadImageW(hModule, MAKEINTRESOURCEW(iResourceId), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE));
+        ThmExitOnNullWithLastError(*phIcon, hr, "Failed to load icon.");
+    }
+    else
+    {
+        ReleaseNullBSTR(bstr);
+        hr = XmlGetAttribute(pElement, L"IconFile", &bstr);
+        ThmExitOnFailure(hr, "Failed to get icon file attribute.");
+        if (S_OK == hr)
+        {
+            if (wzRelativePath)
+            {
+                hr = PathConcat(wzRelativePath, bstr, &sczImageFile);
+                ThmExitOnFailure(hr, "Failed to combine image file path.");
+            }
+            else
+            {
+                hr = PathRelativeToModule(&sczImageFile, bstr, hModule);
+                ThmExitOnFailure(hr, "Failed to get image filename.");
+            }
+            *phIcon = reinterpret_cast<HICON>(::LoadImageW(NULL, sczImageFile, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | LR_LOADFROMFILE));
+            ThmExitOnNullWithLastError(*phIcon, hr, "Failed to load icon: %ls.", sczImageFile);
+        }
+    }
+LExit:
+    ReleaseStr(sczImageFile);
+    ReleaseBSTR(bstr);
+    return hr;
+}
+static HRESULT ParseWindow(
+    __in_opt HMODULE hModule,
+    __in_opt LPCWSTR wzRelativePath,
+    __in IXMLDOMElement* pElement,
+    __in THEME* pTheme
+    )
+{
+    HRESULT hr = S_OK;
+    IXMLDOMNode* pixn = NULL;
+    DWORD dwValue = 0;
+    BSTR bstr = NULL;
+    LPWSTR sczIconFile = NULL;
+    hr = XmlSelectSingleNode(pElement, L"Window", &pixn);
+    if (S_FALSE == hr)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+    }
+    ThmExitOnFailure(hr, "Failed to find window element.");
+    hr = XmlGetYesNoAttribute(pixn, L"AutoResize", &pTheme->fAutoResize);
+    if (E_NOTFOUND == hr)
+    {
+        hr = S_OK;
+    }
+    ThmExitOnFailure(hr, "Failed to get window AutoResize attribute.");
+    hr = XmlGetAttributeNumber(pixn, L"Width", &dwValue);
+    if (S_FALSE == hr)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+        ThmExitOnRootFailure(hr, "Failed to find window Width attribute.");
+    }
+    ThmExitOnFailure(hr, "Failed to get window Width attribute.");
+    pTheme->nWidth = pTheme->nDefaultDpiWidth = pTheme->nWindowWidth = dwValue;
+    hr = XmlGetAttributeNumber(pixn, L"Height", &dwValue);
+    if (S_FALSE == hr)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+        ThmExitOnRootFailure(hr, "Failed to find window Height attribute.");
+    }
+    ThmExitOnFailure(hr, "Failed to get window Height attribute.");
+    pTheme->nHeight = pTheme->nDefaultDpiHeight = pTheme->nWindowHeight = dwValue;
+    hr = XmlGetAttributeNumber(pixn, L"MinimumWidth", &dwValue);
+    if (S_FALSE == hr)
+    {
+        dwValue = 0;
+        hr = S_OK;
+    }
+    ThmExitOnFailure(hr, "Failed to get window MinimumWidth attribute.");
+    pTheme->nMinimumWidth = pTheme->nDefaultDpiMinimumWidth = dwValue;
+    hr = XmlGetAttributeNumber(pixn, L"MinimumHeight", &dwValue);
+    if (S_FALSE == hr)
+    {
+        dwValue = 0;
+        hr = S_OK;
+    }
+    ThmExitOnFailure(hr, "Failed to get window MinimumHeight attribute.");
+    pTheme->nMinimumHeight = pTheme->nDefaultDpiMinimumHeight = dwValue;
+    hr = XmlGetAttributeNumber(pixn, L"FontId", &pTheme->dwFontId);
+    if (S_FALSE == hr)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+        ThmExitOnRootFailure(hr, "Failed to find window FontId attribute.");
+    }
+    ThmExitOnFailure(hr, "Failed to get window FontId attribute.");
+    // Get the optional window icon from a resource.
+    hr = XmlGetAttribute(pixn, L"IconResource", &bstr);
+    ThmExitOnFailure(hr, "Failed to get window IconResource attribute.");
+    if (S_OK == hr)
+    {
+        pTheme->hIcon = ::LoadIconW(hModule, bstr);
+        ThmExitOnNullWithLastError(pTheme->hIcon, hr, "Failed to load window icon from IconResource.");
+        ReleaseNullBSTR(bstr);
+    }
+    // Get the optional window icon from a file.
+    hr = XmlGetAttribute(pixn, L"IconFile", &bstr);
+    ThmExitOnFailure(hr, "Failed to get window IconFile attribute.");
+    if (S_OK == hr)
+    {
+        if (wzRelativePath)
+        {
+            hr = PathConcat(wzRelativePath, bstr, &sczIconFile);
+            ThmExitOnFailure(hr, "Failed to combine icon file path.");
+        }
+        else
+        {
+            hr = PathRelativeToModule(&sczIconFile, bstr, hModule);
+            ThmExitOnFailure(hr, "Failed to get icon filename.");
+        }
+        pTheme->hIcon = ::LoadImageW(NULL, sczIconFile, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | LR_LOADFROMFILE);
+        ThmExitOnNullWithLastError(pTheme->hIcon, hr, "Failed to load window icon from IconFile: %ls.", bstr);
+        ReleaseNullBSTR(bstr);
+    }
+    hr = XmlGetAttributeNumber(pixn, L"SourceX", reinterpret_cast<DWORD*>(&pTheme->nSourceX));
+    if (S_FALSE == hr)
+    {
+        pTheme->nSourceX = -1;
+    }
+    ThmExitOnFailure(hr, "Failed to get window SourceX attribute.");
+    hr = XmlGetAttributeNumber(pixn, L"SourceY", reinterpret_cast<DWORD*>(&pTheme->nSourceY));
+    if (S_FALSE == hr)
+    {
+        pTheme->nSourceY = -1;
+    }
+    ThmExitOnFailure(hr, "Failed to get window SourceY attribute.");
+    // Parse the optional window style.
+    hr = XmlGetAttributeNumberBase(pixn, L"HexStyle", 16, &pTheme->dwStyle);
+    ThmExitOnFailure(hr, "Failed to get theme window style (Window@HexStyle) attribute.");
+    if (S_FALSE == hr)
+    {
+        pTheme->dwStyle = WS_VISIBLE | WS_MINIMIZEBOX | WS_SYSMENU;
+        pTheme->dwStyle |= (0 <= pTheme->nSourceX && 0 <= pTheme->nSourceY) ? WS_POPUP : WS_OVERLAPPED;
+    }
+    hr = XmlGetAttributeNumber(pixn, L"StringId", reinterpret_cast<DWORD*>(&pTheme->uStringId));
+    ThmExitOnFailure(hr, "Failed to get window StringId attribute.");
+    if (S_FALSE == hr)
+    {
+        pTheme->uStringId = UINT_MAX;
+        hr = XmlGetAttribute(pixn, L"Caption", &bstr);
+        ThmExitOnFailure(hr, "Failed to get window Caption attribute.");
+        if (S_FALSE == hr)
+        {
+            hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+            ThmExitOnRootFailure(hr, "Window elements must contain the Caption or StringId attribute.");
+        }
+        hr = StrAllocString(&pTheme->sczCaption, bstr, 0);
+        ThmExitOnFailure(hr, "Failed to copy window Caption attribute.");
+    }
+    // Parse any image lists.
+    hr = ParseImageLists(hModule, wzRelativePath, pixn, pTheme);
+    ThmExitOnFailure(hr, "Failed to parse image lists.");
+    // Parse the pages.
+    hr = ParsePages(hModule, wzRelativePath, pixn, pTheme);
+    ThmExitOnFailure(hr, "Failed to parse theme pages.");
+    // Parse the non-paged controls.
+    hr = ParseControls(hModule, wzRelativePath, pixn, pTheme, NULL, NULL);
+    ThmExitOnFailure(hr, "Failed to parse theme controls.");
+LExit:
+    ReleaseStr(sczIconFile);
+    ReleaseBSTR(bstr);
+    ReleaseObject(pixn);
+    return hr;
+}
+static HRESULT ParseFonts(
+    __in IXMLDOMElement* pElement,
+    __in THEME* pTheme
+    )
+{
+    HRESULT hr = S_OK;
+    IXMLDOMNodeList* pixnl = NULL;
+    IXMLDOMNode* pixn = NULL;
+    BSTR bstrName = NULL;
+    DWORD dwId = 0;
+    COLORREF crForeground = THEME_INVISIBLE_COLORREF;
+    COLORREF crBackground = THEME_INVISIBLE_COLORREF;
+    DWORD dwSystemForegroundColor = FALSE;
+    DWORD dwSystemBackgroundColor = FALSE;
+    hr = XmlSelectNodes(pElement, L"Font", &pixnl);
+    ThmExitOnFailure(hr, "Failed to find font elements.");
+    hr = pixnl->get_length(reinterpret_cast<long*>(&pTheme->cFonts));
+    ThmExitOnFailure(hr, "Failed to count the number of theme fonts.");
+    if (!pTheme->cFonts)
+    {
+        ExitFunction1(hr = S_OK);
+    }
+    pTheme->rgFonts = static_cast<THEME_FONT*>(MemAlloc(sizeof(THEME_FONT) * pTheme->cFonts, TRUE));
+    ThmExitOnNull(pTheme->rgFonts, hr, E_OUTOFMEMORY, "Failed to allocate theme fonts.");
+    while (S_OK == (hr = XmlNextElement(pixnl, &pixn, NULL)))
+    {
+        hr = XmlGetAttributeNumber(pixn, L"Id", &dwId);
+        if (S_FALSE == hr)
+        {
+            hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+        }
+        ThmExitOnFailure(hr, "Failed to find font id.");
+        if (pTheme->cFonts <= dwId)
+        {
+            hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+            ThmExitOnRootFailure(hr, "Invalid theme font id.");
+        }
+        THEME_FONT* pFont = pTheme->rgFonts + dwId;
+        if (pFont->cFontInstances)
+        {
+            hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+            ThmExitOnRootFailure(hr, "Theme font id duplicated.");
+        }
+        pFont->lfQuality = CLEARTYPE_QUALITY;
+        hr = XmlGetText(pixn, &bstrName);
+        if (S_FALSE == hr)
+        {
+            hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+        }
+        ThmExitOnFailure(hr, "Failed to get font name.");
+        hr = StrAllocString(&pFont->sczFaceName, bstrName, 0);
+        ThmExitOnFailure(hr, "Failed to copy font name.");
+        hr = XmlGetAttributeNumber(pixn, L"Height", reinterpret_cast<DWORD*>(&pFont->lfHeight));
+        if (S_FALSE == hr)
+        {
+            hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+        }
+        ThmExitOnFailure(hr, "Failed to find font height attribute.");
+        hr = XmlGetAttributeNumber(pixn, L"Weight", reinterpret_cast<DWORD*>(&pFont->lfWeight));
+        if (S_FALSE == hr)
+        {
+            pFont->lfWeight = FW_DONTCARE;
+            hr = S_OK;
+        }
+        ThmExitOnFailure(hr, "Failed to find font weight attribute.");
+        hr = XmlGetYesNoAttribute(pixn, L"Underline", reinterpret_cast<BOOL*>(&pFont->lfUnderline));
+        if (E_NOTFOUND == hr)
+        {
+            pFont->lfUnderline = FALSE;
+            hr = S_OK;
+        }
+        ThmExitOnFailure(hr, "Failed to find font underline attribute.");
+        hr = GetFontColor(pixn, L"Foreground", &crForeground, &dwSystemForegroundColor);
+        ThmExitOnFailure(hr, "Failed to find font foreground color.");
+        hr = GetFontColor(pixn, L"Background", &crBackground, &dwSystemBackgroundColor);
+        ThmExitOnFailure(hr, "Failed to find font background color.");
+        pFont->crForeground = crForeground;
+        if (THEME_INVISIBLE_COLORREF != pFont->crForeground)
+        {
+            pFont->hForeground = dwSystemForegroundColor ? ::GetSysColorBrush(dwSystemForegroundColor) : ::CreateSolidBrush(pFont->crForeground);
+            ThmExitOnNull(pFont->hForeground, hr, E_OUTOFMEMORY, "Failed to create text foreground brush.");
+        }
+        pFont->crBackground = crBackground;
+        if (THEME_INVISIBLE_COLORREF != pFont->crBackground)
+        {
+            pFont->hBackground = dwSystemBackgroundColor ? ::GetSysColorBrush(dwSystemBackgroundColor) : ::CreateSolidBrush(pFont->crBackground);
+            ThmExitOnNull(pFont->hBackground, hr, E_OUTOFMEMORY, "Failed to create text background brush.");
+        }
+        ReleaseNullBSTR(bstrName);
+        ReleaseNullObject(pixn);
+    }
+    ThmExitOnFailure(hr, "Failed to enumerate all fonts.");
+    if (S_FALSE == hr)
+    {
+        hr = S_OK;
+    }
+LExit:
+    ReleaseBSTR(bstrName);
+    ReleaseObject(pixn);
+    ReleaseObject(pixnl);
+    return hr;
+}
+static HRESULT GetFontColor(
+    __in IXMLDOMNode* pixn,
+    __in_z LPCWSTR wzAttributeName,
+    __out COLORREF* pColorRef,
+    __out DWORD* pdwSystemColor
+    )
+{
+    HRESULT hr = S_OK;
+    BSTR bstr = NULL;
+    *pdwSystemColor = 0;
+    hr = XmlGetAttribute(pixn, wzAttributeName, &bstr);
+    if (S_FALSE == hr)
+    {
+        *pColorRef = THEME_INVISIBLE_COLORREF;
+        ExitFunction1(hr = S_OK);
+    }
+    ThmExitOnFailure(hr, "Failed to find font %ls color.", wzAttributeName);
+    if (pdwSystemColor)
+    {
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstr, -1, L"btnface", -1))
+        {
+            *pdwSystemColor = COLOR_BTNFACE;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstr, -1, L"btntext", -1))
+        {
+            *pdwSystemColor = COLOR_BTNTEXT;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstr, -1, L"graytext", -1))
+        {
+            *pdwSystemColor = COLOR_GRAYTEXT;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstr, -1, L"highlight", -1))
+        {
+            *pdwSystemColor = COLOR_HIGHLIGHT;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstr, -1, L"highlighttext", -1))
+        {
+            *pdwSystemColor = COLOR_HIGHLIGHTTEXT;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstr, -1, L"hotlight", -1))
+        {
+            *pdwSystemColor = COLOR_HOTLIGHT;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstr, -1, L"window", -1))
+        {
+            *pdwSystemColor = COLOR_WINDOW;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstr, -1, L"windowtext", -1))
+        {
+            *pdwSystemColor = COLOR_WINDOWTEXT;
+        }
+        else
+        {
+            *pColorRef = wcstoul(bstr, NULL, 16);
+        }
+        if (*pdwSystemColor)
+        {
+            *pColorRef = ::GetSysColor(*pdwSystemColor);
+        }
+    }
+LExit:
+    ReleaseBSTR(bstr);
+    return hr;
+}
+static HRESULT ParsePages(
+    __in_opt HMODULE hModule,
+    __in_opt LPCWSTR wzRelativePath,
+    __in IXMLDOMNode* pElement,
+    __in THEME* pTheme
+    )
+{
+    HRESULT hr = S_OK;
+    IXMLDOMNodeList* pixnl = NULL;
+    IXMLDOMNode* pixn = NULL;
+    BSTR bstrType = NULL;
+    THEME_PAGE* pPage = NULL;
+    DWORD iPage = 0;
+    hr = XmlSelectNodes(pElement, L"Page", &pixnl);
+    ThmExitOnFailure(hr, "Failed to find page elements.");
+    hr = pixnl->get_length(reinterpret_cast<long*>(&pTheme->cPages));
+    ThmExitOnFailure(hr, "Failed to count the number of theme pages.");
+    if (!pTheme->cPages)
+    {
+        ExitFunction1(hr = S_OK);
+    }
+    pTheme->rgPages = static_cast<THEME_PAGE*>(MemAlloc(sizeof(THEME_PAGE) * pTheme->cPages, TRUE));
+    ThmExitOnNull(pTheme->rgPages, hr, E_OUTOFMEMORY, "Failed to allocate theme pages.");
+    while (S_OK == (hr = XmlNextElement(pixnl, &pixn, &bstrType)))
+    {
+        pPage = pTheme->rgPages + iPage;
+        pPage->wId = static_cast<WORD>(iPage + 1);
+        hr = XmlGetAttributeEx(pixn, L"Name", &pPage->sczName);
+        if (E_NOTFOUND == hr)
+        {
+            hr = S_OK;
+        }
+        ThmExitOnFailure(hr, "Failed when querying page Name.");
+        hr = ParseControls(hModule, wzRelativePath, pixn, pTheme, NULL, pPage);
+        ThmExitOnFailure(hr, "Failed to parse page controls.");
+        ++iPage;
+        ReleaseNullBSTR(bstrType);
+        ReleaseNullObject(pixn);
+    }
+    ThmExitOnFailure(hr, "Failed to enumerate all pages.");
+    if (S_FALSE == hr)
+    {
+        hr = S_OK;
+    }
+LExit:
+    ReleaseBSTR(bstrType);
+    ReleaseObject(pixn);
+    ReleaseObject(pixnl);
+    return hr;
+}
+static HRESULT ParseImageLists(
+    __in_opt HMODULE hModule,
+    __in_opt LPCWSTR wzRelativePath,
+    __in IXMLDOMNode* pElement,
+    __in THEME* pTheme
+    )
+{
+    HRESULT hr = S_OK;
+    IXMLDOMNodeList* pixnlImageLists = NULL;
+    IXMLDOMNode* pixnImageList = NULL;
+    IXMLDOMNodeList* pixnlImages = NULL;
+    IXMLDOMNode* pixnImage = NULL;
+    DWORD dwImageListIndex = 0;
+    DWORD dwImageCount = 0;
+    HBITMAP hBitmap = NULL;
+    BITMAP bm = { };
+    BSTR bstr = NULL;
+    DWORD i = 0;
+    int iRetVal = 0;
+    hr = XmlSelectNodes(pElement, L"ImageList", &pixnlImageLists);
+    ThmExitOnFailure(hr, "Failed to find ImageList elements.");
+    hr = pixnlImageLists->get_length(reinterpret_cast<long*>(&pTheme->cImageLists));
+    ThmExitOnFailure(hr, "Failed to count the number of image lists.");
+    if (!pTheme->cImageLists)
+    {
+        ExitFunction1(hr = S_OK);
+    }
+    pTheme->rgImageLists = static_cast<THEME_IMAGELIST*>(MemAlloc(sizeof(THEME_IMAGELIST) * pTheme->cImageLists, TRUE));
+    ThmExitOnNull(pTheme->rgImageLists, hr, E_OUTOFMEMORY, "Failed to allocate theme image lists.");
+    while (S_OK == (hr = XmlNextElement(pixnlImageLists, &pixnImageList, NULL)))
+    {
+        hr = XmlGetAttribute(pixnImageList, L"Name", &bstr);
+        if (S_FALSE == hr)
+        {
+            hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+        }
+        ThmExitOnFailure(hr, "Failed to find ImageList/@Name attribute.");
+        hr = StrAllocString(&pTheme->rgImageLists[dwImageListIndex].sczName, bstr, 0);
+        ThmExitOnFailure(hr, "Failed to make copy of ImageList name.");
+        hr = XmlSelectNodes(pixnImageList, L"Image", &pixnlImages);
+        ThmExitOnFailure(hr, "Failed to select child Image nodes.");
+        hr = pixnlImages->get_length(reinterpret_cast<long*>(&dwImageCount));
+        ThmExitOnFailure(hr, "Failed to count the number of images in list.");
+        if (0 < dwImageCount)
+        {
+            i = 0;
+            while (S_OK == (hr = XmlNextElement(pixnlImages, &pixnImage, NULL)))
+            {
+                if (hBitmap)
+                {
+                    ::DeleteObject(hBitmap);
+                    hBitmap = NULL;
+                }
+                hr = ParseImage(hModule, wzRelativePath, pixnImage, &hBitmap);
+                ThmExitOnFailure(hr, "Failed to parse image: %u", i);
+                if (0 == i)
+                {
+                    ::GetObjectW(hBitmap, sizeof(BITMAP), &bm);
+                    pTheme->rgImageLists[dwImageListIndex].hImageList = ImageList_Create(bm.bmWidth, bm.bmHeight, ILC_COLOR24, dwImageCount, 0);
+                    ThmExitOnNullWithLastError(pTheme->rgImageLists[dwImageListIndex].hImageList, hr, "Failed to create image list.");
+                }
+                iRetVal = ImageList_Add(pTheme->rgImageLists[dwImageListIndex].hImageList, hBitmap, NULL);
+                if (-1 == iRetVal)
+                {
+                    ThmExitWithLastError(hr, "Failed to add image %u to image list.", i);
+                }
+                ++i;
+            }
+        }
+        ++dwImageListIndex;
+    }
+LExit:
+    if (hBitmap)
+    {
+        ::DeleteObject(hBitmap);
+    }
+    ReleaseBSTR(bstr);
+    ReleaseObject(pixnlImageLists);
+    ReleaseObject(pixnImageList);
+    ReleaseObject(pixnlImages);
+    ReleaseObject(pixnImage);
+    return hr;
+}
+static void GetControls(
+    __in THEME* pTheme,
+    __in_opt THEME_CONTROL* pParentControl,
+    __out DWORD** ppcControls,
+    __out THEME_CONTROL*** pprgControls
+    )
+{
+    if (pParentControl)
+    {
+        *ppcControls = &pParentControl->cControls;
+        *pprgControls = &pParentControl->rgControls;
+    }
+    else
+    {
+        *ppcControls = &pTheme->cControls;
+        *pprgControls = &pTheme->rgControls;
+    }
+}
+static void GetControls(
+    __in const THEME* pTheme,
+    __in_opt const THEME_CONTROL* pParentControl,
+    __out DWORD& cControls,
+    __out THEME_CONTROL*& rgControls
+    )
+{
+    if (pParentControl)
+    {
+        cControls = pParentControl->cControls;
+        rgControls = pParentControl->rgControls;
+    }
+    else
+    {
+        cControls = pTheme->cControls;
+        rgControls = pTheme->rgControls;
+    }
+}
+static HRESULT ParseControls(
+    __in_opt HMODULE hModule,
+    __in_opt LPCWSTR wzRelativePath,
+    __in IXMLDOMNode* pElement,
+    __in THEME* pTheme,
+    __in_opt THEME_CONTROL* pParentControl,
+    __in_opt THEME_PAGE* pPage
+    )
+{
+    HRESULT hr = S_OK;
+    IXMLDOMNodeList* pixnl = NULL;
+    IXMLDOMNode* pixn = NULL;
+    BSTR bstrType = NULL;
+    DWORD cNewControls = 0;
+    DWORD iControl = 0;
+    DWORD iPageControl = 0;
+    DWORD* pcControls = NULL;
+    THEME_CONTROL** prgControls = NULL;
+    GetControls(pTheme, pParentControl, &pcControls, &prgControls);
+    hr = ParseRadioButtons(hModule, wzRelativePath, pElement, pTheme, pParentControl, pPage);
+    ThmExitOnFailure(hr, "Failed to parse radio buttons.");
+    hr = XmlSelectNodes(pElement, L"Billboard|Button|Checkbox|Combobox|CommandLink|Editbox|Hyperlink|Hypertext|ImageControl|Label|ListView|Panel|Progressbar|Richedit|Static|Tabs|TreeView", &pixnl);
+    ThmExitOnFailure(hr, "Failed to find control elements.");
+    hr = pixnl->get_length(reinterpret_cast<long*>(&cNewControls));
+    ThmExitOnFailure(hr, "Failed to count the number of theme controls.");
+    if (!cNewControls)
+    {
+        ExitFunction1(hr = S_OK);
+    }
+    hr = MemReAllocArray(reinterpret_cast<LPVOID*>(prgControls), *pcControls, sizeof(THEME_CONTROL), cNewControls);
+    ThmExitOnFailure(hr, "Failed to reallocate theme controls.");
+    cNewControls += *pcControls;
+    if (pPage)
+    {
+        iPageControl = pPage->cControlIndices;
+        pPage->cControlIndices += cNewControls;
+    }
+    iControl = *pcControls;
+    *pcControls = cNewControls;
+    while (S_OK == (hr = XmlNextElement(pixnl, &pixn, &bstrType)))
+    {
+        THEME_CONTROL_TYPE type = THEME_CONTROL_TYPE_UNKNOWN;
+        if (!bstrType)
+        {
+            hr = E_UNEXPECTED;
+            ThmExitOnFailure(hr, "Null element encountered!");
+        }
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Billboard", -1))
+        {
+            type = THEME_CONTROL_TYPE_BILLBOARD;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Button", -1))
+        {
+            type = THEME_CONTROL_TYPE_BUTTON;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Checkbox", -1))
+        {
+            type = THEME_CONTROL_TYPE_CHECKBOX;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Combobox", -1))
+        {
+            type = THEME_CONTROL_TYPE_COMBOBOX;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"CommandLink", -1))
+        {
+            type = THEME_CONTROL_TYPE_COMMANDLINK;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Editbox", -1))
+        {
+            type = THEME_CONTROL_TYPE_EDITBOX;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Hyperlink", -1))
+        {
+            type = THEME_CONTROL_TYPE_HYPERLINK;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Hypertext", -1))
+        {
+            type = THEME_CONTROL_TYPE_HYPERTEXT;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"ImageControl", -1))
+        {
+            type = THEME_CONTROL_TYPE_IMAGE;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Label", -1))
+        {
+            type = THEME_CONTROL_TYPE_LABEL;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"ListView", -1))
+        {
+            type = THEME_CONTROL_TYPE_LISTVIEW;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Panel", -1))
+        {
+            type = THEME_CONTROL_TYPE_PANEL;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Progressbar", -1))
+        {
+            type = THEME_CONTROL_TYPE_PROGRESSBAR;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Richedit", -1))
+        {
+            type = THEME_CONTROL_TYPE_RICHEDIT;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Static", -1))
+        {
+            type = THEME_CONTROL_TYPE_STATIC;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"Tabs", -1))
+        {
+            type = THEME_CONTROL_TYPE_TAB;
+        }
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"TreeView", -1))
+        {
+            type = THEME_CONTROL_TYPE_TREEVIEW;
+        }
+        if (THEME_CONTROL_TYPE_UNKNOWN != type)
+        {
+            THEME_CONTROL* pControl = *prgControls + iControl;
+            pControl->type = type;
+            // billboard children are always the size of the billboard
+            BOOL fBillboardSizing = pParentControl && THEME_CONTROL_TYPE_BILLBOARD == pParentControl->type;
+            hr = ParseControl(hModule, wzRelativePath, pixn, pTheme, pControl, fBillboardSizing, pPage);
+            ThmExitOnFailure(hr, "Failed to parse control.");
+            if (fBillboardSizing)
+            {
+                pControl->nX = pControl->nDefaultDpiX = 0;
+                pControl->nY = pControl->nDefaultDpiY = 0;
+                pControl->nWidth = pControl->nDefaultDpiWidth = 0;
+                pControl->nHeight = pControl->nDefaultDpiHeight = 0;
+            }
+            if (pPage)
+            {
+                pControl->wPageId = pPage->wId;
+                ++iPageControl;
+            }
+            ++iControl;
+        }
+        ReleaseNullBSTR(bstrType);
+        ReleaseNullObject(pixn);
+    }
+    ThmExitOnFailure(hr, "Failed to enumerate all controls.");
+    if (S_FALSE == hr)
+    {
+        hr = S_OK;
+    }
+    AssertSz(iControl == cNewControls, "The number of parsed controls didn't match the number of expected controls.");
+LExit:
+    ReleaseBSTR(bstrType);
+    ReleaseObject(pixn);
+    ReleaseObject(pixnl);
+    return hr;
+}
+static HRESULT ParseControl(
+    __in_opt HMODULE hModule,
+    __in_opt LPCWSTR wzRelativePath,
+    __in IXMLDOMNode* pixn,
+    __in THEME* pTheme,
+    __in THEME_CONTROL* pControl,
+    __in BOOL fSkipDimensions,
+    __in_opt THEME_PAGE* pPage
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD dwValue = 0;
+    BOOL fValue = FALSE;
+    BSTR bstrText = NULL;
+    BOOL fAnyTextChildren = FALSE;
+    BOOL fAnyNoteChildren = FALSE;
+    hr = XmlGetAttributeEx(pixn, L"Name", &pControl->sczName);
+    if (E_NOTFOUND == hr)
+    {
+        hr = S_OK;
+    }
+    ThmExitOnFailure(hr, "Failed when querying control Name attribute.");
+    hr = XmlGetAttributeEx(pixn, L"EnableCondition", &pControl->sczEnableCondition);
+    if (E_NOTFOUND == hr)
+    {
+        hr = S_OK;
+    }
+    ThmExitOnFailure(hr, "Failed when querying control EnableCondition attribute.");
+    hr = XmlGetAttributeEx(pixn, L"VisibleCondition", &pControl->sczVisibleCondition);
+    if (E_NOTFOUND == hr)
+    {
+        hr = S_OK;
+    }
+    ThmExitOnFailure(hr, "Failed when querying control VisibleCondition attribute.");
+    if (!fSkipDimensions)
+    {
+        hr = XmlGetAttributeNumber(pixn, L"X", &dwValue);
+        if (S_FALSE == hr)
+        {
+            hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+        }
+        ThmExitOnFailure(hr, "Failed to find control X attribute.");
+        pControl->nX = pControl->nDefaultDpiX = dwValue;
+        hr = XmlGetAttributeNumber(pixn, L"Y", &dwValue);
+        if (S_FALSE == hr)
+        {
+            hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+        }
+        ThmExitOnFailure(hr, "Failed to find control Y attribute.");
+        pControl->nY = pControl->nDefaultDpiY = dwValue;
+        hr = XmlGetAttributeNumber(pixn, L"Height", &dwValue);
+        if (S_FALSE == hr)
+        {
+            hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+        }
+        ThmExitOnFailure(hr, "Failed to find control Height attribute.");
+        pControl->nHeight = pControl->nDefaultDpiHeight = dwValue;
+        hr = XmlGetAttributeNumber(pixn, L"Width", &dwValue);
+        if (S_FALSE == hr)
+        {
+            hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+        }
+        ThmExitOnFailure(hr, "Failed to find control Width attribute.");
+        pControl->nWidth = pControl->nDefaultDpiWidth = dwValue;
+    }
+    // Parse the optional background resource image.
+    hr = ParseImage(hModule, wzRelativePath, pixn, &pControl->hImage);
+    ThmExitOnFailure(hr, "Failed while parsing control image.");
+    hr = XmlGetAttributeNumber(pixn, L"SourceX", reinterpret_cast<DWORD*>(&pControl->nSourceX));
+    if (S_FALSE == hr)
+    {
+        pControl->nSourceX = -1;
+    }
+    ThmExitOnFailure(hr, "Failed when querying control SourceX attribute.");
+    hr = XmlGetAttributeNumber(pixn, L"SourceY", reinterpret_cast<DWORD*>(&pControl->nSourceY));
+    if (S_FALSE == hr)
+    {
+        pControl->nSourceY = -1;
+    }
+    ThmExitOnFailure(hr, "Failed when querying control SourceY attribute.");
+    hr = XmlGetAttributeNumber(pixn, L"FontId", &pControl->dwFontId);
+    if (S_FALSE == hr)
+    {
+        pControl->dwFontId = THEME_INVALID_ID;
+    }
+    ThmExitOnFailure(hr, "Failed when querying control FontId attribute.");
+    // Parse the optional window style.
+    hr = XmlGetAttributeNumberBase(pixn, L"HexStyle", 16, &pControl->dwStyle);
+    ThmExitOnFailure(hr, "Failed when querying control HexStyle attribute.");
+    // Parse the tabstop bit "shortcut nomenclature", this could have been set with the style above.
+    hr = XmlGetYesNoAttribute(pixn, L"TabStop", &fValue);
+    if (E_NOTFOUND == hr)
+    {
+        hr = S_OK;
+    }
+    else
+    {
+        ThmExitOnFailure(hr, "Failed when querying control TabStop attribute.");
+        if (fValue)
+        {
+            pControl->dwStyle |= WS_TABSTOP;
+        }
+    }
+    hr = XmlGetYesNoAttribute(pixn, L"Visible", &fValue);
+    if (E_NOTFOUND == hr)
+    {
+        hr = S_OK;
+    }
+    else
+    {
+        ThmExitOnFailure(hr, "Failed when querying control Visible attribute.");
+        if (fValue)
+        {
+            pControl->dwStyle |= WS_VISIBLE;
+        }
+    }
+    hr = XmlGetYesNoAttribute(pixn, L"HideWhenDisabled", &fValue);
+    if (E_NOTFOUND == hr)
+    {
+        hr = S_OK;
+    }
+    else
+    {
+        ThmExitOnFailure(hr, "Failed when querying control HideWhenDisabled attribute.");
+        if (fValue)
+        {
+            pControl->dwInternalStyle |= INTERNAL_CONTROL_STYLE_HIDE_WHEN_DISABLED;
+        }
+    }
+    hr = XmlGetYesNoAttribute(pixn, L"DisableAutomaticBehavior", &pControl->fDisableVariableFunctionality);
+    if (E_NOTFOUND == hr)
+    {
+        hr = S_OK;
+    }
+    else
+    {
+        ThmExitOnFailure(hr, "Failed when querying control DisableAutomaticBehavior attribute.");
+    }
+    hr = ParseActions(pixn, pControl);
+    ThmExitOnFailure(hr, "Failed to parse action nodes of the control.");
+    hr = ParseText(pixn, pControl, &fAnyTextChildren);
+    ThmExitOnFailure(hr, "Failed to parse text nodes of the control.");
+    hr = ParseTooltips(pixn, pControl, &fAnyTextChildren);
+    ThmExitOnFailure(hr, "Failed to parse control Tooltip.");
+    if (THEME_CONTROL_TYPE_COMMANDLINK == pControl->type)
+    {
+        hr = ParseNotes(pixn, pControl, &fAnyNoteChildren);
+        ThmExitOnFailure(hr, "Failed to parse note text nodes of the control.");
+    }
+    if (fAnyTextChildren || fAnyNoteChildren)
+    {
+        pControl->uStringId = UINT_MAX;
+    }
+    else
+    {
+        hr = XmlGetAttributeNumber(pixn, L"StringId", reinterpret_cast<DWORD*>(&pControl->uStringId));
+        ThmExitOnFailure(hr, "Failed when querying control StringId attribute.");
+        if (S_FALSE == hr)
+        {
+            pControl->uStringId = UINT_MAX;
+            if (THEME_CONTROL_TYPE_BILLBOARD == pControl->type || THEME_CONTROL_TYPE_PANEL == pControl->type)
+            {
+                // Billboards and panels have child elements and we don't want to pick up child element text in the parents.
+                hr = S_OK;
+            }
+            else
+            {
+                hr = XmlGetText(pixn, &bstrText);
+                ThmExitOnFailure(hr, "Failed to get control inner text.");
+                if (S_OK == hr)
+                {
+                    hr = StrAllocString(&pControl->sczText, bstrText, 0);
+                    ThmExitOnFailure(hr, "Failed to copy control text.");
+                    ReleaseNullBSTR(bstrText);
+                }
+                else if (S_FALSE == hr)
+                {
+                    hr = S_OK;
+                }
+            }
+        }
+    }
+    if (THEME_CONTROL_TYPE_BILLBOARD == pControl->type)
+    {
+        hr = XmlGetYesNoAttribute(pixn, L"Loop", &pControl->fBillboardLoops);
+        if (E_NOTFOUND == hr)
+        {
+            hr = S_OK;
+        }
+        ThmExitOnFailure(hr, "Failed when querying Billboard/@Loop attribute.");
+        pControl->wBillboardInterval = 5000;
+        hr = XmlGetAttributeNumber(pixn, L"Interval", &dwValue);
+        if (S_OK == hr && dwValue)
+        {
+            pControl->wBillboardInterval = static_cast<WORD>(dwValue & 0xFFFF);
+        }
+        ThmExitOnFailure(hr, "Failed when querying Billboard/@Interval attribute.");
+        hr = ParseControls(hModule, wzRelativePath, pixn, pTheme, pControl, pPage);
+        ThmExitOnFailure(hr, "Failed to parse billboard children.");
+    }
+    else if (THEME_CONTROL_TYPE_COMMANDLINK == pControl->type)
+    {
+        hr = ParseIcon(hModule, wzRelativePath, pixn, &pControl->hIcon);
+        ThmExitOnFailure(hr, "Failed while parsing control icon.");
+    }
+    else if (THEME_CONTROL_TYPE_EDITBOX == pControl->type)
+    {
+        hr = XmlGetYesNoAttribute(pixn, L"FileSystemAutoComplete", &fValue);
+        if (E_NOTFOUND == hr)
+        {
+            hr = S_OK;
+        }
+        else
+        {
+            ThmExitOnFailure(hr, "Failed when querying Editbox/@FileSystemAutoComplete attribute.");
+            if (fValue)
+            {
+                pControl->dwInternalStyle |= INTERNAL_CONTROL_STYLE_FILESYSTEM_AUTOCOMPLETE;
+            }
+        }
+    }
+    else if (THEME_CONTROL_TYPE_HYPERLINK == pControl->type || THEME_CONTROL_TYPE_BUTTON == pControl->type)
+    {
+        hr = XmlGetAttributeNumber(pixn, L"HoverFontId", &pControl->dwFontHoverId);
+        if (S_FALSE == hr)
+        {
+            pControl->dwFontHoverId = THEME_INVALID_ID;
+        }
+        ThmExitOnFailure(hr, "Failed when querying control HoverFontId attribute.");
+        hr = XmlGetAttributeNumber(pixn, L"SelectedFontId", &pControl->dwFontSelectedId);
+        if (S_FALSE == hr)
+        {
+            pControl->dwFontSelectedId = THEME_INVALID_ID;
+        }
+        ThmExitOnFailure(hr, "Failed when querying control SelectedFontId attribute.");
+    }
+    else if (THEME_CONTROL_TYPE_LABEL == pControl->type)
+    {
+        hr = XmlGetYesNoAttribute(pixn, L"Center", &fValue);
+        if (E_NOTFOUND == hr)
+        {
+            hr = S_OK;
+        }
+        else if (fValue)
+        {
+            pControl->dwStyle |= SS_CENTER;
+        }
+        ThmExitOnFailure(hr, "Failed when querying Label/@Center attribute.");
+        hr = XmlGetYesNoAttribute(pixn, L"DisablePrefix", &fValue);
+        if (E_NOTFOUND == hr)
+        {
+            hr = S_OK;
+        }
+        else if (fValue)
+        {
+            pControl->dwStyle |= SS_NOPREFIX;
+        }
+        ThmExitOnFailure(hr, "Failed when querying Label/@DisablePrefix attribute.");
+    }
+    else if (THEME_CONTROL_TYPE_LISTVIEW == pControl->type)
+    {
+        // Parse the optional extended window style.
+        hr = XmlGetAttributeNumberBase(pixn, L"HexExtendedStyle", 16, &pControl->dwExtendedStyle);
+        ThmExitOnFailure(hr, "Failed when querying ListView/@HexExtendedStyle attribute.");
+        hr = XmlGetAttribute(pixn, L"ImageList", &bstrText);
+        if (S_FALSE != hr)
+        {
+            ThmExitOnFailure(hr, "Failed when querying ListView/@ImageList attribute.");
+            hr = FindImageList(pTheme, bstrText, &pControl->rghImageList[0]);
+            ThmExitOnFailure(hr, "Failed to find image list %ls while setting ImageList for ListView.", bstrText);
+        }
+        hr = XmlGetAttribute(pixn, L"ImageListSmall", &bstrText);
+        if (S_FALSE != hr)
+        {
+            ThmExitOnFailure(hr, "Failed when querying ListView/@ImageListSmall attribute.");
+            hr = FindImageList(pTheme, bstrText, &pControl->rghImageList[1]);
+            ThmExitOnFailure(hr, "Failed to find image list %ls while setting ImageListSmall for ListView.", bstrText);
+        }
+        hr = XmlGetAttribute(pixn, L"ImageListState", &bstrText);
+        if (S_FALSE != hr)
+        {
+            ThmExitOnFailure(hr, "Failed when querying ListView/@ImageListState attribute.");
+            hr = FindImageList(pTheme, bstrText, &pControl->rghImageList[2]);
+            ThmExitOnFailure(hr, "Failed to find image list %ls while setting ImageListState for ListView.", bstrText);
+        }
+        hr = XmlGetAttribute(pixn, L"ImageListGroupHeader", &bstrText);
+        if (S_FALSE != hr)
+        {
+            ThmExitOnFailure(hr, "Failed when querying ListView/@ImageListGroupHeader attribute.");
+            hr = FindImageList(pTheme, bstrText, &pControl->rghImageList[3]);
+            ThmExitOnFailure(hr, "Failed to find image list %ls while setting ImageListGroupHeader for ListView.", bstrText);
+        }
+        hr = ParseColumns(pixn, pControl);
+        ThmExitOnFailure(hr, "Failed to parse columns.");
+    }
+    else if (THEME_CONTROL_TYPE_PANEL == pControl->type)
+    {
+        hr = ParseControls(hModule, wzRelativePath, pixn, pTheme, pControl, pPage);
+        ThmExitOnFailure(hr, "Failed to parse panel children.");
+    }
+    else if (THEME_CONTROL_TYPE_RADIOBUTTON == pControl->type)
+    {
+        hr = XmlGetAttributeEx(pixn, L"Value", &pControl->sczValue);
+        if (E_NOTFOUND == hr)
+        {
+            hr = S_OK;
+        }
+        ThmExitOnFailure(hr, "Failed when querying RadioButton/@Value attribute.");
+    }
+    else if (THEME_CONTROL_TYPE_TAB == pControl->type)
+    {
+        hr = ParseTabs(pixn, pControl);
+        ThmExitOnFailure(hr, "Failed to parse tabs");
+    }
+    else if (THEME_CONTROL_TYPE_TREEVIEW == pControl->type)
+    {
+        pControl->dwStyle |= TVS_DISABLEDRAGDROP;
+        hr = XmlGetYesNoAttribute(pixn, L"EnableDragDrop", &fValue);
+        if (E_NOTFOUND == hr)
+        {
+            hr = S_OK;
+        }
+        else if (fValue)
+        {
+            pControl->dwStyle &= ~TVS_DISABLEDRAGDROP;
+        }
+        ThmExitOnFailure(hr, "Failed when querying TreeView/@EnableDragDrop attribute.");
+        hr = XmlGetYesNoAttribute(pixn, L"FullRowSelect", &fValue);
+        if (E_NOTFOUND == hr)
+        {
+            hr = S_OK;
+        }
+        else if (fValue)
+        {
+            pControl->dwStyle |= TVS_FULLROWSELECT;
+        }
+        ThmExitOnFailure(hr, "Failed when querying TreeView/@FullRowSelect attribute.");
+        hr = XmlGetYesNoAttribute(pixn, L"HasButtons", &fValue);
+        if (E_NOTFOUND == hr)
+        {
+            hr = S_OK;
+        }
+        else if (fValue)
+        {
+            pControl->dwStyle |= TVS_HASBUTTONS;
+        }
+        ThmExitOnFailure(hr, "Failed when querying TreeView/@HasButtons attribute.");
+        hr = XmlGetYesNoAttribute(pixn, L"AlwaysShowSelect", &fValue);
+        if (E_NOTFOUND == hr)
+        {
+            hr = S_OK;
+        }
+        else if (fValue)
+        {
+            pControl->dwStyle |= TVS_SHOWSELALWAYS;
+        }
+        ThmExitOnFailure(hr, "Failed when querying TreeView/@AlwaysShowSelect attribute.");
+        hr = XmlGetYesNoAttribute(pixn, L"LinesAtRoot", &fValue);
+        if (E_NOTFOUND == hr)
+        {
+            hr = S_OK;
+        }
+        else if (fValue)
+        {
+            pControl->dwStyle |= TVS_LINESATROOT;
+        }
+        ThmExitOnFailure(hr, "Failed when querying TreeView/@LinesAtRoot attribute.");
+        hr = XmlGetYesNoAttribute(pixn, L"HasLines", &fValue);
+        if (E_NOTFOUND == hr)
+        {
+            hr = S_OK;
+        }
+        else if (fValue)
+        {
+            pControl->dwStyle |= TVS_HASLINES;
+        }
+        ThmExitOnFailure(hr, "Failed when querying TreeView/@HasLines attribute.");
+    }
+LExit:
+    ReleaseBSTR(bstrText);
+    return hr;
+}
+static HRESULT ParseActions(
+    __in IXMLDOMNode* pixn,
+    __in THEME_CONTROL* pControl
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD i = 0;
+    IXMLDOMNodeList* pixnl = NULL;
+    IXMLDOMNode* pixnChild = NULL;
+    BSTR bstrType = NULL;
+    hr = XmlSelectNodes(pixn, L"BrowseDirectoryAction|ChangePageAction|CloseWindowAction", &pixnl);
+    ThmExitOnFailure(hr, "Failed to select child action nodes.");
+    hr = pixnl->get_length(reinterpret_cast<long*>(&pControl->cActions));
+    ThmExitOnFailure(hr, "Failed to count the number of action nodes.");
+    if (0 < pControl->cActions)
+    {
+        MemAllocArray(reinterpret_cast<LPVOID*>(&pControl->rgActions), sizeof(THEME_ACTION), pControl->cActions);
+        ThmExitOnNull(pControl->rgActions, hr, E_OUTOFMEMORY, "Failed to allocate THEME_ACTION structs.");
+        i = 0;
+        while (S_OK == (hr = XmlNextElement(pixnl, &pixnChild, &bstrType)))
+        {
+            if (!bstrType)
+            {
+                hr = E_UNEXPECTED;
+                ThmExitOnFailure(hr, "Null element encountered!");
+            }
+            THEME_ACTION* pAction = pControl->rgActions + i;
+            if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"BrowseDirectoryAction", -1))
+            {
+                pAction->type = THEME_ACTION_TYPE_BROWSE_DIRECTORY;
+                hr = XmlGetAttributeEx(pixnChild, L"VariableName", &pAction->BrowseDirectory.sczVariableName);
+                ThmExitOnFailure(hr, "Failed when querying BrowseDirectoryAction/@VariableName attribute.");
+            }
+            else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"ChangePageAction", -1))
+            {
+                pAction->type = THEME_ACTION_TYPE_CHANGE_PAGE;
+                hr = XmlGetAttributeEx(pixnChild, L"Page", &pAction->ChangePage.sczPageName);
+                ThmExitOnFailure(hr, "Failed when querying ChangePageAction/@Page attribute.");
+                hr = XmlGetYesNoAttribute(pixnChild, L"Cancel", &pAction->ChangePage.fCancel);
+                if (E_NOTFOUND != hr)
+                {
+                    ThmExitOnFailure(hr, "Failed when querying ChangePageAction/@Cancel attribute.");
+                }
+            }
+            else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, bstrType, -1, L"CloseWindowAction", -1))
+            {
+                pAction->type = THEME_ACTION_TYPE_CLOSE_WINDOW;
+            }
+            else
+            {
+                hr = E_UNEXPECTED;
+                ThmExitOnFailure(hr, "Unexpected element encountered: %ls", bstrType);
+            }
+            hr = XmlGetAttributeEx(pixnChild, L"Condition", &pAction->sczCondition);
+            if (E_NOTFOUND != hr)
+            {
+                ThmExitOnFailure(hr, "Failed when querying %ls/@Condition attribute.", bstrType);
+            }
+            if (!pAction->sczCondition)
+            {
+                if (pControl->pDefaultAction)
+                {
+                    hr = E_INVALIDDATA;
+                    ThmExitOnFailure(hr, "Control '%ls' has multiple actions without a condition.", pControl->sczName);
+                }
+                pControl->pDefaultAction = pAction;
+            }
+            ++i;
+            ReleaseNullBSTR(bstrType);
+            ReleaseObject(pixnChild);
+        }
+    }
+LExit:
+    ReleaseObject(pixnl);
+    ReleaseObject(pixnChild);
+    ReleaseBSTR(bstrType);
+    return hr;
+}
+static HRESULT ParseColumns(
+    __in IXMLDOMNode* pixn,
+    __in THEME_CONTROL* pControl
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD i = 0;
+    IXMLDOMNodeList* pixnl = NULL;
+    IXMLDOMNode* pixnChild = NULL;
+    BSTR bstrText = NULL;
+    DWORD dwValue = 0;
+    hr = XmlSelectNodes(pixn, L"Column", &pixnl);
+    ThmExitOnFailure(hr, "Failed to select child column nodes.");
+    hr = pixnl->get_length(reinterpret_cast<long*>(&pControl->cColumns));
+    ThmExitOnFailure(hr, "Failed to count the number of control columns.");
+    if (0 < pControl->cColumns)
+    {
+        hr = MemAllocArray(reinterpret_cast<LPVOID*>(&pControl->ptcColumns), sizeof(THEME_COLUMN), pControl->cColumns);
+        ThmExitOnFailure(hr, "Failed to allocate column structs.");
+        i = 0;
+        while (S_OK == (hr = XmlNextElement(pixnl, &pixnChild, NULL)))
+        {
+            THEME_COLUMN* pColumn = pControl->ptcColumns + i;
+            hr = XmlGetText(pixnChild, &bstrText);
+            ThmExitOnFailure(hr, "Failed to get inner text of column element.");
+            hr = XmlGetAttributeNumber(pixnChild, L"Width", &dwValue);
+            if (S_FALSE == hr)
+            {
+                dwValue = 100;
+            }
+            ThmExitOnFailure(hr, "Failed to get column width attribute.");
+            pColumn->nBaseWidth = pColumn->nDefaultDpiBaseWidth = dwValue;
+            hr = XmlGetYesNoAttribute(pixnChild, L"Expands", reinterpret_cast<BOOL*>(&pColumn->fExpands));
+            if (E_NOTFOUND == hr)
+            {
+                hr = S_OK;
+            }
+            ThmExitOnFailure(hr, "Failed to get expands attribute.");
+            hr = StrAllocString(&pColumn->pszName, bstrText, 0);
+            ThmExitOnFailure(hr, "Failed to copy column name.");
+            ++i;
+            ReleaseNullBSTR(bstrText);
+        }
+    }
+LExit:
+    ReleaseObject(pixnl);
+    ReleaseObject(pixnChild);
+    ReleaseBSTR(bstrText);
+    return hr;
+}
+static HRESULT ParseRadioButtons(
+    __in_opt HMODULE hModule,
+    __in_opt LPCWSTR wzRelativePath,
+    __in IXMLDOMNode* pixn,
+    __in THEME* pTheme,
+    __in_opt THEME_CONTROL* pParentControl,
+    __in THEME_PAGE* pPage
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD cRadioButtons = 0;
+    DWORD iControl = 0;
+    DWORD iPageControl = 0;
+    IXMLDOMNodeList* pixnlRadioButtons = NULL;
+    IXMLDOMNodeList* pixnl = NULL;
+    IXMLDOMNode* pixnRadioButtons = NULL;
+    IXMLDOMNode* pixnChild = NULL;
+    LPWSTR sczName = NULL;
+    THEME_CONTROL* pControl = NULL;
+    BOOL fFirst = FALSE;
+    DWORD* pcControls = NULL;
+    THEME_CONTROL** prgControls = NULL;
+    GetControls(pTheme, pParentControl, &pcControls, &prgControls);
+    hr = XmlSelectNodes(pixn, L"RadioButtons", &pixnlRadioButtons);
+    ThmExitOnFailure(hr, "Failed to select RadioButtons nodes.");
+    while (S_OK == (hr = XmlNextElement(pixnlRadioButtons, &pixnRadioButtons, NULL)))
+    {
+        hr = XmlGetAttributeEx(pixnRadioButtons, L"Name", &sczName);
+        if (E_NOTFOUND == hr)
+        {
+            hr = S_OK;
+        }
+        ThmExitOnFailure(hr, "Failed when querying RadioButtons Name.");
+        hr = XmlSelectNodes(pixnRadioButtons, L"RadioButton", &pixnl);
+        ThmExitOnFailure(hr, "Failed to select RadioButton nodes.");
+        hr = pixnl->get_length(reinterpret_cast<long*>(&cRadioButtons));
+        ThmExitOnFailure(hr, "Failed to count the number of RadioButton nodes.");
+        if (cRadioButtons)
+        {
+            if (pPage)
+            {
+                iPageControl = pPage->cControlIndices;
+                pPage->cControlIndices += cRadioButtons;
+            }
+            hr = MemReAllocArray(reinterpret_cast<LPVOID*>(prgControls), *pcControls, sizeof(THEME_CONTROL), cRadioButtons);
+            ThmExitOnFailure(hr, "Failed to reallocate theme controls.");
+            iControl = *pcControls;
+            *pcControls += cRadioButtons;
+            fFirst = TRUE;
+            while (S_OK == (hr = XmlNextElement(pixnl, &pixnChild, NULL)))
+            {
+                pControl = *prgControls + iControl;
+                pControl->type = THEME_CONTROL_TYPE_RADIOBUTTON;
+                hr = ParseControl(hModule, wzRelativePath, pixnChild, pTheme, pControl, FALSE, pPage);
+                ThmExitOnFailure(hr, "Failed to parse control.");
+                if (fFirst)
+                {
+                    pControl->dwStyle |= WS_GROUP;
+                    fFirst = FALSE;
+                }
+                hr = StrAllocString(&pControl->sczVariable, sczName, 0);
+                ThmExitOnFailure(hr, "Failed to copy radio button variable.");
+                if (pPage)
+                {
+                    pControl->wPageId = pPage->wId;
+                    ++iPageControl;
+                }
+                ++iControl;
+            }
+            if (!fFirst)
+            {
+                pControl->fLastRadioButton = TRUE;
+            }
+        }
+    }
+LExit:
+    ReleaseStr(sczName);
+    ReleaseObject(pixnl);
+    ReleaseObject(pixnChild);
+    ReleaseObject(pixnlRadioButtons);
+    ReleaseObject(pixnRadioButtons);
+    return hr;
+}
+static HRESULT ParseTabs(
+    __in IXMLDOMNode* pixn,
+    __in THEME_CONTROL* pControl
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD i = 0;
+    IXMLDOMNodeList* pixnl = NULL;
+    IXMLDOMNode* pixnChild = NULL;
+    BSTR bstrText = NULL;
+    hr = XmlSelectNodes(pixn, L"Tab", &pixnl);
+    ThmExitOnFailure(hr, "Failed to select child tab nodes.");
+    hr = pixnl->get_length(reinterpret_cast<long*>(&pControl->cTabs));
+    ThmExitOnFailure(hr, "Failed to count the number of tabs.");
+    if (0 < pControl->cTabs)
+    {
+        hr = MemAllocArray(reinterpret_cast<LPVOID*>(&pControl->pttTabs), sizeof(THEME_TAB), pControl->cTabs);
+        ThmExitOnFailure(hr, "Failed to allocate tab structs.");
+        i = 0;
+        while (S_OK == (hr = XmlNextElement(pixnl, &pixnChild, NULL)))
+        {
+            hr = XmlGetText(pixnChild, &bstrText);
+            ThmExitOnFailure(hr, "Failed to get inner text of tab element.");
+            hr = StrAllocString(&(pControl->pttTabs[i].pszName), bstrText, 0);
+            ThmExitOnFailure(hr, "Failed to copy tab name.");
+            ++i;
+            ReleaseNullBSTR(bstrText);
+        }
+    }
+LExit:
+    ReleaseObject(pixnl);
+    ReleaseObject(pixnChild);
+    ReleaseBSTR(bstrText);
+    return hr;
+}
+static HRESULT ParseText(
+    __in IXMLDOMNode* pixn,
+    __in THEME_CONTROL* pControl,
+    __inout BOOL* pfAnyChildren
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD i = 0;
+    IXMLDOMNodeList* pixnl = NULL;
+    IXMLDOMNode* pixnChild = NULL;
+    BSTR bstrText = NULL;
+    hr = XmlSelectNodes(pixn, L"Text", &pixnl);
+    ThmExitOnFailure(hr, "Failed to select child Text nodes.");
+    hr = pixnl->get_length(reinterpret_cast<long*>(&pControl->cConditionalText));
+    ThmExitOnFailure(hr, "Failed to count the number of Text nodes.");
+    *pfAnyChildren |= 0 < pControl->cConditionalText;
+    if (0 < pControl->cConditionalText)
+    {
+        MemAllocArray(reinterpret_cast<LPVOID*>(&pControl->rgConditionalText), sizeof(THEME_CONDITIONAL_TEXT), pControl->cConditionalText);
+        ThmExitOnNull(pControl->rgConditionalText, hr, E_OUTOFMEMORY, "Failed to allocate THEME_CONDITIONAL_TEXT structs.");
+        i = 0;
+        while (S_OK == (hr = XmlNextElement(pixnl, &pixnChild, NULL)))
+        {
+            THEME_CONDITIONAL_TEXT* pConditionalText = pControl->rgConditionalText + i;
+            hr = XmlGetAttributeEx(pixnChild, L"Condition", &pConditionalText->sczCondition);
+            if (E_NOTFOUND == hr)
+            {
+                hr = S_OK;
+            }
+            ThmExitOnFailure(hr, "Failed when querying Text/@Condition attribute.");
+            hr = XmlGetText(pixnChild, &bstrText);
+            ThmExitOnFailure(hr, "Failed to get inner text of Text element.");
+            if (S_OK == hr)
+            {
+                if (pConditionalText->sczCondition)
+                {
+                    hr = StrAllocString(&pConditionalText->sczText, bstrText, 0);
+                    ThmExitOnFailure(hr, "Failed to copy text to conditional text.");
+                    ++i;
+                }
+                else
+                {
+                    if (pControl->sczText)
+                    {
+                        hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+                        ThmExitOnFailure(hr, "Unconditional text for the '%ls' control is specified multiple times.", pControl->sczName);
+                    }
+                    hr = StrAllocString(&pControl->sczText, bstrText, 0);
+                    ThmExitOnFailure(hr, "Failed to copy text to control.");
+                    // Unconditional text entries aren't stored in the conditional text list.
+                    --pControl->cConditionalText;
+                }
+            }
+            ReleaseNullBSTR(bstrText);
+        }
+    }
+LExit:
+    ReleaseObject(pixnl);
+    ReleaseObject(pixnChild);
+    ReleaseBSTR(bstrText);
+    return hr;
+}
+static HRESULT ParseTooltips(
+    __in IXMLDOMNode* pixn,
+    __in THEME_CONTROL* pControl,
+    __inout BOOL* pfAnyChildren
+)
+{
+    HRESULT hr = S_OK;
+    IXMLDOMNode* pixnChild = NULL;
+    BSTR bstrText = NULL;
+    hr = XmlSelectSingleNode(pixn, L"Tooltip", &pixnChild);
+    ThmExitOnFailure(hr, "Failed to select child Tooltip node.");
+    if (S_OK == hr)
+    {
+        *pfAnyChildren |= TRUE;
+        hr = XmlGetText(pixnChild, &bstrText);
+        ThmExitOnFailure(hr, "Failed to get inner text of Tooltip element.");
+        if (S_OK == hr)
+        {
+            hr = StrAllocString(&pControl->sczTooltip, bstrText, 0);
+            ThmExitOnFailure(hr, "Failed to copy tooltip text to control.");
+        }
+    }
+LExit:
+    ReleaseObject(pixnChild);
+    ReleaseBSTR(bstrText);
+    return hr;
+}
+static HRESULT ParseNotes(
+    __in IXMLDOMNode* pixn,
+    __in THEME_CONTROL* pControl,
+    __out BOOL* pfAnyChildren
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD i = 0;
+    IXMLDOMNodeList* pixnl = NULL;
+    IXMLDOMNode* pixnChild = NULL;
+    BSTR bstrText = NULL;
+    hr = XmlSelectNodes(pixn, L"Note", &pixnl);
+    ThmExitOnFailure(hr, "Failed to select child Note nodes.");
+    hr = pixnl->get_length(reinterpret_cast<long*>(&pControl->cConditionalNotes));
+    ThmExitOnFailure(hr, "Failed to count the number of Note nodes.");
+    if (pfAnyChildren)
+    {
+        *pfAnyChildren = 0 < pControl->cConditionalNotes;
+    }
+    if (0 < pControl->cConditionalNotes)
+    {
+        MemAllocArray(reinterpret_cast<LPVOID*>(&pControl->rgConditionalNotes), sizeof(THEME_CONDITIONAL_TEXT), pControl->cConditionalNotes);
+        ThmExitOnNull(pControl->rgConditionalNotes, hr, E_OUTOFMEMORY, "Failed to allocate note THEME_CONDITIONAL_TEXT structs.");
+        i = 0;
+        while (S_OK == (hr = XmlNextElement(pixnl, &pixnChild, NULL)))
+        {
+            THEME_CONDITIONAL_TEXT* pConditionalNote = pControl->rgConditionalNotes + i;
+            hr = XmlGetAttributeEx(pixnChild, L"Condition", &pConditionalNote->sczCondition);
+            if (E_NOTFOUND == hr)
+            {
+                hr = S_OK;
+            }
+            ThmExitOnFailure(hr, "Failed when querying Note/@Condition attribute.");
+            hr = XmlGetText(pixnChild, &bstrText);
+            ThmExitOnFailure(hr, "Failed to get inner text of Note element.");
+            if (S_OK == hr)
+            {
+                if (pConditionalNote->sczCondition)
+                {
+                    hr = StrAllocString(&pConditionalNote->sczText, bstrText, 0);
+                    ThmExitOnFailure(hr, "Failed to copy text to conditional note text.");
+                    ++i;
+                }
+                else
+                {
+                    if (pControl->sczNote)
+                    {
+                        hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+                        ThmExitOnFailure(hr, "Unconditional note text for the '%ls' control is specified multiple times.", pControl->sczName);
+                    }
+                    hr = StrAllocString(&pControl->sczNote, bstrText, 0);
+                    ThmExitOnFailure(hr, "Failed to copy text to command link control.");
+                    // Unconditional note entries aren't stored in the conditional notes list.
+                    --pControl->cConditionalNotes;
+                }
+            }
+            ReleaseNullBSTR(bstrText);
+        }
+    }
+LExit:
+    ReleaseObject(pixnl);
+    ReleaseObject(pixnChild);
+    ReleaseBSTR(bstrText);
+    return hr;
+}
+static HRESULT StartBillboard(
+    __in THEME* pTheme,
+    __in DWORD dwControl
+    )
+{
+    HRESULT hr = E_NOTFOUND;
+    HWND hWnd = ::GetDlgItem(pTheme->hwndParent, dwControl);
+    if (hWnd)
+    {
+        THEME_CONTROL* pControl = const_cast<THEME_CONTROL*>(FindControlFromHWnd(pTheme, hWnd));
+        if (pControl && THEME_CONTROL_TYPE_BILLBOARD == pControl->type)
+        {
+            // kick off
+            pControl->dwData = 0;
+            OnBillboardTimer(pTheme, pTheme->hwndParent, dwControl);
+            if (!::SetTimer(pTheme->hwndParent, pControl->wId, pControl->wBillboardInterval, NULL))
+            {
+                ThmExitWithLastError(hr, "Failed to start billboard.");
+            }
+            hr = S_OK;
+        }
+    }
+LExit:
+    return hr;
+}
+static HRESULT StopBillboard(
+    __in THEME* pTheme,
+    __in DWORD dwControl
+    )
+{
+    HRESULT hr = E_NOTFOUND;
+    HWND hWnd = ::GetDlgItem(pTheme->hwndParent, dwControl);
+    if (hWnd)
+    {
+        const THEME_CONTROL* pControl = FindControlFromHWnd(pTheme, hWnd);
+        if (pControl && THEME_CONTROL_TYPE_BILLBOARD == pControl->type)
+        {
+            ThemeControlEnable(pTheme, dwControl, FALSE);
+            if (::KillTimer(pTheme->hwndParent, pControl->wId))
+            {
+                hr = S_OK;
+            }
+        }
+    }
+    return hr;
+}
+static HRESULT EnsureFontInstance(
+    __in THEME* pTheme,
+    __in THEME_FONT* pFont,
+    __out THEME_FONT_INSTANCE** ppFontInstance
+    )
+{
+    HRESULT hr = S_OK;
+    THEME_FONT_INSTANCE* pFontInstance = NULL;
+    LOGFONTW lf = { };
+    for (DWORD i = 0; i < pFont->cFontInstances; ++i)
+    {
+        pFontInstance = pFont->rgFontInstances + i;
+        if (pTheme->nDpi == pFontInstance->nDpi)
+        {
+            *ppFontInstance = pFontInstance;
+            ExitFunction();
+        }
+    }
+    hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&pFont->rgFontInstances), pFont->cFontInstances, sizeof(THEME_FONT_INSTANCE), GROW_FONT_INSTANCES);
+    ThmExitOnFailure(hr, "Failed to allocate memory for font instances.");
+    pFontInstance = pFont->rgFontInstances + pFont->cFontInstances;
+    pFontInstance->nDpi = pTheme->nDpi;
+    lf.lfHeight = DpiuScaleValue(pFont->lfHeight, pFontInstance->nDpi);
+    lf.lfWeight = pFont->lfWeight;
+    lf.lfUnderline = pFont->lfUnderline;
+    lf.lfQuality = pFont->lfQuality;
+    hr = ::StringCchCopyW(lf.lfFaceName, countof(lf.lfFaceName), pFont->sczFaceName);
+    ThmExitOnFailure(hr, "Failed to copy font name to create font.");
+    pFontInstance->hFont = ::CreateFontIndirectW(&lf);
+    ThmExitOnNull(pFontInstance->hFont, hr, E_OUTOFMEMORY, "Failed to create DPI specific font.");
+    ++pFont->cFontInstances;
+    *ppFontInstance = pFontInstance;
+LExit:
+    return hr;
+}
+static HRESULT FindImageList(
+    __in THEME* pTheme,
+    __in_z LPCWSTR wzImageListName,
+    __out HIMAGELIST *phImageList
+    )
+{
+    HRESULT hr = S_OK;
+    for (DWORD i = 0; i < pTheme->cImageLists; ++i)
+    {
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, pTheme->rgImageLists[i].sczName, -1, wzImageListName, -1))
+        {
+            *phImageList = pTheme->rgImageLists[i].hImageList;
+            ExitFunction1(hr = S_OK);
+        }
+    }
+    hr = E_NOTFOUND;
+LExit:
+    return hr;
+}
+static HRESULT DrawButton(
+    __in THEME* pTheme,
+    __in DRAWITEMSTRUCT* pdis,
+    __in const THEME_CONTROL* pControl
+    )
+{
+    int nSourceX = pControl->hImage ? 0 : pControl->nSourceX;
+    int nSourceY = pControl->hImage ? 0 : pControl->nSourceY;
+    DWORD dwSourceWidth = pControl->nDefaultDpiWidth;
+    DWORD dwSourceHeight = pControl->nDefaultDpiHeight;
+    HDC hdcMem = ::CreateCompatibleDC(pdis->hDC);
+    HBITMAP hDefaultBitmap = static_cast<HBITMAP>(::SelectObject(hdcMem, pControl->hImage ? pControl->hImage : pTheme->hImage));
+    DWORD_PTR dwStyle = ::GetWindowLongPtrW(pdis->hwndItem, GWL_STYLE);
+    // "clicked" gets priority
+    if (ODS_SELECTED & pdis->itemState)
+    {
+        nSourceY += pControl->nDefaultDpiHeight * 2;
+    }
+    // then hover
+    else if (pControl->dwData & THEME_CONTROL_DATA_HOVER)
+    {
+        nSourceY += pControl->nDefaultDpiHeight;
+    }
+    // then focused
+    else if (WS_TABSTOP & dwStyle && ODS_FOCUS & pdis->itemState)
+    {
+        nSourceY += pControl->nDefaultDpiHeight * 3;
+    }
+    ::StretchBlt(pdis->hDC, 0, 0, pControl->nWidth, pControl->nHeight, hdcMem, nSourceX, nSourceY, dwSourceWidth, dwSourceHeight, SRCCOPY);
+    ::SelectObject(hdcMem, hDefaultBitmap);
+    ::DeleteDC(hdcMem);
+    DrawControlText(pTheme, pdis, pControl, TRUE, FALSE);
+    return S_OK;
+}
+static HRESULT DrawHyperlink(
+    __in THEME* pTheme,
+    __in DRAWITEMSTRUCT* pdis,
+    __in const THEME_CONTROL* pControl
+    )
+{
+    DrawControlText(pTheme, pdis, pControl, FALSE, TRUE);
+    return S_OK;
+}
+static void DrawControlText(
+    __in THEME* pTheme,
+    __in DRAWITEMSTRUCT* pdis,
+    __in const THEME_CONTROL* pControl,
+    __in BOOL fCentered,
+    __in BOOL fDrawFocusRect
+    )
+{
+    HRESULT hr = S_OK;
+    WCHAR wzText[256] = { };
+    DWORD cchText = 0;
+    THEME_FONT* pFont = NULL;
+    THEME_FONT_INSTANCE* pFontInstance = NULL;
+    HFONT hfPrev = NULL;
+    if (0 == (cchText = ::GetWindowTextW(pdis->hwndItem, wzText, countof(wzText))))
+    {
+        // nothing to do
+        return;
+    }
+    if (ODS_SELECTED & pdis->itemState)
+    {
+        pFont = pTheme->rgFonts + (THEME_INVALID_ID != pControl->dwFontSelectedId ? pControl->dwFontSelectedId : pControl->dwFontId);
+    }
+    else if (pControl->dwData & THEME_CONTROL_DATA_HOVER)
+    {
+        pFont = pTheme->rgFonts + (THEME_INVALID_ID != pControl->dwFontHoverId ? pControl->dwFontHoverId : pControl->dwFontId);
+    }
+    else
+    {
+        pFont = pTheme->rgFonts + pControl->dwFontId;
+    }
+    hr = EnsureFontInstance(pTheme, pFont, &pFontInstance);
+    if (SUCCEEDED(hr))
+    {
+        hfPrev = SelectFont(pdis->hDC, pFontInstance->hFont);
+    }
+    ::DrawTextExW(pdis->hDC, wzText, cchText, &pdis->rcItem, DT_SINGLELINE | (fCentered ? (DT_CENTER | DT_VCENTER) : 0), NULL);
+    if (fDrawFocusRect && (WS_TABSTOP & ::GetWindowLongPtrW(pdis->hwndItem, GWL_STYLE)) && (ODS_FOCUS & pdis->itemState))
+    {
+        ::DrawFocusRect(pdis->hDC, &pdis->rcItem);
+    }
+    if (hfPrev)
+    {
+        SelectFont(pdis->hDC, hfPrev);
+    }
+}
+static HRESULT DrawImage(
+    __in THEME* pTheme,
+    __in DRAWITEMSTRUCT* pdis,
+    __in const THEME_CONTROL* pControl
+    )
+{
+    DWORD dwHeight = pdis->rcItem.bottom - pdis->rcItem.top;
+    DWORD dwWidth = pdis->rcItem.right - pdis->rcItem.left;
+    int nSourceX = pControl->hImage ? 0 : pControl->nSourceX;
+    int nSourceY = pControl->hImage ? 0 : pControl->nSourceY;
+    DWORD dwSourceHeight = pControl->nDefaultDpiHeight;
+    DWORD dwSourceWidth = pControl->nDefaultDpiWidth;
+    BLENDFUNCTION bf = { };
+    bf.BlendOp = AC_SRC_OVER;
+    bf.SourceConstantAlpha = 255;
+    bf.AlphaFormat = AC_SRC_ALPHA;
+    HDC hdcMem = ::CreateCompatibleDC(pdis->hDC);
+    HBITMAP hDefaultBitmap = static_cast<HBITMAP>(::SelectObject(hdcMem, pControl->hImage ? pControl->hImage : pTheme->hImage));
+    // Try to draw the image with transparency and if that fails (usually because the image has no
+    // alpha channel) then draw the image as is.
+    if (!::AlphaBlend(pdis->hDC, 0, 0, dwWidth, dwHeight, hdcMem, nSourceX, nSourceY, dwSourceWidth, dwSourceHeight, bf))
+    {
+        ::StretchBlt(pdis->hDC, 0, 0, dwWidth, dwHeight, hdcMem, nSourceX, nSourceY, dwSourceWidth, dwSourceHeight, SRCCOPY);
+    }
+    ::SelectObject(hdcMem, hDefaultBitmap);
+    ::DeleteDC(hdcMem);
+    return S_OK;
+}
+static HRESULT DrawProgressBar(
+    __in THEME* pTheme,
+    __in DRAWITEMSTRUCT* pdis,
+    __in const THEME_CONTROL* pControl
+    )
+{
+    DWORD dwProgressColor = HIWORD(pControl->dwData);
+    DWORD dwProgressPercentage = LOWORD(pControl->dwData);
+    DWORD dwHeight = pdis->rcItem.bottom - pdis->rcItem.top;
+    DWORD dwCenter = (pdis->rcItem.right - 2) * dwProgressPercentage / 100;
+    DWORD dwSourceHeight = pControl->nDefaultDpiHeight;
+    int nSourceX = pControl->hImage ? 0 : pControl->nSourceX;
+    int nSourceY = (pControl->hImage ? 0 : pControl->nSourceY) + (dwProgressColor * dwSourceHeight);
+    HDC hdcMem = ::CreateCompatibleDC(pdis->hDC);
+    HBITMAP hDefaultBitmap = static_cast<HBITMAP>(::SelectObject(hdcMem, pControl->hImage ? pControl->hImage : pTheme->hImage));
+    // Draw the left side of the progress bar.
+    ::StretchBlt(pdis->hDC, 0, 0, 1, dwHeight, hdcMem, nSourceX, nSourceY, 1, dwSourceHeight, SRCCOPY);
+    // Draw the filled side of the progress bar, if there is any.
+    if (0 < dwCenter)
+    {
+        ::StretchBlt(pdis->hDC, 1, 0, dwCenter, dwHeight, hdcMem, nSourceX + 1, nSourceY, 1, dwSourceHeight, SRCCOPY);
+    }
+    // Draw the unfilled side of the progress bar, if there is any.
+    if (dwCenter < static_cast<DWORD>(pdis->rcItem.right - 2))
+    {
+        ::StretchBlt(pdis->hDC, 1 + dwCenter, 0, pdis->rcItem.right - dwCenter - 1, dwHeight, hdcMem, nSourceX + 2, nSourceY, 1, dwSourceHeight, SRCCOPY);
+    }
+    // Draw the right side of the progress bar.
+    ::StretchBlt(pdis->hDC, pdis->rcItem.right - 1, 0, 1, dwHeight, hdcMem, nSourceX + 3, nSourceY, 1, dwSourceHeight, SRCCOPY);
+    ::SelectObject(hdcMem, hDefaultBitmap);
+    ::DeleteDC(hdcMem);
+    return S_OK;
+}
+static BOOL DrawHoverControl(
+    __in THEME* pTheme,
+    __in BOOL fHover
+    )
+{
+    BOOL fChangedHover = FALSE;
+    THEME_CONTROL* pControl = const_cast<THEME_CONTROL*>(FindControlFromHWnd(pTheme, pTheme->hwndHover));
+    // Only hyperlinks and owner-drawn buttons have hover states.
+    if (pControl && (THEME_CONTROL_TYPE_HYPERLINK == pControl->type ||
+        (THEME_CONTROL_TYPE_BUTTON == pControl->type && (pControl->dwInternalStyle & INTERNAL_CONTROL_STYLE_OWNER_DRAW))))
+    {
+        if (fHover)
+        {
+            pControl->dwData |= THEME_CONTROL_DATA_HOVER;
+        }
+        else
+        {
+            pControl->dwData &= ~THEME_CONTROL_DATA_HOVER;
+        }
+        ::InvalidateRect(pControl->hWnd, NULL, FALSE);
+        fChangedHover = TRUE;
+    }
+    return fChangedHover;
+}
+static void FreePage(
+    __in THEME_PAGE* pPage
+    )
+{
+    if (pPage)
+    {
+        ReleaseStr(pPage->sczName);
+        if (pPage->cSavedVariables)
+        {
+            for (DWORD i = 0; i < pPage->cSavedVariables; ++i)
+            {
+                ReleaseStr(pPage->rgSavedVariables[i].sczValue);
+            }
+        }
+        ReleaseMem(pPage->rgSavedVariables);
+    }
+}
+static void FreeImageList(
+    __in THEME_IMAGELIST* pImageList
+    )
+{
+    if (pImageList)
+    {
+        ReleaseStr(pImageList->sczName);
+        ImageList_Destroy(pImageList->hImageList);
+    }
+}
+static void FreeControl(
+    __in THEME_CONTROL* pControl
+    )
+{
+    if (pControl)
+    {
+        if (::IsWindow(pControl->hWnd))
+        {
+            ::CloseWindow(pControl->hWnd);
+            pControl->hWnd = NULL;
+        }
+        ReleaseStr(pControl->sczName);
+        ReleaseStr(pControl->sczText);
+        ReleaseStr(pControl->sczTooltip);
+        ReleaseStr(pControl->sczNote);
+        ReleaseStr(pControl->sczEnableCondition);
+        ReleaseStr(pControl->sczVisibleCondition);
+        ReleaseStr(pControl->sczValue);
+        ReleaseStr(pControl->sczVariable);
+        if (pControl->hImage)
+        {
+            ::DeleteBitmap(pControl->hImage);
+        }
+        for (DWORD i = 0; i < pControl->cControls; ++i)
+        {
+            FreeControl(pControl->rgControls + i);
+        }
+        for (DWORD i = 0; i < pControl->cActions; ++i)
+        {
+            FreeAction(&(pControl->rgActions[i]));
+        }
+        for (DWORD i = 0; i < pControl->cColumns; ++i)
+        {
+            FreeColumn(&(pControl->ptcColumns[i]));
+        }
+        for (DWORD i = 0; i < pControl->cConditionalText; ++i)
+        {
+            FreeConditionalText(&(pControl->rgConditionalText[i]));
+        }
+        for (DWORD i = 0; i < pControl->cConditionalNotes; ++i)
+        {
+            FreeConditionalText(&(pControl->rgConditionalNotes[i]));
+        }
+        for (DWORD i = 0; i < pControl->cTabs; ++i)
+        {
+            FreeTab(&(pControl->pttTabs[i]));
+        }
+        ReleaseMem(pControl->rgActions)
+        ReleaseMem(pControl->ptcColumns);
+        ReleaseMem(pControl->rgConditionalText);
+        ReleaseMem(pControl->rgConditionalNotes);
+        ReleaseMem(pControl->pttTabs);
+    }
+}
+static void FreeAction(
+    __in THEME_ACTION* pAction
+    )
+{
+    switch (pAction->type)
+    {
+    case THEME_ACTION_TYPE_BROWSE_DIRECTORY:
+        ReleaseStr(pAction->BrowseDirectory.sczVariableName);
+        break;
+    case THEME_ACTION_TYPE_CHANGE_PAGE:
+        ReleaseStr(pAction->ChangePage.sczPageName);
+        break;
+    }
+    ReleaseStr(pAction->sczCondition);
+}
+static void FreeColumn(
+    __in THEME_COLUMN* pColumn
+    )
+{
+    ReleaseStr(pColumn->pszName);
+}
+static void FreeConditionalText(
+    __in THEME_CONDITIONAL_TEXT* pConditionalText
+    )
+{
+    ReleaseStr(pConditionalText->sczCondition);
+    ReleaseStr(pConditionalText->sczText);
+}
+static void FreeTab(
+    __in THEME_TAB* pTab
+    )
+{
+    ReleaseStr(pTab->pszName);
+}
+static void FreeFontInstance(
+    __in THEME_FONT_INSTANCE* pFontInstance
+    )
+{
+    if (pFontInstance->hFont)
+    {
+        ::DeleteObject(pFontInstance->hFont);
+        pFontInstance->hFont = NULL;
+    }
+}
+static void FreeFont(
+    __in THEME_FONT* pFont
+    )
+{
+    if (pFont)
+    {
+        if (pFont->hBackground)
+        {
+            ::DeleteObject(pFont->hBackground);
+            pFont->hBackground = NULL;
+        }
+        if (pFont->hForeground)
+        {
+            ::DeleteObject(pFont->hForeground);
+            pFont->hForeground = NULL;
+        }
+        for (DWORD i = 0; i < pFont->cFontInstances; ++i)
+        {
+            FreeFontInstance(&(pFont->rgFontInstances[i]));
+        }
+        ReleaseMem(pFont->rgFontInstances);
+        ReleaseStr(pFont->sczFaceName);
+    }
+}
+static DWORD CALLBACK RichEditStreamFromFileHandleCallback(
+    __in DWORD_PTR dwCookie,
+    __in_bcount(cb) LPBYTE pbBuff,
+    __in LONG cb,
+    __in LONG* pcb
+    )
+{
+    HRESULT hr = S_OK;
+    HANDLE hFile = reinterpret_cast<HANDLE>(dwCookie);
+    if (!::ReadFile(hFile, pbBuff, cb, reinterpret_cast<DWORD*>(pcb), NULL))
+    {
+        ThmExitWithLastError(hr, "Failed to read file");
+    }
+LExit:
+    return hr;
+}
+static DWORD CALLBACK RichEditStreamFromMemoryCallback(
+    __in DWORD_PTR dwCookie,
+    __in_bcount(cb) LPBYTE pbBuff,
+    __in LONG cb,
+    __in LONG* pcb
+    )
+{
+    HRESULT hr = S_OK;
+    MEMBUFFER_FOR_RICHEDIT* pBuffer = reinterpret_cast<MEMBUFFER_FOR_RICHEDIT*>(dwCookie);
+    DWORD cbCopy = 0;
+    if (pBuffer->iData < pBuffer->cbData)
+    {
+        cbCopy = min(static_cast<DWORD>(cb), pBuffer->cbData - pBuffer->iData);
+        memcpy(pbBuff, pBuffer->rgbData + pBuffer->iData, cbCopy);
+        pBuffer->iData += cbCopy;
+        Assert(pBuffer->iData <= pBuffer->cbData);
+    }
+    *pcb = cbCopy;
+    return hr;
+}
+static void CALLBACK OnBillboardTimer(
+    __in THEME* pTheme,
+    __in HWND hwnd,
+    __in UINT_PTR idEvent
+    )
+{
+    HWND hwndControl = ::GetDlgItem(hwnd, static_cast<int>(idEvent));
+    if (hwndControl)
+    {
+        THEME_CONTROL* pControl = const_cast<THEME_CONTROL*>(FindControlFromHWnd(pTheme, hwndControl));
+        AssertSz(pControl && THEME_CONTROL_TYPE_BILLBOARD == pControl->type, "Only billboard controls should get billboard timer messages.");
+        if (pControl)
+        {
+            if (pControl->dwData < pControl->cControls)
+            {
+                ThemeShowChild(pTheme, pControl, pControl->dwData);
+            }
+            else if (pControl->fBillboardLoops)
+            {
+                pControl->dwData = 0;
+                ThemeShowChild(pTheme, pControl, pControl->dwData);
+            }
+            else // no more looping
+            {
+                ::KillTimer(hwnd, idEvent);
+            }
+            ++pControl->dwData;
+        }
+    }
+}
+static void OnBrowseDirectory(
+    __in THEME* pTheme,
+    __in HWND hWnd,
+    __in const THEME_ACTION* pAction
+    )
+{
+    HRESULT hr = S_OK;
+    WCHAR wzPath[MAX_PATH] = { };
+    BROWSEINFOW browseInfo = { };
+    PIDLIST_ABSOLUTE pidl = NULL;
+    browseInfo.hwndOwner = hWnd;
+    browseInfo.pszDisplayName = wzPath;
+    browseInfo.lpszTitle = pTheme->sczCaption;
+    browseInfo.ulFlags = BIF_RETURNONLYFSDIRS | BIF_USENEWUI;
+    pidl = ::SHBrowseForFolderW(&browseInfo);
+    if (pidl && ::SHGetPathFromIDListW(pidl, wzPath))
+    {
+        // Since editbox changes aren't immediately saved off, we have to treat them differently.
+        THEME_CONTROL* pTargetControl = NULL;
+        for (DWORD i = 0; i < pTheme->cControls; ++i)
+        {
+            THEME_CONTROL* pControl = pTheme->rgControls + i;
+            if ((!pControl->wPageId || pControl->wPageId == pTheme->dwCurrentPageId) &&
+                CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, pControl->sczName, -1, pAction->BrowseDirectory.sczVariableName, -1))
+            {
+                pTargetControl = pControl;
+                break;
+            }
+        }
+        if (pTargetControl && THEME_CONTROL_TYPE_EDITBOX == pTargetControl->type && !pTargetControl->fDisableVariableFunctionality)
+        {
+            hr = ThemeSetTextControl(pTheme, pTargetControl->wId, wzPath);
+            ThmExitOnFailure(hr, "Failed to set text on editbox: %ls", pTargetControl->sczName);
+        }
+        else if (pTheme->pfnSetStringVariable)
+        {
+            hr = pTheme->pfnSetStringVariable(pAction->BrowseDirectory.sczVariableName, wzPath, FALSE, pTheme->pvVariableContext);
+            ThmExitOnFailure(hr, "Failed to set variable: %ls", pAction->BrowseDirectory.sczVariableName);
+        }
+        else if (pTargetControl)
+        {
+            hr = ThemeSetTextControl(pTheme, pTargetControl->wId, wzPath);
+            ThmExitOnFailure(hr, "Failed to set text on control: %ls", pTargetControl->sczName);
+        }
+        ThemeShowPageEx(pTheme, pTheme->dwCurrentPageId, SW_SHOW, THEME_SHOW_PAGE_REASON_REFRESH);
+    }
+LExit:
+    if (pidl)
+    {
+        ::CoTaskMemFree(pidl);
+    }
+}
+static BOOL OnButtonClicked(
+    __in THEME* pTheme,
+    __in HWND hWnd,
+    __in const THEME_CONTROL* pControl
+    )
+{
+    HRESULT hr = S_OK;
+    BOOL fHandled = FALSE;
+    if (THEME_CONTROL_TYPE_BUTTON == pControl->type || THEME_CONTROL_TYPE_COMMANDLINK == pControl->type)
+    {
+        if (pControl->cActions)
+        {
+            fHandled = TRUE;
+            THEME_ACTION* pChosenAction = pControl->pDefaultAction;
+            if (pTheme->pfnEvaluateCondition)
+            {
+                // As documented in the xsd, if there are multiple conditions that are true at the same time then the behavior is undefined.
+                // This is the current implementation and can change at any time.
+                for (DWORD j = 0; j < pControl->cActions; ++j)
+                {
+                    THEME_ACTION* pAction = pControl->rgActions + j;
+                    if (pAction->sczCondition)
+                    {
+                        BOOL fCondition = FALSE;
+                        hr = pTheme->pfnEvaluateCondition(pAction->sczCondition, &fCondition, pTheme->pvVariableContext);
+                        ThmExitOnFailure(hr, "Failed to evaluate condition: %ls", pAction->sczCondition);
+                        if (fCondition)
+                        {
+                            pChosenAction = pAction;
+                            break;
+                        }
+                    }
+                }
+            }
+            if (pChosenAction)
+            {
+                switch (pChosenAction->type)
+                {
+                case THEME_ACTION_TYPE_BROWSE_DIRECTORY:
+                    OnBrowseDirectory(pTheme, hWnd, pChosenAction);
+                    break;
+                case THEME_ACTION_TYPE_CLOSE_WINDOW:
+                    ::SendMessageW(hWnd, WM_CLOSE, 0, 0);
+                    break;
+                case THEME_ACTION_TYPE_CHANGE_PAGE:
+                    DWORD dwPageId = 0;
+                    LPCWSTR pPageNames = pChosenAction->ChangePage.sczPageName;
+                    ThemeGetPageIds(pTheme, &pPageNames, &dwPageId, 1);
+                    if (!dwPageId)
+                    {
+                        ThmExitOnFailure(E_INVALIDDATA, "Unknown page: %ls", pChosenAction->ChangePage.sczPageName);
+                    }
+                    ThemeShowPageEx(pTheme, pTheme->dwCurrentPageId, SW_HIDE, pChosenAction->ChangePage.fCancel ? THEME_SHOW_PAGE_REASON_CANCEL : THEME_SHOW_PAGE_REASON_DEFAULT);
+                    ThemeShowPage(pTheme, dwPageId, SW_SHOW);
+                    break;
+                }
+            }
+        }
+    }
+    else if (!pControl->fDisableVariableFunctionality && (pTheme->pfnSetNumericVariable || pTheme->pfnSetStringVariable))
+    {
+        BOOL fRefresh = FALSE;
+        switch (pControl->type)
+        {
+        case THEME_CONTROL_TYPE_CHECKBOX:
+            if (pTheme->pfnSetNumericVariable && pControl->sczName && *pControl->sczName)
+            {
+                BOOL fChecked = ThemeIsControlChecked(pTheme, pControl->wId);
+                pTheme->pfnSetNumericVariable(pControl->sczName, fChecked ? 1 : 0, pTheme->pvVariableContext);
+                fRefresh = TRUE;
+            }
+            break;
+        case THEME_CONTROL_TYPE_RADIOBUTTON:
+            if (pTheme->pfnSetStringVariable && pControl->sczVariable && *pControl->sczVariable && ThemeIsControlChecked(pTheme, pControl->wId))
+            {
+                pTheme->pfnSetStringVariable(pControl->sczVariable, pControl->sczValue, FALSE, pTheme->pvVariableContext);
+                fRefresh = TRUE;
+            }
+            break;
+        }
+        if (fRefresh)
+        {
+            ThemeShowPageEx(pTheme, pTheme->dwCurrentPageId, SW_SHOW, THEME_SHOW_PAGE_REASON_REFRESH);
+            fHandled = TRUE;
+        }
+    }
+LExit:
+    return fHandled;
+}
+    
+static BOOL OnDpiChanged(
+    __in THEME* pTheme,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    )
+{
+    UINT nDpi = HIWORD(wParam);
+    RECT* pRect = reinterpret_cast<RECT*>(lParam);
+    BOOL fIgnored = pTheme->nDpi == nDpi;
+    if (fIgnored)
+    {
+        ExitFunction();
+    }
+    pTheme->fForceResize = !pTheme->fAutoResize;
+    ScaleThemeFromWindow(pTheme, nDpi, pRect->left, pRect->top);
+LExit:
+    return !fIgnored;
+}
+static void OnNcCreate(
+    __in THEME* pTheme,
+    __in HWND hWnd,
+    __in LPARAM lParam
+    )
+{
+    DPIU_WINDOW_CONTEXT windowContext = { };
+    CREATESTRUCTW* pCreateStruct = reinterpret_cast<CREATESTRUCTW*>(lParam);
+    pTheme->hwndParent = hWnd;
+    DpiuGetWindowContext(pTheme->hwndParent, &windowContext);
+    if (windowContext.nDpi != pTheme->nDpi)
+    {
+        ScaleTheme(pTheme, windowContext.nDpi, pCreateStruct->x, pCreateStruct->y, pCreateStruct->style, NULL != pCreateStruct->hMenu, pCreateStruct->dwExStyle);
+    }
+}
+static HRESULT OnRichEditEnLink(
+    __in LPARAM lParam,
+    __in HWND hWndRichEdit,
+    __in HWND hWnd
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczLink = NULL;
+    ENLINK* link = reinterpret_cast<ENLINK*>(lParam);
+    switch (link->msg)
+    {
+    case WM_LBUTTONDOWN:
+        {
+        hr = StrAlloc(&sczLink, link->chrg.cpMax - link->chrg.cpMin + 2);
+        ThmExitOnFailure(hr, "Failed to allocate string for link.");
+        TEXTRANGEW tr;
+        tr.chrg.cpMin = link->chrg.cpMin;
+        tr.chrg.cpMax = link->chrg.cpMax;
+        tr.lpstrText = sczLink;
+        if (0 < ::SendMessageW(hWndRichEdit, EM_GETTEXTRANGE, 0, reinterpret_cast<LPARAM>(&tr)))
+        {
+            hr = ShelExec(sczLink, NULL, L"open", NULL, SW_SHOWDEFAULT, hWnd, NULL);
+            ThmExitOnFailure(hr, "Failed to launch link: %ls", sczLink);
+        }
+        
+        break;
+        }
+    case WM_SETCURSOR:
+        ::SetCursor(vhCursorHand);
+        break;
+    }
+LExit:
+    ReleaseStr(sczLink);
+    return hr;
+}
+static BOOL ControlIsType(
+    __in const THEME* pTheme,
+    __in DWORD dwControl,
+    __in const THEME_CONTROL_TYPE type
+    )
+{
+    BOOL fIsType = FALSE;
+    HWND hWnd = ::GetDlgItem(pTheme->hwndParent, dwControl);
+    if (hWnd)
+    {
+        const THEME_CONTROL* pControl = FindControlFromHWnd(pTheme, hWnd);
+        fIsType = (pControl && type == pControl->type);
+    }
+    return fIsType;
+}
+static const THEME_CONTROL* FindControlFromHWnd(
+    __in const THEME* pTheme,
+    __in HWND hWnd,
+    __in_opt const THEME_CONTROL* pParentControl
+    )
+{
+    DWORD cControls = 0;
+    THEME_CONTROL* rgControls = NULL;
+    GetControls(pTheme, pParentControl, cControls, rgControls);
+    // As we can't use GWLP_USERDATA (SysLink controls on Windows XP uses it too)...
+    for (DWORD i = 0; i < cControls; ++i)
+    {
+        if (hWnd == rgControls[i].hWnd)
+        {
+            return rgControls + i;
+        }
+        else if (0 < rgControls[i].cControls)
+        {
+            const THEME_CONTROL* pChildControl = FindControlFromHWnd(pTheme, hWnd, rgControls + i);
+            if (pChildControl)
+            {
+                return pChildControl;
+            }
+        }
+    }
+    return NULL;
+}
+static void GetControlDimensions(
+    __in const THEME_CONTROL* pControl,
+    __in const RECT* prcParent,
+    __out int* piWidth,
+    __out int* piHeight,
+    __out int* piX,
+    __out int* piY
+    )
+{
+    *piWidth  = pControl->nWidth  + (0 < pControl->nWidth  ? 0 : prcParent->right  - max(0, pControl->nX));
+    *piHeight = pControl->nHeight + (0 < pControl->nHeight ? 0 : prcParent->bottom - max(0, pControl->nY));
+    *piX = pControl->nX + (-1 < pControl->nX ? 0 : prcParent->right - *piWidth);
+    *piY = pControl->nY + (-1 < pControl->nY ? 0 : prcParent->bottom - *piHeight);
+}
+static HRESULT SizeListViewColumns(
+    __inout THEME_CONTROL* pControl
+    )
+{
+    HRESULT hr = S_OK;
+    RECT rcParent = { };
+    int cNumExpandingColumns = 0;
+    int iExtraAvailableSize;
+    if (!::GetWindowRect(pControl->hWnd, &rcParent))
+    {
+        ThmExitWithLastError(hr, "Failed to get window rect of listview control.");
+    }
+    iExtraAvailableSize = rcParent.right - rcParent.left;
+    for (DWORD i = 0; i < pControl->cColumns; ++i)
+    {
+        if (pControl->ptcColumns[i].fExpands)
+        {
+            ++cNumExpandingColumns;
+        }
+        iExtraAvailableSize -= pControl->ptcColumns[i].nBaseWidth;
+    }
+    // Leave room for a vertical scroll bar just in case.
+    iExtraAvailableSize -= ::GetSystemMetrics(SM_CXVSCROLL);
+    for (DWORD i = 0; i < pControl->cColumns; ++i)
+    {
+        if (pControl->ptcColumns[i].fExpands)
+        {
+            pControl->ptcColumns[i].nWidth = pControl->ptcColumns[i].nBaseWidth + (iExtraAvailableSize / cNumExpandingColumns);
+            // In case there is any remainder, use it up the first chance we get.
+            pControl->ptcColumns[i].nWidth += iExtraAvailableSize % cNumExpandingColumns;
+            iExtraAvailableSize -= iExtraAvailableSize % cNumExpandingColumns;
+        }
+        else
+        {
+            pControl->ptcColumns[i].nWidth = pControl->ptcColumns[i].nBaseWidth;
+        }
+    }
+LExit:
+    return hr;
+}
+static HRESULT ShowControl(
+    __in THEME* pTheme,
+    __in THEME_CONTROL* pControl,
+    __in int nCmdShow,
+    __in BOOL fSaveEditboxes,
+    __in THEME_SHOW_PAGE_REASON reason,
+    __in DWORD dwPageId,
+    __out_opt HWND* phwndFocus
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD iPageControl = 0;
+    HWND hwndFocus = NULL;
+    LPWSTR sczFormatString = NULL;
+    LPWSTR sczText = NULL;
+    THEME_SAVEDVARIABLE* pSavedVariable = NULL;
+    BOOL fHide = SW_HIDE == nCmdShow;
+    THEME_PAGE* pPage = ThemeGetPage(pTheme, dwPageId);
+    // Save the editbox value if necessary (other control types save their values immediately).
+    if (pTheme->pfnSetStringVariable && !pControl->fDisableVariableFunctionality &&
+        fSaveEditboxes && THEME_CONTROL_TYPE_EDITBOX == pControl->type && pControl->sczName && *pControl->sczName)
+    {
+        hr = ThemeGetTextControl(pTheme, pControl->wId, &sczText);
+        ThmExitOnFailure(hr, "Failed to get the text for control: %ls", pControl->sczName);
+        hr = pTheme->pfnSetStringVariable(pControl->sczName, sczText, FALSE, pTheme->pvVariableContext);
+        ThmExitOnFailure(hr, "Failed to set the variable '%ls' to '%ls'", pControl->sczName, sczText);
+    }
+    HWND hWnd = pControl->hWnd;
+    if (fHide && pControl->wPageId)
+    {
+        ::ShowWindow(hWnd, SW_HIDE);
+        if (THEME_CONTROL_TYPE_BILLBOARD == pControl->type)
+        {
+            StopBillboard(pTheme, pControl->wId);
+        }
+        ExitFunction();
+    }
+    BOOL fEnabled = !(pControl->dwInternalStyle & INTERNAL_CONTROL_STYLE_DISABLED);
+    BOOL fVisible = !(pControl->dwInternalStyle & INTERNAL_CONTROL_STYLE_HIDDEN);
+    if (!pControl->fDisableVariableFunctionality)
+    {
+        if (pTheme->pfnEvaluateCondition)
+        {
+            // If the control has a VisibleCondition, check if it's true.
+            if (pControl->sczVisibleCondition)
+            {
+                hr = pTheme->pfnEvaluateCondition(pControl->sczVisibleCondition, &fVisible, pTheme->pvVariableContext);
+                ThmExitOnFailure(hr, "Failed to evaluate VisibleCondition: %ls", pControl->sczVisibleCondition);
+            }
+            // If the control has an EnableCondition, check if it's true.
+            if (pControl->sczEnableCondition)
+            {
+                hr = pTheme->pfnEvaluateCondition(pControl->sczEnableCondition, &fEnabled, pTheme->pvVariableContext);
+                ThmExitOnFailure(hr, "Failed to evaluate EnableCondition: %ls", pControl->sczEnableCondition);
+            }
+        }
+        // Try to format each control's text based on context, except for editboxes since their text comes from the user.
+        if (pTheme->pfnFormatString && ((pControl->sczText && *pControl->sczText) || pControl->cConditionalText) && THEME_CONTROL_TYPE_EDITBOX != pControl->type)
+        {
+            LPWSTR wzText = pControl->sczText;
+            LPWSTR wzNote = pControl->sczNote;
+            if (pTheme->pfnEvaluateCondition)
+            {
+                // As documented in the xsd, if there are multiple conditions that are true at the same time then the behavior is undefined.
+                // This is the current implementation and can change at any time.
+                for (DWORD j = 0; j < pControl->cConditionalText; ++j)
+                {
+                    THEME_CONDITIONAL_TEXT* pConditionalText = pControl->rgConditionalText + j;
+                    wzText = pConditionalText->sczText;
+                    if (pConditionalText->sczCondition)
+                    {
+                        BOOL fCondition = FALSE;
+                        hr = pTheme->pfnEvaluateCondition(pConditionalText->sczCondition, &fCondition, pTheme->pvVariableContext);
+                        ThmExitOnFailure(hr, "Failed to evaluate condition: %ls", pConditionalText->sczCondition);
+                        if (fCondition)
+                        {
+                            wzText = pConditionalText->sczText;
+                            break;
+                        }
+                    }
+                }
+                for (DWORD j = 0; j < pControl->cConditionalNotes; ++j)
+                {
+                    THEME_CONDITIONAL_TEXT* pConditionalNote = pControl->rgConditionalNotes + j;
+                    wzNote = pConditionalNote->sczText;
+                    if (pConditionalNote->sczCondition)
+                    {
+                        BOOL fCondition = FALSE;
+                        hr = pTheme->pfnEvaluateCondition(pConditionalNote->sczCondition, &fCondition, pTheme->pvVariableContext);
+                        ThmExitOnFailure(hr, "Failed to evaluate note condition: %ls", pConditionalNote->sczCondition);
+                        if (fCondition)
+                        {
+                            wzNote = pConditionalNote->sczText;
+                            break;
+                        }
+                    }
+                }
+            }
+            if (wzText && *wzText)
+            {
+                hr = pTheme->pfnFormatString(wzText, &sczText, pTheme->pvVariableContext);
+                ThmExitOnFailure(hr, "Failed to format string: %ls", wzText);
+            }
+            else
+            {
+                ReleaseNullStr(sczText);
+            }
+            ThemeSetTextControl(pTheme, pControl->wId, sczText);
+            if (wzNote && *wzNote)
+            {
+                hr = pTheme->pfnFormatString(wzNote, &sczText, pTheme->pvVariableContext);
+                ThmExitOnFailure(hr, "Failed to format note: %ls", wzNote);
+            }
+            else
+            {
+                ReleaseNullStr(sczText);
+            }
+            ::SendMessageW(pControl->hWnd, BCM_SETNOTE, 0, reinterpret_cast<WPARAM>(sczText));
+        }
+        // If this is a named control, do variable magic.
+        if (pControl->sczName && *pControl->sczName)
+        {
+            // If this is a checkbox control,
+            // try to set its default state to the state of a matching named variable.
+            if (pTheme->pfnGetNumericVariable && THEME_CONTROL_TYPE_CHECKBOX == pControl->type)
+            {
+                LONGLONG llValue = 0;
+                hr = pTheme->pfnGetNumericVariable(pControl->sczName, &llValue, pTheme->pvVariableContext);
+                if (E_NOTFOUND == hr)
+                {
+                    hr = S_OK;
+                }
+                ThmExitOnFailure(hr, "Failed to get numeric variable: %ls", pControl->sczName);
+                if (THEME_SHOW_PAGE_REASON_REFRESH != reason && pPage && pControl->wPageId)
+                {
+                    pSavedVariable = pPage->rgSavedVariables + iPageControl;
+                    pSavedVariable->wzName = pControl->sczName;
+                    if (SUCCEEDED(hr))
+                    {
+                        hr = StrAllocFormattedSecure(&pSavedVariable->sczValue, L"%lld", llValue);
+                        ThmExitOnFailure(hr, "Failed to save variable: %ls", pControl->sczName);
+                    }
+                    ++iPageControl;
+                }
+                ThemeSendControlMessage(pTheme, pControl->wId, BM_SETCHECK, SUCCEEDED(hr) && llValue ? BST_CHECKED : BST_UNCHECKED, 0);
+            }
+            // If this is an editbox control,
+            // try to set its default state to the state of a matching named variable.
+            if (pTheme->pfnFormatString && THEME_CONTROL_TYPE_EDITBOX == pControl->type)
+            {
+                hr = StrAllocFormatted(&sczFormatString, L"[%ls]", pControl->sczName);
+                ThmExitOnFailure(hr, "Failed to create format string: '%ls'", pControl->sczName);
+                hr = pTheme->pfnFormatString(sczFormatString, &sczText, pTheme->pvVariableContext);
+                ThmExitOnFailure(hr, "Failed to format string: '%ls'", sczFormatString);
+                if (THEME_SHOW_PAGE_REASON_REFRESH != reason && pPage && pControl->wPageId)
+                {
+                    pSavedVariable = pPage->rgSavedVariables + iPageControl;
+                    pSavedVariable->wzName = pControl->sczName;
+                    if (SUCCEEDED(hr))
+                    {
+                        hr = StrAllocStringSecure(&pSavedVariable->sczValue, sczText, 0);
+                        ThmExitOnFailure(hr, "Failed to save variable: %ls", pControl->sczName);
+                    }
+                    ++iPageControl;
+                }
+                ThemeSetTextControl(pTheme, pControl->wId, sczText);
+            }
+        }
+        // If this is a radio button associated with a variable,
+        // try to set its default state to the state of the variable.
+        if (pTheme->pfnGetStringVariable && THEME_CONTROL_TYPE_RADIOBUTTON == pControl->type && pControl->sczVariable && *pControl->sczVariable)
+        {
+            hr = pTheme->pfnGetStringVariable(pControl->sczVariable, &sczText, pTheme->pvVariableContext);
+            if (E_NOTFOUND == hr)
+            {
+                ReleaseNullStr(sczText);
+            }
+            else
+            {
+                ThmExitOnFailure(hr, "Failed to get string variable: %ls", pControl->sczVariable);
+            }
+            if (THEME_SHOW_PAGE_REASON_REFRESH != reason && pPage && pControl->wPageId && pControl->fLastRadioButton)
+            {
+                pSavedVariable = pPage->rgSavedVariables + iPageControl;
+                pSavedVariable->wzName = pControl->sczVariable;
+                if (SUCCEEDED(hr))
+                {
+                    hr = StrAllocStringSecure(&pSavedVariable->sczValue, sczText, 0);
+                    ThmExitOnFailure(hr, "Failed to save variable: %ls", pControl->sczVariable);
+                }
+                ++iPageControl;
+            }
+            hr = S_OK;
+            Button_SetCheck(hWnd, (!sczText && !pControl->sczValue) || (sczText && CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, sczText, -1, pControl->sczValue, -1)));
+        }
+    }
+    if (!fVisible || (!fEnabled && (pControl->dwInternalStyle & INTERNAL_CONTROL_STYLE_HIDE_WHEN_DISABLED)))
+    {
+        ::ShowWindow(hWnd, SW_HIDE);
+    }
+    else
+    {
+        ::EnableWindow(hWnd, !fHide && fEnabled);
+        if (!hwndFocus && pControl->wPageId && (pControl->dwStyle & WS_TABSTOP))
+        {
+            hwndFocus = hWnd;
+        }
+        ::ShowWindow(hWnd, nCmdShow);
+    }
+    if (0 < pControl->cControls)
+    {
+        ShowControls(pTheme, pControl, nCmdShow, fSaveEditboxes, reason, dwPageId);
+    }
+    if (THEME_CONTROL_TYPE_BILLBOARD == pControl->type && pControl->wPageId)
+    {
+        if (fEnabled)
+        {
+            StartBillboard(pTheme, pControl->wId);
+        }
+        else
+        {
+            StopBillboard(pTheme, pControl->wId);
+        }
+    }
+    if (phwndFocus)
+    {
+        *phwndFocus = hwndFocus;
+    }
+LExit:
+    ReleaseStr(sczFormatString);
+    ReleaseStr(sczText);
+    return hr;
+}
+static HRESULT ShowControls(
+    __in THEME* pTheme,
+    __in_opt const THEME_CONTROL* pParentControl,
+    __in int nCmdShow,
+    __in BOOL fSaveEditboxes,
+    __in THEME_SHOW_PAGE_REASON reason,
+    __in DWORD dwPageId
+    )
+{
+    HRESULT hr = S_OK;
+    HWND hwndFocus = NULL;
+    DWORD cControls = 0;
+    THEME_CONTROL* rgControls = NULL;
+    GetControls(pTheme, pParentControl, cControls, rgControls);
+    for (DWORD i = 0; i < cControls; ++i)
+    {
+        THEME_CONTROL* pControl = rgControls + i;
+        // Only look at non-page controls and the specified page's controls.
+        if (!pControl->wPageId || pControl->wPageId == dwPageId)
+        {
+            hr = ShowControl(pTheme, pControl, nCmdShow, fSaveEditboxes, reason, dwPageId, &hwndFocus);
+            ThmExitOnFailure(hr, "Failed to show control '%ls' at index %d.", pControl->sczName, i);
+        }
+    }
+    if (hwndFocus)
+    {
+        ::SetFocus(hwndFocus);
+    }
+LExit:
+    return hr;
+}
+static LRESULT CALLBACK ControlGroupDefWindowProc(
+    __in_opt THEME* pTheme,
+    __in HWND hWnd,
+    __in UINT uMsg,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    )
+{
+    if (pTheme)
+    {
+        switch (uMsg)
+        {
+        case WM_DRAWITEM:
+            ThemeDrawControl(pTheme, reinterpret_cast<LPDRAWITEMSTRUCT>(lParam));
+            return TRUE;
+        case WM_CTLCOLORBTN: __fallthrough;
+        case WM_CTLCOLORSTATIC:
+        {
+            HBRUSH hBrush = NULL;
+            if (ThemeSetControlColor(pTheme, reinterpret_cast<HDC>(wParam), reinterpret_cast<HWND>(lParam), &hBrush))
+            {
+                return reinterpret_cast<LRESULT>(hBrush);
+            }
+        }
+        break;
+        case WM_SETCURSOR:
+            if (ThemeHoverControl(pTheme, hWnd, reinterpret_cast<HWND>(wParam)))
+            {
+                return TRUE;
+            }
+            break;
+        case WM_PAINT:
+            if (::GetUpdateRect(hWnd, NULL, FALSE))
+            {
+                PAINTSTRUCT ps;
+                ::BeginPaint(hWnd, &ps);
+                if (hWnd == pTheme->hwndParent)
+                {
+                    ThemeDrawBackground(pTheme, &ps);
+                }
+                ::EndPaint(hWnd, &ps);
+            }
+            return 0;
+        case WM_TIMER:
+            OnBillboardTimer(pTheme, hWnd, wParam);
+            break;
+        case WM_NOTIFY:
+            if (lParam)
+            {
+                LPNMHDR pnmhdr = reinterpret_cast<LPNMHDR>(lParam);
+                switch (pnmhdr->code)
+                {
+                    // Tab/Shift+Tab support for rich-edit control.
+                case EN_MSGFILTER:
+                {
+                    MSGFILTER* msgFilter = reinterpret_cast<MSGFILTER*>(lParam);
+                    if (WM_KEYDOWN == msgFilter->msg && VK_TAB == msgFilter->wParam)
+                    {
+                        BOOL fShift = 0x8000 & ::GetKeyState(VK_SHIFT);
+                        HWND hwndFocus = ::GetNextDlgTabItem(hWnd, msgFilter->nmhdr.hwndFrom, fShift);
+                        ::SetFocus(hwndFocus);
+                        return 1;
+                    }
+                    break;
+                }
+                // Hyperlink clicks from rich-edit control.
+                case EN_LINK:
+                    return SUCCEEDED(OnRichEditEnLink(lParam, pnmhdr->hwndFrom, hWnd));
+                    // Clicks on a hypertext/syslink control.
+                case NM_CLICK: __fallthrough;
+                case NM_RETURN:
+                    if (ControlIsType(pTheme, static_cast<DWORD>(pnmhdr->idFrom), THEME_CONTROL_TYPE_HYPERTEXT))
+                    {
+                        PNMLINK pnmlink = reinterpret_cast<PNMLINK>(lParam);
+                        LITEM litem = pnmlink->item;
+                        ShelExec(litem.szUrl, NULL, L"open", NULL, SW_SHOWDEFAULT, hWnd, NULL);
+                        return 1;
+                    }
+                    return 0;
+                }
+            }
+            break;
+        case WM_COMMAND:
+            switch (HIWORD(wParam))
+            {
+            case BN_CLICKED:
+                if (lParam)
+                {
+                    const THEME_CONTROL* pControl = FindControlFromHWnd(pTheme, (HWND)lParam);
+                    if (pControl && OnButtonClicked(pTheme, hWnd, pControl))
+                    {
+                        return 0;
+                    }
+                }
+                break;
+            }
+            break;
+        }
+    }
+    return ::DefWindowProcW(hWnd, uMsg, wParam, lParam);
+}
+static LRESULT CALLBACK PanelWndProc(
+    __in HWND hWnd,
+    __in UINT uMsg,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    )
+{
+    LRESULT lres = 0;
+    THEME* pTheme = reinterpret_cast<THEME*>(::GetWindowLongPtrW(hWnd, GWLP_USERDATA));
+    switch (uMsg)
+    {
+    case WM_NCCREATE:
+    {
+        LPCREATESTRUCTW lpcs = reinterpret_cast<LPCREATESTRUCTW>(lParam);
+        pTheme = reinterpret_cast<THEME*>(lpcs->lpCreateParams);
+        ::SetWindowLongPtrW(hWnd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(pTheme));
+    }
+    break;
+    case WM_NCDESTROY:
+        lres = ::DefWindowProcW(hWnd, uMsg, wParam, lParam);
+        ::SetWindowLongPtrW(hWnd, GWLP_USERDATA, 0);
+        return lres;
+    case WM_NCHITTEST:
+        return HTCLIENT;
+        break;
+    }
+    return ControlGroupDefWindowProc(pTheme, hWnd, uMsg, wParam, lParam);
+}
+static LRESULT CALLBACK StaticOwnerDrawWndProc(
+    __in HWND hWnd,
+    __in UINT uMsg,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    )
+{
+    switch (uMsg)
+    {
+    case WM_UPDATEUISTATE:
+        return ::DefWindowProc(hWnd, uMsg, wParam, lParam);
+    default:
+        return (*vpfnStaticOwnerDrawBaseWndProc)(hWnd, uMsg, wParam, lParam);
+    }
+}
+static HRESULT LoadControls(
+    __in THEME* pTheme,
+    __in_opt THEME_CONTROL* pParentControl,
+    __in_ecount_opt(cAssignControlIds) const THEME_ASSIGN_CONTROL_ID* rgAssignControlIds,
+    __in DWORD cAssignControlIds
+    )
+{
+    HRESULT hr = S_OK;
+    RECT rcParent = { };
+    LPWSTR sczText = NULL;
+    BOOL fStartNewGroup = FALSE;
+    DWORD cControls = 0;
+    THEME_CONTROL* rgControls = NULL;
+    HWND hwndParent = pParentControl ? pParentControl->hWnd : pTheme->hwndParent;
+    int w = 0;
+    int h = 0;
+    int x = 0;
+    int y = 0;
+    GetControls(pTheme, pParentControl, cControls, rgControls);
+    ::GetClientRect(hwndParent, &rcParent);
+    for (DWORD i = 0; i < cControls; ++i)
+    {
+        THEME_CONTROL* pControl = rgControls + i;
+        THEME_FONT* pControlFont = (pTheme->cFonts > pControl->dwFontId) ? pTheme->rgFonts + pControl->dwFontId : NULL;
+        THEME_FONT_INSTANCE* pControlFontInstance = NULL;
+        LPCWSTR wzWindowClass = NULL;
+        DWORD dwWindowBits = WS_CHILD;
+        DWORD dwWindowExBits = 0;
+        if (fStartNewGroup)
+        {
+            dwWindowBits |= WS_GROUP;
+            fStartNewGroup = FALSE;
+        }
+        switch (pControl->type)
+        {
+        case THEME_CONTROL_TYPE_BILLBOARD: 
+            __fallthrough;
+        case THEME_CONTROL_TYPE_PANEL:
+            wzWindowClass = THEME_WC_PANEL;
+            dwWindowBits |= WS_CHILDWINDOW | WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
+            dwWindowExBits |= WS_EX_TRANSPARENT | WS_EX_CONTROLPARENT;
+#ifdef DEBUG
+            StrAllocFormatted(&pControl->sczText, L"Panel '%ls', id: %d", pControl->sczName, pControl->wId);
+#endif
+            break;
+        case THEME_CONTROL_TYPE_CHECKBOX:
+            dwWindowBits |= BS_AUTOCHECKBOX | BS_MULTILINE; // checkboxes are basically buttons with an extra bit tossed in.
+            __fallthrough;
+        case THEME_CONTROL_TYPE_BUTTON:
+            wzWindowClass = WC_BUTTONW;
+            if (pControl->hImage || (pTheme->hImage && 0 <= pControl->nSourceX && 0 <= pControl->nSourceY))
+            {
+                dwWindowBits |= BS_OWNERDRAW;
+                pControl->dwInternalStyle |= INTERNAL_CONTROL_STYLE_OWNER_DRAW;
+            }
+            break;
+        case THEME_CONTROL_TYPE_COMBOBOX:
+            wzWindowClass = WC_COMBOBOXW;
+            dwWindowBits |= CBS_DROPDOWNLIST | CBS_HASSTRINGS;
+            break;
+        case THEME_CONTROL_TYPE_COMMANDLINK:
+            wzWindowClass = WC_BUTTONW;
+            dwWindowBits |= BS_COMMANDLINK;
+            break;
+        case THEME_CONTROL_TYPE_EDITBOX:
+            wzWindowClass = WC_EDITW;
+            dwWindowBits |= ES_LEFT | ES_AUTOHSCROLL;
+            dwWindowExBits = WS_EX_CLIENTEDGE;
+            break;
+        case THEME_CONTROL_TYPE_HYPERLINK: // hyperlinks are basically just owner drawn buttons.
+            wzWindowClass = THEME_WC_HYPERLINK;
+            dwWindowBits |= BS_OWNERDRAW | BTNS_NOPREFIX;
+            break;
+        case THEME_CONTROL_TYPE_HYPERTEXT:
+            wzWindowClass = WC_LINK;
+            dwWindowBits |= LWS_NOPREFIX;
+            break;
+        case THEME_CONTROL_TYPE_IMAGE: // images are basically just owner drawn static controls (so we can draw .jpgs and .pngs instead of just bitmaps).
+            if (pControl->hImage || (pTheme->hImage && 0 <= pControl->nSourceX && 0 <= pControl->nSourceY))
+            {
+                wzWindowClass = THEME_WC_STATICOWNERDRAW;
+                dwWindowBits |= SS_OWNERDRAW;
+                pControl->dwInternalStyle |= INTERNAL_CONTROL_STYLE_OWNER_DRAW;
+            }
+            else
+            {
+                hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
+                ThmExitOnRootFailure(hr, "Invalid image or image list coordinates.");
+            }
+            break;
+        case THEME_CONTROL_TYPE_LABEL:
+            wzWindowClass = WC_STATICW;
+            break;
+        case THEME_CONTROL_TYPE_LISTVIEW:
+            // If thmutil is handling the image list for this listview, tell Windows not to free it when the control is destroyed.
+            if (pControl->rghImageList[0] || pControl->rghImageList[1] || pControl->rghImageList[2] || pControl->rghImageList[3])
+            {
+                pControl->dwStyle |= LVS_SHAREIMAGELISTS;
+            }
+            wzWindowClass = WC_LISTVIEWW;
+            break;
+        case THEME_CONTROL_TYPE_PROGRESSBAR:
+            if (pControl->hImage || (pTheme->hImage && 0 <= pControl->nSourceX && 0 <= pControl->nSourceY))
+            {
+                wzWindowClass = THEME_WC_STATICOWNERDRAW; // no such thing as an owner drawn progress bar so we'll make our own out of a static control.
+                dwWindowBits |= SS_OWNERDRAW;
+                pControl->dwInternalStyle |= INTERNAL_CONTROL_STYLE_OWNER_DRAW;
+            }
+            else
+            {
+                wzWindowClass = PROGRESS_CLASSW;
+            }
+            break;
+        case THEME_CONTROL_TYPE_RADIOBUTTON:
+            dwWindowBits |= BS_AUTORADIOBUTTON | BS_MULTILINE;
+            wzWindowClass = WC_BUTTONW;
+            if (pControl->fLastRadioButton)
+            {
+                fStartNewGroup = TRUE;
+            }
+            break;
+        case THEME_CONTROL_TYPE_RICHEDIT:
+            if (!vhModuleMsftEdit && !vhModuleRichEd)
+            {
+                hr = LoadSystemLibrary(L"Msftedit.dll", &vhModuleMsftEdit);
+                if (FAILED(hr))
+                {
+                    hr = LoadSystemLibrary(L"Riched20.dll", &vhModuleRichEd);
+                    ThmExitOnFailure(hr, "Failed to load Rich Edit control library.");
+                }
+            }
+            wzWindowClass = vhModuleMsftEdit ? MSFTEDIT_CLASS : RICHEDIT_CLASSW;
+            dwWindowBits |= ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL | ES_READONLY;
+            break;
+        case THEME_CONTROL_TYPE_STATIC:
+            wzWindowClass = WC_STATICW;
+            dwWindowBits |= SS_ETCHEDHORZ;
+            break;
+        case THEME_CONTROL_TYPE_TAB:
+            wzWindowClass = WC_TABCONTROLW;
+            break;
+        case THEME_CONTROL_TYPE_TREEVIEW:
+            wzWindowClass = WC_TREEVIEWW;
+            break;
+        }
+        ThmExitOnNull(wzWindowClass, hr, E_INVALIDDATA, "Failed to configure control %u because of unknown type: %u", i, pControl->type);
+        // Default control ids to the theme id and its index in the control array, unless there
+        // is a specific id to assign to a named control.
+        WORD wControlId = MAKEWORD(i, pTheme->wId);
+        for (DWORD iAssignControl = 0; pControl->sczName && iAssignControl < cAssignControlIds; ++iAssignControl)
+        {
+            if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, pControl->sczName, -1, rgAssignControlIds[iAssignControl].wzName, -1))
+            {
+                wControlId = rgAssignControlIds[iAssignControl].wId;
+                break;
+            }
+        }
+        pControl->wId = wControlId;
+        GetControlDimensions(pControl, &rcParent, &w, &h, &x, &y);
+        BOOL fVisible = pControl->dwStyle & WS_VISIBLE;
+        BOOL fDisabled = pControl->dwStyle & WS_DISABLED;
+        // If the control is supposed to be initially visible and it has a VisibleCondition, check if it's true.
+        if (fVisible && pControl->sczVisibleCondition && pTheme->pfnEvaluateCondition && !pControl->fDisableVariableFunctionality)
+        {
+            hr = pTheme->pfnEvaluateCondition(pControl->sczVisibleCondition, &fVisible, pTheme->pvVariableContext);
+            ThmExitOnFailure(hr, "Failed to evaluate VisibleCondition: %ls", pControl->sczVisibleCondition);
+            if (!fVisible)
+            {
+                pControl->dwStyle &= ~WS_VISIBLE;
+            }
+        }
+        // Disable controls that aren't visible so their shortcut keys don't trigger.
+        if (!fVisible)
+        {
+            dwWindowBits |= WS_DISABLED;
+            fDisabled = TRUE;
+        }
+        // If the control is supposed to be initially enabled and it has an EnableCondition, check if it's true.
+        if (!fDisabled && pControl->sczEnableCondition && pTheme->pfnEvaluateCondition && !pControl->fDisableVariableFunctionality)
+        {
+            BOOL fEnable = TRUE;
+            hr = pTheme->pfnEvaluateCondition(pControl->sczEnableCondition, &fEnable, pTheme->pvVariableContext);
+            ThmExitOnFailure(hr, "Failed to evaluate EnableCondition: %ls", pControl->sczEnableCondition);
+            fDisabled = !fEnable;
+            dwWindowBits |= fDisabled ? WS_DISABLED : 0;
+        }
+        // Honor the HideWhenDisabled option.
+        if ((pControl->dwInternalStyle & INTERNAL_CONTROL_STYLE_HIDE_WHEN_DISABLED) && fVisible && fDisabled)
+        {
+            fVisible = FALSE;
+            pControl->dwStyle &= ~WS_VISIBLE;
+        }
+        pControl->hWnd = ::CreateWindowExW(dwWindowExBits, wzWindowClass, pControl->sczText, pControl->dwStyle | dwWindowBits, x, y, w, h, hwndParent, reinterpret_cast<HMENU>(wControlId), NULL, pTheme);
+        ThmExitOnNullWithLastError(pControl->hWnd, hr, "Failed to create window.");
+        if (pControl->sczTooltip)
+        {
+            if (!pTheme->hwndTooltip)
+            {
+                pTheme->hwndTooltip = ::CreateWindowExW(WS_EX_TOOLWINDOW, TOOLTIPS_CLASSW, NULL, WS_POPUP | TTS_ALWAYSTIP | TTS_BALLOON | TTS_NOPREFIX, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hwndParent, NULL, NULL, NULL);
+            }
+            if (pTheme->hwndTooltip)
+            {
+                TOOLINFOW toolinfo = {};
+                toolinfo.cbSize = sizeof(toolinfo);
+                toolinfo.hwnd = hwndParent;
+                toolinfo.uFlags = TTF_IDISHWND | TTF_SUBCLASS;
+                toolinfo.uId = reinterpret_cast<UINT_PTR>(pControl->hWnd);
+                toolinfo.lpszText = pControl->sczTooltip;
+                ::SendMessageW(pTheme->hwndTooltip, TTM_ADDTOOLW, 0, reinterpret_cast<LPARAM>(&toolinfo));
+            }
+        }
+        if (THEME_CONTROL_TYPE_COMMANDLINK == pControl->type)
+        {
+            if (pControl->sczNote)
+            {
+                ::SendMessageW(pControl->hWnd, BCM_SETNOTE, 0, reinterpret_cast<WPARAM>(pControl->sczNote));
+            }
+            if (pControl->hImage)
+            {
+                ::SendMessageW(pControl->hWnd, BM_SETIMAGE, IMAGE_BITMAP, reinterpret_cast<LPARAM>(pControl->hImage));
+            }
+            else if (pControl->hIcon)
+            {
+                ::SendMessageW(pControl->hWnd, BM_SETIMAGE, IMAGE_ICON, reinterpret_cast<LPARAM>(pControl->hIcon));
+            }
+        }
+        else if (THEME_CONTROL_TYPE_EDITBOX == pControl->type)
+        {
+            if (pControl->dwInternalStyle & INTERNAL_CONTROL_STYLE_FILESYSTEM_AUTOCOMPLETE)
+            {
+                hr = ::SHAutoComplete(pControl->hWnd, SHACF_FILESYS_ONLY);
+            }
+        }
+        else if (THEME_CONTROL_TYPE_LISTVIEW == pControl->type)
+        {
+            ::SendMessageW(pControl->hWnd, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, pControl->dwExtendedStyle);
+            hr = SizeListViewColumns(pControl);
+            ThmExitOnFailure(hr, "Failed to get size of list view columns.");
+            for (DWORD j = 0; j < pControl->cColumns; ++j)
+            {
+                LVCOLUMNW lvc = { };
+                lvc.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT | LVCF_SUBITEM;
+                lvc.cx = pControl->ptcColumns[j].nWidth;
+                lvc.iSubItem = j;
+                lvc.pszText = pControl->ptcColumns[j].pszName;
+                lvc.fmt = LVCFMT_LEFT;
+                lvc.cchTextMax = 4;
+                if (-1 == ::SendMessageW(pControl->hWnd, LVM_INSERTCOLUMNW, (WPARAM) (int) (j), (LPARAM) (const LV_COLUMNW *) (&lvc)))
+                {
+                    ThmExitWithLastError(hr, "Failed to insert listview column %u into tab control.", j);
+                }
+                // Return value tells us the old image list, we don't care.
+                if (pControl->rghImageList[0])
+                {
+                    ::SendMessageW(pControl->hWnd, LVM_SETIMAGELIST, static_cast<WPARAM>(LVSIL_NORMAL), reinterpret_cast<LPARAM>(pControl->rghImageList[0]));
+                }
+                else if (pControl->rghImageList[1])
+                {
+                    ::SendMessageW(pControl->hWnd, LVM_SETIMAGELIST, static_cast<WPARAM>(LVSIL_SMALL), reinterpret_cast<LPARAM>(pControl->rghImageList[1]));
+                }
+                else if (pControl->rghImageList[2])
+                {
+                    ::SendMessageW(pControl->hWnd, LVM_SETIMAGELIST, static_cast<WPARAM>(LVSIL_STATE), reinterpret_cast<LPARAM>(pControl->rghImageList[2]));
+                }
+                else if (pControl->rghImageList[3])
+                {
+                    ::SendMessageW(pControl->hWnd, LVM_SETIMAGELIST, static_cast<WPARAM>(LVSIL_GROUPHEADER), reinterpret_cast<LPARAM>(pControl->rghImageList[3]));
+                }
+            }
+        }
+        else if (THEME_CONTROL_TYPE_RICHEDIT == pControl->type)
+        {
+            ::SendMessageW(pControl->hWnd, EM_AUTOURLDETECT, static_cast<WPARAM>(TRUE), 0);
+            ::SendMessageW(pControl->hWnd, EM_SETEVENTMASK, 0, ENM_KEYEVENTS | ENM_LINK);
+        }
+        else if (THEME_CONTROL_TYPE_TAB == pControl->type)
+        {
+            ULONG_PTR hbrBackground = 0;
+            if (THEME_INVALID_ID != pControl->dwFontId)
+            {
+                hbrBackground = reinterpret_cast<ULONG_PTR>(pTheme->rgFonts[pControl->dwFontId].hBackground);
+            }
+            else
+            {
+                hbrBackground = ::GetClassLongPtr(pTheme->hwndParent, GCLP_HBRBACKGROUND);
+            }
+            ::SetClassLongPtr(pControl->hWnd, GCLP_HBRBACKGROUND, hbrBackground);
+            for (DWORD j = 0; j < pControl->cTabs; ++j)
+            {
+                TCITEMW tci = { };
+                tci.mask = TCIF_TEXT | TCIF_IMAGE;
+                tci.iImage = -1;
+                tci.pszText = pControl->pttTabs[j].pszName;
+                if (-1 == ::SendMessageW(pControl->hWnd, TCM_INSERTITEMW, (WPARAM) (int) (j), (LPARAM) (const TC_ITEMW *) (&tci)))
+                {
+                    ThmExitWithLastError(hr, "Failed to insert tab %u into tab control.", j);
+                }
+            }
+        }
+        if (pControlFont)
+        {
+            hr = EnsureFontInstance(pTheme, pControlFont, &pControlFontInstance);
+            ThmExitOnFailure(hr, "Failed to get DPI specific font.");
+            ::SendMessageW(pControl->hWnd, WM_SETFONT, (WPARAM) pControlFontInstance->hFont, FALSE);
+        }
+        // Initialize the text on all "application" (non-page) controls, best effort only.
+        if (pTheme->pfnFormatString && !pControl->wPageId && pControl->sczText && *pControl->sczText)
+        {
+            HRESULT hrFormat = pTheme->pfnFormatString(pControl->sczText, &sczText, pTheme->pvVariableContext);
+            if (SUCCEEDED(hrFormat))
+            {
+                ThemeSetTextControl(pTheme, pControl->wId, sczText);
+            }
+        }
+        if (pControl->cControls)
+        {
+            hr = LoadControls(pTheme, pControl, rgAssignControlIds, cAssignControlIds);
+            ThmExitOnFailure(hr, "Failed to load child controls.");
+        }
+    }
+LExit:
+    ReleaseStr(sczText);
+    return hr;
+}
+static HRESULT LocalizeControls(
+    __in DWORD cControls,
+    __in THEME_CONTROL* rgControls,
+    __in const WIX_LOCALIZATION *pWixLoc
+    )
+{
+    HRESULT hr = S_OK;
+    for (DWORD i = 0; i < cControls; ++i)
+    {
+        THEME_CONTROL* pControl = rgControls + i;
+        hr = LocalizeControl(pControl, pWixLoc);
+        ThmExitOnFailure(hr, "Failed to localize control: %ls", pControl->sczName);
+    }
+LExit:
+    return hr;
+}
+static HRESULT LocalizeControl(
+    __in THEME_CONTROL* pControl,
+    __in const WIX_LOCALIZATION *pWixLoc
+    )
+{
+    HRESULT hr = S_OK;
+    LOC_CONTROL* pLocControl = NULL;
+    LPWSTR sczLocStringId = NULL;
+    if (pControl->sczText && *pControl->sczText)
+    {
+        hr = LocLocalizeString(pWixLoc, &pControl->sczText);
+        ThmExitOnFailure(hr, "Failed to localize control text.");
+    }
+    else if (pControl->sczName)
+    {
+        LOC_STRING* plocString = NULL;
+        hr = StrAllocFormatted(&sczLocStringId, L"#(loc.%ls)", pControl->sczName);
+        ThmExitOnFailure(hr, "Failed to format loc string id: %ls", pControl->sczName);
+        hr = LocGetString(pWixLoc, sczLocStringId, &plocString);
+        if (E_NOTFOUND != hr)
+        {
+            ThmExitOnFailure(hr, "Failed to get loc string: %ls", pControl->sczName);
+            hr = StrAllocString(&pControl->sczText, plocString->wzText, 0);
+            ThmExitOnFailure(hr, "Failed to copy loc string to control: %ls", plocString->wzText);
+        }
+    }
+    if (pControl->sczTooltip && *pControl->sczTooltip)
+    {
+        hr = LocLocalizeString(pWixLoc, &pControl->sczTooltip);
+        ThmExitOnFailure(hr, "Failed to localize control tooltip text.");
+    }
+    if (pControl->sczNote && *pControl->sczNote)
+    {
+        hr = LocLocalizeString(pWixLoc, &pControl->sczNote);
+        ThmExitOnFailure(hr, "Failed to localize control note text.");
+    }
+    for (DWORD j = 0; j < pControl->cConditionalText; ++j)
+    {
+        hr = LocLocalizeString(pWixLoc, &pControl->rgConditionalText[j].sczText);
+        ThmExitOnFailure(hr, "Failed to localize conditional text.");
+    }
+    for (DWORD j = 0; j < pControl->cConditionalNotes; ++j)
+    {
+        hr = LocLocalizeString(pWixLoc, &pControl->rgConditionalNotes[j].sczText);
+        ThmExitOnFailure(hr, "Failed to localize conditional note.");
+    }
+    for (DWORD j = 0; j < pControl->cColumns; ++j)
+    {
+        hr = LocLocalizeString(pWixLoc, &pControl->ptcColumns[j].pszName);
+        ThmExitOnFailure(hr, "Failed to localize column text.");
+    }
+    for (DWORD j = 0; j < pControl->cTabs; ++j)
+    {
+        hr = LocLocalizeString(pWixLoc, &pControl->pttTabs[j].pszName);
+        ThmExitOnFailure(hr, "Failed to localize tab text.");
+    }
+    // Localize control's size, location, and text.
+    if (pControl->sczName)
+    {
+        hr = LocGetControl(pWixLoc, pControl->sczName, &pLocControl);
+        if (E_NOTFOUND == hr)
+        {
+            ExitFunction1(hr = S_OK);
+        }
+        ThmExitOnFailure(hr, "Failed to localize control.");
+        if (LOC_CONTROL_NOT_SET != pLocControl->nX)
+        {
+            pControl->nDefaultDpiX = pLocControl->nX;
+        }
+        if (LOC_CONTROL_NOT_SET != pLocControl->nY)
+        {
+            pControl->nDefaultDpiY = pLocControl->nY;
+        }
+        if (LOC_CONTROL_NOT_SET != pLocControl->nWidth)
+        {
+            pControl->nDefaultDpiWidth = pLocControl->nWidth;
+        }
+        if (LOC_CONTROL_NOT_SET != pLocControl->nHeight)
+        {
+            pControl->nDefaultDpiHeight = pLocControl->nHeight;
+        }
+        if (pLocControl->wzText && *pLocControl->wzText)
+        {
+            hr = StrAllocString(&pControl->sczText, pLocControl->wzText, 0);
+            ThmExitOnFailure(hr, "Failed to localize control text.");
+        }
+    }
+    hr = LocalizeControls(pControl->cControls, pControl->rgControls, pWixLoc);
+LExit:
+    ReleaseStr(sczLocStringId);
+    return hr;
+}
+static HRESULT LoadControlsString(
+    __in DWORD cControls,
+    __in THEME_CONTROL* rgControls,
+    __in HMODULE hResModule
+    )
+{
+    HRESULT hr = S_OK;
+    for (DWORD i = 0; i < cControls; ++i)
+    {
+        THEME_CONTROL* pControl = rgControls + i;
+        hr = LoadControlString(pControl, hResModule);
+        ThmExitOnFailure(hr, "Failed to load string for control: %ls", pControl->sczName);
+    }
+LExit:
+    return hr;
+}
+static HRESULT LoadControlString(
+    __in THEME_CONTROL* pControl,
+    __in HMODULE hResModule
+    )
+{
+    HRESULT hr = S_OK;
+    if (UINT_MAX != pControl->uStringId)
+    {
+        hr = ResReadString(hResModule, pControl->uStringId, &pControl->sczText);
+        ThmExitOnFailure(hr, "Failed to load control text.");
+        for (DWORD j = 0; j < pControl->cColumns; ++j)
+        {
+            if (UINT_MAX != pControl->ptcColumns[j].uStringId)
+            {
+                hr = ResReadString(hResModule, pControl->ptcColumns[j].uStringId, &pControl->ptcColumns[j].pszName);
+                ThmExitOnFailure(hr, "Failed to load column text.");
+            }
+        }
+        for (DWORD j = 0; j < pControl->cTabs; ++j)
+        {
+            if (UINT_MAX != pControl->pttTabs[j].uStringId)
+            {
+                hr = ResReadString(hResModule, pControl->pttTabs[j].uStringId, &pControl->pttTabs[j].pszName);
+                ThmExitOnFailure(hr, "Failed to load tab text.");
+            }
+        }
+    }
+    hr = LoadControlsString(pControl->cControls, pControl->rgControls, hResModule);
+LExit:
+    return hr;
+}
+static void ResizeControls(
+    __in DWORD cControls,
+    __in THEME_CONTROL* rgControls,
+    __in const RECT* prcParent
+    )
+{
+    for (DWORD i = 0; i < cControls; ++i)
+    {
+        THEME_CONTROL* pControl = rgControls + i;
+        ResizeControl(pControl, prcParent);
+    }
+}
+static void ResizeControl(
+    __in THEME_CONTROL* pControl,
+    __in const RECT* prcParent
+    )
+{
+    int w = 0;
+    int h = 0;
+    int x = 0;
+    int y = 0;
+    RECT rcControl = { };
+    GetControlDimensions(pControl, prcParent, &w, &h, &x, &y);
+    ::SetWindowPos(pControl->hWnd, NULL, x, y, w, h, SWP_NOACTIVATE | SWP_NOZORDER);
+#ifdef DEBUG
+    if (THEME_CONTROL_TYPE_BUTTON == pControl->type)
+    {
+        Trace(REPORT_STANDARD, "Resizing button (%ls/%ls) to (%d,%d)+(%d,%d) for parent (%d,%d)-(%d,%d)",
+            pControl->sczName, pControl->sczText, x, y, w, h, prcParent->left, prcParent->top, prcParent->right, prcParent->bottom);
+    }
+#endif
+    if (THEME_CONTROL_TYPE_LISTVIEW == pControl->type)
+    {
+        SizeListViewColumns(pControl);
+        for (DWORD j = 0; j < pControl->cColumns; ++j)
+        {
+            if (-1 == ::SendMessageW(pControl->hWnd, LVM_SETCOLUMNWIDTH, (WPARAM) (int) (j), (LPARAM) (pControl->ptcColumns[j].nWidth)))
+            {
+                Trace(REPORT_DEBUG, "Failed to resize listview column %u with error %u", j, ::GetLastError());
+                return;
+            }
+        }
+    }
+    if (pControl->cControls)
+    {
+        ::GetClientRect(pControl->hWnd, &rcControl);
+        ResizeControls(pControl->cControls, pControl->rgControls, &rcControl);
+    }
+}
+static void ScaleThemeFromWindow(
+    __in THEME* pTheme,
+    __in UINT nDpi,
+    __in int x,
+    __in int y
+    )
+{
+    DWORD dwStyle = GetWindowStyle(pTheme->hwndParent);
+    BOOL fMenu = NULL != ::GetMenu(pTheme->hwndParent);
+    DWORD dwExStyle = GetWindowExStyle(pTheme->hwndParent);
+    ScaleTheme(pTheme, nDpi, x, y, dwStyle, fMenu, dwExStyle);
+}
+static void ScaleTheme(
+    __in THEME* pTheme,
+    __in UINT nDpi,
+    __in int x,
+    __in int y,
+    __in DWORD dwStyle,
+    __in BOOL fMenu,
+    __in DWORD dwExStyle
+    )
+{
+    RECT rect = { };
+    pTheme->nDpi = nDpi;
+    pTheme->nHeight = DpiuScaleValue(pTheme->nDefaultDpiHeight, pTheme->nDpi);
+    pTheme->nWidth = DpiuScaleValue(pTheme->nDefaultDpiWidth, pTheme->nDpi);
+    pTheme->nMinimumHeight = DpiuScaleValue(pTheme->nDefaultDpiMinimumHeight, pTheme->nDpi);
+    pTheme->nMinimumWidth = DpiuScaleValue(pTheme->nDefaultDpiMinimumWidth, pTheme->nDpi);
+    rect.left = x;
+    rect.top = y;
+    rect.right = x + pTheme->nWidth;
+    rect.bottom = y + pTheme->nHeight;
+    DpiuAdjustWindowRect(&rect, dwStyle, fMenu, dwExStyle, pTheme->nDpi);
+    pTheme->nWindowWidth = rect.right - rect.left;
+    pTheme->nWindowHeight = rect.bottom - rect.top;
+    ScaleControls(pTheme, pTheme->cControls, pTheme->rgControls, pTheme->nDpi);
+    if (pTheme->hwndParent)
+    {
+        ::SetWindowPos(pTheme->hwndParent, NULL, x, y, pTheme->nWindowWidth, pTheme->nWindowHeight, SWP_NOACTIVATE | SWP_NOZORDER);
+    }
+}
+static void ScaleControls(
+    __in THEME* pTheme,
+    __in DWORD cControls,
+    __in THEME_CONTROL* rgControls,
+    __in UINT nDpi
+    )
+{
+    for (DWORD i = 0; i < cControls; ++i)
+    {
+        THEME_CONTROL* pControl = rgControls + i;
+        ScaleControl(pTheme, pControl, nDpi);
+    }
+}
+static void ScaleControl(
+    __in THEME* pTheme,
+    __in THEME_CONTROL* pControl,
+    __in UINT nDpi
+    )
+{
+    HRESULT hr = S_OK;
+    THEME_FONT* pControlFont = (pTheme->cFonts > pControl->dwFontId) ? pTheme->rgFonts + pControl->dwFontId : NULL;
+    THEME_FONT_INSTANCE* pControlFontInstance = NULL;
+    if (pControlFont)
+    {
+        hr = EnsureFontInstance(pTheme, pControlFont, &pControlFontInstance);
+        if (SUCCEEDED(hr) && pControl->hWnd)
+        {
+            ::SendMessageW(pControl->hWnd, WM_SETFONT, (WPARAM)pControlFontInstance->hFont, FALSE);
+        }
+    }
+    if (THEME_CONTROL_TYPE_LISTVIEW == pControl->type)
+    {
+        for (DWORD i = 0; i < pControl->cColumns; ++i)
+        {
+            THEME_COLUMN* pColumn = pControl->ptcColumns + i;
+            pColumn->nBaseWidth = DpiuScaleValue(pColumn->nDefaultDpiBaseWidth, nDpi);
+        }
+    }
+    pControl->nWidth = DpiuScaleValue(pControl->nDefaultDpiWidth, nDpi);
+    pControl->nHeight = DpiuScaleValue(pControl->nDefaultDpiHeight, nDpi);
+    pControl->nX = DpiuScaleValue(pControl->nDefaultDpiX, nDpi);
+    pControl->nY = DpiuScaleValue(pControl->nDefaultDpiY, nDpi);
+    if (pControl->cControls)
+    {
+        ScaleControls(pTheme, pControl->cControls, pControl->rgControls, nDpi);
+    }
+}
+static void UnloadControls(
+    __in DWORD cControls,
+    __in THEME_CONTROL* rgControls
+    )
+{
+    for (DWORD i = 0; i < cControls; ++i)
+    {
+        THEME_CONTROL* pControl = rgControls + i;
+        pControl->hWnd = NULL;
+        UnloadControls(pControl->cControls, pControl->rgControls);
+    }
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/timeutil.cpp b/src/libs/dutil/WixToolset.DUtil/timeutil.cpp
new file mode 100644
index 00000000..b7953c94
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/timeutil.cpp
@@ -0,0 +1,385 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define TimeExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_TIMEUTIL, x, s, __VA_ARGS__)
+#define TimeExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_TIMEUTIL, x, s, __VA_ARGS__)
+#define TimeExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_TIMEUTIL, x, s, __VA_ARGS__)
+#define TimeExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_TIMEUTIL, x, s, __VA_ARGS__)
+#define TimeExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_TIMEUTIL, x, s, __VA_ARGS__)
+#define TimeExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_TIMEUTIL, x, s, __VA_ARGS__)
+#define TimeExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_TIMEUTIL, p, x, e, s, __VA_ARGS__)
+#define TimeExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_TIMEUTIL, p, x, s, __VA_ARGS__)
+#define TimeExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_TIMEUTIL, p, x, e, s, __VA_ARGS__)
+#define TimeExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_TIMEUTIL, p, x, s, __VA_ARGS__)
+#define TimeExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_TIMEUTIL, e, x, s, __VA_ARGS__)
+#define TimeExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_TIMEUTIL, g, x, s, __VA_ARGS__)
+const LPCWSTR DAY_OF_WEEK[] = { L"Sun", L"Mon", L"Tue", L"Wed", L"Thu", L"Fri", L"Sat" };
+const LPCWSTR MONTH_OF_YEAR[] = { L"None", L"Jan", L"Feb", L"Mar", L"Apr", L"May", L"Jun", L"Jul", L"Aug", L"Sep", L"Oct", L"Nov", L"Dec" };
+enum TIME_PARSER { DayOfWeek, DayOfMonth, MonthOfYear, Year, Hours, Minutes, Seconds, TimeZone };
+enum TIME_PARSERRFC3339 { RFC3339_Year, RFC3339_Month, RFC3339_Day, RFC3339_Hours, RFC3339_Minutes, RFC3339_Seconds, RFC3339_TimeZone };
+// prototypes
+static HRESULT DayFromString(
+    __in_z LPCWSTR wzDay,
+    __out WORD* pwDayOfWeek
+    );
+static HRESULT MonthFromString(
+    __in_z LPCWSTR wzMonth,
+    __out WORD* pwMonthOfYear
+    );
+/********************************************************************
+ TimeFromString - converts string to FILETIME
+*******************************************************************/
+extern "C" HRESULT DAPI TimeFromString(
+    __in_z LPCWSTR wzTime,
+    __out FILETIME* pFileTime
+    )
+{
+    Assert(wzTime && pFileTime);
+    HRESULT hr = S_OK;
+    LPWSTR pwzTime = NULL;
+    SYSTEMTIME sysTime = { };
+    TIME_PARSER timeParser = DayOfWeek;
+    LPCWSTR pwzStart = NULL;
+    LPWSTR pwzEnd = NULL;
+    hr = StrAllocString(&pwzTime, wzTime, 0);
+    TimeExitOnFailure(hr, "Failed to copy time.");
+    pwzStart = pwzEnd = pwzTime;
+    while (pwzEnd && *pwzEnd)
+    {
+        if (L',' == *pwzEnd || L' ' == *pwzEnd || L':' == *pwzEnd)
+        {
+            *pwzEnd = L'\0'; // null terminate
+            ++pwzEnd;
+            while (L' ' == *pwzEnd)
+            {
+                ++pwzEnd; // and skip past the blank space
+            }
+            switch (timeParser)
+            {
+                case DayOfWeek:
+                    hr = DayFromString(pwzStart, &sysTime.wDayOfWeek);
+                    TimeExitOnFailure(hr, "Failed to convert string to day: %ls", pwzStart);
+                    break;
+                case DayOfMonth:
+                    sysTime.wDay = (WORD)wcstoul(pwzStart, NULL, 10);
+                    break;
+                case MonthOfYear:
+                    hr = MonthFromString(pwzStart, &sysTime.wMonth);
+                    TimeExitOnFailure(hr, "Failed to convert to month: %ls", pwzStart);
+                    break;
+                case Year:
+                    sysTime.wYear = (WORD)wcstoul(pwzStart, NULL, 10);
+                    break;
+                case Hours:
+                    sysTime.wHour = (WORD)wcstoul(pwzStart, NULL, 10);
+                    break;
+                case Minutes:
+                    sysTime.wMinute = (WORD)wcstoul(pwzStart, NULL, 10);
+                    break;
+                case Seconds:
+                    sysTime.wSecond = (WORD)wcstoul(pwzStart, NULL, 10);
+                    break;
+                case TimeZone:
+                    // TODO: do something with this in the future, but this should only hit outside of the while loop.
+                    break;
+                default:
+                    break;
+            }
+            pwzStart = pwzEnd;
+            timeParser = (TIME_PARSER)((int)timeParser + 1);
+        }
+        ++pwzEnd;
+    }
+    if (!::SystemTimeToFileTime(&sysTime, pFileTime))
+    {
+        TimeExitWithLastError(hr, "Failed to convert system time to file time.");
+    }
+LExit:
+    ReleaseStr(pwzTime);
+    return hr;
+}
+/********************************************************************
+ TimeFromString3339 - converts string formated in accorance with RFC3339 to FILETIME
+ http://tools.ietf.org/html/rfc3339
+*******************************************************************/
+extern "C" HRESULT DAPI TimeFromString3339(
+    __in_z LPCWSTR wzTime,
+    __out FILETIME* pFileTime
+    )
+{
+    Assert(wzTime && pFileTime);
+    HRESULT hr = S_OK;
+    LPWSTR pwzTime = NULL;
+    SYSTEMTIME sysTime = { };
+    TIME_PARSERRFC3339 timeParser = RFC3339_Year;
+    LPCWSTR pwzStart = NULL;
+    LPWSTR pwzEnd = NULL;
+    hr = StrAllocString(&pwzTime, wzTime, 0);
+    TimeExitOnFailure(hr, "Failed to copy time.");
+    pwzStart = pwzEnd = pwzTime;
+    while (pwzEnd && *pwzEnd)
+    {
+        if (L'T' == *pwzEnd || L':' == *pwzEnd || L'-' == *pwzEnd)
+        {
+            *pwzEnd = L'\0'; // null terminate
+            ++pwzEnd;
+            switch (timeParser)
+            {
+                case RFC3339_Year:
+                    sysTime.wYear = (WORD)wcstoul(pwzStart, NULL, 10);
+                    break;
+                case RFC3339_Month:
+                    sysTime.wMonth = (WORD)wcstoul(pwzStart, NULL, 10);
+                    break;
+                case RFC3339_Day:
+                    sysTime.wDay = (WORD)wcstoul(pwzStart, NULL, 10);
+                    break;
+                case RFC3339_Hours:
+                    sysTime.wHour = (WORD)wcstoul(pwzStart, NULL, 10);
+                    break;
+                case RFC3339_Minutes:
+                    sysTime.wMinute = (WORD)wcstoul(pwzStart, NULL, 10);
+                    break;
+                case RFC3339_Seconds:
+                    sysTime.wSecond = (WORD)wcstoul(pwzStart, NULL, 10);
+                    break;
+                case RFC3339_TimeZone:
+                    // TODO: do something with this in the future, but this should only hit outside of the while loop.
+                    break;
+                default:
+                    break;
+            }
+            pwzStart = pwzEnd;
+            timeParser = (TIME_PARSERRFC3339)((int)timeParser + 1);
+        }
+        ++pwzEnd;
+    }
+    if (!::SystemTimeToFileTime(&sysTime, pFileTime))
+    {
+        TimeExitWithLastError(hr, "Failed to convert system time to file time.");
+    }
+LExit:
+    ReleaseStr(pwzTime);
+    return hr;
+}
+/****************************************************************************
+TimeCurrentTime - gets the current time in string format
+****************************************************************************/
+extern "C" HRESULT DAPI TimeCurrentTime(
+    __deref_out_z LPWSTR* ppwz,
+    __in BOOL fGMT
+    )
+{
+    SYSTEMTIME st;
+    if (fGMT)
+    {
+        ::GetSystemTime(&st);
+    }
+    else
+    {
+        SYSTEMTIME stGMT;
+        TIME_ZONE_INFORMATION tzi;
+        ::GetTimeZoneInformation(&tzi);
+        ::GetSystemTime(&stGMT);
+        ::SystemTimeToTzSpecificLocalTime(&tzi, &stGMT, &st);
+    }
+    return StrAllocFormatted(ppwz, L"%02d:%02d:%02d", st.wHour, st.wMinute, st.wSecond);
+}
+/****************************************************************************
+TimeCurrentDateTime - gets the current date and time in string format,
+  per format described in RFC 3339
+****************************************************************************/
+extern "C" HRESULT DAPI TimeCurrentDateTime(
+    __deref_out_z LPWSTR* ppwz,
+    __in BOOL fGMT
+    )
+{
+    SYSTEMTIME st;
+    ::GetSystemTime(&st);
+    return TimeSystemDateTime(ppwz, &st, fGMT);
+}
+/****************************************************************************
+TimeSystemDateTime - converts the provided system time struct to string format,
+  per format described in RFC 3339
+****************************************************************************/
+extern "C" HRESULT DAPI TimeSystemDateTime(
+    __deref_out_z LPWSTR* ppwz,
+    __in const SYSTEMTIME *pst,
+    __in BOOL fGMT
+    )
+{
+    DWORD dwAbsBias = 0;
+    if (fGMT)
+    {
+        return StrAllocFormatted(ppwz, L"%04hu-%02hu-%02huT%02hu:%02hu:%02huZ", pst->wYear, pst->wMonth, pst->wDay, pst->wHour, pst->wMinute, pst->wSecond);
+    }
+    else
+    {
+        SYSTEMTIME st;
+        TIME_ZONE_INFORMATION tzi;
+        ::GetTimeZoneInformation(&tzi);
+        ::SystemTimeToTzSpecificLocalTime(&tzi, pst, &st);
+        dwAbsBias = abs(tzi.Bias);
+        return StrAllocFormatted(ppwz, L"%04hu-%02hu-%02huT%02hu:%02hu:%02hu%c%02u:%02u", st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, 0 >= tzi.Bias ? L'+' : L'-', dwAbsBias / 60, dwAbsBias % 60);
+    }
+}
+/****************************************************************************
+TimeSystemToDateTimeString - converts the provided system time struct to
+  string format representing date and time for the specified locale
+****************************************************************************/
+HRESULT DAPI TimeSystemToDateTimeString(
+    __deref_out_z LPWSTR* ppwz,
+    __in const SYSTEMTIME* pst,
+    __in LCID locale
+    )
+{
+    HRESULT hr = S_OK;
+    const WCHAR * DATE_FORMAT = L"MMM dd',' yyyy',' ";
+    const WCHAR * TIME_FORMAT = L"hh':'mm':'ss tt";
+    int iLenDate = 0;
+    int iLenTime = 0;
+    iLenDate = ::GetDateFormatW(locale, 0, pst, DATE_FORMAT, NULL, 0);
+    if (0 >= iLenDate)
+    {
+        TimeExitWithLastError(hr, "Failed to get date format with NULL");
+    }
+    iLenTime = ::GetTimeFormatW(locale, 0, pst, TIME_FORMAT, NULL, 0);
+    if (0 >= iLenTime)
+    {
+        TimeExitWithLastError(hr, "Failed to get time format with NULL");
+    }
+    // Between both lengths we account for 2 null terminators, and only need one, so we subtract one
+    hr = StrAlloc(ppwz, iLenDate + iLenTime - 1);
+    TimeExitOnFailure(hr, "Failed to allocate string");
+    if (!::GetDateFormatW(locale, 0, pst, DATE_FORMAT, *ppwz, iLenDate))
+    {
+        TimeExitWithLastError(hr, "Failed to get date format with buffer");
+    }
+    // Space to separate them
+    (*ppwz)[iLenDate - 1] = ' ';
+    if (!::GetTimeFormatW(locale, 0, pst, TIME_FORMAT, (*ppwz) + iLenDate - 1, iLenTime))
+    {
+        TimeExitWithLastError(hr, "Failed to get time format with buffer");
+    }
+LExit:
+    return hr;
+}
+/********************************************************************
+ DayFromString - converts string to day
+*******************************************************************/
+static HRESULT DayFromString(
+    __in_z LPCWSTR wzDay,
+    __out WORD* pwDayOfWeek
+    )
+{
+    HRESULT hr = E_INVALIDARG; // assume we won't find a matching name
+    for (WORD i = 0; i < countof(DAY_OF_WEEK); ++i)
+    {
+        if (0 == lstrcmpW(wzDay, DAY_OF_WEEK[i]))
+        {
+            *pwDayOfWeek = i;
+            hr = S_OK;
+            break;
+        }
+    }
+    return hr;
+}
+/********************************************************************
+ MonthFromString - converts string to month
+*******************************************************************/
+static HRESULT MonthFromString(
+    __in_z LPCWSTR wzMonth,
+    __out WORD* pwMonthOfYear
+    )
+{
+    HRESULT hr = E_INVALIDARG; // assume we won't find a matching name
+    for (WORD i = 0; i < countof(MONTH_OF_YEAR); ++i)
+    {
+        if (0 == lstrcmpW(wzMonth, MONTH_OF_YEAR[i]))
+        {
+            *pwMonthOfYear = i;
+            hr = S_OK;
+            break;
+        }
+    }
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/uncutil.cpp b/src/libs/dutil/WixToolset.DUtil/uncutil.cpp
new file mode 100644
index 00000000..415ea198
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/uncutil.cpp
@@ -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.
+#include "precomp.h"
+// Exit macros
+#define UncExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_UNCUTIL, x, s, __VA_ARGS__)
+#define UncExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_UNCUTIL, x, s, __VA_ARGS__)
+#define UncExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_UNCUTIL, x, s, __VA_ARGS__)
+#define UncExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_UNCUTIL, x, s, __VA_ARGS__)
+#define UncExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_UNCUTIL, x, s, __VA_ARGS__)
+#define UncExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_UNCUTIL, x, s, __VA_ARGS__)
+#define UncExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_UNCUTIL, p, x, e, s, __VA_ARGS__)
+#define UncExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_UNCUTIL, p, x, s, __VA_ARGS__)
+#define UncExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_UNCUTIL, p, x, e, s, __VA_ARGS__)
+#define UncExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_UNCUTIL, p, x, s, __VA_ARGS__)
+#define UncExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_UNCUTIL, e, x, s, __VA_ARGS__)
+#define UncExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_UNCUTIL, g, x, s, __VA_ARGS__)
+DAPI_(HRESULT) UncConvertFromMountedDrive(
+    __inout LPWSTR *psczUNCPath,
+    __in LPCWSTR sczMountedDrivePath
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD dwLength = 0;
+    DWORD er = ERROR_SUCCESS;
+    LPWSTR sczDrive = NULL;
+    // Only copy drive letter and colon
+    hr = StrAllocString(&sczDrive, sczMountedDrivePath, 2);
+    UncExitOnFailure(hr, "Failed to copy drive");
+    // ERROR_NOT_CONNECTED means it's not a mapped drive
+    er = ::WNetGetConnectionW(sczDrive, NULL, &dwLength);
+    if (ERROR_MORE_DATA == er)
+    {
+        er = ERROR_SUCCESS;
+        hr = StrAlloc(psczUNCPath, dwLength);
+        UncExitOnFailure(hr, "Failed to allocate string to get raw UNC path of length %u", dwLength);
+        er = ::WNetGetConnectionW(sczDrive, *psczUNCPath, &dwLength);
+        if (ERROR_CONNECTION_UNAVAIL == er)
+        {
+            // This means the drive is remembered but not currently connected, this can mean the location is accessible via UNC path but not via mounted drive path
+            er = ERROR_SUCCESS;
+        }
+        UncExitOnWin32Error(er, hr, "::WNetGetConnectionW() failed with buffer provided on drive %ls", sczDrive);
+        // Skip drive letter and colon
+        hr = StrAllocConcat(psczUNCPath, sczMountedDrivePath + 2, 0);
+        UncExitOnFailure(hr, "Failed to copy rest of database path");
+    }
+    else
+    {
+        if (ERROR_SUCCESS == er)
+        {
+            er = ERROR_NO_DATA;
+        }
+        UncExitOnWin32Error(er, hr, "::WNetGetConnectionW() failed on drive %ls", sczDrive);
+    }
+LExit:
+    ReleaseStr(sczDrive);
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/uriutil.cpp b/src/libs/dutil/WixToolset.DUtil/uriutil.cpp
new file mode 100644
index 00000000..7913c22e
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/uriutil.cpp
@@ -0,0 +1,553 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define UriExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_URIUTIL, x, s, __VA_ARGS__)
+#define UriExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_URIUTIL, x, s, __VA_ARGS__)
+#define UriExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_URIUTIL, x, s, __VA_ARGS__)
+#define UriExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_URIUTIL, x, s, __VA_ARGS__)
+#define UriExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_URIUTIL, x, s, __VA_ARGS__)
+#define UriExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_URIUTIL, x, s, __VA_ARGS__)
+#define UriExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_URIUTIL, p, x, e, s, __VA_ARGS__)
+#define UriExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_URIUTIL, p, x, s, __VA_ARGS__)
+#define UriExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_URIUTIL, p, x, e, s, __VA_ARGS__)
+#define UriExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_URIUTIL, p, x, s, __VA_ARGS__)
+#define UriExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_URIUTIL, e, x, s, __VA_ARGS__)
+#define UriExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_URIUTIL, g, x, s, __VA_ARGS__)
+//
+// UriCanonicalize - canonicalizes a URI.
+//
+extern "C" HRESULT DAPI UriCanonicalize(
+    __inout_z LPWSTR* psczUri
+    )
+{
+    HRESULT hr = S_OK;
+    WCHAR wz[INTERNET_MAX_URL_LENGTH] = { };
+    DWORD cch = countof(wz);
+    if (!::InternetCanonicalizeUrlW(*psczUri, wz, &cch, ICU_DECODE))
+    {
+        UriExitWithLastError(hr, "Failed to canonicalize URI.");
+    }
+    hr = StrAllocString(psczUri, wz, cch);
+    UriExitOnFailure(hr, "Failed copy canonicalized URI.");
+LExit:
+    return hr;
+}
+//
+// UriCrack - cracks a URI into constituent parts.
+//
+extern "C" HRESULT DAPI UriCrack(
+    __in_z LPCWSTR wzUri,
+    __out_opt INTERNET_SCHEME* pScheme,
+    __deref_opt_out_z LPWSTR* psczHostName,
+    __out_opt INTERNET_PORT* pPort,
+    __deref_opt_out_z LPWSTR* psczUser,
+    __deref_opt_out_z LPWSTR* psczPassword,
+    __deref_opt_out_z LPWSTR* psczPath,
+    __deref_opt_out_z LPWSTR* psczQueryString
+    )
+{
+    HRESULT hr = S_OK;
+    URL_COMPONENTSW components = { };
+    WCHAR wzHostName[INTERNET_MAX_HOST_NAME_LENGTH + 1];
+    WCHAR wzUserName[INTERNET_MAX_USER_NAME_LENGTH + 1];
+    WCHAR wzPassword[INTERNET_MAX_PASSWORD_LENGTH + 1];
+    WCHAR wzPath[INTERNET_MAX_PATH_LENGTH + 1];
+    WCHAR wzQueryString[INTERNET_MAX_PATH_LENGTH + 1];
+    components.dwStructSize = sizeof(URL_COMPONENTSW);
+    if (psczHostName)
+    {
+        components.lpszHostName = wzHostName;
+        components.dwHostNameLength = countof(wzHostName);
+    }
+    if (psczUser)
+    {
+        components.lpszUserName = wzUserName;
+        components.dwUserNameLength = countof(wzUserName);
+    }
+    if (psczPassword)
+    {
+        components.lpszPassword = wzPassword;
+        components.dwPasswordLength = countof(wzPassword);
+    }
+    if (psczPath)
+    {
+        components.lpszUrlPath = wzPath;
+        components.dwUrlPathLength = countof(wzPath);
+    }
+    if (psczQueryString)
+    {
+        components.lpszExtraInfo = wzQueryString;
+        components.dwExtraInfoLength = countof(wzQueryString);
+    }
+    if (!::InternetCrackUrlW(wzUri, 0, ICU_DECODE | ICU_ESCAPE, &components))
+    {
+        UriExitWithLastError(hr, "Failed to crack URI.");
+    }
+    if (pScheme)
+    {
+        *pScheme = components.nScheme;
+    }
+    if (psczHostName)
+    {
+        hr = StrAllocString(psczHostName, components.lpszHostName, components.dwHostNameLength);
+        UriExitOnFailure(hr, "Failed to copy host name.");
+    }
+    if (pPort)
+    {
+        *pPort = components.nPort;
+    }
+    if (psczUser)
+    {
+        hr = StrAllocString(psczUser, components.lpszUserName, components.dwUserNameLength);
+        UriExitOnFailure(hr, "Failed to copy user name.");
+    }
+    if (psczPassword)
+    {
+        hr = StrAllocString(psczPassword, components.lpszPassword, components.dwPasswordLength);
+        UriExitOnFailure(hr, "Failed to copy password.");
+    }
+    if (psczPath)
+    {
+        hr = StrAllocString(psczPath, components.lpszUrlPath, components.dwUrlPathLength);
+        UriExitOnFailure(hr, "Failed to copy path.");
+    }
+    if (psczQueryString)
+    {
+        hr = StrAllocString(psczQueryString, components.lpszExtraInfo, components.dwExtraInfoLength);
+        UriExitOnFailure(hr, "Failed to copy query string.");
+    }
+LExit:
+    return hr;
+}
+//
+// UriCrackEx - cracks a URI into URI_INFO.
+//
+extern "C" HRESULT DAPI UriCrackEx(
+    __in_z LPCWSTR wzUri,
+    __in URI_INFO* pUriInfo
+    )
+{
+    HRESULT hr = S_OK;
+    hr = UriCrack(wzUri, &pUriInfo->scheme, &pUriInfo->sczHostName, &pUriInfo->port, &pUriInfo->sczUser, &pUriInfo->sczPassword, &pUriInfo->sczPath, &pUriInfo->sczQueryString);
+    UriExitOnFailure(hr, "Failed to crack URI.");
+LExit:
+    return hr;
+}
+//
+// UriInfoUninitialize - frees the memory in a URI_INFO struct.
+//
+extern "C" void DAPI UriInfoUninitialize(
+    __in URI_INFO* pUriInfo
+    )
+{
+    ReleaseStr(pUriInfo->sczHostName);
+    ReleaseStr(pUriInfo->sczUser);
+    ReleaseStr(pUriInfo->sczPassword);
+    ReleaseStr(pUriInfo->sczPath);
+    ReleaseStr(pUriInfo->sczQueryString);
+    memset(pUriInfo, 0, sizeof(URI_INFO));
+}
+//
+// UriCreate - creates a URI from constituent parts.
+//
+extern "C" HRESULT DAPI UriCreate(
+    __inout_z LPWSTR* psczUri,
+    __in INTERNET_SCHEME scheme,
+    __in_z_opt LPWSTR wzHostName,
+    __in INTERNET_PORT port,
+    __in_z_opt LPWSTR wzUser,
+    __in_z_opt LPWSTR wzPassword,
+    __in_z_opt LPWSTR wzPath,
+    __in_z_opt LPWSTR wzQueryString
+    )
+{
+    HRESULT hr = S_OK;
+    WCHAR wz[INTERNET_MAX_URL_LENGTH] = { };
+    DWORD cch = countof(wz);
+    URL_COMPONENTSW components = { };
+    components.dwStructSize = sizeof(URL_COMPONENTSW);
+    components.nScheme = scheme;
+    components.lpszHostName = wzHostName;
+    components.nPort = port;
+    components.lpszUserName = wzUser;
+    components.lpszPassword = wzPassword;
+    components.lpszUrlPath = wzPath;
+    components.lpszExtraInfo = wzQueryString;
+    if (!::InternetCreateUrlW(&components, ICU_ESCAPE, wz, &cch))
+    {
+        UriExitWithLastError(hr, "Failed to create URI.");
+    }
+    hr = StrAllocString(psczUri, wz, cch);
+    UriExitOnFailure(hr, "Failed copy created URI.");
+LExit:
+    return hr;
+}
+//
+// UriGetServerAndResource - gets the server and resource as independent strings from a URI.
+//
+// NOTE: This function is useful for the InternetConnect/HttpRequest APIs.
+//
+extern "C" HRESULT DAPI UriGetServerAndResource(
+    __in_z LPCWSTR wzUri,
+    __out_z LPWSTR* psczServer,
+    __out_z LPWSTR* psczResource
+    )
+{
+    HRESULT hr = S_OK;
+    INTERNET_SCHEME scheme = INTERNET_SCHEME_UNKNOWN;
+    LPWSTR sczHostName = NULL;
+    INTERNET_PORT port = INTERNET_INVALID_PORT_NUMBER;
+    LPWSTR sczUser = NULL;
+    LPWSTR sczPassword = NULL;
+    LPWSTR sczPath = NULL;
+    LPWSTR sczQueryString = NULL;
+    hr = UriCrack(wzUri, &scheme, &sczHostName, &port, &sczUser, &sczPassword, &sczPath, &sczQueryString);
+    UriExitOnFailure(hr, "Failed to crack URI.");
+    hr = UriCreate(psczServer, scheme, sczHostName, port, sczUser, sczPassword, NULL, NULL);
+    UriExitOnFailure(hr, "Failed to allocate server URI.");
+    hr = UriCreate(psczResource, INTERNET_SCHEME_UNKNOWN, NULL, INTERNET_INVALID_PORT_NUMBER, NULL, NULL, sczPath, sczQueryString);
+    UriExitOnFailure(hr, "Failed to allocate resource URI.");
+LExit:
+    ReleaseStr(sczQueryString);
+    ReleaseStr(sczPath);
+    ReleaseStr(sczPassword);
+    ReleaseStr(sczUser);
+    ReleaseStr(sczHostName);
+    return hr;
+}
+//
+// UriFile - returns the file part of the URI.
+//
+extern "C" HRESULT DAPI UriFile(
+    __deref_out_z LPWSTR* psczFile,
+    __in_z LPCWSTR wzUri
+    )
+{
+    HRESULT hr = S_OK;
+    WCHAR wz[MAX_PATH + 1];
+    DWORD cch = countof(wz);
+    URL_COMPONENTSW uc = { };
+    uc.dwStructSize = sizeof(uc);
+    uc.lpszUrlPath = wz;
+    uc.dwUrlPathLength = cch;
+    if (!::InternetCrackUrlW(wzUri, 0, ICU_DECODE | ICU_ESCAPE, &uc))
+    {
+        UriExitWithLastError(hr, "Failed to crack URI.");
+    }
+    // Copy only the file name. Fortunately, PathFile() understands that
+    // forward slashes can be directory separators like backslashes.
+    hr = StrAllocString(psczFile, PathFile(wz), 0);
+    UriExitOnFailure(hr, "Failed to copy file name");
+LExit:
+    return hr;
+}
+/*******************************************************************
+ UriProtocol - determines the protocol of a URI.
+********************************************************************/
+extern "C" HRESULT DAPI UriProtocol(
+    __in_z LPCWSTR wzUri,
+    __out URI_PROTOCOL* pProtocol
+    )
+{
+    Assert(wzUri && *wzUri);
+    Assert(pProtocol);
+    HRESULT hr = S_OK;
+    if ((L'h' == wzUri[0] || L'H' == wzUri[0]) &&
+        (L't' == wzUri[1] || L'T' == wzUri[1]) &&
+        (L't' == wzUri[2] || L'T' == wzUri[2]) &&
+        (L'p' == wzUri[3] || L'P' == wzUri[3]) &&
+        (L's' == wzUri[4] || L'S' == wzUri[4]) &&
+         L':' == wzUri[5] &&
+         L'/' == wzUri[6] &&
+         L'/' == wzUri[7])
+    {
+        *pProtocol = URI_PROTOCOL_HTTPS;
+    }
+    else if ((L'h' == wzUri[0] || L'H' == wzUri[0]) &&
+             (L't' == wzUri[1] || L'T' == wzUri[1]) &&
+             (L't' == wzUri[2] || L'T' == wzUri[2]) &&
+             (L'p' == wzUri[3] || L'P' == wzUri[3]) &&
+              L':' == wzUri[4] &&
+              L'/' == wzUri[5] &&
+              L'/' == wzUri[6])
+    {
+        *pProtocol = URI_PROTOCOL_HTTP;
+    }
+    else if ((L'f' == wzUri[0] || L'F' == wzUri[0]) &&
+             (L't' == wzUri[1] || L'T' == wzUri[1]) &&
+             (L'p' == wzUri[2] || L'P' == wzUri[2]) &&
+              L':' == wzUri[3] &&
+              L'/' == wzUri[4] &&
+              L'/' == wzUri[5])
+    {
+        *pProtocol = URI_PROTOCOL_FTP;
+    }
+    else if ((L'f' == wzUri[0] || L'F' == wzUri[0]) &&
+             (L'i' == wzUri[1] || L'I' == wzUri[1]) &&
+             (L'l' == wzUri[2] || L'L' == wzUri[2]) &&
+             (L'e' == wzUri[3] || L'E' == wzUri[3]) &&
+              L':' == wzUri[4] &&
+              L'/' == wzUri[5] &&
+              L'/' == wzUri[6])
+    {
+        *pProtocol = URI_PROTOCOL_FILE;
+    }
+    else
+    {
+        *pProtocol = URI_PROTOCOL_UNKNOWN;
+    }
+    return hr;
+}
+/*******************************************************************
+ UriRoot - returns the root of the path specified in the URI.
+ examples:
+    file:///C:\path\path             -> C:\
+    file://server/share/path/path    -> \\server\share
+    http://www.example.com/path/path -> http://www.example.com/
+    ftp://ftp.example.com/path/path  -> ftp://www.example.com/
+ NOTE: This function should only be used on cannonicalized URIs.
+       It does not cannonicalize itself.
+********************************************************************/
+extern "C" HRESULT DAPI UriRoot(
+    __in_z LPCWSTR wzUri,
+    __out LPWSTR* ppwzRoot,
+    __out_opt URI_PROTOCOL* pProtocol
+    )
+{
+    Assert(wzUri && *wzUri);
+    Assert(ppwzRoot);
+    HRESULT hr = S_OK;
+    URI_PROTOCOL protocol = URI_PROTOCOL_UNKNOWN;
+    LPCWSTR pwcSlash = NULL;
+    hr = UriProtocol(wzUri, &protocol);
+    UriExitOnFailure(hr, "Invalid URI.");
+    switch (protocol)
+    {
+    case URI_PROTOCOL_FILE:
+        if (L'/' == wzUri[7]) // file path
+        {
+            if (((L'a' <= wzUri[8] && L'z' >= wzUri[8]) || (L'A' <= wzUri[8] && L'Z' >= wzUri[8])) && L':' == wzUri[9])
+            {
+                hr = StrAlloc(ppwzRoot, 4);
+                UriExitOnFailure(hr, "Failed to allocate string for root of URI.");
+                *ppwzRoot[0] = wzUri[8];
+                *ppwzRoot[1] = L':';
+                *ppwzRoot[2] = L'\\';
+                *ppwzRoot[3] = L'\0';
+            }
+            else
+            {
+                hr = E_INVALIDARG;
+                UriExitOnFailure(hr, "Invalid file path in URI.");
+            }
+        }
+        else // UNC share
+        {
+            pwcSlash = wcschr(wzUri + 8, L'/');
+            if (!pwcSlash)
+            {
+                hr = E_INVALIDARG;
+                UriExitOnFailure(hr, "Invalid server name in URI.");
+            }
+            else
+            {
+                hr = StrAllocString(ppwzRoot, L"\\\\", 64);
+                UriExitOnFailure(hr, "Failed to allocate string for root of URI.");
+                pwcSlash = wcschr(pwcSlash + 1, L'/');
+                if (pwcSlash)
+                {
+                    hr = StrAllocConcat(ppwzRoot, wzUri + 8, pwcSlash - wzUri - 8);
+                    UriExitOnFailure(hr, "Failed to add server/share to root of URI.");
+                }
+                else
+                {
+                    hr = StrAllocConcat(ppwzRoot, wzUri + 8, 0);
+                    UriExitOnFailure(hr, "Failed to add server/share to root of URI.");
+                }
+                // replace all slashes with backslashes to be truly UNC.
+                for (LPWSTR pwc = *ppwzRoot; pwc && *pwc; ++pwc)
+                {
+                    if (L'/' == *pwc)
+                    {
+                        *pwc = L'\\';
+                    }
+                }
+            }
+        }
+        break;
+    case URI_PROTOCOL_FTP:
+        pwcSlash = wcschr(wzUri + 6, L'/');
+        if (pwcSlash)
+        {
+            hr = StrAllocString(ppwzRoot, wzUri, pwcSlash - wzUri);
+            UriExitOnFailure(hr, "Failed allocate root from URI.");
+        }
+        else
+        {
+            hr = StrAllocString(ppwzRoot, wzUri, 0);
+            UriExitOnFailure(hr, "Failed allocate root from URI.");
+        }
+        break;
+    case URI_PROTOCOL_HTTP:
+        pwcSlash = wcschr(wzUri + 7, L'/');
+        if (pwcSlash)
+        {
+            hr = StrAllocString(ppwzRoot, wzUri, pwcSlash - wzUri);
+            UriExitOnFailure(hr, "Failed allocate root from URI.");
+        }
+        else
+        {
+            hr = StrAllocString(ppwzRoot, wzUri, 0);
+            UriExitOnFailure(hr, "Failed allocate root from URI.");
+        }
+        break;
+    default:
+        hr = E_INVALIDARG;
+        UriExitOnFailure(hr, "Unknown URI protocol.");
+    }
+    if (pProtocol)
+    {
+        *pProtocol = protocol;
+    }
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI UriResolve(
+    __in_z LPCWSTR wzUri,
+    __in_opt LPCWSTR wzBaseUri,
+    __out LPWSTR* ppwzResolvedUri,
+    __out_opt URI_PROTOCOL* pResolvedProtocol
+    )
+{
+    UNREFERENCED_PARAMETER(wzUri);
+    UNREFERENCED_PARAMETER(wzBaseUri);
+    UNREFERENCED_PARAMETER(ppwzResolvedUri);
+    UNREFERENCED_PARAMETER(pResolvedProtocol);
+    HRESULT hr = E_NOTIMPL;
+#if 0
+    URI_PROTOCOL protocol = URI_PROTOCOL_UNKNOWN;
+    hr = UriProtocol(wzUri, &protocol);
+    UriExitOnFailure(hr, "Failed to determine protocol for URL: %ls", wzUri);
+    UriExitOnNull(ppwzResolvedUri, hr, E_INVALIDARG, "Failed to resolve URI, because no method of output was provided");
+    if (URI_PROTOCOL_UNKNOWN == protocol)
+    {
+        UriExitOnNull(wzBaseUri, hr, E_INVALIDARG, "Failed to resolve URI - base URI provided was NULL");
+        if (L'/' == *wzUri || L'\\' == *wzUri)
+        {
+            hr = UriRoot(wzBaseUri, ppwzResolvedUri, &protocol);
+            UriExitOnFailure(hr, "Failed to get root from URI: %ls", wzBaseUri);
+            hr = StrAllocConcat(ppwzResolvedUri, wzUri, 0);
+            UriExitOnFailure(hr, "Failed to concat file to base URI.");
+        }
+        else
+        {
+            hr = UriProtocol(wzBaseUri, &protocol);
+            UriExitOnFailure(hr, "Failed to get protocol of base URI: %ls", wzBaseUri);
+            LPCWSTR pwcFile = const_cast<LPCWSTR> (UriFile(wzBaseUri));
+            if (!pwcFile)
+            {
+                hr = E_INVALIDARG;
+                UriExitOnFailure(hr, "Failed to get file from base URI: %ls", wzBaseUri);
+            }
+            hr = StrAllocString(ppwzResolvedUri, wzBaseUri, pwcFile - wzBaseUri);
+            UriExitOnFailure(hr, "Failed to allocate string for resolved URI.");
+            hr = StrAllocConcat(ppwzResolvedUri, wzUri, 0);
+            UriExitOnFailure(hr, "Failed to concat file to resolved URI.");
+        }
+    }
+    else
+    {
+        hr = StrAllocString(ppwzResolvedUri, wzUri, 0);
+        UriExitOnFailure(hr, "Failed to copy resolved URI.");
+    }
+    if (pResolvedProtocol)
+    {
+        *pResolvedProtocol = protocol;
+    }
+LExit:
+#endif
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/userutil.cpp b/src/libs/dutil/WixToolset.DUtil/userutil.cpp
new file mode 100644
index 00000000..ca6d5480
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/userutil.cpp
@@ -0,0 +1,300 @@
+// 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.
+#include "precomp.h"
+// UserExit macros
+#define UserExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_USERUTIL, x, s, __VA_ARGS__)
+#define UserExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_USERUTIL, x, s, __VA_ARGS__)
+#define UserExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_USERUTIL, x, s, __VA_ARGS__)
+#define UserExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_USERUTIL, x, s, __VA_ARGS__)
+#define UserExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_USERUTIL, x, s, __VA_ARGS__)
+#define UserExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_USERUTIL, x, s, __VA_ARGS__)
+#define UserExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_USERUTIL, p, x, e, s, __VA_ARGS__)
+#define UserExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_USERUTIL, p, x, s, __VA_ARGS__)
+#define UserExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_USERUTIL, p, x, e, s, __VA_ARGS__)
+#define UserExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_USERUTIL, p, x, s, __VA_ARGS__)
+#define UserExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_USERUTIL, e, x, s, __VA_ARGS__)
+#define UserExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_USERUTIL, g, x, s, __VA_ARGS__)
+static BOOL CheckIsMemberHelper(
+    __in_z LPCWSTR pwzGroupUserDomain,
+    __in_ecount(cguiGroupData) const GROUP_USERS_INFO_0 *pguiGroupData,
+    __in DWORD cguiGroupData
+    );
+/*******************************************************************
+ UserBuildDomainUserName - builds a DOMAIN\USERNAME string
+********************************************************************/
+extern "C" HRESULT DAPI UserBuildDomainUserName(
+    __out_ecount_z(cchDest) LPWSTR wzDest,
+    __in int cchDest,
+    __in_z LPCWSTR pwzName,
+    __in_z LPCWSTR pwzDomain
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD cchLeft = cchDest;
+    WCHAR* pwz = wzDest;
+    DWORD cchWz = cchDest; 
+    DWORD cch;
+    cch = lstrlenW(pwzDomain);
+    if (cch >= cchLeft)
+    {
+        hr = ERROR_MORE_DATA;
+        UserExitOnFailure(hr, "Buffer size is not big enough to hold domain name: %ls", pwzDomain);
+    }
+    else if (cch > 0)
+    {
+        // handle the domain case
+        hr = ::StringCchCopyNW(pwz, cchWz, pwzDomain, cchLeft - 1); // last parameter does not include '\0'
+        UserExitOnFailure(hr, "Failed to copy Domain onto string.");
+        cchLeft -= cch;
+        pwz += cch;
+        cchWz -= cch;
+        if (1 >= cchLeft)
+        {
+            hr = ERROR_MORE_DATA;
+            UserExitOnFailure(hr, "Insufficient buffer size while building domain user name");
+        }
+        hr = ::StringCchCopyNW(pwz, cchWz, L"\\", cchLeft - 1); // last parameter does not include '\0'
+        UserExitOnFailure(hr, "Failed to copy backslash onto string.");
+        --cchLeft;
+        ++pwz;
+        --cchWz;
+    }
+    cch = lstrlenW(pwzName);
+    if (cch >= cchLeft)
+    {
+        hr = ERROR_MORE_DATA;
+        UserExitOnFailure(hr, "Buffer size is not big enough to hold user name: %ls", pwzName);
+    }
+    hr = ::StringCchCopyNW(pwz, cchWz, pwzName, cchLeft - 1); // last parameter does not include '\0'
+    UserExitOnFailure(hr, "Failed to copy User name onto string.");
+LExit:
+    return hr;
+}
+/*******************************************************************
+ Checks whether a user is a member of a group - outputs the result via lpfMember
+********************************************************************/
+extern "C" HRESULT DAPI UserCheckIsMember(
+    __in_z LPCWSTR pwzName,
+    __in_z LPCWSTR pwzDomain,
+    __in_z LPCWSTR pwzGroupName,
+    __in_z LPCWSTR pwzGroupDomain,
+    __out LPBOOL lpfMember
+    )
+{
+    HRESULT hr = S_OK;
+    UINT er = ERROR_SUCCESS;
+    DWORD dwRead = 0;
+    DWORD dwTotal = 0;
+    LPCWSTR wz = NULL;
+    GROUP_USERS_INFO_0 *pguiGroupData = NULL;
+    WCHAR wzGroupUserDomain[MAX_DARWIN_COLUMN + 1]; // GROUPDOMAIN\GROUPNAME
+    WCHAR wzUserDomain[MAX_DARWIN_COLUMN + 1]; // USERDOMAIN\USERNAME
+    BSTR bstrUser = NULL;
+    BSTR bstrGroup = NULL;
+    
+    IADsGroup *pGroup = NULL;
+    VARIANT_BOOL vtBoolResult = VARIANT_FALSE;
+    hr = UserBuildDomainUserName(wzGroupUserDomain, countof(wzGroupUserDomain), pwzGroupName, pwzGroupDomain);
+    UserExitOnFailure(hr, "Failed to build group name from group domain %ls, group name %ls", pwzGroupDomain, pwzGroupName);
+    hr = UserBuildDomainUserName(wzUserDomain, countof(wzUserDomain), pwzName, pwzDomain);
+    UserExitOnFailure(hr, "Failed to build group name from group domain %ls, group name %ls", pwzGroupDomain, pwzGroupName);
+    if (pwzDomain && *pwzDomain)
+    {
+        wz = pwzDomain;
+    }
+    er = ::NetUserGetGroups(wz, pwzName, 0, (LPBYTE *)&pguiGroupData, MAX_PREFERRED_LENGTH, &dwRead, &dwTotal);
+    // Ignore these errors, and just go to the fallback checks
+    if (ERROR_BAD_NETPATH == er || ERROR_INVALID_NAME == er || NERR_UserNotFound == er)
+    {
+        Trace(REPORT_VERBOSE, "failed to get groups for user %ls from domain %ls with error code 0x%x - continuing", pwzName, (wz != NULL) ? wz : L"", HRESULT_FROM_WIN32(er));
+        er = ERROR_SUCCESS;
+    }
+    UserExitOnWin32Error(er, hr, "Failed to get list of global groups for user while checking group membership information for user: %ls", pwzName);
+    if (dwRead != dwTotal)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_MORE_DATA);
+        UserExitOnRootFailure(hr, "Failed to get entire list of groups (global) for user while checking group membership information for user: %ls", pwzName);
+    }
+    if (CheckIsMemberHelper(wzGroupUserDomain, pguiGroupData, dwRead))
+    {
+        *lpfMember = TRUE;
+        ExitFunction1(hr = S_OK);
+    }
+    if (NULL != pguiGroupData)
+    {
+        ::NetApiBufferFree(pguiGroupData);
+        pguiGroupData = NULL;
+    }
+    // If we fail with the global groups, try again with the local groups
+    er = ::NetUserGetLocalGroups(NULL, wzUserDomain, 0, LG_INCLUDE_INDIRECT, (LPBYTE *)&pguiGroupData, MAX_PREFERRED_LENGTH, &dwRead, &dwTotal);
+    // Ignore these errors, and just go to the fallback checks
+    if (NERR_UserNotFound == er || NERR_DCNotFound == er || RPC_S_SERVER_UNAVAILABLE == er)
+    {
+        Trace(REPORT_VERBOSE, "failed to get local groups for user %ls from domain %ls with error code 0x%x - continuing", pwzName, (wz != NULL) ? wz : L"", HRESULT_FROM_WIN32(er));
+        er = ERROR_SUCCESS;
+    }
+    UserExitOnWin32Error(er, hr, "Failed to get list of groups for user while checking group membership information for user: %ls", pwzName);
+    if (dwRead != dwTotal)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_MORE_DATA);
+        UserExitOnRootFailure(hr, "Failed to get entire list of groups (local) for user while checking group membership information for user: %ls", pwzName);
+    }
+    if (CheckIsMemberHelper(wzGroupUserDomain, pguiGroupData, dwRead))
+    {
+        *lpfMember = TRUE;
+        ExitFunction1(hr = S_OK);
+    }
+    // If the above methods failed, let's try active directory
+    hr = UserCreateADsPath(pwzDomain, pwzName, &bstrUser);
+    UserExitOnFailure(hr, "failed to create user ADsPath in order to check group membership for group: %ls domain: %ls", pwzName, pwzDomain);
+    hr = UserCreateADsPath(pwzGroupDomain, pwzGroupName, &bstrGroup);
+    UserExitOnFailure(hr, "failed to create group ADsPath in order to check group membership for group: %ls domain: %ls", pwzGroupName, pwzGroupDomain);
+    if (lstrlenW(pwzGroupDomain) > 0)
+    {
+        hr = ::ADsGetObject(bstrGroup, IID_IADsGroup, reinterpret_cast<void**>(&pGroup));
+        UserExitOnFailure(hr, "Failed to get group '%ls' from active directory.", reinterpret_cast<WCHAR*>(bstrGroup) );
+        hr = pGroup->IsMember(bstrUser, &vtBoolResult);
+        UserExitOnFailure(hr, "Failed to check if user %ls is a member of group '%ls' using active directory.", reinterpret_cast<WCHAR*>(bstrUser), reinterpret_cast<WCHAR*>(bstrGroup) );
+    }
+    if (vtBoolResult)
+    {
+        *lpfMember = TRUE;
+        ExitFunction1(hr = S_OK);
+    }
+    hr = ::ADsGetObject(bstrGroup, IID_IADsGroup, reinterpret_cast<void**>(&pGroup));
+    UserExitOnFailure(hr, "Failed to get group '%ls' from active directory.", reinterpret_cast<WCHAR*>(bstrGroup) );
+    hr = pGroup->IsMember(bstrUser, &vtBoolResult);
+    UserExitOnFailure(hr, "Failed to check if user %ls is a member of group '%ls' using active directory.", reinterpret_cast<WCHAR*>(bstrUser), reinterpret_cast<WCHAR*>(bstrGroup) );
+    if (vtBoolResult)
+    {
+        *lpfMember = TRUE;
+        ExitFunction1(hr = S_OK);
+    }
+LExit:
+    ReleaseObject(pGroup);
+    ReleaseBSTR(bstrUser);
+    ReleaseBSTR(bstrGroup);
+    if (NULL != pguiGroupData)
+    {
+        ::NetApiBufferFree(pguiGroupData);
+    }
+    return hr;
+}
+/*******************************************************************
+ Takes a domain and name, and allocates a BSTR which represents
+ DOMAIN\NAME's active directory path. The BSTR this function returns
+ should be released manually using the ReleaseBSTR() macro.
+********************************************************************/
+extern "C" HRESULT DAPI UserCreateADsPath(
+    __in_z LPCWSTR wzObjectDomain, 
+    __in_z LPCWSTR wzObjectName,
+    __out BSTR *pbstrAdsPath
+    )
+{
+    Assert(wzObjectDomain && wzObjectName && *wzObjectName);
+    HRESULT hr = S_OK;
+    LPWSTR pwzAdsPath = NULL;
+    hr = StrAllocString(&pwzAdsPath, L"WinNT://", 0);
+    UserExitOnFailure(hr, "failed to allocate AdsPath string");
+    if (*wzObjectDomain)
+    {
+        hr = StrAllocFormatted(&pwzAdsPath, L"%s/%s", wzObjectDomain, wzObjectName);
+        UserExitOnFailure(hr, "failed to allocate AdsPath string");
+    }
+    else if (NULL != wcsstr(wzObjectName, L"\\") || NULL != wcsstr(wzObjectName, L"/"))
+    {
+        hr = StrAllocConcat(&pwzAdsPath, wzObjectName, 0);
+        UserExitOnFailure(hr, "failed to concat objectname: %ls", wzObjectName);
+    }
+    else
+    {
+        hr = StrAllocConcat(&pwzAdsPath, L"Localhost/", 0);
+        UserExitOnFailure(hr, "failed to concat LocalHost/");
+        hr = StrAllocConcat(&pwzAdsPath, wzObjectName, 0);
+        UserExitOnFailure(hr, "failed to concat object name: %ls", wzObjectName);
+    }
+    *pbstrAdsPath = ::SysAllocString(pwzAdsPath);
+    if (NULL == *pbstrAdsPath)
+    {
+        hr = E_OUTOFMEMORY;
+    }
+LExit:
+    ReleaseStr(pwzAdsPath);
+    return hr;
+}
+/*******************************************************************
+ Helper function to check if pwzGroupUserDomain (in form of "domain\username" is
+ a member of a given LOCALGROUP_USERS_INFO_0 structure. Useful to pass in the
+ output from both NetUserGetGroups() and NetUserGetLocalGroups()
+********************************************************************/
+static BOOL CheckIsMemberHelper(
+    __in_z LPCWSTR pwzGroupUserDomain,
+    __in_ecount(cguiGroupData) const GROUP_USERS_INFO_0 *pguiGroupData,
+    __in DWORD cguiGroupData
+    )
+{
+    if (NULL == pguiGroupData)
+    {
+        return FALSE;
+    }
+    for (DWORD dwCounter = 0; dwCounter < cguiGroupData; ++dwCounter)
+    {
+        // If the user is a member of the group, set the output flag to true
+        if (0 == lstrcmpiW(pwzGroupUserDomain, pguiGroupData[dwCounter].grui0_name))
+        {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/verutil.cpp b/src/libs/dutil/WixToolset.DUtil/verutil.cpp
new file mode 100644
index 00000000..21626f94
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/verutil.cpp
@@ -0,0 +1,647 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define VerExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_VERUTIL, x, s, __VA_ARGS__)
+#define VerExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_VERUTIL, x, s, __VA_ARGS__)
+#define VerExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_VERUTIL, x, s, __VA_ARGS__)
+#define VerExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_VERUTIL, x, s, __VA_ARGS__)
+#define VerExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_VERUTIL, x, s, __VA_ARGS__)
+#define VerExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_VERUTIL, x, s, __VA_ARGS__)
+#define VerExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_VERUTIL, p, x, e, s, __VA_ARGS__)
+#define VerExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_VERUTIL, p, x, s, __VA_ARGS__)
+#define VerExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_VERUTIL, p, x, e, s, __VA_ARGS__)
+#define VerExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_VERUTIL, p, x, s, __VA_ARGS__)
+#define VerExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_VERUTIL, e, x, s, __VA_ARGS__)
+// constants
+const DWORD GROW_RELEASE_LABELS = 3;
+// Forward declarations.
+static int CompareDword(
+    __in const DWORD& dw1,
+    __in const DWORD& dw2
+    );
+static HRESULT CompareReleaseLabel(
+    __in const VERUTIL_VERSION_RELEASE_LABEL* p1,
+    __in LPCWSTR wzVersion1,
+    __in const VERUTIL_VERSION_RELEASE_LABEL* p2,
+    __in LPCWSTR wzVersion2,
+    __out int* pnResult
+    );
+static HRESULT CompareVersionSubstring(
+    __in LPCWSTR wzString1,
+    __in int cchCount1,
+    __in LPCWSTR wzString2,
+    __in int cchCount2,
+    __out int* pnResult
+    );
+DAPI_(HRESULT) VerCompareParsedVersions(
+    __in_opt VERUTIL_VERSION* pVersion1,
+    __in_opt VERUTIL_VERSION* pVersion2,
+    __out int* pnResult
+    )
+{
+    HRESULT hr = S_OK;
+    int nResult = 0;
+    DWORD cMaxReleaseLabels = 0;
+    BOOL fCompareMetadata = FALSE;
+    if (pVersion1 && !pVersion1->sczVersion ||
+        pVersion2 && !pVersion2->sczVersion)
+    {
+        ExitFunction1(hr = E_INVALIDARG);
+    }
+    if (pVersion1 == pVersion2)
+    {
+        ExitFunction1(nResult = 0);
+    }
+    else if (pVersion1 && !pVersion2)
+    {
+        ExitFunction1(nResult = 1);
+    }
+    else if (!pVersion1 && pVersion2)
+    {
+        ExitFunction1(nResult = -1);
+    }
+    nResult = CompareDword(pVersion1->dwMajor, pVersion2->dwMajor);
+    if (0 != nResult)
+    {
+        ExitFunction();
+    }
+    nResult = CompareDword(pVersion1->dwMinor, pVersion2->dwMinor);
+    if (0 != nResult)
+    {
+        ExitFunction();
+    }
+    nResult = CompareDword(pVersion1->dwPatch, pVersion2->dwPatch);
+    if (0 != nResult)
+    {
+        ExitFunction();
+    }
+    nResult = CompareDword(pVersion1->dwRevision, pVersion2->dwRevision);
+    if (0 != nResult)
+    {
+        ExitFunction();
+    }
+    if (pVersion1->cReleaseLabels)
+    {
+        if (pVersion2->cReleaseLabels)
+        {
+            cMaxReleaseLabels = max(pVersion1->cReleaseLabels, pVersion2->cReleaseLabels);
+        }
+        else
+        {
+            ExitFunction1(nResult = -1);
+        }
+    }
+    else if (pVersion2->cReleaseLabels)
+    {
+        ExitFunction1(nResult = 1);
+    }
+    if (cMaxReleaseLabels)
+    {
+        for (DWORD i = 0; i < cMaxReleaseLabels; ++i)
+        {
+            VERUTIL_VERSION_RELEASE_LABEL* pReleaseLabel1 = pVersion1->cReleaseLabels > i ? pVersion1->rgReleaseLabels + i : NULL;
+            VERUTIL_VERSION_RELEASE_LABEL* pReleaseLabel2 = pVersion2->cReleaseLabels > i ? pVersion2->rgReleaseLabels + i : NULL;
+            hr = CompareReleaseLabel(pReleaseLabel1, pVersion1->sczVersion, pReleaseLabel2, pVersion2->sczVersion, &nResult);
+            if (FAILED(hr) || 0 != nResult)
+            {
+                ExitFunction();
+            }
+        }
+    }
+    if (pVersion1->fInvalid)
+    {
+        if (!pVersion2->fInvalid)
+        {
+            ExitFunction1(nResult = -1);
+        }
+        else
+        {
+            fCompareMetadata = TRUE;
+        }
+    }
+    else if (pVersion2->fInvalid)
+    {
+        ExitFunction1(nResult = 1);
+    }
+    if (fCompareMetadata)
+    {
+        hr = CompareVersionSubstring(pVersion1->sczVersion + pVersion1->cchMetadataOffset, -1, pVersion2->sczVersion + pVersion2->cchMetadataOffset, -1, &nResult);
+    }
+LExit:
+    *pnResult = nResult;
+    return hr;
+}
+DAPI_(HRESULT) VerCompareStringVersions(
+    __in_z LPCWSTR wzVersion1,
+    __in_z LPCWSTR wzVersion2,
+    __in BOOL fStrict,
+    __out int* pnResult
+    )
+{
+    HRESULT hr = S_OK;
+    VERUTIL_VERSION* pVersion1 = NULL;
+    VERUTIL_VERSION* pVersion2 = NULL;
+    int nResult = 0;
+    hr = VerParseVersion(wzVersion1, 0, fStrict, &pVersion1);
+    VerExitOnFailure(hr, "Failed to parse Verutil version '%ls'", wzVersion1);
+    hr = VerParseVersion(wzVersion2, 0, fStrict, &pVersion2);
+    VerExitOnFailure(hr, "Failed to parse Verutil version '%ls'", wzVersion2);
+    hr = VerCompareParsedVersions(pVersion1, pVersion2, &nResult);
+    VerExitOnFailure(hr, "Failed to compare parsed Verutil versions '%ls' and '%ls'.", wzVersion1, wzVersion2);
+LExit:
+    *pnResult = nResult;
+    ReleaseVerutilVersion(pVersion1);
+    ReleaseVerutilVersion(pVersion2);
+    return hr;
+}
+DAPI_(HRESULT) VerCopyVersion(
+    __in VERUTIL_VERSION* pSource,
+    __out VERUTIL_VERSION** ppVersion
+    )
+{
+    HRESULT hr = S_OK;
+    VERUTIL_VERSION* pCopy = NULL;
+    pCopy = reinterpret_cast<VERUTIL_VERSION*>(MemAlloc(sizeof(VERUTIL_VERSION), TRUE));
+    VerExitOnNull(pCopy, hr, E_OUTOFMEMORY, "Failed to allocate memory for Verutil version copy.");
+    hr = StrAllocString(&pCopy->sczVersion, pSource->sczVersion, 0);
+    VerExitOnFailure(hr, "Failed to copy Verutil version string '%ls'.", pSource->sczVersion);
+    pCopy->dwMajor = pSource->dwMajor;
+    pCopy->dwMinor = pSource->dwMinor;
+    pCopy->dwPatch = pSource->dwPatch;
+    pCopy->dwRevision = pSource->dwRevision;
+    if (pSource->cReleaseLabels)
+    {
+        hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&pCopy->rgReleaseLabels), 0, sizeof(VERUTIL_VERSION_RELEASE_LABEL), pSource->cReleaseLabels);
+        VerExitOnFailure(hr, "Failed to allocate memory for Verutil version release labels copies.");
+        pCopy->cReleaseLabels = pSource->cReleaseLabels;
+        for (DWORD i = 0; i < pCopy->cReleaseLabels; ++i)
+        {
+            VERUTIL_VERSION_RELEASE_LABEL* pSourceLabel = pSource->rgReleaseLabels + i;
+            VERUTIL_VERSION_RELEASE_LABEL* pCopyLabel = pCopy->rgReleaseLabels + i;
+            pCopyLabel->cchLabelOffset = pSourceLabel->cchLabelOffset;
+            pCopyLabel->cchLabel = pSourceLabel->cchLabel;
+            pCopyLabel->fNumeric = pSourceLabel->fNumeric;
+            pCopyLabel->dwValue = pSourceLabel->dwValue;
+        }
+    }
+    pCopy->cchMetadataOffset = pSource->cchMetadataOffset;
+    pCopy->fInvalid = pSource->fInvalid;
+    *ppVersion = pCopy;
+    pCopy = NULL;
+LExit:
+    ReleaseVerutilVersion(pCopy);
+    return hr;
+}
+DAPI_(void) VerFreeVersion(
+    __in VERUTIL_VERSION* pVersion
+    )
+{
+    if (pVersion)
+    {
+        ReleaseStr(pVersion->sczVersion);
+        ReleaseMem(pVersion->rgReleaseLabels);
+        ReleaseMem(pVersion);
+    }
+}
+DAPI_(HRESULT) VerParseVersion(
+    __in_z LPCWSTR wzVersion,
+    __in SIZE_T cchVersion,
+    __in BOOL fStrict,
+    __out VERUTIL_VERSION** ppVersion
+    )
+{
+    HRESULT hr = S_OK;
+    VERUTIL_VERSION* pVersion = NULL;
+    LPCWSTR wzEnd = NULL;
+    LPCWSTR wzPartBegin = NULL;
+    LPCWSTR wzPartEnd = NULL;
+    BOOL fInvalid = FALSE;
+    BOOL fLastPart = FALSE;
+    BOOL fTrailingDot = FALSE;
+    BOOL fParsedVersionNumber = FALSE;
+    BOOL fExpectedReleaseLabels = FALSE;
+    DWORD iPart = 0;
+    if (!wzVersion || !ppVersion)
+    {
+        ExitFunction1(hr = E_INVALIDARG);
+    }
+    // Get string length if not provided.
+    if (!cchVersion)
+    {
+        hr = ::StringCchLengthW(wzVersion, STRSAFE_MAX_CCH, reinterpret_cast<size_t*>(&cchVersion));
+        VerExitOnRootFailure(hr, "Failed to get length of version string: %ls", wzVersion);
+    }
+    else if (INT_MAX < cchVersion)
+    {
+        VerExitOnRootFailure(hr = E_INVALIDARG, "Version string is too long: %Iu", cchVersion);
+    }
+    if (L'v' == *wzVersion || L'V' == *wzVersion)
+    {
+        ++wzVersion;
+        --cchVersion;
+    }
+    pVersion = reinterpret_cast<VERUTIL_VERSION*>(MemAlloc(sizeof(VERUTIL_VERSION), TRUE));
+    VerExitOnNull(pVersion, hr, E_OUTOFMEMORY, "Failed to allocate memory for Verutil version '%ls'.", wzVersion);
+    hr = StrAllocString(&pVersion->sczVersion, wzVersion, cchVersion);
+    VerExitOnFailure(hr, "Failed to copy Verutil version string '%ls'.", wzVersion);
+    wzVersion = wzPartBegin = wzPartEnd = pVersion->sczVersion;
+    // Save end pointer.
+    wzEnd = wzVersion + cchVersion;
+    // Parse version number
+    while (wzPartBegin < wzEnd)
+    {
+        fTrailingDot = FALSE;
+        // Find end of part.
+        for (;;)
+        {
+            if (wzPartEnd >= wzEnd)
+            {
+                fLastPart = TRUE;
+                break;
+            }
+            switch (*wzPartEnd)
+            {
+            case L'0':
+            case L'1':
+            case L'2':
+            case L'3':
+            case L'4':
+            case L'5':
+            case L'6':
+            case L'7':
+            case L'8':
+            case L'9':
+                ++wzPartEnd;
+                continue;
+            case L'.':
+                fTrailingDot = TRUE;
+                break;
+            case L'-':
+            case L'+':
+                fLastPart = TRUE;
+                break;
+            default:
+                fInvalid = TRUE;
+                break;
+            }
+            break;
+        }
+        if (wzPartBegin == wzPartEnd)
+        {
+            fInvalid = TRUE;
+        }
+        if (fInvalid)
+        {
+            break;
+        }
+        DWORD cchPart = 0;
+        hr = ::PtrdiffTToDWord(wzPartEnd - wzPartBegin, &cchPart);
+        if (FAILED(hr))
+        {
+            fInvalid = TRUE;
+            break;
+        }
+        // Parse version part.
+        UINT uPart = 0;
+        hr = StrStringToUInt32(wzPartBegin, cchPart, &uPart);
+        if (FAILED(hr))
+        {
+            fInvalid = TRUE;
+            break;
+        }
+        switch (iPart)
+        {
+        case 0:
+            pVersion->dwMajor = uPart;
+            break;
+        case 1:
+            pVersion->dwMinor = uPart;
+            break;
+        case 2:
+            pVersion->dwPatch = uPart;
+            break;
+        case 3:
+            pVersion->dwRevision = uPart;
+            break;
+        }
+        if (fTrailingDot)
+        {
+            ++wzPartEnd;
+        }
+        wzPartBegin = wzPartEnd;
+        ++iPart;
+        if (4 <= iPart || fLastPart)
+        {
+            fParsedVersionNumber = TRUE;
+            break;
+        }
+    }
+    fInvalid |= !fParsedVersionNumber || fTrailingDot;
+    if (!fInvalid && wzPartBegin < wzEnd && *wzPartBegin == L'-')
+    {
+        wzPartBegin = wzPartEnd = wzPartBegin + 1;
+        fExpectedReleaseLabels = TRUE;
+        fLastPart = FALSE;
+    }
+    while (fExpectedReleaseLabels && wzPartBegin < wzEnd)
+    {
+        fTrailingDot = FALSE;
+        // Find end of part.
+        for (;;)
+        {
+            if (wzPartEnd >= wzEnd)
+            {
+                fLastPart = TRUE;
+                break;
+            }
+            if (*wzPartEnd >= L'0' && *wzPartEnd <= L'9' ||
+                *wzPartEnd >= L'A' && *wzPartEnd <= L'Z' ||
+                *wzPartEnd >= L'a' && *wzPartEnd <= L'z' ||
+                *wzPartEnd == L'-')
+            {
+                ++wzPartEnd;
+                continue;
+            }
+            else if (*wzPartEnd == L'+')
+            {
+                fLastPart = TRUE;
+            }
+            else if (*wzPartEnd == L'.')
+            {
+                fTrailingDot = TRUE;
+            }
+            else
+            {
+                fInvalid = TRUE;
+            }
+            break;
+        }
+        if (wzPartBegin == wzPartEnd)
+        {
+            fInvalid = TRUE;
+        }
+        if (fInvalid)
+        {
+            break;
+        }
+        int cchLabel = 0;
+        hr = ::PtrdiffTToInt32(wzPartEnd - wzPartBegin, &cchLabel);
+        if (FAILED(hr) || 0 > cchLabel)
+        {
+            fInvalid = TRUE;
+            break;
+        }
+        hr = MemReAllocArray(reinterpret_cast<LPVOID*>(&pVersion->rgReleaseLabels), pVersion->cReleaseLabels, sizeof(VERUTIL_VERSION_RELEASE_LABEL), GROW_RELEASE_LABELS - (pVersion->cReleaseLabels % GROW_RELEASE_LABELS));
+        VerExitOnFailure(hr, "Failed to allocate memory for Verutil version release labels '%ls'", wzVersion);
+        VERUTIL_VERSION_RELEASE_LABEL* pReleaseLabel = pVersion->rgReleaseLabels + pVersion->cReleaseLabels;
+        ++pVersion->cReleaseLabels;
+        // Try to parse as number.
+        UINT uLabel = 0;
+        hr = StrStringToUInt32(wzPartBegin, cchLabel, &uLabel);
+        if (SUCCEEDED(hr))
+        {
+            pReleaseLabel->fNumeric = TRUE;
+            pReleaseLabel->dwValue = uLabel;
+        }
+        pReleaseLabel->cchLabelOffset = wzPartBegin - pVersion->sczVersion;
+        pReleaseLabel->cchLabel = cchLabel;
+        if (fTrailingDot)
+        {
+            ++wzPartEnd;
+        }
+        wzPartBegin = wzPartEnd;
+        if (fLastPart)
+        {
+            break;
+        }
+    }
+    fInvalid |= fExpectedReleaseLabels && (!pVersion->cReleaseLabels || fTrailingDot);
+    if (!fInvalid && wzPartBegin < wzEnd)
+    {
+        if (*wzPartBegin == L'+')
+        {
+            wzPartBegin = wzPartEnd = wzPartBegin + 1;
+        }
+        else
+        {
+            fInvalid = TRUE;
+        }
+    }
+    if (fInvalid && fStrict)
+    {
+        ExitFunction1(hr = E_INVALIDARG);
+    }
+    pVersion->cchMetadataOffset = min(wzPartBegin, wzEnd) - pVersion->sczVersion;
+    pVersion->fInvalid = fInvalid;
+    *ppVersion = pVersion;
+    pVersion = NULL;
+    hr = S_OK;
+LExit:
+    ReleaseVerutilVersion(pVersion);
+    return hr;
+}
+DAPI_(HRESULT) VerVersionFromQword(
+    __in DWORD64 qwVersion,
+    __out VERUTIL_VERSION** ppVersion
+    )
+{
+    HRESULT hr = S_OK;
+    VERUTIL_VERSION* pVersion = NULL;
+    pVersion = reinterpret_cast<VERUTIL_VERSION*>(MemAlloc(sizeof(VERUTIL_VERSION), TRUE));
+    VerExitOnNull(pVersion, hr, E_OUTOFMEMORY, "Failed to allocate memory for Verutil version from QWORD.");
+    pVersion->dwMajor = (WORD)(qwVersion >> 48 & 0xffff);
+    pVersion->dwMinor = (WORD)(qwVersion >> 32 & 0xffff);
+    pVersion->dwPatch = (WORD)(qwVersion >> 16 & 0xffff);
+    pVersion->dwRevision = (WORD)(qwVersion & 0xffff);
+    hr = StrAllocFormatted(&pVersion->sczVersion, L"%lu.%lu.%lu.%lu", pVersion->dwMajor, pVersion->dwMinor, pVersion->dwPatch, pVersion->dwRevision);
+    ExitOnFailure(hr, "Failed to allocate and format the version string.");
+    pVersion->cchMetadataOffset = lstrlenW(pVersion->sczVersion);
+    *ppVersion = pVersion;
+    pVersion = NULL;
+LExit:
+    ReleaseVerutilVersion(pVersion);
+    return hr;
+}
+static int CompareDword(
+    __in const DWORD& dw1,
+    __in const DWORD& dw2
+    )
+{
+    int nResult = 0;
+    if (dw1 > dw2)
+    {
+        nResult = 1;
+    }
+    else if (dw1 < dw2)
+    {
+        nResult = -1;
+    }
+    return nResult;
+}
+static HRESULT CompareReleaseLabel(
+    __in const VERUTIL_VERSION_RELEASE_LABEL* p1,
+    __in LPCWSTR wzVersion1,
+    __in const VERUTIL_VERSION_RELEASE_LABEL* p2,
+    __in LPCWSTR wzVersion2,
+    __out int* pnResult
+    )
+{
+    HRESULT hr = S_OK;
+    int nResult = 0;
+    if (p1 == p2)
+    {
+        ExitFunction();
+    }
+    else if (p1 && !p2)
+    {
+        ExitFunction1(nResult = 1);
+    }
+    else if (!p1 && p2)
+    {
+        ExitFunction1(nResult = -1);
+    }
+    if (p1->fNumeric)
+    {
+        if (p2->fNumeric)
+        {
+            nResult = CompareDword(p1->dwValue, p2->dwValue);
+        }
+        else
+        {
+            nResult = -1;
+        }
+    }
+    else
+    {
+        if (p2->fNumeric)
+        {
+            nResult = 1;
+        }
+        else
+        {
+            hr = CompareVersionSubstring(wzVersion1 + p1->cchLabelOffset, p1->cchLabel, wzVersion2 + p2->cchLabelOffset, p2->cchLabel, &nResult);
+        }
+    }
+LExit:
+    *pnResult = nResult;
+    return hr;
+}
+static HRESULT CompareVersionSubstring(
+    __in LPCWSTR wzString1,
+    __in int cchCount1,
+    __in LPCWSTR wzString2,
+    __in int cchCount2,
+    __out int* pnResult
+    )
+{
+    HRESULT hr = S_OK;
+    int nResult = 0;
+    nResult = ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, wzString1, cchCount1, wzString2, cchCount2);
+    if (!nResult)
+    {
+        VerExitOnLastError(hr, "Failed to compare version substrings");
+    }
+LExit:
+    *pnResult = nResult - 2;
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/wiutil.cpp b/src/libs/dutil/WixToolset.DUtil/wiutil.cpp
new file mode 100644
index 00000000..7414ac42
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/wiutil.cpp
@@ -0,0 +1,1629 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define WiuExitTrace(x, s, ...) ExitTraceSource(DUTIL_SOURCE_WIUTIL, x, s, __VA_ARGS__)
+#define WiuExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_WIUTIL, x, s, __VA_ARGS__)
+#define WiuExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_WIUTIL, x, s, __VA_ARGS__)
+#define WiuExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_WIUTIL, x, s, __VA_ARGS__)
+#define WiuExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_WIUTIL, x, s, __VA_ARGS__)
+#define WiuExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_WIUTIL, x, s, __VA_ARGS__)
+#define WiuExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_WIUTIL, x, s, __VA_ARGS__)
+#define WiuExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_WIUTIL, p, x, e, s, __VA_ARGS__)
+#define WiuExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_WIUTIL, p, x, s, __VA_ARGS__)
+#define WiuExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_WIUTIL, p, x, e, s, __VA_ARGS__)
+#define WiuExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_WIUTIL, p, x, s, __VA_ARGS__)
+#define WiuExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_WIUTIL, e, x, s, __VA_ARGS__)
+#define WiuExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_WIUTIL, g, x, s, __VA_ARGS__)
+// constants
+const DWORD WIU_MSI_PROGRESS_INVALID = 0xFFFFFFFF;
+const DWORD WIU_GOOD_ENOUGH_PROPERTY_LENGTH = 64;
+// structs
+static PFN_MSIENABLELOGW vpfnMsiEnableLogW = ::MsiEnableLogW;
+static PFN_MSIGETPRODUCTINFOW vpfnMsiGetProductInfoW = ::MsiGetProductInfoW;
+static PFN_MSIQUERYFEATURESTATEW vpfnMsiQueryFeatureStateW = ::MsiQueryFeatureStateW;
+static PFN_MSIGETCOMPONENTPATHW vpfnMsiGetComponentPathW = ::MsiGetComponentPathW;
+static PFN_MSILOCATECOMPONENTW vpfnMsiLocateComponentW = ::MsiLocateComponentW;
+static PFN_MSIINSTALLPRODUCTW vpfnMsiInstallProductW = ::MsiInstallProductW;
+static PFN_MSICONFIGUREPRODUCTEXW vpfnMsiConfigureProductExW = ::MsiConfigureProductExW;
+static PFN_MSIREMOVEPATCHESW vpfnMsiRemovePatchesW = ::MsiRemovePatchesW;
+static PFN_MSISETINTERNALUI vpfnMsiSetInternalUI = ::MsiSetInternalUI;
+static PFN_MSISETEXTERNALUIW vpfnMsiSetExternalUIW = ::MsiSetExternalUIW;
+static PFN_MSIENUMPRODUCTSW vpfnMsiEnumProductsW = ::MsiEnumProductsW;
+static PFN_MSIENUMRELATEDPRODUCTSW vpfnMsiEnumRelatedProductsW = ::MsiEnumRelatedProductsW;
+// MSI 3.0+
+static PFN_MSIDETERMINEPATCHSEQUENCEW vpfnMsiDeterminePatchSequenceW = NULL;
+static PFN_MSIDETERMINEAPPLICABLEPATCHESW vpfnMsiDetermineApplicablePatchesW = NULL;
+static PFN_MSIENUMPRODUCTSEXW vpfnMsiEnumProductsExW = NULL;
+static PFN_MSIGETPATCHINFOEXW vpfnMsiGetPatchInfoExW = NULL;
+static PFN_MSIGETPRODUCTINFOEXW vpfnMsiGetProductInfoExW = NULL;
+static PFN_MSISETEXTERNALUIRECORD vpfnMsiSetExternalUIRecord = NULL;
+static PFN_MSISOURCELISTADDSOURCEEXW vpfnMsiSourceListAddSourceExW = NULL;
+static HMODULE vhMsiDll = NULL;
+static PFN_MSIDETERMINEPATCHSEQUENCEW vpfnMsiDeterminePatchSequenceWFromLibrary = NULL;
+static PFN_MSIDETERMINEAPPLICABLEPATCHESW vpfnMsiDetermineApplicablePatchesWFromLibrary = NULL;
+static PFN_MSIENUMPRODUCTSEXW vpfnMsiEnumProductsExWFromLibrary = NULL;
+static PFN_MSIGETPATCHINFOEXW vpfnMsiGetPatchInfoExWFromLibrary = NULL;
+static PFN_MSIGETPRODUCTINFOEXW vpfnMsiGetProductInfoExWFromLibrary = NULL;
+static PFN_MSISETEXTERNALUIRECORD vpfnMsiSetExternalUIRecordFromLibrary = NULL;
+static PFN_MSISOURCELISTADDSOURCEEXW vpfnMsiSourceListAddSourceExWFromLibrary = NULL;
+// MSI Transactions v4.5+
+static PFN_MSIBEGINTRANSACTIONW vpfnMsiBeginTransaction = NULL;
+static PFN_MSIENDTRANSACTION vpfnMsiEndTransaction = NULL;
+static BOOL vfWiuInitialized = FALSE;
+// globals
+static DWORD vdwMsiDllMajorMinor = 0;
+static DWORD vdwMsiDllBuildRevision = 0;
+// internal function declarations
+static DWORD CheckForRestartErrorCode(
+    __in DWORD dwErrorCode,
+    __out WIU_RESTART* pRestart
+    );
+static INT CALLBACK InstallEngineCallback(
+    __in LPVOID pvContext,
+    __in UINT uiMessage,
+    __in_z_opt LPCWSTR wzMessage
+    );
+static INT CALLBACK InstallEngineRecordCallback(
+    __in LPVOID pvContext,
+    __in UINT uiMessage,
+    __in_opt MSIHANDLE hRecord
+    );
+static INT HandleInstallMessage(
+    __in WIU_MSI_EXECUTE_CONTEXT* pContext,
+    __in INSTALLMESSAGE mt,
+    __in UINT uiFlags,
+    __in_z LPCWSTR wzMessage,
+    __in_opt MSIHANDLE hRecord
+    );
+static INT HandleInstallProgress(
+    __in WIU_MSI_EXECUTE_CONTEXT* pContext,
+    __in_z_opt LPCWSTR wzMessage,
+    __in_opt MSIHANDLE hRecord
+    );
+static INT SendMsiMessage(
+    __in WIU_MSI_EXECUTE_CONTEXT* pContext,
+    __in INSTALLMESSAGE mt,
+    __in UINT uiFlags,
+    __in_z LPCWSTR wzMessage,
+    __in_opt MSIHANDLE hRecord
+    );
+static INT SendErrorMessage(
+    __in WIU_MSI_EXECUTE_CONTEXT* pContext,
+    __in UINT uiFlags,
+    __in_z LPCWSTR wzMessage,
+    __in_opt MSIHANDLE hRecord
+    );
+static INT SendFilesInUseMessage(
+    __in WIU_MSI_EXECUTE_CONTEXT* pContext,
+    __in_opt MSIHANDLE hRecord,
+    __in BOOL fRestartManagerRequest
+    );
+static INT SendProgressUpdate(
+    __in WIU_MSI_EXECUTE_CONTEXT* pContext
+    );
+static void ResetProgress(
+    __in WIU_MSI_EXECUTE_CONTEXT* pContext
+    );
+static DWORD CalculatePhaseProgress(
+    __in WIU_MSI_EXECUTE_CONTEXT* pContext,
+    __in DWORD dwProgressIndex,
+    __in DWORD dwWeightPercentage
+    );
+void InitializeMessageData(
+    __in_opt MSIHANDLE hRecord,
+    __deref_out_ecount(*pcData) LPWSTR** prgsczData,
+    __out DWORD* pcData
+    );
+void UninitializeMessageData(
+    __in LPWSTR* rgsczData,
+    __in DWORD cData
+    );
+/********************************************************************
+ WiuInitialize - initializes wiutil
+*********************************************************************/
+extern "C" HRESULT DAPI WiuInitialize(
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczMsiDllPath = NULL;
+    hr = LoadSystemLibraryWithPath(L"Msi.dll", &vhMsiDll, &sczMsiDllPath);
+    WiuExitOnFailure(hr, "Failed to load Msi.DLL");
+    // Ignore failures
+    FileVersion(sczMsiDllPath, &vdwMsiDllMajorMinor, &vdwMsiDllBuildRevision);
+    vpfnMsiDeterminePatchSequenceWFromLibrary = reinterpret_cast<PFN_MSIDETERMINEPATCHSEQUENCEW>(::GetProcAddress(vhMsiDll, "MsiDeterminePatchSequenceW"));
+    if (NULL == vpfnMsiDeterminePatchSequenceW)
+    {
+        vpfnMsiDeterminePatchSequenceW = vpfnMsiDeterminePatchSequenceWFromLibrary;
+    }
+    vpfnMsiDetermineApplicablePatchesWFromLibrary = reinterpret_cast<PFN_MSIDETERMINEAPPLICABLEPATCHESW>(::GetProcAddress(vhMsiDll, "MsiDetermineApplicablePatchesW"));
+    if (NULL == vpfnMsiDetermineApplicablePatchesW)
+    {
+        vpfnMsiDetermineApplicablePatchesW = vpfnMsiDetermineApplicablePatchesWFromLibrary;
+    }
+    vpfnMsiEnumProductsExWFromLibrary = reinterpret_cast<PFN_MSIENUMPRODUCTSEXW>(::GetProcAddress(vhMsiDll, "MsiEnumProductsExW"));
+    if (NULL == vpfnMsiEnumProductsExW)
+    {
+        vpfnMsiEnumProductsExW = vpfnMsiEnumProductsExWFromLibrary;
+    }
+    vpfnMsiGetPatchInfoExWFromLibrary = reinterpret_cast<PFN_MSIGETPATCHINFOEXW>(::GetProcAddress(vhMsiDll, "MsiGetPatchInfoExW"));
+    if (NULL == vpfnMsiGetPatchInfoExW)
+    {
+        vpfnMsiGetPatchInfoExW = vpfnMsiGetPatchInfoExWFromLibrary;
+    }
+    vpfnMsiGetProductInfoExWFromLibrary = reinterpret_cast<PFN_MSIGETPRODUCTINFOEXW>(::GetProcAddress(vhMsiDll, "MsiGetProductInfoExW"));
+    if (NULL == vpfnMsiGetProductInfoExW)
+    {
+        vpfnMsiGetProductInfoExW = vpfnMsiGetProductInfoExWFromLibrary;
+    }
+    vpfnMsiSetExternalUIRecordFromLibrary = reinterpret_cast<PFN_MSISETEXTERNALUIRECORD>(::GetProcAddress(vhMsiDll, "MsiSetExternalUIRecord"));
+    if (NULL == vpfnMsiSetExternalUIRecord)
+    {
+        vpfnMsiSetExternalUIRecord = vpfnMsiSetExternalUIRecordFromLibrary;
+    }
+    //static PFN_MSISOURCELISTADDSOURCEEXW vpfnMsiSourceListAddSourceExW = NULL;
+    vpfnMsiSourceListAddSourceExWFromLibrary = reinterpret_cast<PFN_MSISOURCELISTADDSOURCEEXW>(::GetProcAddress(vhMsiDll, "MsiSourceListAddSourceExW"));
+    if (NULL == vpfnMsiSourceListAddSourceExW)
+    {
+        vpfnMsiSourceListAddSourceExW = vpfnMsiSourceListAddSourceExWFromLibrary;
+    }
+    // MSI Transaction functions
+    if (NULL == vpfnMsiBeginTransaction)
+    {
+        vpfnMsiBeginTransaction = reinterpret_cast<PFN_MSIBEGINTRANSACTIONW>(::GetProcAddress(vhMsiDll, "MsiBeginTransactionW"));
+    }
+    if (NULL == vpfnMsiEndTransaction)
+    {
+        vpfnMsiEndTransaction = reinterpret_cast<PFN_MSIENDTRANSACTION>(::GetProcAddress(vhMsiDll, "MsiEndTransaction"));
+    }
+    vfWiuInitialized = TRUE;
+LExit:
+    ReleaseStr(sczMsiDllPath);
+    return hr;
+}
+/********************************************************************
+ WiuUninitialize - uninitializes wiutil
+*********************************************************************/
+extern "C" void DAPI WiuUninitialize(
+    )
+{
+    if (vhMsiDll)
+    {
+        ::FreeLibrary(vhMsiDll);
+        vhMsiDll = NULL;
+        vpfnMsiSetExternalUIRecordFromLibrary = NULL;
+        vpfnMsiGetProductInfoExWFromLibrary = NULL;
+        vpfnMsiGetPatchInfoExWFromLibrary = NULL;
+        vpfnMsiEnumProductsExWFromLibrary = NULL;
+        vpfnMsiDetermineApplicablePatchesWFromLibrary = NULL;
+        vpfnMsiDeterminePatchSequenceWFromLibrary = NULL;
+        vpfnMsiSourceListAddSourceExWFromLibrary = NULL;
+        vpfnMsiBeginTransaction = NULL;
+        vpfnMsiEndTransaction = NULL;
+    }
+    vfWiuInitialized = FALSE;
+}
+/********************************************************************
+ WiuFunctionOverride - overrides the Windows installer functions. Typically used
+                       for unit testing.
+*********************************************************************/
+extern "C" void DAPI WiuFunctionOverride(
+    __in_opt PFN_MSIENABLELOGW pfnMsiEnableLogW,
+    __in_opt PFN_MSIGETCOMPONENTPATHW pfnMsiGetComponentPathW,
+    __in_opt PFN_MSILOCATECOMPONENTW pfnMsiLocateComponentW,
+    __in_opt PFN_MSIQUERYFEATURESTATEW pfnMsiQueryFeatureStateW,
+    __in_opt PFN_MSIGETPRODUCTINFOW pfnMsiGetProductInfoW,
+    __in_opt PFN_MSIGETPRODUCTINFOEXW pfnMsiGetProductInfoExW,
+    __in_opt PFN_MSIINSTALLPRODUCTW pfnMsiInstallProductW,
+    __in_opt PFN_MSICONFIGUREPRODUCTEXW pfnMsiConfigureProductExW,
+    __in_opt PFN_MSISETINTERNALUI pfnMsiSetInternalUI,
+    __in_opt PFN_MSISETEXTERNALUIW pfnMsiSetExternalUIW,
+    __in_opt PFN_MSIENUMRELATEDPRODUCTSW pfnMsiEnumRelatedProductsW,
+    __in_opt PFN_MSISETEXTERNALUIRECORD pfnMsiSetExternalUIRecord,
+    __in_opt PFN_MSISOURCELISTADDSOURCEEXW pfnMsiSourceListAddSourceExW
+    )
+{
+    vpfnMsiEnableLogW = pfnMsiEnableLogW ? pfnMsiEnableLogW : ::MsiEnableLogW;
+    vpfnMsiGetComponentPathW = pfnMsiGetComponentPathW ? pfnMsiGetComponentPathW : ::MsiGetComponentPathW;
+    vpfnMsiLocateComponentW = pfnMsiLocateComponentW ? pfnMsiLocateComponentW : ::MsiLocateComponentW;
+    vpfnMsiQueryFeatureStateW = pfnMsiQueryFeatureStateW ? pfnMsiQueryFeatureStateW : ::MsiQueryFeatureStateW;
+    vpfnMsiGetProductInfoW = pfnMsiGetProductInfoW ? pfnMsiGetProductInfoW : vpfnMsiGetProductInfoW;
+    vpfnMsiInstallProductW = pfnMsiInstallProductW ? pfnMsiInstallProductW : ::MsiInstallProductW;
+    vpfnMsiConfigureProductExW = pfnMsiConfigureProductExW ? pfnMsiConfigureProductExW : ::MsiConfigureProductExW;
+    vpfnMsiSetInternalUI = pfnMsiSetInternalUI ? pfnMsiSetInternalUI : ::MsiSetInternalUI;
+    vpfnMsiSetExternalUIW = pfnMsiSetExternalUIW ? pfnMsiSetExternalUIW : ::MsiSetExternalUIW;
+    vpfnMsiEnumRelatedProductsW = pfnMsiEnumRelatedProductsW ? pfnMsiEnumRelatedProductsW : ::MsiEnumRelatedProductsW;
+    vpfnMsiGetProductInfoExW = pfnMsiGetProductInfoExW ? pfnMsiGetProductInfoExW : vpfnMsiGetProductInfoExWFromLibrary;
+    vpfnMsiSetExternalUIRecord = pfnMsiSetExternalUIRecord ? pfnMsiSetExternalUIRecord : vpfnMsiSetExternalUIRecordFromLibrary;
+    vpfnMsiSourceListAddSourceExW = pfnMsiSourceListAddSourceExW ? pfnMsiSourceListAddSourceExW : vpfnMsiSourceListAddSourceExWFromLibrary;
+}
+extern "C" HRESULT DAPI WiuGetComponentPath(
+    __in_z LPCWSTR wzProductCode,
+    __in_z LPCWSTR wzComponentId,
+    __out INSTALLSTATE* pInstallState,
+    __out_z LPWSTR* psczValue
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD cch = WIU_GOOD_ENOUGH_PROPERTY_LENGTH;
+    DWORD cchCompare;
+    hr = StrAlloc(psczValue, cch);
+    WiuExitOnFailure(hr, "Failed to allocate string for component path.");
+    cchCompare = cch;
+    *pInstallState = vpfnMsiGetComponentPathW(wzProductCode, wzComponentId, *psczValue, &cch);
+    if (INSTALLSTATE_MOREDATA == *pInstallState)
+    {
+        ++cch;
+        hr = StrAlloc(psczValue, cch);
+        WiuExitOnFailure(hr, "Failed to reallocate string for component path.");
+        cchCompare = cch;
+        *pInstallState = vpfnMsiGetComponentPathW(wzProductCode, wzComponentId, *psczValue, &cch);
+    }
+    if (INSTALLSTATE_INVALIDARG == *pInstallState)
+    {
+        hr = E_INVALIDARG;
+        WiuExitOnRootFailure(hr, "Invalid argument when getting component path.");
+    }
+    else if (INSTALLSTATE_UNKNOWN == *pInstallState)
+    {
+        ExitFunction();
+    }
+    // If the actual path length is greater than or equal to the original buffer
+    // allocate a larger buffer and get the path again, just in case we are 
+    // missing any part of the path.
+    if (cchCompare <= cch)
+    {
+        ++cch;
+        hr = StrAlloc(psczValue, cch);
+        WiuExitOnFailure(hr, "Failed to reallocate string for component path.");
+        *pInstallState = vpfnMsiGetComponentPathW(wzProductCode, wzComponentId, *psczValue, &cch);
+    }
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI WiuLocateComponent(
+    __in_z LPCWSTR wzComponentId,
+    __out INSTALLSTATE* pInstallState,
+    __out_z LPWSTR* psczValue
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD cch = WIU_GOOD_ENOUGH_PROPERTY_LENGTH;
+    DWORD cchCompare;
+    hr = StrAlloc(psczValue, cch);
+    WiuExitOnFailure(hr, "Failed to allocate string for component path.");
+    cchCompare = cch;
+    *pInstallState = vpfnMsiLocateComponentW(wzComponentId, *psczValue, &cch);
+    if (INSTALLSTATE_MOREDATA == *pInstallState)
+    {
+        ++cch;
+        hr = StrAlloc(psczValue, cch);
+        WiuExitOnFailure(hr, "Failed to reallocate string for component path.");
+        cchCompare = cch;
+        *pInstallState = vpfnMsiLocateComponentW(wzComponentId, *psczValue, &cch);
+    }
+    if (INSTALLSTATE_INVALIDARG == *pInstallState)
+    {
+        hr = E_INVALIDARG;
+        WiuExitOnRootFailure(hr, "Invalid argument when locating component.");
+    }
+    else if (INSTALLSTATE_UNKNOWN == *pInstallState)
+    {
+        ExitFunction();
+    }
+    // If the actual path length is greater than or equal to the original buffer
+    // allocate a larger buffer and get the path again, just in case we are 
+    // missing any part of the path.
+    if (cchCompare <= cch)
+    {
+        ++cch;
+        hr = StrAlloc(psczValue, cch);
+        WiuExitOnFailure(hr, "Failed to reallocate string for component path.");
+        *pInstallState = vpfnMsiLocateComponentW(wzComponentId, *psczValue, &cch);
+    }
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI WiuQueryFeatureState(
+    __in_z LPCWSTR wzProduct,
+    __in_z LPCWSTR wzFeature,
+    __out INSTALLSTATE* pInstallState
+    )
+{
+    HRESULT hr = S_OK;
+    *pInstallState = vpfnMsiQueryFeatureStateW(wzProduct, wzFeature);
+    if (INSTALLSTATE_INVALIDARG == *pInstallState)
+    {
+        hr = E_INVALIDARG;
+        WiuExitOnRootFailure(hr, "Failed to query state of feature: %ls in product: %ls", wzFeature, wzProduct);
+    }
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI WiuGetProductInfo(
+    __in_z LPCWSTR wzProductCode,
+    __in_z LPCWSTR wzProperty,
+    __out LPWSTR* psczValue
+    )
+{
+    HRESULT hr = S_OK;
+    UINT er = ERROR_SUCCESS;
+    DWORD cch = WIU_GOOD_ENOUGH_PROPERTY_LENGTH;
+    hr = StrAlloc(psczValue, cch);
+    WiuExitOnFailure(hr, "Failed to allocate string for product info.");
+    er = vpfnMsiGetProductInfoW(wzProductCode, wzProperty, *psczValue, &cch);
+    if (ERROR_MORE_DATA == er)
+    {
+        ++cch;
+        hr = StrAlloc(psczValue, cch);
+        WiuExitOnFailure(hr, "Failed to reallocate string for product info.");
+        er = vpfnMsiGetProductInfoW(wzProductCode, wzProperty, *psczValue, &cch);
+    }
+    WiuExitOnWin32Error(er, hr, "Failed to get product info.");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI WiuGetProductInfoEx(
+    __in_z LPCWSTR wzProductCode,
+    __in_z_opt LPCWSTR wzUserSid,
+    __in MSIINSTALLCONTEXT dwContext,
+    __in_z LPCWSTR wzProperty,
+    __out LPWSTR* psczValue
+    )
+{
+    HRESULT hr = S_OK;
+    UINT er = ERROR_SUCCESS;
+    DWORD cch = WIU_GOOD_ENOUGH_PROPERTY_LENGTH;
+    if (!vpfnMsiGetProductInfoExW)
+    {
+        hr = WiuGetProductInfo(wzProductCode, wzProperty, psczValue);
+        WiuExitOnFailure(hr, "Failed to get product info when extended info was not available.");
+        ExitFunction();
+    }
+    hr = StrAlloc(psczValue, cch);
+    WiuExitOnFailure(hr, "Failed to allocate string for extended product info.");
+    er = vpfnMsiGetProductInfoExW(wzProductCode, wzUserSid, dwContext, wzProperty, *psczValue, &cch);
+    if (ERROR_MORE_DATA == er)
+    {
+        ++cch;
+        hr = StrAlloc(psczValue, cch);
+        WiuExitOnFailure(hr, "Failed to reallocate string for extended product info.");
+        er = vpfnMsiGetProductInfoExW(wzProductCode, wzUserSid, dwContext, wzProperty, *psczValue, &cch);
+    }
+    WiuExitOnWin32Error(er, hr, "Failed to get extended product info.");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI WiuGetProductProperty(
+    __in MSIHANDLE hProduct,
+    __in_z LPCWSTR wzProperty,
+    __out LPWSTR* psczValue
+    )
+{
+    HRESULT hr = S_OK;
+    UINT er = ERROR_SUCCESS;
+    DWORD cch = WIU_GOOD_ENOUGH_PROPERTY_LENGTH;
+    hr = StrAlloc(psczValue, cch);
+    WiuExitOnFailure(hr, "Failed to allocate string for product property.");
+    er = ::MsiGetProductPropertyW(hProduct, wzProperty, *psczValue, &cch);
+    if (ERROR_MORE_DATA == er)
+    {
+        ++cch;
+        hr = StrAlloc(psczValue, cch);
+        WiuExitOnFailure(hr, "Failed to reallocate string for product property.");
+        er = ::MsiGetProductPropertyW(hProduct, wzProperty, *psczValue, &cch);
+    }
+    WiuExitOnWin32Error(er, hr, "Failed to get product property.");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI WiuGetPatchInfoEx(
+    __in_z LPCWSTR wzPatchCode,
+    __in_z LPCWSTR wzProductCode,
+    __in_z_opt LPCWSTR wzUserSid,
+    __in MSIINSTALLCONTEXT dwContext,
+    __in_z LPCWSTR wzProperty,
+    __out LPWSTR* psczValue
+    )
+{
+    HRESULT hr = S_OK;
+    UINT er = ERROR_SUCCESS;
+    DWORD cch = WIU_GOOD_ENOUGH_PROPERTY_LENGTH;
+    if (!vpfnMsiGetPatchInfoExW)
+    {
+        ExitFunction1(hr = E_NOTIMPL);
+    }
+    hr = StrAlloc(psczValue, cch);
+    WiuExitOnFailure(hr, "Failed to allocate string for extended patch info.");
+    er = vpfnMsiGetPatchInfoExW(wzPatchCode, wzProductCode, wzUserSid, dwContext, wzProperty, *psczValue, &cch);
+    if (ERROR_MORE_DATA == er)
+    {
+        ++cch;
+        hr = StrAlloc(psczValue, cch);
+        WiuExitOnFailure(hr, "Failed to reallocate string for extended patch info.");
+        er = vpfnMsiGetPatchInfoExW(wzPatchCode, wzProductCode, wzUserSid, dwContext, wzProperty, *psczValue, &cch);
+    }
+    WiuExitOnWin32Error(er, hr, "Failed to get extended patch info.");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI WiuDeterminePatchSequence(
+    __in_z LPCWSTR wzProductCode,
+    __in_z_opt LPCWSTR wzUserSid,
+    __in MSIINSTALLCONTEXT context,
+    __in PMSIPATCHSEQUENCEINFOW pPatchInfo,
+    __in DWORD cPatchInfo
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    if (!vpfnMsiDeterminePatchSequenceW)
+    {
+        ExitFunction1(hr = E_NOTIMPL);
+    }
+    er = vpfnMsiDeterminePatchSequenceW(wzProductCode, wzUserSid, context, cPatchInfo, pPatchInfo);
+    WiuExitOnWin32Error(er, hr, "Failed to determine patch sequence for product code.");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI WiuDetermineApplicablePatches(
+    __in_z LPCWSTR wzProductPackagePath,
+    __in PMSIPATCHSEQUENCEINFOW pPatchInfo,
+    __in DWORD cPatchInfo
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    if (!vpfnMsiDetermineApplicablePatchesW)
+    {
+        ExitFunction1(hr = E_NOTIMPL);
+    }
+    er = vpfnMsiDetermineApplicablePatchesW(wzProductPackagePath, cPatchInfo, pPatchInfo);
+    WiuExitOnWin32Error(er, hr, "Failed to determine applicable patches for product package.");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI WiuEnumProducts(
+    __in DWORD iProductIndex,
+    __out_ecount(MAX_GUID_CHARS + 1) LPWSTR wzProductCode
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    er = vpfnMsiEnumProductsW(iProductIndex, wzProductCode);
+    if (ERROR_NO_MORE_ITEMS == er)
+    {
+        ExitFunction1(hr = HRESULT_FROM_WIN32(er));
+    }
+    WiuExitOnWin32Error(er, hr, "Failed to enumerate products.");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI WiuEnumProductsEx(
+    __in_z_opt LPCWSTR wzProductCode,
+    __in_z_opt LPCWSTR wzUserSid,
+    __in DWORD dwContext,
+    __in DWORD dwIndex,
+    __out_opt WCHAR wzInstalledProductCode[39],
+    __out_opt MSIINSTALLCONTEXT *pdwInstalledContext,
+    __out_opt LPWSTR wzSid,
+    __inout_opt LPDWORD pcchSid
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    if (!vpfnMsiEnumProductsExW)
+    {
+        ExitFunction1(hr = E_NOTIMPL);
+    }
+    er = vpfnMsiEnumProductsExW(wzProductCode, wzUserSid, dwContext, dwIndex, wzInstalledProductCode, pdwInstalledContext, wzSid, pcchSid);
+    if (ERROR_NO_MORE_ITEMS == er)
+    {
+        ExitFunction1(hr = HRESULT_FROM_WIN32(er));
+    }
+    WiuExitOnWin32Error(er, hr, "Failed to enumerate products.");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI WiuEnumRelatedProducts(
+    __in_z LPCWSTR wzUpgradeCode,
+    __in DWORD iProductIndex,
+    __out_ecount(MAX_GUID_CHARS + 1) LPWSTR wzProductCode
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    er = vpfnMsiEnumRelatedProductsW(wzUpgradeCode, 0, iProductIndex, wzProductCode);
+    if (ERROR_NO_MORE_ITEMS == er)
+    {
+        ExitFunction1(hr = HRESULT_FROM_WIN32(er));
+    }
+    WiuExitOnWin32Error(er, hr, "Failed to enumerate related products for updgrade code: %ls", wzUpgradeCode);
+LExit:
+    return hr;
+}
+/********************************************************************
+ WiuEnumRelatedProductCodes - Returns an array of related products for a given upgrade code.
+ Parameters:
+ wzUpgradeCode - The upgrade code that will be used to find the related products.
+ prgsczProductCodes - Pointer to the array that will contain the product codes.
+ pcRelatedProducts - Returns the count of the number of related products found.
+ fReturnHighestVersionOnly - When set to "TRUE", will only return the product code of the highest version found.
+********************************************************************/
+extern "C" HRESULT DAPI WiuEnumRelatedProductCodes(
+    __in_z LPCWSTR wzUpgradeCode,
+    __deref_out_ecount_opt(*pcRelatedProducts) LPWSTR** prgsczProductCodes,
+    __out DWORD* pcRelatedProducts,
+    __in BOOL fReturnHighestVersionOnly
+    )
+{
+    HRESULT hr = S_OK;
+    WCHAR wzCurrentProductCode[MAX_GUID_CHARS + 1] = { };
+    LPWSTR sczInstalledVersion = NULL;
+    VERUTIL_VERSION* pCurrentVersion = NULL;
+    VERUTIL_VERSION* pHighestVersion = NULL;
+    int nCompare = 0;
+    // make sure we start at zero
+    *pcRelatedProducts = 0;
+    for (DWORD i = 0; ; ++i)
+    {
+        hr = WiuEnumRelatedProducts(wzUpgradeCode, i, wzCurrentProductCode);
+        if (E_NOMOREITEMS == hr)
+        {
+            hr = S_OK;
+            break;
+        }
+        WiuExitOnFailure(hr, "Failed to enumerate related products for upgrade code: %ls", wzUpgradeCode);
+        if (fReturnHighestVersionOnly)
+        {
+            // try to get the version but if the product registration is broken
+            // (for whatever reason), skip this product
+            hr = WiuGetProductInfo(wzCurrentProductCode, L"VersionString", &sczInstalledVersion);
+            if (FAILED(hr))
+            {
+                WiuExitTrace(hr, "Could not get product version for product code: %ls, skipping...", wzCurrentProductCode);
+                continue;
+            }
+            hr = VerParseVersion(sczInstalledVersion, 0, FALSE, &pCurrentVersion);
+            WiuExitOnFailure(hr, "Failed to parse version: %ls for product code: %ls", sczInstalledVersion, wzCurrentProductCode);
+            if (pCurrentVersion->fInvalid)
+            {
+                WiuExitTrace(E_INVALIDDATA, "Enumerated msi package with invalid version, product code: '%1!ls!', version: '%2!ls!'");
+            }
+            // if this is the first product found then it is the highest version (for now)
+            if (!pHighestVersion)
+            {
+                pHighestVersion = pCurrentVersion;
+                pCurrentVersion = NULL;
+            }
+            else
+            {
+                hr = VerCompareParsedVersions(pCurrentVersion, pHighestVersion, &nCompare);
+                WiuExitOnFailure(hr, "Failed to compare version '%ls' to highest version: '%ls'", pCurrentVersion->sczVersion, pHighestVersion->sczVersion);
+                // if this is the highest version encountered so far then overwrite
+                // the first item in the array (there will never be more than one item)
+                if (nCompare > 0)
+                {
+                    ReleaseVerutilVersion(pHighestVersion);
+                    pHighestVersion = pCurrentVersion;
+                    pCurrentVersion = NULL;
+                    hr = StrAllocString(prgsczProductCodes[0], wzCurrentProductCode, 0);
+                    WiuExitOnFailure(hr, "Failed to update array with higher versioned product code.");
+                }
+                else
+                {
+                    ReleaseVerutilVersion(pCurrentVersion);
+                }
+                // continue here as we don't want anything else added to the list
+                continue;
+            }
+        }
+        hr = StrArrayAllocString(prgsczProductCodes, (LPUINT)(pcRelatedProducts), wzCurrentProductCode, 0);
+        WiuExitOnFailure(hr, "Failed to add product code to array.");
+    }
+LExit:
+    ReleaseVerutilVersion(pCurrentVersion);
+    ReleaseVerutilVersion(pHighestVersion);
+    ReleaseStr(sczInstalledVersion);
+    return hr;
+}
+extern "C" HRESULT DAPI WiuEnableLog(
+    __in DWORD dwLogMode,
+    __in_z LPCWSTR wzLogFile,
+    __in DWORD dwLogAttributes
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    er = vpfnMsiEnableLogW(dwLogMode, wzLogFile, dwLogAttributes);
+    WiuExitOnWin32Error(er, hr, "Failed to enable MSI internal logging.");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI WiuInitializeInternalUI(
+    __in INSTALLUILEVEL internalUILevel,
+    __in_opt HWND hwndParent,
+    __in WIU_MSI_EXECUTE_CONTEXT* pExecuteContext
+    )
+{
+    HRESULT hr = S_OK;
+    memset(pExecuteContext, 0, sizeof(WIU_MSI_EXECUTE_CONTEXT));
+    pExecuteContext->previousInstallUILevel = vpfnMsiSetInternalUI(internalUILevel, &hwndParent);
+    pExecuteContext->hwndPreviousParentWindow = hwndParent;
+    if (INSTALLUILEVEL_NOCHANGE == pExecuteContext->previousInstallUILevel)
+    {
+        hr = E_INVALIDARG;
+    }
+    return hr;
+}
+extern "C" HRESULT DAPI WiuInitializeExternalUI(
+    __in PFN_MSIEXECUTEMESSAGEHANDLER pfnMessageHandler,
+    __in INSTALLUILEVEL internalUILevel,
+    __in_opt HWND hwndParent,
+    __in LPVOID pvContext,
+    __in BOOL fRollback,
+    __in WIU_MSI_EXECUTE_CONTEXT* pExecuteContext
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    DWORD dwMessageFilter = INSTALLLOGMODE_INITIALIZE | INSTALLLOGMODE_TERMINATE |
+                            INSTALLLOGMODE_FATALEXIT | INSTALLLOGMODE_ERROR | INSTALLLOGMODE_WARNING |
+                            INSTALLLOGMODE_RESOLVESOURCE | INSTALLLOGMODE_OUTOFDISKSPACE |
+                            INSTALLLOGMODE_ACTIONSTART | INSTALLLOGMODE_ACTIONDATA | INSTALLLOGMODE_COMMONDATA |
+                            INSTALLLOGMODE_PROGRESS | INSTALLLOGMODE_FILESINUSE;
+    if (MAKEDWORD(0, 4) <= vdwMsiDllMajorMinor)
+    {
+        dwMessageFilter |= INSTALLLOGMODE_RMFILESINUSE;
+    }
+    // Wire the internal and external UI handler.
+    hr = WiuInitializeInternalUI(internalUILevel, hwndParent, pExecuteContext);
+    WiuExitOnFailure(hr, "Failed to set internal UI level and window.");
+    pExecuteContext->fRollback = fRollback;
+    pExecuteContext->pfnMessageHandler = pfnMessageHandler;
+    pExecuteContext->pvContext = pvContext;
+    // If the external UI record is available (MSI version >= 3.1) use it but fall back to the standard external
+    // UI handler if necesary.
+    if (vpfnMsiSetExternalUIRecord)
+    {
+        er = vpfnMsiSetExternalUIRecord(InstallEngineRecordCallback, dwMessageFilter, pExecuteContext, &pExecuteContext->pfnPreviousExternalUIRecord);
+        WiuExitOnWin32Error(er, hr, "Failed to wire up external UI record handler.");
+        pExecuteContext->fSetPreviousExternalUIRecord = TRUE;
+    }
+    else
+    {
+        pExecuteContext->pfnPreviousExternalUI = vpfnMsiSetExternalUIW(InstallEngineCallback, dwMessageFilter, pExecuteContext);
+        pExecuteContext->fSetPreviousExternalUI = TRUE;
+    }
+LExit:
+    return hr;
+}
+extern "C" void DAPI WiuUninitializeExternalUI(
+    __in WIU_MSI_EXECUTE_CONTEXT* pExecuteContext
+    )
+{
+    if (INSTALLUILEVEL_NOCHANGE != pExecuteContext->previousInstallUILevel)
+    {
+        pExecuteContext->previousInstallUILevel = vpfnMsiSetInternalUI(pExecuteContext->previousInstallUILevel, &pExecuteContext->hwndPreviousParentWindow);
+    }
+    if (pExecuteContext->fSetPreviousExternalUI)  // unset the UI handler
+    {
+        vpfnMsiSetExternalUIW(pExecuteContext->pfnPreviousExternalUI, 0, NULL);
+    }
+    if (pExecuteContext->fSetPreviousExternalUIRecord)  // unset the UI record handler
+    {
+        vpfnMsiSetExternalUIRecord(pExecuteContext->pfnPreviousExternalUIRecord, 0, NULL, NULL);
+    }
+    memset(pExecuteContext, 0, sizeof(WIU_MSI_EXECUTE_CONTEXT));
+}
+extern "C" HRESULT DAPI WiuConfigureProductEx(
+    __in_z LPCWSTR wzProduct,
+    __in int iInstallLevel,
+    __in INSTALLSTATE eInstallState,
+    __in_z LPCWSTR wzCommandLine,
+    __out WIU_RESTART* pRestart
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    er = vpfnMsiConfigureProductExW(wzProduct, iInstallLevel, eInstallState, wzCommandLine);
+    er = CheckForRestartErrorCode(er, pRestart);
+    WiuExitOnWin32Error(er, hr, "Failed to configure product: %ls", wzProduct);
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI WiuInstallProduct(
+    __in_z LPCWSTR wzPackagePath,
+    __in_z LPCWSTR wzCommandLine,
+    __out WIU_RESTART* pRestart
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    er = vpfnMsiInstallProductW(wzPackagePath, wzCommandLine);
+    er = CheckForRestartErrorCode(er, pRestart);
+    WiuExitOnWin32Error(er, hr, "Failed to install product: %ls", wzPackagePath);
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI WiuRemovePatches(
+    __in_z LPCWSTR wzPatchList,
+    __in_z LPCWSTR wzProductCode,
+    __in_z LPCWSTR wzPropertyList,
+    __out WIU_RESTART* pRestart
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    er = vpfnMsiRemovePatchesW(wzPatchList, wzProductCode, INSTALLTYPE_SINGLE_INSTANCE, wzPropertyList);
+    er = CheckForRestartErrorCode(er, pRestart);
+    WiuExitOnWin32Error(er, hr, "Failed to remove patches.");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI WiuSourceListAddSourceEx(
+    __in_z LPCWSTR wzProductCodeOrPatchCode,
+    __in_z_opt LPCWSTR wzUserSid,
+    __in MSIINSTALLCONTEXT dwContext,
+    __in DWORD dwCode,
+    __in_z LPCWSTR wzSource,
+    __in_opt DWORD dwIndex
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    er = vpfnMsiSourceListAddSourceExW(wzProductCodeOrPatchCode, wzUserSid, dwContext, MSISOURCETYPE_NETWORK | dwCode, wzSource, dwIndex);
+    WiuExitOnWin32Error(er, hr, "Failed to add source.");
+LExit:
+    return hr;
+}
+extern "C" BOOL DAPI WiuIsMsiTransactionSupported(
+    )
+{
+    return vpfnMsiBeginTransaction && vpfnMsiEndTransaction;
+}
+extern "C" HRESULT DAPI WiuBeginTransaction(
+    __in_z LPCWSTR szName,
+    __in DWORD dwTransactionAttributes,
+    __out MSIHANDLE * phTransactionHandle,
+    __out HANDLE * phChangeOfOwnerEvent,
+    __in DWORD dwLogMode,
+    __in_z LPCWSTR szLogPath
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    if (!WiuIsMsiTransactionSupported())
+    {
+        WiuExitOnFailure(hr = E_NOTIMPL, "Msi transactions are not supported");
+    }
+    hr = WiuEnableLog(dwLogMode, szLogPath, INSTALLLOGATTRIBUTES_APPEND);
+    WiuExitOnFailure(hr, "Failed to enable logging for MSI transaction");
+    er = vpfnMsiBeginTransaction(szName, dwTransactionAttributes, phTransactionHandle, phChangeOfOwnerEvent);
+    WiuExitOnWin32Error(er, hr, "Failed to begin transaction.");
+LExit:
+    return hr;
+}
+extern "C" HRESULT DAPI WiuEndTransaction(
+    __in DWORD dwTransactionState,
+    __in DWORD dwLogMode,
+    __in_z LPCWSTR szLogPath
+    )
+{
+    HRESULT hr = S_OK;
+    DWORD er = ERROR_SUCCESS;
+    if (!WiuIsMsiTransactionSupported())
+    {
+        WiuExitOnFailure(hr = E_NOTIMPL, "Msi transactions are not supported");
+    }
+    hr = WiuEnableLog(dwLogMode, szLogPath, INSTALLLOGATTRIBUTES_APPEND);
+    WiuExitOnFailure(hr, "Failed to enable logging for MSI transaction");
+    er = vpfnMsiEndTransaction(dwTransactionState);
+    WiuExitOnWin32Error(er, hr, "Failed to end transaction.");
+LExit:
+    return hr;
+}
+static DWORD CheckForRestartErrorCode(
+    __in DWORD dwErrorCode,
+    __out WIU_RESTART* pRestart
+    )
+{
+    switch (dwErrorCode)
+    {
+    case ERROR_SUCCESS_REBOOT_REQUIRED:
+    case ERROR_SUCCESS_RESTART_REQUIRED:
+        *pRestart = WIU_RESTART_REQUIRED;
+        dwErrorCode = ERROR_SUCCESS;
+        break;
+    case ERROR_SUCCESS_REBOOT_INITIATED:
+    case ERROR_INSTALL_SUSPEND:
+        *pRestart = WIU_RESTART_INITIATED;
+        dwErrorCode = ERROR_SUCCESS;
+        break;
+    }
+    return dwErrorCode;
+}
+static INT CALLBACK InstallEngineCallback(
+    __in LPVOID pvContext,
+    __in UINT uiMessage,
+    __in_z_opt LPCWSTR wzMessage
+    )
+{
+    INT nResult = IDNOACTION;
+    WIU_MSI_EXECUTE_CONTEXT* pContext = (WIU_MSI_EXECUTE_CONTEXT*)pvContext;
+    INSTALLMESSAGE mt = static_cast<INSTALLMESSAGE>(0xFF000000 & uiMessage);
+    UINT uiFlags = 0x00FFFFFF & uiMessage;
+    if (wzMessage)
+    {
+        if (INSTALLMESSAGE_PROGRESS == mt)
+        {
+            nResult = HandleInstallProgress(pContext, wzMessage, NULL);
+        }
+        else
+        {
+            nResult = HandleInstallMessage(pContext, mt, uiFlags, wzMessage, NULL);
+        }
+    }
+    return nResult;
+}
+static INT CALLBACK InstallEngineRecordCallback(
+    __in LPVOID pvContext,
+    __in UINT uiMessage,
+    __in_opt MSIHANDLE hRecord
+    )
+{
+    INT nResult = IDNOACTION;
+    HRESULT hr = S_OK;
+    WIU_MSI_EXECUTE_CONTEXT* pContext = (WIU_MSI_EXECUTE_CONTEXT*)pvContext;
+    INSTALLMESSAGE mt = static_cast<INSTALLMESSAGE>(0xFF000000 & uiMessage);
+    UINT uiFlags = 0x00FFFFFF & uiMessage;
+    LPWSTR sczMessage = NULL;
+    DWORD cchMessage = 0;
+    if (hRecord)
+    {
+        if (INSTALLMESSAGE_PROGRESS == mt)
+        {
+            nResult = HandleInstallProgress(pContext, NULL, hRecord);
+        }
+        else
+        {
+            // create formated message string
+#pragma prefast(push)
+#pragma prefast(disable:6298) // docs explicitly say this is a valid option for getting the buffer size
+            DWORD er = ::MsiFormatRecordW(NULL, hRecord, L"", &cchMessage);
+#pragma prefast(pop)
+            if (ERROR_MORE_DATA == er || ERROR_SUCCESS == er)
+            {
+                hr = StrAlloc(&sczMessage, ++cchMessage);
+            }
+            else
+            {
+                hr = HRESULT_FROM_WIN32(er);
+            }
+            WiuExitOnFailure(hr, "Failed to allocate string for formated message.");
+            er = ::MsiFormatRecordW(NULL, hRecord, sczMessage, &cchMessage);
+            WiuExitOnWin32Error(er, hr, "Failed to format message record.");
+            // Pass to handler including both the formated message and the original record.
+            nResult = HandleInstallMessage(pContext, mt, uiFlags, sczMessage, hRecord);
+        }
+    }
+LExit:
+    ReleaseStr(sczMessage);
+    return nResult;
+}
+static INT HandleInstallMessage(
+    __in WIU_MSI_EXECUTE_CONTEXT* pContext,
+    __in INSTALLMESSAGE mt,
+    __in UINT uiFlags,
+    __in_z LPCWSTR wzMessage,
+    __in_opt MSIHANDLE hRecord
+    )
+{
+    INT nResult = IDNOACTION;
+Trace(REPORT_STANDARD, "MSI install[%x]: %ls", pContext->dwCurrentProgressIndex, wzMessage);
+    // Handle the message.
+    switch (mt)
+    {
+    case INSTALLMESSAGE_INITIALIZE: // this message is received prior to internal UI initialization, no string data
+        ResetProgress(pContext);
+        break;
+    case INSTALLMESSAGE_TERMINATE: // sent after UI termination, no string data
+        break;
+    case INSTALLMESSAGE_ACTIONSTART:
+        if (WIU_MSI_PROGRESS_INVALID != pContext->dwCurrentProgressIndex && pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].fEnableActionData)
+        {
+            pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].fEnableActionData = FALSE;
+        }
+        nResult = SendMsiMessage(pContext, mt, uiFlags, wzMessage, hRecord);
+        break;
+    case INSTALLMESSAGE_ACTIONDATA:
+        if (WIU_MSI_PROGRESS_INVALID != pContext->dwCurrentProgressIndex && pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].fEnableActionData)
+        {
+            if (pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].fMoveForward)
+            {
+                pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].dwCompleted += pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].dwStep;
+            }
+            else // rollback.
+            {
+                pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].dwCompleted -= pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].dwStep;
+            }
+            nResult = SendProgressUpdate(pContext);
+        }
+        else
+        {
+            nResult = SendMsiMessage(pContext, mt, uiFlags, wzMessage, hRecord);
+        }
+        break;
+    case INSTALLMESSAGE_OUTOFDISKSPACE: __fallthrough;
+    case INSTALLMESSAGE_FATALEXIT: __fallthrough;
+    case INSTALLMESSAGE_ERROR:
+        nResult = SendErrorMessage(pContext, uiFlags, wzMessage, hRecord);
+        break;
+    case INSTALLMESSAGE_FILESINUSE:
+    case INSTALLMESSAGE_RMFILESINUSE:
+        nResult = SendFilesInUseMessage(pContext, hRecord, INSTALLMESSAGE_RMFILESINUSE == mt);
+        break;
+/*
+#if 0
+    case INSTALLMESSAGE_COMMONDATA:
+        if (L'1' == wzMessage[0] && L':' == wzMessage[1] && L' ' == wzMessage[2])
+        {
+            if (L'0' == wzMessage[3])
+            {
+                // TODO: handle the language common data message.
+                lres = IDOK;
+                return lres;
+            }
+            else if (L'1' == wzMessage[3])
+            {
+                // TODO: really handle sending the caption.
+                lres = ::SendSuxMessage(pInstallContext->pSetupUXInformation, SRM_EXEC_SET_CAPTION, uiFlags, reinterpret_cast<LPARAM>(wzMessage + 3));
+                return lres;
+            }
+            else if (L'2' == wzMessage[3])
+            {
+                // TODO: really handle sending the cancel button status.
+                lres = ::SendSuxMessage(pInstallContext->pSetupUXInformation, SRM_EXEC_SET_CANCEL, uiFlags, reinterpret_cast<LPARAM>(wzMessage + 3));
+                return lres;
+            }
+        }
+        break;
+#endif
+*/
+    //case INSTALLMESSAGE_WARNING:
+    //case INSTALLMESSAGE_USER:
+    //case INSTALLMESSAGE_INFO:
+    //case INSTALLMESSAGE_SHOWDIALOG: // sent prior to display of authored dialog or wizard
+    default:
+        nResult = SendMsiMessage(pContext, mt, uiFlags, wzMessage, hRecord);
+        break;
+    }
+    // Always return "no action" (0) for resolve source messages.
+    return (INSTALLMESSAGE_RESOLVESOURCE == mt) ? IDNOACTION : nResult;
+}
+static INT HandleInstallProgress(
+    __in WIU_MSI_EXECUTE_CONTEXT* pContext,
+    __in_z_opt LPCWSTR wzMessage,
+    __in_opt MSIHANDLE hRecord
+    )
+{
+    HRESULT hr = S_OK;
+    INT nResult = IDNOACTION;
+    INT iFields[4] = { };
+    INT cFields = 0;
+    LPCWSTR pwz = NULL;
+    DWORD cch = 0;
+    // get field values
+    if (hRecord)
+    {
+        cFields = ::MsiRecordGetFieldCount(hRecord);
+        cFields = min(cFields, countof(iFields)); // avoid buffer overrun if there are more fields than our buffer can hold
+        for (INT i = 0; i < cFields; ++i)
+        {
+            iFields[i] = ::MsiRecordGetInteger(hRecord, i + 1);
+        }
+    }
+    else
+    {
+        Assert(wzMessage);
+        // parse message string
+        pwz = wzMessage;
+        while (cFields < 4)
+        {
+            // check if we have the start of a valid part
+            if ((L'1' + cFields) != pwz[0] || L':' != pwz[1] || L' ' != pwz[2])
+            {
+                break;
+            }
+            pwz += 3;
+            // find character count of number
+            cch = 0;
+            while (pwz[cch] && L' ' != pwz[cch])
+            {
+                ++cch;
+            }
+            // parse number
+            hr = StrStringToInt32(pwz, cch, &iFields[cFields]);
+            WiuExitOnFailure(hr, "Failed to parse MSI message part.");
+            // increment field count
+            ++cFields;
+        }
+    }
+#ifdef _DEBUG
+    WCHAR wz[256];
+    ::StringCchPrintfW(wz, countof(wz), L"1: %d 2: %d 3: %d 4: %d", iFields[0], iFields[1], iFields[2], iFields[3]);
+    Trace(REPORT_STANDARD, "MSI progress[%x]: %ls", pContext->dwCurrentProgressIndex, wz);
+#endif
+    // Verify that we have the enough field values.
+    if (1 > cFields)
+    {
+        ExitFunction(); // unknown message, bail
+    }
+    // Handle based on message type.
+    switch (iFields[0])
+    {
+    case 0: // master progress reset
+        if (4 > cFields)
+        {
+            Trace(REPORT_STANDARD, "INSTALLMESSAGE_PROGRESS - Invalid field count %d, '%ls'", cFields, wzMessage);
+            ExitFunction();
+        }
+        //Trace(REPORT_STANDARD, "INSTALLMESSAGE_PROGRESS - MASTER RESET - %d, %d, %d", iFields[1], iFields[2], iFields[3]);
+        // Update the index into progress array.
+        if (WIU_MSI_PROGRESS_INVALID == pContext->dwCurrentProgressIndex)
+        {
+            pContext->dwCurrentProgressIndex = 0;
+        }
+        else if (pContext->dwCurrentProgressIndex + 1 < countof(pContext->rgMsiProgress))
+        {
+            ++pContext->dwCurrentProgressIndex;
+        }
+        else
+        {
+            hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+            WiuExitOnRootFailure(hr, "Insufficient space to hold progress information.");
+        }
+        // we only care about the first stage after script execution has started
+        //if (!pEngineInfo->fMsiProgressScriptInProgress && 1 != iFields[3])
+        //{
+        //    pEngineInfo->fMsiProgressFinished = TRUE;
+        //}
+        pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].dwTotal = iFields[1];
+        pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].dwCompleted = 0 == iFields[2] ? 0 : iFields[1]; // if forward start at 0, if backwards start at max
+        pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].fMoveForward = (0 == iFields[2]);
+        pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].fEnableActionData = FALSE;
+        pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].fScriptInProgress = (1 == iFields[3]);
+        if (0 == pContext->dwCurrentProgressIndex)
+        {
+            // HACK!!! this is a hack courtesy of the Windows Installer team. It seems the script planning phase
+            // is always off by "about 50".  So we'll toss an extra 50 ticks on so that the standard progress
+            // doesn't go over 100%.  If there are any custom actions, they may blow the total so we'll call this
+            // "close" and deal with the rest.
+            pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].dwTotal += 50;
+        }
+        break;
+    case 1: // action info.
+        if (3 > cFields)
+        {
+            Trace(REPORT_STANDARD, "INSTALLMESSAGE_PROGRESS - Invalid field count %d, '%ls'", cFields, wzMessage);
+            ExitFunction();
+        }
+        //Trace(REPORT_STANDARD, "INSTALLMESSAGE_PROGRESS - ACTION INFO - %d, %d, %d", iFields[1], iFields[2], iFields[3]);
+        if (0 == iFields[2])
+        {
+            pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].fEnableActionData = FALSE;
+        }
+        else
+        {
+            pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].fEnableActionData = TRUE;
+            pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].dwStep = iFields[1];
+        }
+        break;
+    case 2: // progress report.
+        if (2 > cFields)
+        {
+            Trace(REPORT_STANDARD, "INSTALLMESSAGE_PROGRESS - Invalid field count %d, '%ls'", cFields, wzMessage);
+            break;
+        }
+        //Trace(REPORT_STANDARD, "INSTALLMESSAGE_PROGRESS - PROGRESS REPORT - %d, %d, %d", iFields[1], iFields[2], iFields[3]);
+        if (WIU_MSI_PROGRESS_INVALID == pContext->dwCurrentProgressIndex)
+        {
+            break;
+        }
+        else if (0 == pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].dwTotal)
+        {
+            break;
+        }
+        // Update progress.
+        if (pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].fMoveForward)
+        {
+            pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].dwCompleted += iFields[1];
+        }
+        else // rollback.
+        {
+            pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].dwCompleted -= iFields[1];
+        }
+        break;
+    case 3: // extend the progress bar.
+        pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].dwTotal += iFields[1];
+        break;
+    default:
+        ExitFunction(); // unknown message, bail
+    }
+    // If we have a valid progress index, send an update.
+    if (WIU_MSI_PROGRESS_INVALID != pContext->dwCurrentProgressIndex)
+    {
+        nResult = SendProgressUpdate(pContext);
+    }
+LExit:
+    return nResult;
+}
+static INT SendMsiMessage(
+    __in WIU_MSI_EXECUTE_CONTEXT* pContext,
+    __in INSTALLMESSAGE mt,
+    __in UINT uiFlags,
+    __in_z LPCWSTR wzMessage,
+    __in_opt MSIHANDLE hRecord
+    )
+{
+    INT nResult = IDNOACTION;
+    WIU_MSI_EXECUTE_MESSAGE message = { };
+    LPWSTR* rgsczData = NULL;
+    DWORD cData = 0;
+    InitializeMessageData(hRecord, &rgsczData, &cData);
+    message.type = WIU_MSI_EXECUTE_MESSAGE_MSI_MESSAGE;
+    message.dwAllowedResults = uiFlags;
+    message.cData = cData;
+    message.rgwzData = (LPCWSTR*)rgsczData;
+    message.msiMessage.mt = mt;
+    message.msiMessage.wzMessage = wzMessage;
+    nResult = pContext->pfnMessageHandler(&message, pContext->pvContext);
+    UninitializeMessageData(rgsczData, cData);
+    return nResult;
+}
+static INT SendErrorMessage(
+    __in WIU_MSI_EXECUTE_CONTEXT* pContext,
+    __in UINT uiFlags,
+    __in_z LPCWSTR wzMessage,
+    __in_opt MSIHANDLE hRecord
+    )
+{
+    INT nResult = IDNOACTION;
+    WIU_MSI_EXECUTE_MESSAGE message = { };
+    DWORD dwErrorCode = 0;
+    LPWSTR* rgsczData = NULL;
+    DWORD cData = 0;
+    if (hRecord)
+    {
+        dwErrorCode = ::MsiRecordGetInteger(hRecord, 1);
+        // Set the recommendation if it's a known error code.
+        switch (dwErrorCode)
+        {
+        case 1605: // continue with install even if there isn't enough room for rollback.
+            nResult = IDIGNORE;
+            break;
+        case 1704: // rollback suspended installs so our install can continue.
+            nResult = IDOK;
+            break;
+        }
+    }
+    InitializeMessageData(hRecord, &rgsczData, &cData);
+    message.type = WIU_MSI_EXECUTE_MESSAGE_ERROR;
+    message.dwAllowedResults = uiFlags;
+    message.nResultRecommendation = nResult;
+    message.cData = cData;
+    message.rgwzData = (LPCWSTR*)rgsczData;
+    message.error.dwErrorCode = dwErrorCode;
+    message.error.wzMessage = wzMessage;
+    nResult = pContext->pfnMessageHandler(&message, pContext->pvContext);
+    UninitializeMessageData(rgsczData, cData);
+    return nResult;
+}
+static INT SendFilesInUseMessage(
+    __in WIU_MSI_EXECUTE_CONTEXT* pContext,
+    __in_opt MSIHANDLE hRecord,
+    __in BOOL /*fRestartManagerRequest*/
+    )
+{
+    INT nResult = IDNOACTION;
+    WIU_MSI_EXECUTE_MESSAGE message = { };
+    LPWSTR* rgsczData = NULL;
+    DWORD cData = 0;
+    InitializeMessageData(hRecord, &rgsczData, &cData);
+    message.type = WIU_MSI_EXECUTE_MESSAGE_MSI_FILES_IN_USE;
+    message.dwAllowedResults = WIU_MB_OKIGNORECANCELRETRY;
+    message.cData = cData;
+    message.rgwzData = (LPCWSTR*)rgsczData;
+    message.msiFilesInUse.cFiles = message.cData;       // point the files in use information to the message record information.
+    message.msiFilesInUse.rgwzFiles = message.rgwzData;
+    nResult = pContext->pfnMessageHandler(&message, pContext->pvContext);
+    UninitializeMessageData(rgsczData, cData);
+    return nResult;
+}
+static INT SendProgressUpdate(
+    __in WIU_MSI_EXECUTE_CONTEXT* pContext
+    )
+{
+    int nResult = IDNOACTION;
+    DWORD dwPercentage = 0; // number representing 0 - 100%
+    WIU_MSI_EXECUTE_MESSAGE message = { };
+    //DWORD dwMsiProgressTotal = pEngineInfo->dwMsiProgressTotal;
+    //DWORD dwMsiProgressComplete = pEngineInfo->dwMsiProgressComplete; //min(dwMsiProgressTotal, pEngineInfo->dwMsiProgressComplete);
+    //double dProgressGauge = 0;
+    //double dProgressStageTotal = (double)pEngineInfo->qwProgressStageTotal;
+    // Calculate progress for the phases of Windows Installer.
+    // TODO: handle upgrade progress which would add another phase.
+    dwPercentage += CalculatePhaseProgress(pContext, 0, 15);
+    dwPercentage += CalculatePhaseProgress(pContext, 1, 80);
+    dwPercentage += CalculatePhaseProgress(pContext, 2, 5);
+    dwPercentage = min(dwPercentage, 100); // ensure the percentage never goes over 100%.
+    if (pContext->fRollback)
+    {
+        dwPercentage = 100 - dwPercentage;
+    }
+    //if (qwTotal) // avoid "divide by zero" if the MSI range is blank.
+    //{
+    //    // calculate gauge.
+    //    double dProgressGauge = static_cast<double>(qwCompleted) / static_cast<double>(qwTotal);
+    //    dProgressGauge = (1.0 / (1.0 + exp(3.7 - dProgressGauge * 7.5)) - 0.024127021417669196) / 0.975872978582330804;
+    //    qwCompleted = (DWORD)(dProgressGauge * qwTotal);
+    //    // calculate progress within range
+    //    //qwProgressComplete = (DWORD64)(dwMsiProgressComplete * (dProgressStageTotal / dwMsiProgressTotal));
+    //    //qwProgressComplete = min(qwProgressComplete, pEngineInfo->qwProgressStageTotal);
+    //}
+#ifdef _DEBUG
+    DWORD64 qwCompleted = pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].dwCompleted;
+    DWORD64 qwTotal = pContext->rgMsiProgress[pContext->dwCurrentProgressIndex].dwTotal;
+    Trace(REPORT_STANDARD, "MSI progress: %I64u/%I64u (%u%%)", qwCompleted, qwTotal, dwPercentage);
+    //AssertSz(qwCompleted <= qwTotal, "Completed progress is larger than total progress.");
+#endif
+    message.type = WIU_MSI_EXECUTE_MESSAGE_PROGRESS;
+    message.dwAllowedResults = MB_OKCANCEL;
+    message.progress.dwPercentage = dwPercentage;
+    nResult = pContext->pfnMessageHandler(&message, pContext->pvContext);
+    return nResult;
+}
+static void ResetProgress(
+    __in WIU_MSI_EXECUTE_CONTEXT* pContext
+    )
+{
+    memset(pContext->rgMsiProgress, 0, sizeof(pContext->rgMsiProgress));
+    pContext->dwCurrentProgressIndex = WIU_MSI_PROGRESS_INVALID;
+}
+static DWORD CalculatePhaseProgress(
+    __in WIU_MSI_EXECUTE_CONTEXT* pContext,
+    __in DWORD dwProgressIndex,
+    __in DWORD dwWeightPercentage
+    )
+{
+    DWORD dwPhasePercentage = 0;
+    // If we've already passed this progress index, return the maximum percentage possible (the weight)
+    if (dwProgressIndex < pContext->dwCurrentProgressIndex)
+    {
+        dwPhasePercentage = dwWeightPercentage;
+    }
+    else if (dwProgressIndex == pContext->dwCurrentProgressIndex) // have to do the math for the current progress.
+    {
+        WIU_MSI_PROGRESS* pProgress = pContext->rgMsiProgress + dwProgressIndex;
+        if (pProgress->dwTotal)
+        {
+            DWORD64 dw64Completed = pProgress->dwCompleted;
+            dwPhasePercentage = static_cast<DWORD>(dw64Completed * dwWeightPercentage / pProgress->dwTotal);
+        }
+    }
+    // else we're not there yet so it has to be zero.
+    return dwPhasePercentage;
+}
+void InitializeMessageData(
+    __in_opt MSIHANDLE hRecord,
+    __deref_out_ecount(*pcData) LPWSTR** prgsczData,
+    __out DWORD* pcData
+    )
+{
+    DWORD cData = 0;
+    LPWSTR* rgsczData = NULL;
+    // If we have a record based message, try to get the extra data.
+    if (hRecord)
+    {
+        cData = ::MsiRecordGetFieldCount(hRecord);
+        if (cData)
+        {
+            rgsczData = (LPWSTR*)MemAlloc(sizeof(LPWSTR*) * cData, TRUE);
+        }
+        for (DWORD i = 0; rgsczData && i < cData; ++i)
+        {
+            DWORD cch = 0;
+            // get string from record
+#pragma prefast(push)
+#pragma prefast(disable:6298)
+            DWORD er = ::MsiRecordGetStringW(hRecord, i + 1, L"", &cch);
+#pragma prefast(pop)
+            if (ERROR_MORE_DATA == er)
+            {
+                HRESULT hr = StrAlloc(&rgsczData[i], ++cch);
+                if (SUCCEEDED(hr))
+                {
+                    er = ::MsiRecordGetStringW(hRecord, i + 1, rgsczData[i], &cch);
+                }
+            }
+        }
+    }
+    *prgsczData = rgsczData;
+    *pcData = cData;
+}
+void UninitializeMessageData(
+    __in LPWSTR* rgsczData,
+    __in DWORD cData
+    )
+{
+    // Clean up if there was any data allocated.
+    if (rgsczData)
+    {
+        for (DWORD i = 0; i < cData; ++i)
+        {
+            ReleaseStr(rgsczData[i]);
+        }
+        MemFree(rgsczData);
+    }
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/wuautil.cpp b/src/libs/dutil/WixToolset.DUtil/wuautil.cpp
new file mode 100644
index 00000000..dfb28818
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/wuautil.cpp
@@ -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.
+#include "precomp.h"
+// Exit macros
+#define WuaExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_WUAUTIL, x, s, __VA_ARGS__)
+#define WuaExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_WUAUTIL, x, s, __VA_ARGS__)
+#define WuaExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_WUAUTIL, x, s, __VA_ARGS__)
+#define WuaExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_WUAUTIL, x, s, __VA_ARGS__)
+#define WuaExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_WUAUTIL, x, s, __VA_ARGS__)
+#define WuaExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_WUAUTIL, x, s, __VA_ARGS__)
+#define WuaExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_WUAUTIL, p, x, e, s, __VA_ARGS__)
+#define WuaExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_WUAUTIL, p, x, s, __VA_ARGS__)
+#define WuaExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_WUAUTIL, p, x, e, s, __VA_ARGS__)
+#define WuaExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_WUAUTIL, p, x, s, __VA_ARGS__)
+#define WuaExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_WUAUTIL, e, x, s, __VA_ARGS__)
+#define WuaExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_WUAUTIL, g, x, s, __VA_ARGS__)
+// internal function declarations
+static HRESULT GetAutomaticUpdatesService(
+    __out IAutomaticUpdates **ppAutomaticUpdates
+    );
+// function definitions
+extern "C" HRESULT DAPI WuaPauseAutomaticUpdates()
+{
+    HRESULT hr = S_OK;
+    IAutomaticUpdates *pAutomaticUpdates = NULL;
+    hr = GetAutomaticUpdatesService(&pAutomaticUpdates);
+    WuaExitOnFailure(hr, "Failed to get the Automatic Updates service.");
+    hr = pAutomaticUpdates->Pause();
+    WuaExitOnFailure(hr, "Failed to pause the Automatic Updates service.");
+LExit:
+    ReleaseObject(pAutomaticUpdates);
+    return hr;
+}
+extern "C" HRESULT DAPI WuaResumeAutomaticUpdates()
+{
+    HRESULT hr = S_OK;
+    IAutomaticUpdates *pAutomaticUpdates = NULL;
+    hr = GetAutomaticUpdatesService(&pAutomaticUpdates);
+    WuaExitOnFailure(hr, "Failed to get the Automatic Updates service.");
+    hr = pAutomaticUpdates->Resume();
+    WuaExitOnFailure(hr, "Failed to resume the Automatic Updates service.");
+LExit:
+    ReleaseObject(pAutomaticUpdates);
+    return hr;
+}
+extern "C" HRESULT DAPI WuaRestartRequired(
+    __out BOOL* pfRestartRequired
+    )
+{
+    HRESULT hr = S_OK;
+    ISystemInformation* pSystemInformation = NULL;
+    VARIANT_BOOL bRestartRequired;
+    hr = ::CoCreateInstance(__uuidof(SystemInformation), NULL, CLSCTX_INPROC_SERVER, __uuidof(ISystemInformation), reinterpret_cast<LPVOID*>(&pSystemInformation));
+    WuaExitOnRootFailure(hr, "Failed to get WUA system information interface.");
+    hr = pSystemInformation->get_RebootRequired(&bRestartRequired);
+    WuaExitOnRootFailure(hr, "Failed to determine if restart is required from WUA.");
+    *pfRestartRequired = (VARIANT_FALSE != bRestartRequired);
+LExit:
+    ReleaseObject(pSystemInformation);
+    return hr;
+}
+// internal function definitions
+static HRESULT GetAutomaticUpdatesService(
+    __out IAutomaticUpdates **ppAutomaticUpdates
+    )
+{
+    HRESULT hr = S_OK;
+    CLSID clsidAutomaticUpdates = { };
+    hr = ::CLSIDFromProgID(L"Microsoft.Update.AutoUpdate", &clsidAutomaticUpdates);
+    WuaExitOnFailure(hr, "Failed to get CLSID for Microsoft.Update.AutoUpdate.");
+    hr = ::CoCreateInstance(clsidAutomaticUpdates, NULL, CLSCTX_INPROC_SERVER, IID_IAutomaticUpdates, reinterpret_cast<LPVOID*>(ppAutomaticUpdates));
+    WuaExitOnFailure(hr, "Failed to create instance of Microsoft.Update.AutoUpdate.");
+LExit:
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/xmlutil.cpp b/src/libs/dutil/WixToolset.DUtil/xmlutil.cpp
new file mode 100644
index 00000000..0f1e611d
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/xmlutil.cpp
@@ -0,0 +1,1332 @@
+// 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.
+#include "precomp.h"
+// Exit macros
+#define XmlExitOnLastError(x, s, ...) ExitOnLastErrorSource(DUTIL_SOURCE_XMLUTIL, x, s, __VA_ARGS__)
+#define XmlExitOnLastErrorDebugTrace(x, s, ...) ExitOnLastErrorDebugTraceSource(DUTIL_SOURCE_XMLUTIL, x, s, __VA_ARGS__)
+#define XmlExitWithLastError(x, s, ...) ExitWithLastErrorSource(DUTIL_SOURCE_XMLUTIL, x, s, __VA_ARGS__)
+#define XmlExitOnFailure(x, s, ...) ExitOnFailureSource(DUTIL_SOURCE_XMLUTIL, x, s, __VA_ARGS__)
+#define XmlExitOnRootFailure(x, s, ...) ExitOnRootFailureSource(DUTIL_SOURCE_XMLUTIL, x, s, __VA_ARGS__)
+#define XmlExitOnFailureDebugTrace(x, s, ...) ExitOnFailureDebugTraceSource(DUTIL_SOURCE_XMLUTIL, x, s, __VA_ARGS__)
+#define XmlExitOnNull(p, x, e, s, ...) ExitOnNullSource(DUTIL_SOURCE_XMLUTIL, p, x, e, s, __VA_ARGS__)
+#define XmlExitOnNullWithLastError(p, x, s, ...) ExitOnNullWithLastErrorSource(DUTIL_SOURCE_XMLUTIL, p, x, s, __VA_ARGS__)
+#define XmlExitOnNullDebugTrace(p, x, e, s, ...)  ExitOnNullDebugTraceSource(DUTIL_SOURCE_XMLUTIL, p, x, e, s, __VA_ARGS__)
+#define XmlExitOnInvalidHandleWithLastError(p, x, s, ...) ExitOnInvalidHandleWithLastErrorSource(DUTIL_SOURCE_XMLUTIL, p, x, s, __VA_ARGS__)
+#define XmlExitOnWin32Error(e, x, s, ...) ExitOnWin32ErrorSource(DUTIL_SOURCE_XMLUTIL, e, x, s, __VA_ARGS__)
+#define XmlExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_XMLUTIL, g, x, s, __VA_ARGS__)
+// intialization globals
+CLSID vclsidXMLDOM = { 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0} };
+static volatile LONG vcXmlInitialized = 0;
+static BOOL vfMsxml40 = FALSE;
+static BOOL fComInitialized = FALSE;
+BOOL vfMsxml30 = FALSE;
+/********************************************************************
+ XmlInitialize - finds an appropriate version of the XML DOM
+*********************************************************************/
+extern "C" HRESULT DAPI XmlInitialize(
+    )
+{
+    HRESULT hr = S_OK;
+    if (!fComInitialized)
+    {
+        hr = ::CoInitialize(0);
+        if (RPC_E_CHANGED_MODE != hr)
+        {
+            XmlExitOnFailure(hr, "failed to initialize COM");
+            fComInitialized = TRUE;
+        }
+    }
+    LONG cInitialized = ::InterlockedIncrement(&vcXmlInitialized);
+    if (1 == cInitialized)
+    {
+        // NOTE: 4.0 behaves differently than 3.0 so there may be problems doing this
+#if 0
+        hr = ::CLSIDFromProgID(L"Msxml2.DOMDocument.4.0", &vclsidXMLDOM);
+        if (S_OK == hr)
+        {
+            vfMsxml40 = TRUE;
+            Trace(REPORT_VERBOSE, "found Msxml2.DOMDocument.4.0");
+            ExitFunction();
+        }
+#endif
+        hr = ::CLSIDFromProgID(L"Msxml2.DOMDocument", &vclsidXMLDOM);
+        if (FAILED(hr))
+        {
+            // try to fall back to old MSXML
+            hr = ::CLSIDFromProgID(L"MSXML.DOMDocument", &vclsidXMLDOM);
+        }
+        XmlExitOnFailure(hr, "failed to get CLSID for XML DOM");
+        Assert(IsEqualCLSID(vclsidXMLDOM, XmlUtil_CLSID_DOMDocument) ||
+               IsEqualCLSID(vclsidXMLDOM, XmlUtil_CLSID_DOMDocument20) ||
+               IsEqualCLSID(vclsidXMLDOM, XmlUtil_CLSID_DOMDocument26) ||
+               IsEqualCLSID(vclsidXMLDOM, XmlUtil_CLSID_DOMDocument30) ||
+               IsEqualCLSID(vclsidXMLDOM, XmlUtil_CLSID_DOMDocument40) ||
+               IsEqualCLSID(vclsidXMLDOM, XmlUtil_CLSID_DOMDocument50) ||
+               IsEqualCLSID(vclsidXMLDOM, XmlUtil_CLSID_DOMDocument60));
+    }
+    hr = S_OK;
+LExit:
+    return hr;
+}
+/********************************************************************
+ XmUninitialize -
+*********************************************************************/
+extern "C" void DAPI XmlUninitialize(
+    )
+{
+    AssertSz(vcXmlInitialized, "XmlUninitialize called when not initialized");
+    LONG cInitialized = ::InterlockedDecrement(&vcXmlInitialized);
+    if (0 == cInitialized)
+    {
+        memset(&vclsidXMLDOM, 0, sizeof(vclsidXMLDOM));
+        if (fComInitialized)
+        {
+            ::CoUninitialize();
+        }
+    } 
+}
+extern "C" HRESULT DAPI XmlCreateElement(
+    __in IXMLDOMDocument *pixdDocument,
+    __in_z LPCWSTR wzElementName,
+    __out IXMLDOMElement **ppixnElement
+    )
+{
+    if (!ppixnElement || !pixdDocument)
+    {
+        return E_INVALIDARG;
+    }
+    HRESULT hr = S_OK;
+    BSTR bstrElementName = ::SysAllocString(wzElementName);
+    XmlExitOnNull(bstrElementName, hr, E_OUTOFMEMORY, "failed SysAllocString");
+    hr = pixdDocument->createElement(bstrElementName, ppixnElement);
+LExit:
+    ReleaseBSTR(bstrElementName);
+    return hr;
+}
+/********************************************************************
+ XmlCreateDocument -
+*********************************************************************/
+extern "C" HRESULT DAPI XmlCreateDocument(
+    __in_opt LPCWSTR pwzElementName,
+    __out IXMLDOMDocument** ppixdDocument,
+    __out_opt IXMLDOMElement** ppixeRootElement
+    )
+{
+    HRESULT hr = S_OK;
+    BOOL (WINAPI *pfnDisableWow64)(__out PVOID* ) = NULL;
+    BOOLEAN (WINAPI *pfnEnableWow64)(__in BOOLEAN ) = NULL;
+    BOOL (WINAPI *pfnRevertWow64)(__in PVOID ) = NULL;
+    BOOL fWow64Available = FALSE;
+    void *pvWow64State = NULL;
+    // RELEASEME
+    IXMLDOMElement* pixeRootElement = NULL;
+    IXMLDOMDocument *pixdDocument = NULL;
+    // Test if we have access to the Wow64 API, and store the result in fWow64Available
+    HMODULE hKernel32 = ::GetModuleHandleA("kernel32.dll");
+    XmlExitOnNullWithLastError(hKernel32, hr, "failed to get handle to kernel32.dll");
+    // This will test if we have access to the Wow64 API
+    if (NULL != GetProcAddress(hKernel32, "IsWow64Process"))
+    {
+        pfnDisableWow64 = (BOOL (WINAPI *)(PVOID *))::GetProcAddress(hKernel32, "Wow64DisableWow64FsRedirection");
+        pfnEnableWow64 = (BOOLEAN (WINAPI *)(BOOLEAN))::GetProcAddress(hKernel32, "Wow64EnableWow64FsRedirection");
+        pfnRevertWow64 = (BOOL (WINAPI *)(PVOID))::GetProcAddress(hKernel32, "Wow64RevertWow64FsRedirection");
+        fWow64Available = pfnDisableWow64 && pfnEnableWow64 && pfnRevertWow64;
+    }
+    // create the top level XML document
+    AssertSz(vcXmlInitialized, "XmlInitialize() was not called");
+    // Enable Wow64 Redirection, if possible
+    if (fWow64Available)
+    {
+        // We want to enable Wow64 redirection, but the Wow64 API requires us to disable it first to get its current state (so we can revert it later)
+        pfnDisableWow64(&pvWow64State);
+        // If we fail to enable it, don't bother trying to disable it later on
+        fWow64Available = pfnEnableWow64(TRUE);
+    }
+    hr = ::CoCreateInstance(vclsidXMLDOM, NULL, CLSCTX_INPROC_SERVER, XmlUtil_IID_IXMLDOMDocument, (void**)&pixdDocument);
+    XmlExitOnFailure(hr, "failed to create XML DOM Document");
+    Assert(pixdDocument);
+    if (IsEqualCLSID(vclsidXMLDOM, XmlUtil_CLSID_DOMDocument30) || IsEqualCLSID(vclsidXMLDOM, XmlUtil_CLSID_DOMDocument20))
+    {
+        vfMsxml30 = TRUE;
+    }
+    if (pwzElementName)
+    {
+        hr = XmlCreateElement(pixdDocument, pwzElementName, &pixeRootElement);
+        XmlExitOnFailure(hr, "failed XmlCreateElement");
+        hr = pixdDocument->appendChild(pixeRootElement, NULL);
+        XmlExitOnFailure(hr, "failed appendChild");
+    }
+    *ppixdDocument = pixdDocument;
+    pixdDocument = NULL;
+    if (ppixeRootElement)
+    {
+        *ppixeRootElement = pixeRootElement;
+        pixeRootElement = NULL;
+    }
+LExit:
+    // Re-disable Wow64 Redirection, if appropriate
+    if (fWow64Available && !pfnRevertWow64(pvWow64State))
+    {
+        // If we expected to be able to revert, and couldn't, fail in the only graceful way we can
+        ::ExitProcess(1);
+    }
+    ReleaseObject(pixeRootElement);
+    ReleaseObject(pixdDocument);
+    return hr;
+}
+/********************************************************************
+ XmlLoadDocument -
+*********************************************************************/
+extern "C" HRESULT DAPI XmlLoadDocument(
+    __in_z LPCWSTR wzDocument,
+    __out IXMLDOMDocument** ppixdDocument
+    )
+{
+    return XmlLoadDocumentEx(wzDocument, 0, ppixdDocument);
+}
+/********************************************************************
+ XmlReportParseError -
+*********************************************************************/
+static void XmlReportParseError(
+    __in IXMLDOMParseError* pixpe
+    )
+{
+    HRESULT hr = S_OK;
+    long lNumber = 0;
+    BSTR bstr = NULL;
+    Trace(REPORT_STANDARD, "Failed to parse XML. IXMLDOMParseError reports:");
+    hr = pixpe->get_errorCode(&lNumber);
+    XmlExitOnFailure(hr, "Failed to query IXMLDOMParseError.errorCode.");
+    Trace(REPORT_STANDARD, "errorCode = 0x%x", lNumber);
+    hr = pixpe->get_filepos(&lNumber);
+    XmlExitOnFailure(hr, "Failed to query IXMLDOMParseError.filepos.");
+    Trace(REPORT_STANDARD, "filepos = %d", lNumber);
+    hr = pixpe->get_line(&lNumber);
+    XmlExitOnFailure(hr, "Failed to query IXMLDOMParseError.line.");
+    Trace(REPORT_STANDARD, "line = %d", lNumber);
+    hr = pixpe->get_linepos(&lNumber);
+    XmlExitOnFailure(hr, "Failed to query IXMLDOMParseError.linepos.");
+    Trace(REPORT_STANDARD, "linepos = %d", lNumber);
+    hr = pixpe->get_reason(&bstr);
+    XmlExitOnFailure(hr, "Failed to query IXMLDOMParseError.reason.");
+    Trace(REPORT_STANDARD, "reason = %ls", bstr);
+    ReleaseNullBSTR(bstr);
+    hr = pixpe->get_srcText (&bstr);
+    XmlExitOnFailure(hr, "Failed to query IXMLDOMParseError.srcText .");
+    Trace(REPORT_STANDARD, "srcText = %ls", bstr);
+    ReleaseNullBSTR(bstr);
+LExit:
+    ReleaseBSTR(bstr);
+}
+/********************************************************************
+ XmlLoadDocumentEx -
+*********************************************************************/
+extern "C" HRESULT DAPI XmlLoadDocumentEx(
+    __in_z LPCWSTR wzDocument,
+    __in DWORD dwAttributes,
+    __out IXMLDOMDocument** ppixdDocument
+    )
+{
+    HRESULT hr = S_OK;
+    VARIANT_BOOL vbSuccess = 0;
+    // RELEASEME
+    IXMLDOMDocument* pixd = NULL;
+    IXMLDOMParseError* pixpe = NULL;
+    BSTR bstrLoad = NULL;
+    if (!wzDocument || !*wzDocument)
+    {
+        hr = E_UNEXPECTED;
+        XmlExitOnFailure(hr, "string must be non-null");
+    }
+    hr = XmlCreateDocument(NULL, &pixd);
+    if (hr == S_FALSE)
+    {
+        hr = E_FAIL;
+    }
+    XmlExitOnFailure(hr, "failed XmlCreateDocument");
+    if (dwAttributes & XML_LOAD_PRESERVE_WHITESPACE)
+    {
+        hr = pixd->put_preserveWhiteSpace(VARIANT_TRUE);
+        XmlExitOnFailure(hr, "failed put_preserveWhiteSpace");
+    }
+    // Security issue.  Avoid triggering anything external.
+    hr = pixd->put_validateOnParse(VARIANT_FALSE);
+    XmlExitOnFailure(hr, "failed put_validateOnParse");
+    hr = pixd->put_resolveExternals(VARIANT_FALSE);
+    XmlExitOnFailure(hr, "failed put_resolveExternals");
+    bstrLoad = ::SysAllocString(wzDocument);
+    XmlExitOnNull(bstrLoad, hr, E_OUTOFMEMORY, "failed to allocate bstr for Load in XmlLoadDocumentEx");
+    hr = pixd->loadXML(bstrLoad, &vbSuccess);
+    if (S_FALSE == hr)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_OPEN_FAILED);
+    }
+    if (FAILED(hr) && S_OK == pixd->get_parseError(&pixpe))
+    {
+        XmlReportParseError(pixpe);
+    }
+    XmlExitOnFailure(hr, "failed loadXML");
+    hr = S_OK;
+LExit:
+    if (ppixdDocument)
+    {
+        *ppixdDocument = pixd;
+        pixd = NULL;
+    }
+    ReleaseBSTR(bstrLoad);
+    ReleaseObject(pixd);
+    ReleaseObject(pixpe);
+    return hr;
+}
+/*******************************************************************
+ XmlLoadDocumentFromFile
+********************************************************************/
+extern "C" HRESULT DAPI XmlLoadDocumentFromFile(
+    __in_z LPCWSTR wzPath,
+    __out IXMLDOMDocument** ppixdDocument
+    )
+{
+    return XmlLoadDocumentFromFileEx(wzPath, 0, ppixdDocument);
+}
+/*******************************************************************
+ XmlLoadDocumentFromFileEx
+********************************************************************/
+extern "C" HRESULT DAPI XmlLoadDocumentFromFileEx(
+    __in_z LPCWSTR wzPath,
+    __in DWORD dwAttributes,
+    __out IXMLDOMDocument** ppixdDocument
+    )
+{
+    HRESULT hr = S_OK;
+    VARIANT varPath;
+    VARIANT_BOOL vbSuccess = 0;
+    IXMLDOMDocument* pixd = NULL;
+    IXMLDOMParseError* pixpe = NULL;
+    ::VariantInit(&varPath);
+    varPath.vt = VT_BSTR;
+    varPath.bstrVal = ::SysAllocString(wzPath);
+    XmlExitOnNull(varPath.bstrVal, hr, E_OUTOFMEMORY, "failed to allocate bstr for Path in XmlLoadDocumentFromFileEx");
+    hr = XmlCreateDocument(NULL, &pixd);
+    if (hr == S_FALSE)
+    {
+        hr = E_FAIL;
+    }
+    XmlExitOnFailure(hr, "failed XmlCreateDocument");
+    if (dwAttributes & XML_LOAD_PRESERVE_WHITESPACE)
+    {
+        hr = pixd->put_preserveWhiteSpace(VARIANT_TRUE);
+        XmlExitOnFailure(hr, "failed put_preserveWhiteSpace");
+    }
+    // Avoid triggering anything external.
+    hr = pixd->put_validateOnParse(VARIANT_FALSE);
+    XmlExitOnFailure(hr, "failed put_validateOnParse");
+    hr = pixd->put_resolveExternals(VARIANT_FALSE);
+    XmlExitOnFailure(hr, "failed put_resolveExternals");
+    pixd->put_async(VARIANT_FALSE);
+    hr = pixd->load(varPath, &vbSuccess);
+    if (S_FALSE == hr)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_OPEN_FAILED);
+    }
+    if (FAILED(hr) && S_OK == pixd->get_parseError(&pixpe))
+    {
+        XmlReportParseError(pixpe);
+    }
+    XmlExitOnFailure(hr, "failed to load XML from: %ls", wzPath);
+    if (ppixdDocument)
+    {
+        *ppixdDocument = pixd;
+        pixd = NULL;
+    }
+    hr = S_OK;
+LExit:
+    ReleaseVariant(varPath);
+    ReleaseObject(pixd);
+    ReleaseObject(pixpe);
+    return hr;
+}
+/********************************************************************
+ XmlLoadDocumentFromBuffer
+*********************************************************************/
+extern "C" HRESULT DAPI XmlLoadDocumentFromBuffer(
+    __in_bcount(cbSource) const BYTE* pbSource,
+    __in SIZE_T cbSource,
+    __out IXMLDOMDocument** ppixdDocument
+    )
+{
+    HRESULT hr = S_OK;
+    IXMLDOMDocument* pixdDocument = NULL;
+    SAFEARRAY sa = { };
+    VARIANT vtXmlSource;
+    VARIANT_BOOL vbSuccess = 0;
+    ::VariantInit(&vtXmlSource);
+    // create document
+    hr = XmlCreateDocument(NULL, &pixdDocument);
+    if (hr == S_FALSE)
+    {
+        hr = E_FAIL;
+    }
+    XmlExitOnFailure(hr, "failed XmlCreateDocument");
+    // Security issue.  Avoid triggering anything external.
+    hr = pixdDocument->put_validateOnParse(VARIANT_FALSE);
+    XmlExitOnFailure(hr, "failed put_validateOnParse");
+    hr = pixdDocument->put_resolveExternals(VARIANT_FALSE);
+    XmlExitOnFailure(hr, "failed put_resolveExternals");
+    // load document
+    sa.cDims = 1;
+    sa.fFeatures = FADF_STATIC | FADF_FIXEDSIZE;
+    sa.cbElements = 1;
+    sa.pvData = (PVOID)pbSource;
+    sa.rgsabound[0].cElements = (ULONG)cbSource;
+    vtXmlSource.vt = VT_ARRAY | VT_UI1;
+    vtXmlSource.parray = &sa;
+    hr = pixdDocument->load(vtXmlSource, &vbSuccess);
+    if (S_FALSE == hr)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_OPEN_FAILED);
+    }
+    XmlExitOnFailure(hr, "failed loadXML");
+    // return value
+    *ppixdDocument = pixdDocument;
+    pixdDocument = NULL;
+LExit:
+    ReleaseObject(pixdDocument);
+    return hr;
+}
+/********************************************************************
+ XmlSetAttribute -
+*********************************************************************/
+extern "C" HRESULT DAPI XmlSetAttribute(
+    __in IXMLDOMNode* pixnNode,
+    __in_z LPCWSTR pwzAttribute,
+    __in_z LPCWSTR pwzAttributeValue
+    )
+{
+    HRESULT hr = S_OK;
+    VARIANT varAttributeValue;
+    ::VariantInit(&varAttributeValue);
+    // RELEASEME
+    IXMLDOMDocument* pixdDocument = NULL;
+    IXMLDOMNamedNodeMap* pixnnmAttributes = NULL;
+    IXMLDOMAttribute* pixaAttribute = NULL;
+    IXMLDOMNode* pixaNode = NULL;
+    BSTR bstrAttributeName = ::SysAllocString(pwzAttribute);
+    XmlExitOnNull(bstrAttributeName, hr, E_OUTOFMEMORY, "failed to allocate bstr for AttributeName in XmlSetAttribute");
+    hr = pixnNode->get_attributes(&pixnnmAttributes);
+    XmlExitOnFailure(hr, "failed get_attributes in XmlSetAttribute(%ls)", pwzAttribute);
+    hr = pixnNode->get_ownerDocument(&pixdDocument);
+    if (hr == S_FALSE)
+    {
+        hr = E_FAIL;
+    }
+    XmlExitOnFailure(hr, "failed get_ownerDocument in XmlSetAttribute");
+    hr = pixdDocument->createAttribute(bstrAttributeName, &pixaAttribute);
+    XmlExitOnFailure(hr, "failed createAttribute in XmlSetAttribute(%ls)", pwzAttribute);
+    varAttributeValue.vt = VT_BSTR;
+    varAttributeValue.bstrVal = ::SysAllocString(pwzAttributeValue);
+    if (!varAttributeValue.bstrVal)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY);
+    }
+    XmlExitOnFailure(hr, "failed SysAllocString in XmlSetAttribute");
+    hr = pixaAttribute->put_nodeValue(varAttributeValue);
+    XmlExitOnFailure(hr, "failed put_nodeValue in XmlSetAttribute(%ls)", pwzAttribute);
+    hr = pixnnmAttributes->setNamedItem(pixaAttribute, &pixaNode);
+    XmlExitOnFailure(hr, "failed setNamedItem in XmlSetAttribute(%ls)", pwzAttribute);
+LExit:
+    ReleaseObject(pixdDocument);
+    ReleaseObject(pixnnmAttributes);
+    ReleaseObject(pixaAttribute);
+    ReleaseObject(pixaNode);
+    ReleaseBSTR(varAttributeValue.bstrVal);
+    ReleaseBSTR(bstrAttributeName);
+    return hr;
+}
+/********************************************************************
+ XmlSelectSingleNode -
+*********************************************************************/
+extern "C" HRESULT DAPI XmlSelectSingleNode(
+    __in IXMLDOMNode* pixnParent,
+    __in_z LPCWSTR wzXPath,
+    __out IXMLDOMNode **ppixnChild
+    )
+{
+    HRESULT hr = S_OK;
+    BSTR bstrXPath = NULL;
+    XmlExitOnNull(pixnParent, hr, E_UNEXPECTED, "pixnParent parameter was null in XmlSelectSingleNode");
+    XmlExitOnNull(ppixnChild, hr, E_UNEXPECTED, "ppixnChild parameter was null in XmlSelectSingleNode");
+    bstrXPath = ::SysAllocString(wzXPath ? wzXPath : L"");
+    XmlExitOnNull(bstrXPath, hr, E_OUTOFMEMORY, "failed to allocate bstr for XPath expression in XmlSelectSingleNode");
+    hr = pixnParent->selectSingleNode(bstrXPath, ppixnChild);
+LExit:
+    ReleaseBSTR(bstrXPath);
+    return hr;
+}
+/********************************************************************
+ XmlCreateTextNode -
+*********************************************************************/
+extern "C" HRESULT DAPI XmlCreateTextNode(
+    __in IXMLDOMDocument *pixdDocument,
+    __in_z LPCWSTR wzText,
+    __out IXMLDOMText **ppixnTextNode
+    )
+{
+    if (!ppixnTextNode || !pixdDocument)
+    {
+        return E_INVALIDARG;
+    }
+    HRESULT hr = S_OK;
+    BSTR bstrText = ::SysAllocString(wzText);
+    XmlExitOnNull(bstrText, hr, E_OUTOFMEMORY, "failed SysAllocString");
+    hr = pixdDocument->createTextNode(bstrText, ppixnTextNode);
+LExit:
+    ReleaseBSTR(bstrText);
+    return hr;
+}
+/********************************************************************
+ XmlGetText
+*********************************************************************/
+extern "C" HRESULT DAPI XmlGetText(
+    __in IXMLDOMNode* pixnNode,
+    __deref_out_z BSTR* pbstrText
+    )
+{
+    return pixnNode->get_text(pbstrText);
+}
+/********************************************************************
+ XmlGetAttribute
+*********************************************************************/
+extern "C" HRESULT DAPI XmlGetAttribute(
+    __in IXMLDOMNode* pixnNode,
+    __in_z LPCWSTR pwzAttribute,
+    __deref_out_z BSTR* pbstrAttributeValue
+    )
+{
+    Assert(pixnNode);
+    HRESULT hr = S_OK;
+    // RELEASEME
+    IXMLDOMNamedNodeMap* pixnnmAttributes = NULL;
+    IXMLDOMNode* pixnAttribute = NULL;
+    VARIANT varAttributeValue;
+    BSTR bstrAttribute = SysAllocString(pwzAttribute);
+    // INIT
+    ::VariantInit(&varAttributeValue);
+    // get attribute value from source
+    hr = pixnNode->get_attributes(&pixnnmAttributes);
+    XmlExitOnFailure(hr, "failed get_attributes");
+    hr = XmlGetNamedItem(pixnnmAttributes, bstrAttribute, &pixnAttribute);
+    if (S_FALSE == hr)
+    {
+        // hr = E_FAIL;
+        ExitFunction();
+    }
+    XmlExitOnFailure(hr, "failed getNamedItem in XmlGetAttribute(%ls)", pwzAttribute);
+    hr = pixnAttribute->get_nodeValue(&varAttributeValue);
+    XmlExitOnFailure(hr, "failed get_nodeValue in XmlGetAttribute(%ls)", pwzAttribute);
+    // steal the BSTR from the VARIANT
+    if (S_OK == hr && pbstrAttributeValue)
+    {
+        *pbstrAttributeValue = varAttributeValue.bstrVal;
+        varAttributeValue.bstrVal = NULL;
+    }
+LExit:
+    ReleaseObject(pixnnmAttributes);
+    ReleaseObject(pixnAttribute);
+    ReleaseVariant(varAttributeValue);
+    ReleaseBSTR(bstrAttribute);
+    return hr;
+}
+/********************************************************************
+ XmlGetAttributeEx
+*********************************************************************/
+HRESULT DAPI XmlGetAttributeEx(
+    __in IXMLDOMNode* pixnNode,
+    __in_z LPCWSTR wzAttribute,
+    __deref_out_z LPWSTR* psczAttributeValue
+    )
+{
+    Assert(pixnNode);
+    HRESULT hr = S_OK;
+    IXMLDOMNamedNodeMap* pixnnmAttributes = NULL;
+    IXMLDOMNode* pixnAttribute = NULL;
+    VARIANT varAttributeValue;
+    BSTR bstrAttribute = NULL;
+    ::VariantInit(&varAttributeValue);
+    // get attribute value from source
+    hr = pixnNode->get_attributes(&pixnnmAttributes);
+    XmlExitOnFailure(hr, "Failed get_attributes.");
+    bstrAttribute = ::SysAllocString(wzAttribute);
+    XmlExitOnNull(bstrAttribute, hr, E_OUTOFMEMORY, "Failed to allocate attribute name BSTR.");
+    hr = XmlGetNamedItem(pixnnmAttributes, bstrAttribute, &pixnAttribute);
+    if (S_FALSE == hr)
+    {
+        ExitFunction1(hr = E_NOTFOUND);
+    }
+    XmlExitOnFailure(hr, "Failed getNamedItem in XmlGetAttribute(%ls)", wzAttribute);
+    hr = pixnAttribute->get_nodeValue(&varAttributeValue);
+    if (S_FALSE == hr)
+    {
+        ExitFunction1(hr = E_NOTFOUND);
+    }
+    XmlExitOnFailure(hr, "Failed get_nodeValue in XmlGetAttribute(%ls)", wzAttribute);
+    // copy value
+    hr = StrAllocString(psczAttributeValue, varAttributeValue.bstrVal, 0);
+    XmlExitOnFailure(hr, "Failed to copy attribute value.");
+LExit:
+    ReleaseObject(pixnnmAttributes);
+    ReleaseObject(pixnAttribute);
+    ReleaseVariant(varAttributeValue);
+    ReleaseBSTR(bstrAttribute);
+    return hr;
+}
+/********************************************************************
+ XmlGetYesNoAttribute
+*********************************************************************/
+HRESULT DAPI XmlGetYesNoAttribute(
+    __in IXMLDOMNode* pixnNode,
+    __in_z LPCWSTR wzAttribute,
+    __out BOOL* pfYes
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczValue = NULL;
+    hr = XmlGetAttributeEx(pixnNode, wzAttribute, &sczValue);
+    if (E_NOTFOUND != hr)
+    {
+        XmlExitOnFailure(hr, "Failed to get attribute.");
+        *pfYes = CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, 0, sczValue, -1, L"yes", -1);
+    }
+LExit:
+    ReleaseStr(sczValue);
+    return hr;
+}
+/********************************************************************
+ XmlGetAttributeNumber
+*********************************************************************/
+extern "C" HRESULT DAPI XmlGetAttributeNumber(
+    __in IXMLDOMNode* pixnNode,
+    __in_z LPCWSTR pwzAttribute,
+    __out DWORD* pdwValue
+    )
+{
+    HRESULT hr = XmlGetAttributeNumberBase(pixnNode, pwzAttribute, 10, pdwValue);
+    return hr;
+}
+/********************************************************************
+ XmlGetAttributeNumberBase
+*********************************************************************/
+extern "C" HRESULT DAPI XmlGetAttributeNumberBase(
+    __in IXMLDOMNode* pixnNode,
+    __in_z LPCWSTR pwzAttribute,
+    __in int nBase,
+    __out DWORD* pdwValue
+    )
+{
+    HRESULT hr = S_OK;
+    BSTR bstrPointer = NULL;
+    hr = XmlGetAttribute(pixnNode, pwzAttribute, &bstrPointer);
+    XmlExitOnFailure(hr, "Failed to get value from attribute.");
+    if (S_OK == hr)
+    {
+        *pdwValue = wcstoul(bstrPointer, NULL, nBase);
+    }
+LExit:
+    ReleaseBSTR(bstrPointer);
+    return hr;
+}
+/********************************************************************
+ XmlGetAttributeLargeNumber
+*********************************************************************/
+extern "C" HRESULT DAPI XmlGetAttributeLargeNumber(
+    __in IXMLDOMNode* pixnNode,
+    __in_z LPCWSTR pwzAttribute,
+    __out DWORD64* pdw64Value
+    )
+{
+    HRESULT hr = S_OK;
+    BSTR bstrValue = NULL;
+    hr = XmlGetAttribute(pixnNode, pwzAttribute, &bstrValue);
+    XmlExitOnFailure(hr, "failed XmlGetAttribute");
+    if (S_OK == hr)
+    {
+        LONGLONG ll = 0;
+        hr = StrStringToInt64(bstrValue, 0, &ll);
+        XmlExitOnFailure(hr, "Failed to treat attribute value as number.");
+        *pdw64Value = ll;
+    }
+    else
+    {
+        *pdw64Value = 0;
+    }
+LExit:
+    ReleaseBSTR(bstrValue);
+    return hr;
+}
+/********************************************************************
+ XmlGetNamedItem -
+*********************************************************************/
+extern "C" HRESULT DAPI XmlGetNamedItem(
+    __in IXMLDOMNamedNodeMap *pixnmAttributes,
+    __in_opt LPCWSTR wzName,
+    __out IXMLDOMNode **ppixnNamedItem
+    )
+{
+    if (!pixnmAttributes || !ppixnNamedItem)
+    {
+        return E_INVALIDARG;
+    }
+    HRESULT hr = S_OK;
+    BSTR bstrName = ::SysAllocString(wzName);
+    XmlExitOnNull(bstrName, hr, E_OUTOFMEMORY, "failed SysAllocString");
+    hr = pixnmAttributes->getNamedItem(bstrName, ppixnNamedItem);
+LExit:
+    ReleaseBSTR(bstrName);
+    return hr;
+}
+/********************************************************************
+ XmlSetText -
+*********************************************************************/
+extern "C" HRESULT DAPI XmlSetText(
+    __in IXMLDOMNode *pixnNode,
+    __in_z LPCWSTR pwzText
+    )
+{
+    Assert(pixnNode && pwzText);
+    HRESULT hr = S_OK;
+    DOMNodeType dnType;
+    // RELEASEME
+    IXMLDOMDocument* pixdDocument = NULL;
+    IXMLDOMNodeList* pixnlNodeList = NULL;
+    IXMLDOMNode* pixnChildNode = NULL;
+    IXMLDOMText* pixtTextNode = NULL;
+    VARIANT varText;
+    ::VariantInit(&varText);
+    // find the text node
+    hr = pixnNode->get_childNodes(&pixnlNodeList);
+    XmlExitOnFailure(hr, "failed to get child nodes");
+    while (S_OK == (hr = pixnlNodeList->nextNode(&pixnChildNode)))
+    {
+        hr = pixnChildNode->get_nodeType(&dnType);
+        XmlExitOnFailure(hr, "failed to get node type");
+        if (NODE_TEXT == dnType)
+            break;
+        ReleaseNullObject(pixnChildNode);
+    }
+    if (S_FALSE == hr)
+    {
+        hr = S_OK;
+    }
+    if (pixnChildNode)
+    {
+        varText.vt = VT_BSTR;
+        varText.bstrVal = ::SysAllocString(pwzText);
+        if (!varText.bstrVal)
+        {
+            hr = HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY);
+        }
+        XmlExitOnFailure(hr, "failed SysAllocString in XmlSetText");
+        hr = pixnChildNode->put_nodeValue(varText);
+        XmlExitOnFailure(hr, "failed IXMLDOMNode::put_nodeValue");
+    }
+    else
+    {
+        hr = pixnNode->get_ownerDocument(&pixdDocument);
+        if (hr == S_FALSE)
+        {
+            hr = E_FAIL;
+        }
+        XmlExitOnFailure(hr, "failed get_ownerDocument in XmlSetAttribute");
+        hr = XmlCreateTextNode(pixdDocument, pwzText, &pixtTextNode);
+        XmlExitOnFailure(hr, "failed createTextNode in XmlSetText(%ls)", pwzText);
+        hr = pixnNode->appendChild(pixtTextNode, NULL);
+        XmlExitOnFailure(hr, "failed appendChild in XmlSetText(%ls)", pwzText);
+    }
+    hr = *pwzText ? S_OK : S_FALSE;
+LExit:
+    ReleaseObject(pixnlNodeList);
+    ReleaseObject(pixnChildNode);
+    ReleaseObject(pixdDocument);
+    ReleaseObject(pixtTextNode);
+    ReleaseVariant(varText);
+    return hr;
+}
+/********************************************************************
+ XmlSetTextNumber -
+*********************************************************************/
+extern "C" HRESULT DAPI XmlSetTextNumber(
+    __in IXMLDOMNode *pixnNode,
+    __in DWORD dwValue
+    )
+{
+    HRESULT hr = S_OK;
+    WCHAR wzValue[12];
+    hr = ::StringCchPrintfW(wzValue, countof(wzValue), L"%u", dwValue);
+    XmlExitOnFailure(hr, "Failed to format numeric value as string.");
+    hr = XmlSetText(pixnNode, wzValue);
+LExit:
+    return hr;
+}
+/********************************************************************
+ XmlCreateChild -
+*********************************************************************/
+extern "C" HRESULT DAPI XmlCreateChild(
+    __in IXMLDOMNode* pixnParent,
+    __in_z LPCWSTR pwzElementType,
+    __out IXMLDOMNode** ppixnChild
+    )
+{
+    HRESULT hr = S_OK;
+    // RELEASEME
+    IXMLDOMDocument* pixdDocument = NULL;
+    IXMLDOMNode* pixnChild = NULL;
+    hr = pixnParent->get_ownerDocument(&pixdDocument);
+    if (hr == S_FALSE)
+    {
+        hr = E_FAIL;
+    }
+    XmlExitOnFailure(hr, "failed get_ownerDocument");
+    hr = XmlCreateElement(pixdDocument, pwzElementType, (IXMLDOMElement**) &pixnChild);
+    if (hr == S_FALSE)
+    {
+        hr = E_FAIL;
+    }
+    XmlExitOnFailure(hr, "failed createElement");
+    pixnParent->appendChild(pixnChild,NULL);
+    if (hr == S_FALSE)
+    {
+        hr = E_FAIL;
+    }
+    XmlExitOnFailure(hr, "failed appendChild");
+    if (ppixnChild)
+    {
+        *ppixnChild = pixnChild;
+        pixnChild = NULL;
+    }
+LExit:
+    ReleaseObject(pixdDocument);
+    ReleaseObject(pixnChild);
+    return hr;
+}
+/********************************************************************
+ XmlRemoveAttribute -
+*********************************************************************/
+extern "C" HRESULT DAPI XmlRemoveAttribute(
+    __in IXMLDOMNode* pixnNode,
+    __in_z LPCWSTR pwzAttribute
+    )
+{
+    HRESULT hr = S_OK;
+    // RELEASEME
+    IXMLDOMNamedNodeMap* pixnnmAttributes = NULL;
+    BSTR bstrAttribute = ::SysAllocString(pwzAttribute);
+    XmlExitOnNull(bstrAttribute, hr, E_OUTOFMEMORY, "failed to allocate bstr for attribute in XmlRemoveAttribute");
+    hr = pixnNode->get_attributes(&pixnnmAttributes);
+    XmlExitOnFailure(hr, "failed get_attributes in RemoveXmlAttribute(%ls)", pwzAttribute);
+    hr = pixnnmAttributes->removeNamedItem(bstrAttribute, NULL);
+    XmlExitOnFailure(hr, "failed removeNamedItem in RemoveXmlAttribute(%ls)", pwzAttribute);
+LExit:
+    ReleaseObject(pixnnmAttributes);
+    ReleaseBSTR(bstrAttribute);
+    return hr;
+}
+/********************************************************************
+ XmlSelectNodes -
+*********************************************************************/
+extern "C" HRESULT DAPI XmlSelectNodes(
+    __in IXMLDOMNode* pixnParent,
+    __in_z LPCWSTR wzXPath,
+    __out IXMLDOMNodeList **ppixnlChildren
+    )
+{
+    HRESULT hr = S_OK;
+    BSTR bstrXPath = NULL;
+    XmlExitOnNull(pixnParent, hr, E_UNEXPECTED, "pixnParent parameter was null in XmlSelectNodes");
+    XmlExitOnNull(ppixnlChildren, hr, E_UNEXPECTED, "ppixnChild parameter was null in XmlSelectNodes");
+    bstrXPath = ::SysAllocString(wzXPath ? wzXPath : L"");
+    XmlExitOnNull(bstrXPath, hr, E_OUTOFMEMORY, "failed to allocate bstr for XPath expression in XmlSelectNodes");
+    hr = pixnParent->selectNodes(bstrXPath, ppixnlChildren);
+LExit:
+    ReleaseBSTR(bstrXPath);
+    return hr;
+}
+/********************************************************************
+ XmlNextAttribute - returns the next attribute in a node list
+ NOTE: pbstrAttribute is optional
+       returns S_OK if found an element
+       returns S_FALSE if no element found
+       returns E_* if something went wrong
+********************************************************************/
+extern "C" HRESULT DAPI XmlNextAttribute(
+    __in IXMLDOMNamedNodeMap* pixnnm,
+    __out IXMLDOMNode** pixnAttribute,
+    __deref_opt_out_z_opt BSTR* pbstrAttribute
+    )
+{
+    Assert(pixnnm && pixnAttribute);
+    HRESULT hr = S_OK;
+    IXMLDOMNode* pixn = NULL;
+    DOMNodeType nt;
+    // null out the return values
+    *pixnAttribute = NULL;
+    if (pbstrAttribute)
+    {
+        *pbstrAttribute = NULL;
+    }
+    hr = pixnnm->nextNode(&pixn);
+    XmlExitOnFailure(hr, "Failed to get next attribute.");
+    if (S_OK == hr)
+    {
+        hr = pixn->get_nodeType(&nt);
+        XmlExitOnFailure(hr, "failed to get node type");
+        if (NODE_ATTRIBUTE != nt)
+        {
+            hr = E_UNEXPECTED;
+            XmlExitOnFailure(hr, "Failed to get expected node type back: attribute");
+        }
+        // if the caller asked for the attribute name
+        if (pbstrAttribute)
+        {
+            hr = pixn->get_baseName(pbstrAttribute);
+            XmlExitOnFailure(hr, "failed to get attribute name");
+        }
+        *pixnAttribute = pixn;
+        pixn = NULL;
+    }
+LExit:
+    ReleaseObject(pixn);
+    return hr;
+}
+/********************************************************************
+ XmlNextElement - returns the next element in a node list
+ NOTE: pbstrElement is optional
+       returns S_OK if found an element
+       returns S_FALSE if no element found
+       returns E_* if something went wrong
+********************************************************************/
+extern "C" HRESULT DAPI XmlNextElement(
+    __in IXMLDOMNodeList* pixnl,
+    __out IXMLDOMNode** pixnElement,
+    __deref_opt_out_z_opt BSTR* pbstrElement
+    )
+{
+    Assert(pixnl && pixnElement);
+    HRESULT hr = S_OK;
+    IXMLDOMNode* pixn = NULL;
+    DOMNodeType nt;
+    // null out the return values
+    *pixnElement = NULL;
+    if (pbstrElement)
+    {
+        *pbstrElement = NULL;
+    }
+    //
+    // find the next element in the list
+    //
+    while (S_OK == (hr = pixnl->nextNode(&pixn)))
+    {
+        hr = pixn->get_nodeType(&nt);
+        XmlExitOnFailure(hr, "failed to get node type");
+        if (NODE_ELEMENT == nt)
+            break;
+        ReleaseNullObject(pixn);
+    }
+    XmlExitOnFailure(hr, "failed to get next element");
+    // if we have a node and the caller asked for the element name
+    if (pixn && pbstrElement)
+    {
+        hr = pixn->get_baseName(pbstrElement);
+        XmlExitOnFailure(hr, "failed to get element name");
+    }
+    *pixnElement = pixn;
+    pixn = NULL;
+    hr = *pixnElement ? S_OK : S_FALSE;
+LExit:
+    ReleaseObject(pixn);
+    return hr;
+}
+/********************************************************************
+ XmlRemoveChildren -
+*********************************************************************/
+extern "C" HRESULT DAPI XmlRemoveChildren(
+    __in IXMLDOMNode* pixnSource,
+    __in_z LPCWSTR pwzXPath
+    )
+{
+    HRESULT hr = S_OK;
+    // RELEASEME
+    IXMLDOMNodeList* pixnlNodeList = NULL;
+    IXMLDOMNode* pixnNode = NULL;
+    IXMLDOMNode* pixnRemoveChild = NULL;
+    if (pwzXPath)
+    {
+        hr = XmlSelectNodes(pixnSource, pwzXPath, &pixnlNodeList);
+        XmlExitOnFailure(hr, "failed XmlSelectNodes");
+    }
+    else
+    {
+        hr = pixnSource->get_childNodes(&pixnlNodeList);
+        XmlExitOnFailure(hr, "failed childNodes");
+    }
+    if (S_FALSE == hr)
+    {
+        ExitFunction();
+    }
+    while (S_OK == (hr = pixnlNodeList->nextNode(&pixnNode)))
+    {
+        hr = pixnSource->removeChild(pixnNode, &pixnRemoveChild);
+        XmlExitOnFailure(hr, "failed removeChild");
+        ReleaseNullObject(pixnRemoveChild);
+        ReleaseNullObject(pixnNode);
+    }
+    if (S_FALSE == hr)
+    {
+        hr = S_OK;
+    }
+LExit:
+    ReleaseObject(pixnlNodeList);
+    ReleaseObject(pixnNode);
+    ReleaseObject(pixnRemoveChild);
+    return hr;
+}
+/********************************************************************
+ XmlSaveDocument -
+*********************************************************************/
+extern "C" HRESULT DAPI XmlSaveDocument(
+    __in IXMLDOMDocument* pixdDocument,
+    __inout LPCWSTR wzPath
+    )
+{
+    HRESULT hr = S_OK;
+    // RELEASEME
+    VARIANT varsDestPath;
+    ::VariantInit(&varsDestPath);
+    varsDestPath.vt = VT_BSTR;
+    varsDestPath.bstrVal = ::SysAllocString(wzPath);
+    if (!varsDestPath.bstrVal)
+    {
+        hr = HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY);
+    }
+    XmlExitOnFailure(hr, "failed to create BSTR");
+    hr = pixdDocument->save(varsDestPath);
+    if (hr == S_FALSE)
+    {
+        hr = E_FAIL;
+    }
+    XmlExitOnFailure(hr, "failed save in WriteDocument");
+LExit:
+    ReleaseVariant(varsDestPath);
+    return hr;
+}
+/********************************************************************
+ XmlSaveDocumentToBuffer
+*********************************************************************/
+extern "C" HRESULT DAPI XmlSaveDocumentToBuffer(
+    __in IXMLDOMDocument* pixdDocument,
+    __deref_out_bcount(*pcbDest) BYTE** ppbDest,
+    __out DWORD* pcbDest
+    )
+{
+    HRESULT hr = S_OK;
+    IStream* pStream = NULL;
+    LARGE_INTEGER li = { };
+    STATSTG statstg = { };
+    BYTE* pbDest = NULL;
+    ULONG cbRead = 0;
+    VARIANT vtDestination;
+    ::VariantInit(&vtDestination);
+    // create stream
+    hr = ::CreateStreamOnHGlobal(NULL, TRUE, &pStream);
+    XmlExitOnFailure(hr, "Failed to create stream.");
+    // write document to stream
+    vtDestination.vt = VT_UNKNOWN;
+    vtDestination.punkVal = (IUnknown*)pStream;
+    hr = pixdDocument->save(vtDestination);
+    XmlExitOnFailure(hr, "Failed to save document.");
+    // get stream size
+    hr = pStream->Stat(&statstg, STATFLAG_NONAME);
+    XmlExitOnFailure(hr, "Failed to get stream size.");
+    // allocate buffer
+    pbDest = static_cast<BYTE*>(MemAlloc(statstg.cbSize.LowPart, TRUE));
+    XmlExitOnNull(pbDest, hr, E_OUTOFMEMORY, "Failed to allocate destination buffer.");
+    // read data from stream
+    li.QuadPart = 0;
+    hr = pStream->Seek(li, STREAM_SEEK_SET, NULL);
+    XmlExitOnFailure(hr, "Failed to seek stream.");
+    hr = pStream->Read(pbDest, statstg.cbSize.LowPart, &cbRead);
+    if (cbRead < statstg.cbSize.LowPart)
+    {
+        hr = E_FAIL;
+    }
+    XmlExitOnFailure(hr, "Failed to read stream content to buffer.");
+    // return value
+    *ppbDest = pbDest;
+    pbDest = NULL;
+    *pcbDest = statstg.cbSize.LowPart;
+LExit:
+    ReleaseObject(pStream);
+    ReleaseMem(pbDest);
+    return hr;
+}
diff --git a/src/libs/dutil/WixToolset.DUtil/xsd/thmutil.xsd b/src/libs/dutil/WixToolset.DUtil/xsd/thmutil.xsd
new file mode 100644
index 00000000..46c20e4a
--- /dev/null
+++ b/src/libs/dutil/WixToolset.DUtil/xsd/thmutil.xsd
@@ -0,0 +1,1188 @@
+<?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. -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+          xmlns:xse="http://wixtoolset.org/schemas/XmlSchemaExtension"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+    targetNamespace="http://wixtoolset.org/schemas/v4/thmutil"
+              xmlns="http://wixtoolset.org/schemas/v4/thmutil">
+    <xs:annotation>
+        <xs:documentation>
+            Schema for describing Theme files processed by thmutil.
+        </xs:documentation>
+    </xs:annotation>
+    <xs:import namespace="http://www.w3.org/1999/xhtml" />
+    <xs:element name="Theme">
+        <xs:annotation>
+            <xs:documentation>
+                This is the top-level container element for every thmutil Theme file.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="Font" maxOccurs="unbounded" />
+                <xs:element ref="Window" />
+            </xs:sequence>
+            <xs:attribute name="ImageFile" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        Relative path to an image file that can serve as a single source for images in the rest of the theme.
+                        This image is referenced by controls using the SourceX and SourceY attributes.
+                        Mutually exclusive with the ImageResource attribute.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="ImageResource" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        Identifier that references an image resource in the module for the window.
+                        Mutually exclusive with the ImageFile attribute.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Font">
+        <xs:annotation>
+            <xs:documentation>Defines a font including the size and color.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="xs:string">
+                    <xs:annotation>
+                        <xs:documentation>Name of the font face (required).</xs:documentation>
+                    </xs:annotation>
+                    <xs:attribute name="Id" type="xs:nonNegativeInteger" use="required">
+                        <xs:annotation>
+                            <xs:documentation>Numeric identifier for the font. Due to limitations in thmutil the first Font must start with "0" and each subsequent Font must increment the Id by 1. Failure to ensure the Font identifiers follow this strict ordering will create unexpected behavior or crashes.</xs:documentation>
+                        </xs:annotation>
+                    </xs:attribute>
+                    <xs:attribute name="Height" type="xs:int" use="required">
+                        <xs:annotation>
+                            <xs:documentation>Font size. Use negative numbers to specify the font in pixels.</xs:documentation>
+                        </xs:annotation>
+                    </xs:attribute>
+                    <xs:attribute name="Weight" type="xs:nonNegativeInteger">
+                        <xs:annotation>
+                            <xs:documentation>Font weight.</xs:documentation>
+                        </xs:annotation>
+                    </xs:attribute>
+                    <xs:attribute name="Foreground" type="FontColorType">
+                        <xs:annotation>
+                            <xs:documentation>
+                                A system color id or a hexadecimal value representing BGR foreground color of the font.
+                                "ffffff" is white, "ff0000" is pure blue, "00ff00" is pure green, "0000ff" is pure red, and "000000" is black.
+                                If this attribute is absent the foreground will be transparent.
+                                Supported system color ids are: btnface, btntext, graytext, highlight, highlighttext, hotlight, window, and windowtext.
+                            </xs:documentation>
+                        </xs:annotation>
+                    </xs:attribute>
+                    <xs:attribute name="Background" type="FontColorType">
+                        <xs:annotation>
+                            <xs:documentation>
+                                A system color id or a hexadecimal value representing BGR background color of the font.
+                                "ffffff" is white, "ff0000" is pure blue, "00ff00" is pure green, "0000ff" is pure red, and "000000" is black.
+                                If this attribute is absent the background will be transparent.
+                                Supported system color ids are: btnface, btntext, graytext, highlight, highlighttext, hotlight, window, and windowtext.
+                            </xs:documentation>
+                        </xs:annotation>
+                    </xs:attribute>
+                    <xs:attribute name="Underline" type="YesNoType">
+                        <xs:annotation>
+                            <xs:documentation>Specifies whether the font is underlined.</xs:documentation>
+                        </xs:annotation>
+                    </xs:attribute>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="ImageList">
+        <xs:annotation>
+            <xs:documentation>List of images which can be shared between multiple controls.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:choice maxOccurs="unbounded">
+                <xs:element ref="Image" />
+            </xs:choice>
+            <xs:attribute name="Name" type="xs:string" use="required">
+                <xs:annotation>
+                    <xs:documentation>
+                        Name of the ImageList, to be referenced by other controls.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Page">
+        <xs:annotation>
+            <xs:documentation>Named set of controls that can be shown and hidden collectively.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:group ref="ControlElements" maxOccurs="unbounded"/>
+            <xs:attribute name="Name" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        Optional name for the page.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Window">
+        <xs:annotation>
+            <xs:documentation>Defines the overall look of the main window.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="ImageList" />
+                <xs:element ref="Page" />
+                <xs:group ref="ControlElements" minOccurs="0" maxOccurs="unbounded" />
+            </xs:choice>
+            <xs:attribute name="AutoResize" type="YesNoType">
+                <xs:annotation>
+                    <xs:documentation>Specifies whether the ThmUtil default window proc should process WM_SIZE and WM_SIZING events.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Caption" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        Caption for the window.
+                        This is required if not using the StringId attribute.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="FontId" type="xs:nonNegativeInteger" use="required">
+                <xs:annotation>
+                    <xs:documentation>Numeric identifier to the Font element that serves as the default font for the window.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Height" type="xs:positiveInteger" use="required">
+                <xs:annotation>
+                    <xs:documentation>Height of the window's client area.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="HexStyle" type="xs:hexBinary">
+                <xs:annotation>
+                    <xs:documentation>
+                        Hexadecimal window style. If this is not specified the default value is: WS_OVERLAPPED | WS_VISIBLE | WS_MINIMIZEBOX | WS_SYSMENU.
+                        If SourceX and SourceY are specified, then WS_OVERLAPPED is replaced with WS_POPUP.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IconFile" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>Relative path to an icon file for the window. Mutually exclusive with IconResource and SourceX and SourceY attributes.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IconResource" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        Identifier that references an icon resource in the module for the icon for the window.
+                        Mutually exclusive with IconFile and SourceX and SourceY attributes.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="MinimumHeight" type="xs:positiveInteger">
+                <xs:annotation>
+                    <xs:documentation>Minimum height of the window. Only functions if AutoResize is enabled.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="MinimumWidth" type="xs:positiveInteger">
+                <xs:annotation>
+                    <xs:documentation>Minimum width of the window. Only functions if AutoResize is enabled.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="SourceX" type="xs:nonNegativeInteger">
+                <xs:annotation>
+                    <xs:documentation>X offset of the window background in the Theme/@ImageFile. Mutually exclusive with IconFile and IconResource.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="SourceY" type="xs:nonNegativeInteger">
+                <xs:annotation>
+                    <xs:documentation>Y offset of the window background in the Theme/@ImageFile. Mutually exclusive with IconFile and IconResource.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="StringId" type="xs:nonNegativeInteger">
+                <xs:annotation>
+                    <xs:documentation>
+                        Identifier that references a string resource in the module to define the window caption.
+                        Mutually exclusive with the Caption attribute.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Width" type="xs:positiveInteger" use="required">
+                <xs:annotation>
+                    <xs:documentation>Width of the window's client area.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Billboard">
+        <xs:annotation>
+            <xs:documentation>Defines a control that rotates through a set of images on a specified interval.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="Image" />
+            </xs:sequence>
+            <xs:attributeGroup ref="CommonControlAttributes" />
+            <xs:attribute name="Interval" type="xs:positiveInteger">
+                <xs:annotation>
+                    <xs:documentation>
+                        Specifies the time to wait before showing the next image, in milliseconds.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Loop" type="YesNoType">
+                <xs:annotation>
+                    <xs:documentation>Specifies whether the billboard should loop through the images infinitely.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Button">
+        <xs:annotation>
+            <xs:documentation>Defines a button.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:annotation>
+                <xs:documentation>
+                    Text to display in the button.
+                    Mutually exclusive with the StringId attribute and child Text elements.
+                </xs:documentation>
+            </xs:annotation>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation>
+                        If multiple Action elements are given, the conditions should be mutually exclusive (when multiple conditions are true, the behavior is undefined and could be changed at any time).
+                        If none of the conditions of the Action elements are true, then it uses the Action element without the Condition attribute.
+                    </xs:documentation>
+                </xs:annotation>
+                <xs:element ref="BrowseDirectoryAction" />
+                <xs:element ref="ChangePageAction" />
+                <xs:element ref="CloseWindowAction" />
+                <xs:element ref="Text" />
+                <xs:element ref="Tooltip" maxOccurs="1" />
+            </xs:choice>
+            <xs:attributeGroup ref="CommonControlAttributes" />
+            <xs:attribute name="FontId" type="xs:nonNegativeInteger" use="required">
+                <xs:annotation>
+                    <xs:documentation>Numeric identifier to the Font element that serves as the font for the control. Only valid when using graphic buttons.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="HoverFontId" type="xs:nonNegativeInteger">
+                <xs:annotation>
+                    <xs:documentation>Numeric identifier to the Font element that serves as the font when the control is hovered over. Only valid when using graphic buttons.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="ImageFile" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        Relative path to an image file to define a graphic button.
+                        The image must be 4x the height to represent the button in 4 states: unselected, hover, selected, focused.
+                        Mutually exclusive with ImageResource and SourceX and SourceY attributes.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="ImageResource" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        Identifier that references an image resource in the module to define a graphic button.
+                        The image must be 4x the height to represent the button in 4 states: unselected, hover, selected, focused.
+                        Mutually exclusive with ImageFile and SourceX and SourceY attributes.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="SelectedFontId" type="xs:nonNegativeInteger">
+                <xs:annotation>
+                    <xs:documentation>Numeric identifier to the Font element that serves as the font when the control is selected. Only valid when using graphic buttons.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="StringId" type="xs:nonNegativeInteger">
+                <xs:annotation>
+                    <xs:documentation>
+                        Identifier that references a string resource in the module to define the text for the control.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="BrowseDirectoryAction">
+        <xs:annotation>
+            <xs:documentation>
+                When the button is pressed, a directory browser dialog is shown.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attribute name="Condition" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        The condition that determines if the parent control will execute this action.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="VariableName" type="xs:string" use="required">
+                <xs:annotation>
+                    <xs:documentation>
+                        The name of the variable to update when the user selects a directory from the dialog.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="ChangePageAction">
+        <xs:annotation>
+            <xs:documentation>
+                When the button is pressed, the specified page is shown.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attribute name="Cancel" type="YesNoType">
+                <xs:annotation>
+                    <xs:documentation>
+                        When set to 'yes', none of the variable changes made on the current page are saved.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Condition" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        The condition that determines if the parent control will execute this action.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Page" type="xs:string" use="required">
+                <xs:annotation>
+                    <xs:documentation>
+                        The Name of the Page to show.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="CloseWindowAction">
+        <xs:annotation>
+            <xs:documentation>
+                When the button is pressed, the WM_CLOSE message is sent to the window.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attribute name="Condition" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        The condition that determines if the parent control will execute this action.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Checkbox">
+        <xs:annotation>
+            <xs:documentation>Defines a checkbox.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:annotation>
+                <xs:documentation>
+                    Text to display beside the checkbox.
+                    Mutually exclusive with the StringId attribute and child Text elements.
+                </xs:documentation>
+            </xs:annotation>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="Text" />
+                <xs:element ref="Tooltip" maxOccurs="1" />
+            </xs:choice>
+            <xs:attributeGroup ref="CommonControlAttributes" />
+            <xs:attribute name="FontId" type="xs:nonNegativeInteger" use="required">
+                <xs:annotation>
+                    <xs:documentation>Numeric identifier to the Font element that serves as the font for the control.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="StringId" type="xs:nonNegativeInteger">
+                <xs:annotation>
+                    <xs:documentation>
+                        Identifier that references a string resource in the module to define the text for the control.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Combobox">
+        <xs:annotation>
+            <xs:documentation>Defines a combobox.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attributeGroup ref="CommonControlAttributes" />
+            <xs:attribute name="FontId" type="xs:nonNegativeInteger" use="required">
+                <xs:annotation>
+                    <xs:documentation>Numeric identifier to the Font element that serves as the font for the control.</xs:documentation>
+                </xs:annotation>
+             </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="CommandLink">
+        <xs:annotation>
+            <xs:documentation>Defines a button.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:annotation>
+                <xs:documentation>
+                    Text to display in the button.
+                    Mutually exclusive with the StringId attribute and child Text elements.
+                </xs:documentation>
+            </xs:annotation>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation>
+                        If multiple Action elements are given, the conditions should be mutually exclusive (when multiple conditions are true, the behavior is undefined and could be changed at any time).
+                        If none of the conditions of the Action elements are true, then it uses the Action element without the Condition attribute.
+                    </xs:documentation>
+                </xs:annotation>
+                <xs:element ref="BrowseDirectoryAction" />
+                <xs:element ref="ChangePageAction" />
+                <xs:element ref="CloseWindowAction" />
+                <xs:element ref="Note" />
+                <xs:element ref="Text" />
+            </xs:choice>
+            <xs:attributeGroup ref="CommonControlAttributes" />
+            <xs:attribute name="FontId" type="xs:nonNegativeInteger" use="required">
+                <xs:annotation>
+                    <xs:documentation>Numeric identifier to the Font element that serves as the font for the control. Only valid when using graphic buttons.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IconFile" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        Relative path to an icon file to define a command link glyph.
+                        Mutually exclusive with ImageResource and SourceX and SourceY attributes.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IconResource" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        Identifier that references an icon resource in the module to define a command link glyph.
+                        Mutually exclusive with ImageFile and SourceX and SourceY attributes.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="ImageFile" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        Relative path to an image file to define a command link glyph.
+                        Mutually exclusive with ImageResource and SourceX and SourceY attributes.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="ImageResource" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        Identifier that references an image resource in the module to define a command link glyph.
+                        Mutually exclusive with ImageFile and SourceX and SourceY attributes.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="StringId" type="xs:nonNegativeInteger">
+                <xs:annotation>
+                    <xs:documentation>
+                        Identifier that references a string resource in the module to define the text for the control.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Editbox">
+        <xs:annotation>
+            <xs:documentation>Defines an edit box.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="xs:string">
+                    <xs:annotation>
+                        <xs:documentation>
+                            Initial text for the control.
+                            Mutually exclusive with the StringId attribute.
+                        </xs:documentation>
+                    </xs:annotation>
+                    <xs:attributeGroup ref="CommonControlAttributes" />
+                    <xs:attribute name="FileSystemAutoComplete" type="YesNoType">
+                        <xs:annotation>
+                            <xs:documentation>Specifies whether the edit box should auto-complete with file system paths.</xs:documentation>
+                        </xs:annotation>
+                    </xs:attribute>
+                    <xs:attribute name="FontId" type="xs:nonNegativeInteger" use="required">
+                        <xs:annotation>
+                            <xs:documentation>Numeric identifier to the Font element that serves as the font for the control.</xs:documentation>
+                        </xs:annotation>
+                    </xs:attribute>
+                    <xs:attribute name="StringId" type="xs:nonNegativeInteger">
+                        <xs:annotation>
+                            <xs:documentation>
+                                Identifier that references a string resource in the module to define the initial text for the control.
+                            </xs:documentation>
+                        </xs:annotation>
+                    </xs:attribute>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Hyperlink">
+        <xs:annotation>
+            <xs:documentation>Defines a hyperlink.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:annotation>
+                <xs:documentation>
+                    Text to display as the link.
+                    Mutually exclusive with the StringId attribute and child Text elements.
+                </xs:documentation>
+            </xs:annotation>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="Text" />
+                <xs:element ref="Tooltip" maxOccurs="1" />
+            </xs:choice>
+            <xs:attributeGroup ref="CommonControlAttributes" />
+            <xs:attribute name="FontId" type="xs:nonNegativeInteger" use="required">
+                <xs:annotation>
+                    <xs:documentation>Numeric identifier to the Font element that serves as the unselected font.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="HoverFontId" type="xs:nonNegativeInteger" use="required">
+                <xs:annotation>
+                    <xs:documentation>Numeric identifier to the Font element that serves as the font when the control is hovered over.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="SelectedFontId" type="xs:nonNegativeInteger" use="required">
+                <xs:annotation>
+                    <xs:documentation>Numeric identifier to the Font element that serves as the font when the control is selected.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="StringId" type="xs:nonNegativeInteger">
+                <xs:annotation>
+                    <xs:documentation>
+                        Identifier that references a string resource in the module to define the text for the control.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Hypertext">
+        <xs:annotation>
+            <xs:documentation>Defines a text block with support for HTML &lt;a&gt; tags.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:annotation>
+                <xs:documentation>
+                    Text to display as the link.
+                    Use HTML &lt;a href="URL"&gt; to create a link.
+                    Mutually exclusive with the StringId attribute and child Text elements.
+                </xs:documentation>
+            </xs:annotation>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="Text" />
+                <xs:element ref="Tooltip" maxOccurs="1" />
+            </xs:choice>
+            <xs:attributeGroup ref="CommonControlAttributes" />
+            <xs:attribute name="FontId" type="xs:nonNegativeInteger" use="required">
+                <xs:annotation>
+                    <xs:documentation>Numeric identifier to the Font element that serves as the font for the control.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="StringId" type="xs:nonNegativeInteger">
+                <xs:annotation>
+                    <xs:documentation>
+                        Identifier that references a string resource in the module to define the text for the control.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Image">
+        <xs:annotation>
+            <xs:documentation>Defines an image for an ImageList or Billboard.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attribute name="ImageFile" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>Relative path to an image file. Mutually exclusive with ImageResource.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="ImageResource" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>Identifier that references an image resource in the module. Mutually exclusive with ImageFile.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="ImageControl">
+        <xs:annotation>
+            <xs:documentation>Defines an image.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attributeGroup ref="CommonControlAttributes" />
+            <xs:attribute name="ImageFile" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>Relative path to an image file. Mutually exclusive with ImageResource and SourceX and SourceY attributes.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="ImageResource" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>Identifier that references an image resource in the module. Mutually exclusive with ImageFile and SourceX and SourceY attributes.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Label">
+        <xs:annotation>
+            <xs:documentation>Defines a label.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:annotation>
+                <xs:documentation>
+                    Text for the label to display.
+                    Mutually exclusive with the StringId attribute and child Text elements.
+                </xs:documentation>
+            </xs:annotation>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="Text" />
+                <xs:element ref="Tooltip" maxOccurs="1" />
+            </xs:choice>
+            <xs:attributeGroup ref="CommonControlAttributes" />
+            <xs:attribute name="Center" type="YesNoType" use="optional">
+                <xs:annotation>
+                    <xs:documentation>Specifies whether the text should be centered horizontally in the width of the control. Default is "no".</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="DisablePrefix" type="YesNoType" use="optional">
+                <xs:annotation>
+                    <xs:documentation>By default ampersands (&amp;) in the text will underline the next character and treat it as an accelerator key. Set this attribute to "yes" to disable that behavior. Default is "no".</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="FontId" type="xs:nonNegativeInteger" use="required">
+                <xs:annotation>
+                    <xs:documentation>Numeric identifier to the Font element that serves as the font for the control.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="StringId" type="xs:nonNegativeInteger">
+                <xs:annotation>
+                    <xs:documentation>
+                        Identifier that references a string resource in the module to define the text for the label.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="ListView">
+        <xs:annotation>
+            <xs:documentation>Defines a listview.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:choice maxOccurs="unbounded">
+                <xs:element ref="Column" />
+            </xs:choice>
+            <xs:attributeGroup ref="CommonControlAttributes" />
+            <xs:attribute name="FontId" type="xs:nonNegativeInteger">
+                <xs:annotation>
+                    <xs:documentation>Numeric identifier to the Font element that serves as the default font for the ListView.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="HexExtendedStyle" type="xs:hexBinary">
+                <xs:annotation>
+                    <xs:documentation>Hexadecimal extended window style.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="ImageList" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        The name of the ImageList to assign to this listview with type LVSIL_NORMAL.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="ImageListSmall" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        The name of the ImageList to assign to this listview with type LVSIL_SMALL.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="ImageListState" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        The name of the ImageList to assign to this listview with type LVSIL_STATE.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="ImageListGroupHeader" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        The name of the ImageList to assign to this listview with type LVSIL_GROUPHEADER.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Note">
+        <xs:annotation>
+            <xs:documentation>
+                Defines note text for a command link control based on an optional condition.
+                If multiple Note elements are given for one control, the conditions should be mutually exclusive (when multiple conditions are true, the behavior is undefined and may be changed at any time).
+                If none of the conditions of a control's Note elements are true, then it uses the text of the Note element without the Condition attribute.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="xs:string">
+                    <xs:annotation>
+                        <xs:documentation>
+                            Note text for the parent command link control.
+                        </xs:documentation>
+                    </xs:annotation>
+                    <xs:attribute name="Condition" type="xs:string">
+                        <xs:annotation>
+                            <xs:documentation>
+                                The condition that determines when the parent control will use this note text.
+                            </xs:documentation>
+                        </xs:annotation>
+                    </xs:attribute>
+                </xs:extension>                
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Panel">
+        <xs:annotation>
+            <xs:documentation>Defines a collection of controls.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:group ref="ControlElements" maxOccurs="unbounded"/>
+            <xs:attributeGroup ref="CommonControlAttributes" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Progressbar">
+        <xs:annotation>
+            <xs:documentation>Defines a progress bar.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attributeGroup ref="CommonControlAttributes" />
+            <xs:attribute name="ImageFile" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>Relative path to an image file for the control. The image must be 4 pixels wide: left pixel is the left side of progress bar, left middle pixel is progress used, right middle pixel is progress unused, right pixel is right side of progress bar. Mutually exclusive with ImageResource and SourceX and SourceY attributes.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="ImageResource" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>Identifier that references an image resource in the module for the control. The image must be 4 pixels wide: left pixel is the left side of progress bar, left middle pixel is progress used, right middle pixel is progress unused, right pixel is right side of progress bar. Mutually exclusive with ImageFile and SourceX and SourceY attributes.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="RadioButton">
+        <xs:annotation>
+            <xs:documentation>Defines an individual radio button within a set of radio buttons.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:annotation>
+                <xs:documentation>
+                    Text to display beside the radio button.
+                    Mutually exclusive with the StringId attribute and child Text elements.
+                </xs:documentation>
+            </xs:annotation>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="Text" />
+                <xs:element ref="Tooltip" maxOccurs="1" />
+            </xs:choice>
+            <xs:attributeGroup ref="CommonControlAttributes" />
+            <xs:attribute name="FontId" type="xs:nonNegativeInteger" use="required">
+                <xs:annotation>
+                    <xs:documentation>Numeric identifier to the Font element that serves as the font for the control.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="StringId" type="xs:nonNegativeInteger">
+                <xs:annotation>
+                    <xs:documentation>
+                        Identifier that references a string resource in the module to define the text for the control.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="Value" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>Optional value used when setting the variable associated with the set of radio buttons.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="RadioButtons">
+        <xs:annotation>
+            <xs:documentation>Defines a set of radio buttons.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:choice maxOccurs="unbounded">
+                <xs:element ref="RadioButton" />
+            </xs:choice>
+            <xs:attribute name="Name" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>Optional variable name for the set of radio buttons.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Richedit">
+        <xs:annotation>
+            <xs:documentation>Defines a rich edit control.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:annotation>
+                <xs:documentation>
+                    Initial text for the control.
+                    Mutually exclusive with the StringId attribute.
+                </xs:documentation>
+            </xs:annotation>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="Text" />
+                <xs:element ref="Tooltip" maxOccurs="1" />
+            </xs:choice>
+            <xs:attributeGroup ref="CommonControlAttributes" />
+            <xs:attribute name="FontId" type="xs:nonNegativeInteger" use="required">
+                <xs:annotation>
+                    <xs:documentation>
+                        Numeric identifier to the Font element that serves as the font for the control.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="StringId" type="xs:nonNegativeInteger">
+                <xs:annotation>
+                    <xs:documentation>
+                        Identifier that references a string resource in the module to define the initial text for the control.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Static">
+        <xs:annotation>
+            <xs:documentation>Defines a straight line.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attributeGroup ref="CommonControlAttributes" />
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Tab">
+        <xs:annotation>
+            <xs:documentation>Defines an individual tab within a set of tabs.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="xs:string">
+                    <xs:annotation>
+                        <xs:documentation>
+                            Caption of the tab.
+                            Mutually exclusive with the StringId attribute.
+                        </xs:documentation>
+                    </xs:annotation>
+                    <xs:attribute name="StringId" type="xs:nonNegativeInteger">
+                        <xs:annotation>
+                            <xs:documentation>
+                                Identifier that references a string resource in the module to define the caption of the tab.
+                            </xs:documentation>
+                        </xs:annotation>
+                    </xs:attribute>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Tabs">
+        <xs:annotation>
+            <xs:documentation>Defines a set of tabs.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:choice maxOccurs="unbounded">
+                <xs:element ref="Tab" />
+            </xs:choice>
+            <xs:attributeGroup ref="CommonControlAttributes" />
+            <xs:attribute name="FontId" type="xs:nonNegativeInteger" use="required">
+                <xs:annotation>
+                    <xs:documentation>Numeric identifier to the Font element that serves as the font for the control.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Text">
+        <xs:annotation>
+            <xs:documentation>
+                Defines text for the parent control based on an optional condition.
+                If multiple Text elements are given for one control, the conditions should be mutually exclusive (when multiple conditions are true, the behavior is undefined and may be changed at any time).
+                If none of the conditions of a control's Text elements are true, then it uses the text of the Text element without the Condition attribute.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="xs:string">
+                    <xs:annotation>
+                        <xs:documentation>
+                            Text for the parent control.
+                        </xs:documentation>
+                    </xs:annotation>
+                    <xs:attribute name="Condition" type="xs:string">
+                        <xs:annotation>
+                            <xs:documentation>
+                                The condition that determines when the parent control will use this text.
+                            </xs:documentation>
+                        </xs:annotation>
+                    </xs:attribute>
+                </xs:extension>                
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Tooltip">
+        <xs:annotation>
+            <xs:documentation>
+                Defines text for the parent control's tooltip.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="xs:string">
+                    <xs:annotation>
+                        <xs:documentation>
+                            Text for the parent control's tooltip.
+                        </xs:documentation>
+                    </xs:annotation>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="TreeView">
+        <xs:annotation>
+            <xs:documentation>Defines a treeview.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:attributeGroup ref="CommonControlAttributes"/>
+            <xs:attribute name="AlwaysShowSelect">
+                <xs:annotation>
+                    <xs:documentation>Specifies whether the row always appears selected even when the treeview has lost focus.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="EnableDragDrop">
+                <xs:annotation>
+                    <xs:documentation>Specifies whether drag and drop is enabled for the treeview.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="FullRowSelect">
+                <xs:annotation>
+                    <xs:documentation>Specifies whether an entire row is selected for the treeview.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="HasButtons">
+                <xs:annotation>
+                    <xs:documentation>Specifies whether the treeview will show buttons.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="HasLines">
+                <xs:annotation>
+                    <xs:documentation>Specifies whether lines appear for all treeview items.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="LinesAtRoot">
+                <xs:annotation>
+                    <xs:documentation>Specifies whether the root nodes have lines beside them.</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="Column">
+        <xs:annotation>
+            <xs:documentation>A column of a list.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="xs:string">
+                    <xs:annotation>
+                        <xs:documentation>
+                            Text for the column header.
+                            Mutually exclusive with the StringId attribute.
+                        </xs:documentation>
+                    </xs:annotation>
+                    <xs:attribute name="Width" type="xs:int">
+                        <xs:annotation>
+                            <xs:documentation>Width of the column.</xs:documentation>
+                        </xs:annotation>
+                    </xs:attribute>
+                    <xs:attribute name="Expands" type="YesNoType">
+                        <xs:annotation>
+                            <xs:documentation>
+                                Whether or not this column can grow to fill available width of the listview.
+                                More than one column can be marked with yes - all expandable columns will share available extra space.
+                                This is especially useful if the Window/@AutoResize is yes.
+                            </xs:documentation>
+                        </xs:annotation>
+                    </xs:attribute>
+                    <xs:attribute name="StringId" type="xs:nonNegativeInteger">
+                        <xs:annotation>
+                            <xs:documentation>
+                                Identifier that references a string resource in the module to define the text for the column header.
+                            </xs:documentation>
+                        </xs:annotation>
+                    </xs:attribute>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+    <xs:group name="ControlElements">
+        <xs:choice>
+            <xs:element ref="Billboard" />
+            <xs:element ref="Button" />
+            <xs:element ref="Checkbox" />
+            <xs:element ref="Combobox" />
+            <xs:element ref="CommandLink" />
+            <xs:element ref="Editbox" />
+            <xs:element ref="Hyperlink" />
+            <xs:element ref="Hypertext" />
+            <xs:element ref="ImageControl" />
+            <xs:element ref="Label" />
+            <xs:element ref="ListView" />
+            <xs:element ref="Panel" />
+            <xs:element ref="Progressbar" />
+            <xs:element ref="RadioButtons" />
+            <xs:element ref="Richedit" />
+            <xs:element ref="Static" />
+            <xs:element ref="Tabs" />
+            <xs:element ref="TreeView" />
+        </xs:choice>
+    </xs:group>
+    <xs:attributeGroup name="CommonControlAttributes">
+        <xs:attribute name="Name" type="xs:string">
+            <xs:annotation>
+                <xs:documentation>Optional name for the control.</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="DisableAutomaticBehavior" type="YesNoType">
+            <xs:annotation>
+                <xs:documentation>Set to 'yes' to disable automatic variable getting and setting, EnableCondition, VisibleCondition, and conditional Text elements. The default is 'no'.</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="EnableCondition" type="xs:string">
+            <xs:annotation>
+                <xs:documentation>A condition that determines if the control is enabled.  If this condition is true or omitted, then the control will be enabled.</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="Height" type="xs:int" use="required">
+            <xs:annotation>
+                <xs:documentation>Height of the control. Non-positive values extend the control to the bottom of the window minus the value.</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="HexStyle" type="xs:hexBinary">
+            <xs:annotation>
+                <xs:documentation>Hexadecimal window style for the control.</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="HideWhenDisabled" type="YesNoType">
+            <xs:annotation>
+                <xs:documentation>Specifies whether the control should be hidden when disabled.</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="TabStop" type="YesNoType">
+            <xs:annotation>
+                <xs:documentation>Specifies whether the control is part of the tab sequence of controls.</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="Visible" type="YesNoType">
+            <xs:annotation>
+                <xs:documentation>Specifies whether the control is initially visible.</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="VisibleCondition" type="xs:string">
+            <xs:annotation>
+                <xs:documentation>
+                    A condition that determines if the control is visible.  If this condition is true or omitted, then the control will be visible.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="Width" type="xs:int" use="required">
+            <xs:annotation>
+                <xs:documentation>Width of the control. Non-positive values extend the control to the right of the window minus the value.</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="X" type="xs:int" use="required">
+            <xs:annotation>
+                <xs:documentation>X coordinate for the control from the left of the window. Negative values are coordinates from the right of the window minus the width of the control.</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="Y" type="xs:int" use="required">
+            <xs:annotation>
+                <xs:documentation>Y coordinate for the control from the top of the window. Negative values are coordinates from the bottom of the window minus the height of the control.</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:attributeGroup>
+    <xs:simpleType name="YesNoType">
+        <xs:annotation>
+            <xs:documentation>Values of this type will either be "yes" or "no".</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="no"/>
+            <xs:enumeration value="yes"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="SystemColorType">
+        <xs:annotation>
+            <xs:documentation>
+                Indicates a system color for a font.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="btnface" />
+            <xs:enumeration value="btntext" />
+            <xs:enumeration value="graytext" />
+            <xs:enumeration value="highlight" />
+            <xs:enumeration value="highlighttext" />
+            <xs:enumeration value="hotlight" />
+            <xs:enumeration value="window" />
+            <xs:enumeration value="windowtext" />
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="FontColorType">
+        <xs:annotation>
+            <xs:documentation>
+                Indicates the foreground or background color of a font.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:union memberTypes="SystemColorType xs:string"/>
+    </xs:simpleType>
+</xs:schema>
diff --git a/src/libs/dutil/appveyor.cmd b/src/libs/dutil/appveyor.cmd
new file mode 100644
index 00000000..85476b8e
--- /dev/null
+++ b/src/libs/dutil/appveyor.cmd
@@ -0,0 +1,24 @@
+@setlocal
+@pushd %~dp0
+@set _C=Release
+@if /i "%1"=="debug" set _C=Debug
+nuget restore || exit /b
+msbuild -t:Test -p:Configuration=%_C% src\test\DUtilUnitTest || exit /b
+msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140 || exit /b
+msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 || exit /b
+msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 || exit /b
+msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 || exit /b
+msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 || exit /b
+msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 || exit /b
+msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 || exit /b
+msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 || exit /b
+msbuild -p:Configuration=%_C% -t:PackNative src\dutil\dutil.vcxproj || exit /b
+@popd
+@endlocal
+\ No newline at end of file
diff --git a/src/libs/dutil/appveyor.yml b/src/libs/dutil/appveyor.yml
new file mode 100644
index 00000000..f602d07c
--- /dev/null
+++ b/src/libs/dutil/appveyor.yml
@@ -0,0 +1,44 @@
+# 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
+test: off
+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/libs/dutil/dutil.sln b/src/libs/dutil/dutil.sln
new file mode 100644
index 00000000..433f42a5
--- /dev/null
+++ b/src/libs/dutil/dutil.sln
@@ -0,0 +1,47 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30711.63
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dutil", "src\dutil\dutil.vcxproj", "{1244E671-F108-4334-BA52-8A7517F26ECD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DUtilUnitTest", "src\test\DUtilUnitTest\DUtilUnitTest.vcxproj", "{AB7EE608-E5FB-42A5-831F-0DEEEA141223}"
+EndProject
+Global
+        GlobalSection(SolutionConfigurationPlatforms) = preSolution
+                Debug|ARM64 = Debug|ARM64
+                Debug|x64 = Debug|x64
+                Debug|x86 = Debug|x86
+                Release|ARM64 = Release|ARM64
+                Release|x64 = Release|x64
+                Release|x86 = Release|x86
+        EndGlobalSection
+        GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|ARM64.ActiveCfg = Debug|ARM64
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|ARM64.Build.0 = Debug|ARM64
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x64.ActiveCfg = Debug|x64
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x64.Build.0 = Debug|x64
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x86.ActiveCfg = Debug|Win32
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Debug|x86.Build.0 = Debug|Win32
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|ARM64.ActiveCfg = Release|ARM64
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|ARM64.Build.0 = Release|ARM64
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x64.ActiveCfg = Release|x64
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x64.Build.0 = Release|x64
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x86.ActiveCfg = Release|Win32
+                {1244E671-F108-4334-BA52-8A7517F26ECD}.Release|x86.Build.0 = Release|Win32
+                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Debug|ARM64.ActiveCfg = Debug|Win32
+                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Debug|x64.ActiveCfg = Debug|Win32
+                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Debug|x86.ActiveCfg = Debug|Win32
+                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Debug|x86.Build.0 = Debug|Win32
+                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Release|ARM64.ActiveCfg = Release|Win32
+                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Release|x64.ActiveCfg = Release|Win32
+                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Release|x86.ActiveCfg = Release|Win32
+                {AB7EE608-E5FB-42A5-831F-0DEEEA141223}.Release|x86.Build.0 = Release|Win32
+        EndGlobalSection
+        GlobalSection(SolutionProperties) = preSolution
+                HideSolutionNode = FALSE
+        EndGlobalSection
+        GlobalSection(ExtensibilityGlobals) = postSolution
+                SolutionGuid = {DD209744-C40E-4C34-8CB4-BC6B71F9A133}
+        EndGlobalSection
+EndGlobal
diff --git a/src/libs/dutil/nuget.config b/src/libs/dutil/nuget.config
new file mode 100644
index 00000000..d5ef8952
--- /dev/null
+++ b/src/libs/dutil/nuget.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" />
+    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
+</configuration>
+\ No newline at end of file
diff --git a/src/libs/dutil/test/DUtilUnitTest/ApupUtilTests.cpp b/src/libs/dutil/test/DUtilUnitTest/ApupUtilTests.cpp
new file mode 100644
index 00000000..30a45f5a
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/ApupUtilTests.cpp
@@ -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.
+#include "precomp.h"
+using namespace System;
+using namespace Xunit;
+using namespace WixBuildTools::TestSupport;
+namespace DutilTests
+{
+    public ref class ApupUtil
+    {
+    public:
+        [Fact]
+        void AllocChainFromAtomSortsDescending()
+        {
+            HRESULT hr = S_OK;
+            ATOM_FEED* pFeed = NULL;
+            APPLICATION_UPDATE_CHAIN* pChain = NULL;
+            DutilInitialize(&DutilTestTraceError);
+            try
+            {
+                XmlInitialize();
+                NativeAssert::Succeeded(hr, "Failed to initialize Xml.");
+                pin_ptr<const wchar_t> feedFilePath = PtrToStringChars(TestData::Get("TestData", "ApupUtilTests", "FeedBv2.0.xml"));
+                hr = AtomParseFromFile(feedFilePath, &pFeed);
+                NativeAssert::Succeeded(hr, "Failed to parse feed: {0}", feedFilePath);
+                hr = ApupAllocChainFromAtom(pFeed, &pChain);
+                NativeAssert::Succeeded(hr, "Failed to get chain from feed.");
+                Assert::Equal(3ul, pChain->cEntries);
+                NativeAssert::StringEqual(L"Bundle v2.0", pChain->rgEntries[0].wzTitle);
+                NativeAssert::StringEqual(L"Bundle v1.0", pChain->rgEntries[1].wzTitle);
+                NativeAssert::StringEqual(L"Bundle v1.0-preview", pChain->rgEntries[2].wzTitle);
+            }
+            finally
+            {
+                DutilUninitialize();
+            }
+        }
+    };
+}
diff --git a/src/libs/dutil/test/DUtilUnitTest/AssemblyInfo.cpp b/src/libs/dutil/test/DUtilUnitTest/AssemblyInfo.cpp
new file mode 100644
index 00000000..2d527910
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/AssemblyInfo.cpp
@@ -0,0 +1,12 @@
+// 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.
+#include "precomp.h"
+using namespace System::Reflection;
+using namespace System::Runtime::CompilerServices;
+using namespace System::Runtime::InteropServices;
+[assembly: AssemblyTitleAttribute("Windows Installer XML Dutil unit tests")];
+[assembly: AssemblyDescriptionAttribute("Dutil unit tests")];
+[assembly: AssemblyCultureAttribute("")];
+[assembly: ComVisible(false)];
diff --git a/src/libs/dutil/test/DUtilUnitTest/DUtilTests.cpp b/src/libs/dutil/test/DUtilUnitTest/DUtilTests.cpp
new file mode 100644
index 00000000..55e81d46
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/DUtilTests.cpp
@@ -0,0 +1,35 @@
+// 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.
+#include "precomp.h"
+using namespace System;
+using namespace Xunit;
+using namespace WixBuildTools::TestSupport;
+namespace DutilTests
+{
+    public ref class DUtil
+    {
+    public:
+        [Fact]
+        void DUtilTraceErrorSourceFiltersOnTraceLevel()
+        {
+            DutilInitialize(&DutilTestTraceError);
+            CallDutilTraceErrorSource();
+            Dutil_TraceSetLevel(REPORT_DEBUG, FALSE);
+            Action^ action = gcnew Action(this, &DUtil::CallDutilTraceErrorSource);
+            Assert::Throws<Exception^>(action);
+            DutilUninitialize();
+        }
+    private:
+        void CallDutilTraceErrorSource()
+        {
+            Dutil_TraceErrorSource(__FILE__, __LINE__, REPORT_DEBUG, DUTIL_SOURCE_EXTERNAL, E_FAIL, "Error message");
+        }
+    };
+}
diff --git a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
new file mode 100644
index 00000000..18410e5d
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
@@ -0,0 +1,99 @@
+<?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" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props')" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes>
+    <ProjectGuid>{AB7EE608-E5FB-42A5-831F-0DEEEA141223}</ProjectGuid>
+    <RootNamespace>DUtilUnitTests</RootNamespace>
+    <Keyword>ManagedCProj</Keyword>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <CLRSupport>true</CLRSupport>
+    <SignOutput>false</SignOutput>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <PropertyGroup>
+    <ProjectAdditionalIncludeDirectories>..\..\dutil\inc</ProjectAdditionalIncludeDirectories>
+    <ProjectAdditionalLinkLibraries>rpcrt4.lib;Mpr.lib;Ws2_32.lib;urlmon.lib;wininet.lib</ProjectAdditionalLinkLibraries>
+  </PropertyGroup>
+  <ItemGroup>
+    <ClCompile Include="ApupUtilTests.cpp" />
+    <ClCompile Include="AssemblyInfo.cpp" />
+    <ClCompile Include="DictUtilTest.cpp" />
+    <ClCompile Include="DirUtilTests.cpp" />
+    <ClCompile Include="DUtilTests.cpp" />
+    <ClCompile Include="error.cpp" />
+    <ClCompile Include="FileUtilTest.cpp" />
+    <ClCompile Include="GuidUtilTest.cpp" />
+    <ClCompile Include="IniUtilTest.cpp" />
+    <ClCompile Include="MemUtilTest.cpp" />
+    <ClCompile Include="MonUtilTest.cpp" />
+    <ClCompile Include="PathUtilTest.cpp" />
+    <ClCompile Include="precomp.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+      <!-- Warnings from referencing netstandard dlls -->
+      <DisableSpecificWarnings>4564;4691</DisableSpecificWarnings>
+    </ClCompile>
+    <ClCompile Include="SceUtilTest.cpp" Condition=" Exists('$(SqlCESdkIncludePath)') " />
+    <ClCompile Include="StrUtilTest.cpp" />
+    <ClCompile Include="UriUtilTest.cpp" />
+    <ClCompile Include="VerUtilTests.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="precomp.h" />
+    <ClInclude Include="error.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <ResourceCompile Include="UnitTest.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="TestData\ApupUtilTests\FeedBv2.0.xml" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="WixBuildTools.TestSupport">
+      <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.47\lib\net472\WixBuildTools.TestSupport.dll</HintPath>
+    </Reference>
+    <Reference Include="WixBuildTools.TestSupport.Native">
+      <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\dutil\dutil.vcxproj">
+      <Project>{1244E671-F108-4334-BA52-8A7517F26ECD}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets'))" />
+  </Target>
+</Project>
+\ No newline at end of file
diff --git a/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
new file mode 100644
index 00000000..4df7af89
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj.filters
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="ApupUtilTests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="AssemblyInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DictUtilTest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DirUtilTests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DUtilTests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="error.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="FileUtilTest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="GuidUtilTest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="IniUtilTest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MemUtilTest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MonUtilTest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PathUtilTest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="precomp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="StrUtilTest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="UriUtilTest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="VerUtilTests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="UnitTest.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="precomp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="error.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/libs/dutil/test/DUtilUnitTest/DictUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/DictUtilTest.cpp
new file mode 100644
index 00000000..4b4777d7
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/DictUtilTest.cpp
@@ -0,0 +1,191 @@
+// 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.
+#include "precomp.h"
+using namespace System;
+using namespace Xunit;
+using namespace WixBuildTools::TestSupport;
+const DWORD numIterations = 100000;
+namespace DutilTests
+{
+    struct Value
+    {
+        DWORD dwNum;
+        LPWSTR sczKey;
+    };
+    public ref class DictUtil
+    {
+    public:
+        [Fact]
+        void DictUtilTest()
+        {
+            DutilInitialize(&DutilTestTraceError);
+            EmbeddedKeyTestHelper(DICT_FLAG_NONE, numIterations);
+            EmbeddedKeyTestHelper(DICT_FLAG_CASEINSENSITIVE, numIterations);
+            StringListTestHelper(DICT_FLAG_NONE, numIterations);
+            StringListTestHelper(DICT_FLAG_CASEINSENSITIVE, numIterations);
+            DutilUninitialize();
+        }
+    private:
+        void EmbeddedKeyTestHelper(DICT_FLAG dfFlags, DWORD dwNumIterations)
+        {
+            HRESULT hr = S_OK;
+            Value *rgValues = NULL;
+            Value *valueFound = NULL;
+            DWORD cValues = 0;
+            LPWSTR sczExpectedKey = NULL;
+            STRINGDICT_HANDLE sdValues = NULL;
+            try
+            {
+                hr = DictCreateWithEmbeddedKey(&sdValues, 0, (void **)&rgValues, offsetof(Value, sczKey), dfFlags);
+                NativeAssert::Succeeded(hr, "Failed to create dictionary of values");
+                for (DWORD i = 0; i < dwNumIterations; ++i)
+                {
+                    cValues++;
+                    hr = MemEnsureArraySize((void **)&rgValues, cValues, sizeof(Value), 5);
+                    NativeAssert::Succeeded(hr, "Failed to grow value array");
+                    hr = StrAllocFormatted(&rgValues[i].sczKey, L"%u_a_%u", i, i);
+                    NativeAssert::Succeeded(hr, "Failed to allocate key for value {0}", i);
+                    hr = DictAddValue(sdValues, rgValues + i);
+                    NativeAssert::Succeeded(hr, "Failed to add item {0} to dict", i);
+                }
+                for (DWORD i = 0; i < dwNumIterations; ++i)
+                {
+                    hr = StrAllocFormatted(&sczExpectedKey, L"%u_a_%u", i, i);
+                    NativeAssert::Succeeded(hr, "Failed to allocate expected key {0}", i);
+                    hr = DictGetValue(sdValues, sczExpectedKey, (void **)&valueFound);
+                    NativeAssert::Succeeded(hr, "Failed to find value {0}", sczExpectedKey);
+                    NativeAssert::StringEqual(sczExpectedKey, valueFound->sczKey);
+                    hr = StrAllocFormatted(&sczExpectedKey, L"%u_A_%u", i, i);
+                    NativeAssert::Succeeded(hr, "Failed to allocate uppercase expected key {0}", i);
+                    hr = DictGetValue(sdValues, sczExpectedKey, (void **)&valueFound);
+                    if (dfFlags & DICT_FLAG_CASEINSENSITIVE)
+                    {
+                        NativeAssert::Succeeded(hr, "Failed to find value {0}", sczExpectedKey);
+                        NativeAssert::StringEqual(sczExpectedKey, valueFound->sczKey, TRUE);
+                    }
+                    else
+                    {
+                        if (E_NOTFOUND != hr)
+                        {
+                            hr = E_FAIL;
+                            ExitOnFailure(hr, "This embedded key is case sensitive, but it seemed to have found something case using case insensitivity!: %ls", sczExpectedKey);
+                        }
+                    }
+                    hr = StrAllocFormatted(&sczExpectedKey, L"%u_b_%u", i, i);
+                    NativeAssert::Succeeded(hr, "Failed to allocate unexpected key {0}", i);
+                    hr = DictGetValue(sdValues, sczExpectedKey, (void **)&valueFound);
+                    if (E_NOTFOUND != hr)
+                    {
+                        hr = E_FAIL;
+                        ExitOnFailure(hr, "Item shouldn't have been found in dictionary: %ls", sczExpectedKey);
+                    }
+                }
+            }
+            finally
+            {
+                for (DWORD i = 0; i < cValues; ++i)
+                {
+                    ReleaseStr(rgValues[i].sczKey);
+                }
+                ReleaseMem(rgValues);
+                ReleaseStr(sczExpectedKey);
+                ReleaseDict(sdValues);
+            }
+        LExit:
+            return;
+        }
+        void StringListTestHelper(DICT_FLAG dfFlags, DWORD dwNumIterations)
+        {
+            HRESULT hr = S_OK;
+            LPWSTR sczKey = NULL;
+            LPWSTR sczExpectedKey = NULL;
+            STRINGDICT_HANDLE sdValues = NULL;
+            try
+            {
+                hr = DictCreateStringList(&sdValues, 0, dfFlags);
+                NativeAssert::Succeeded(hr, "Failed to create dictionary of keys");
+                for (DWORD i = 0; i < dwNumIterations; ++i)
+                {
+                    hr = StrAllocFormatted(&sczKey, L"%u_a_%u", i, i);
+                    NativeAssert::Succeeded(hr, "Failed to allocate key for value {0}", i);
+                    hr = DictAddKey(sdValues, sczKey);
+                    NativeAssert::Succeeded(hr, "Failed to add key {0} to dict", i);
+                }
+                for (DWORD i = 0; i < dwNumIterations; ++i)
+                {
+                    hr = StrAllocFormatted(&sczExpectedKey, L"%u_a_%u", i, i);
+                    NativeAssert::Succeeded(hr, "Failed to allocate expected key {0}", i);
+                    hr = DictKeyExists(sdValues, sczExpectedKey);
+                    NativeAssert::Succeeded(hr, "Failed to find value {0}", sczExpectedKey);
+                    hr = StrAllocFormatted(&sczExpectedKey, L"%u_A_%u", i, i);
+                    NativeAssert::Succeeded(hr, "Failed to allocate uppercase expected key {0}", i);
+                    hr = DictKeyExists(sdValues, sczExpectedKey);
+                    if (dfFlags & DICT_FLAG_CASEINSENSITIVE)
+                    {
+                        NativeAssert::Succeeded(hr, "Failed to find value {0}", sczExpectedKey);
+                    }
+                    else
+                    {
+                        if (E_NOTFOUND != hr)
+                        {
+                            hr = E_FAIL;
+                            ExitOnFailure(hr, "This stringlist dict is case sensitive, but it seemed to have found something case using case insensitivity!: %ls", sczExpectedKey);
+                        }
+                    }
+                    hr = StrAllocFormatted(&sczExpectedKey, L"%u_b_%u", i, i);
+                    NativeAssert::Succeeded(hr, "Failed to allocate unexpected key {0}", i);
+                    hr = DictKeyExists(sdValues, sczExpectedKey);
+                    if (E_NOTFOUND != hr)
+                    {
+                        hr = E_FAIL;
+                        ExitOnFailure(hr, "Item shouldn't have been found in dictionary: %ls", sczExpectedKey);
+                    }
+                }                
+            }
+            finally
+            {
+                ReleaseStr(sczKey);
+                ReleaseStr(sczExpectedKey);
+                ReleaseDict(sdValues);
+            }
+        LExit:
+            return;
+        }
+    };
+}
diff --git a/src/libs/dutil/test/DUtilUnitTest/DirUtilTests.cpp b/src/libs/dutil/test/DUtilUnitTest/DirUtilTests.cpp
new file mode 100644
index 00000000..7643366f
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/DirUtilTests.cpp
@@ -0,0 +1,70 @@
+// 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.
+#include "precomp.h"
+using namespace System;
+using namespace Xunit;
+using namespace WixBuildTools::TestSupport;
+namespace DutilTests
+{
+    public ref class DirUtil
+    {
+    public:
+        [Fact]
+        void DirUtilTest()
+        {
+            HRESULT hr = S_OK;
+            LPWSTR sczCurrentDir = NULL;
+            LPWSTR sczGuid = NULL;
+            LPWSTR sczFolder = NULL;
+            LPWSTR sczSubFolder = NULL;
+            try
+            {
+                hr = GuidCreate(&sczGuid);
+                NativeAssert::Succeeded(hr, "Failed to create guid.");
+                hr = DirGetCurrent(&sczCurrentDir);
+                NativeAssert::Succeeded(hr, "Failed to get current directory.");
+                hr = PathConcat(sczCurrentDir, sczGuid, &sczFolder);
+                NativeAssert::Succeeded(hr, "Failed to combine current directory: '{0}' with Guid: '{1}'", sczCurrentDir, sczGuid);
+                BOOL fExists = DirExists(sczFolder, NULL);
+                Assert::False(fExists == TRUE);
+                hr = PathConcat(sczFolder, L"foo", &sczSubFolder);
+                NativeAssert::Succeeded(hr, "Failed to combine folder: '%ls' with subfolder: 'foo'", sczFolder);
+                hr = DirEnsureExists(sczSubFolder, NULL);
+                NativeAssert::Succeeded(hr, "Failed to create multiple directories: %ls", sczSubFolder);
+                // Test failure to delete non-empty folder.
+                hr = DirEnsureDelete(sczFolder, FALSE, FALSE);
+                Assert::Equal(HRESULT_FROM_WIN32(ERROR_DIR_NOT_EMPTY), hr);
+                hr = DirEnsureDelete(sczSubFolder, FALSE, FALSE);
+                NativeAssert::Succeeded(hr, "Failed to delete single directory: %ls", sczSubFolder);
+                // Put the directory back and we'll test deleting tree.
+                hr = DirEnsureExists(sczSubFolder, NULL);
+                NativeAssert::Succeeded(hr, "Failed to create single directory: %ls", sczSubFolder);
+                hr = DirEnsureDelete(sczFolder, FALSE, TRUE);
+                NativeAssert::Succeeded(hr, "Failed to delete directory tree: %ls", sczFolder);
+                // Finally, try to create "C:\" which would normally fail, but we want success
+                hr = DirEnsureExists(L"C:\\", NULL);
+                NativeAssert::Succeeded(hr, "Failed to create C:\\");
+            }
+            finally
+            {
+                ReleaseStr(sczSubFolder);
+                ReleaseStr(sczFolder);
+                ReleaseStr(sczGuid);
+                ReleaseStr(sczCurrentDir);
+            }
+        }
+    };
+}
diff --git a/src/libs/dutil/test/DUtilUnitTest/FileUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/FileUtilTest.cpp
new file mode 100644
index 00000000..ac071ef2
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/FileUtilTest.cpp
@@ -0,0 +1,125 @@
+// 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.
+#include "precomp.h"
+using namespace System;
+using namespace Xunit;
+using namespace WixBuildTools::TestSupport;
+namespace DutilTests
+{
+    public ref class FileUtil
+    {
+    public:
+        [Fact(Skip="Skipped until we have a good way to reference ANSI.txt.")]
+        void FileUtilTest()
+        {
+            HRESULT hr = S_OK;
+            LPWSTR sczTempDir = NULL;
+            LPWSTR sczFileDir = NULL;
+            DutilInitialize(&DutilTestTraceError);
+            try
+            {
+                hr = PathExpand(&sczTempDir, L"%TEMP%\\FileUtilTest\\", PATH_EXPAND_ENVIRONMENT);
+                NativeAssert::Succeeded(hr, "Failed to get temp dir");
+                hr = PathExpand(&sczFileDir, L"%WIX_ROOT%\\examples\\data\\TextEncodings\\", PATH_EXPAND_ENVIRONMENT);
+                NativeAssert::Succeeded(hr, "Failed to get path to encodings file dir");
+                hr = DirEnsureExists(sczTempDir, NULL);
+                NativeAssert::Succeeded(hr, "Failed to ensure directory exists: {0}", sczTempDir);
+                TestFile(sczFileDir, sczTempDir, L"ANSI.txt", 32, FILE_ENCODING_UTF8);
+                // Big endian not supported today!
+                //TestFile(sczFileDir, L"UnicodeBENoBOM.txt", 34);
+                //TestFile(sczFileDir, L"UnicodeBEWithBOM.txt", 34);
+                TestFile(sczFileDir, sczTempDir, L"UnicodeLENoBOM.txt", 34, FILE_ENCODING_UTF16);
+                TestFile(sczFileDir, sczTempDir, L"UnicodeLEWithBOM.txt", 34, FILE_ENCODING_UTF16_WITH_BOM);
+                TestFile(sczFileDir, sczTempDir, L"UTF8WithSignature.txt", 34, FILE_ENCODING_UTF8_WITH_BOM);
+                hr = DirEnsureDelete(sczTempDir, TRUE, TRUE);
+            }
+            finally
+            {
+                ReleaseStr(sczTempDir);
+                ReleaseStr(sczFileDir);
+                DutilUninitialize();
+            }
+        }
+    private:
+        void TestFile(LPWSTR wzDir, LPCWSTR wzTempDir, LPWSTR wzFileName, size_t cbExpectedStringLength, FILE_ENCODING feExpectedEncoding)
+        {
+            HRESULT hr = S_OK;
+            LPWSTR sczFullPath = NULL;
+            LPWSTR sczContents = NULL;
+            LPWSTR sczOutputPath = NULL;
+            FILE_ENCODING feEncodingFound = FILE_ENCODING_UNSPECIFIED;
+            BYTE *pbFile1 = NULL;
+            DWORD cbFile1 = 0;
+            BYTE *pbFile2 = NULL;
+            DWORD cbFile2 = 0;
+            size_t cbActualStringLength = 0;
+            try
+            {
+                hr = PathConcat(wzDir, wzFileName, &sczFullPath);
+                NativeAssert::Succeeded(hr, "Failed to create path to test file: {0}", sczFullPath);
+                hr = FileToString(sczFullPath, &sczContents, &feEncodingFound);
+                hr = E_FAIL;
+                NativeAssert::Succeeded(hr, "Failed to read text from file: {0}", sczFullPath);
+                if (!sczContents)
+                {
+                    hr = E_FAIL;
+                    NativeAssert::Succeeded(hr, "FileToString() returned NULL for file: {0}", sczFullPath);
+                }
+                hr = ::StringCchLengthW(sczContents, STRSAFE_MAX_CCH, &cbActualStringLength);
+                NativeAssert::Succeeded(hr, "Failed to get length of text from file: {0}", sczFullPath);
+                if (cbActualStringLength != cbExpectedStringLength)
+                {
+                    hr = E_FAIL;
+                    ExitOnFailure(hr, "FileToString() returned wrong size for file: %ls (expected size %Iu, found size %Iu)", sczFullPath, cbExpectedStringLength, cbActualStringLength);
+                }
+                if (feEncodingFound != feExpectedEncoding)
+                {
+                    hr = E_FAIL;
+                    ExitOnFailure(hr, "FileToString() returned unexpected encoding type for file: %ls (expected type %u, found type %u)", sczFullPath, feExpectedEncoding, feEncodingFound);
+                }
+                hr = PathConcat(wzTempDir, wzFileName, &sczOutputPath);
+                NativeAssert::Succeeded(hr, "Failed to get output path");
+                hr = FileFromString(sczOutputPath, 0, sczContents, feExpectedEncoding);
+                NativeAssert::Succeeded(hr, "Failed to write contents of file back out to disk");
+                hr = FileRead(&pbFile1, &cbFile1, sczFullPath);
+                NativeAssert::Succeeded(hr, "Failed to read input file as binary");
+                hr = FileRead(&pbFile2, &cbFile2, sczOutputPath);
+                NativeAssert::Succeeded(hr, "Failed to read output file as binary");
+                if (cbFile1 != cbFile2 || 0 != memcmp(pbFile1, pbFile2, cbFile1))
+                {
+                    hr = E_FAIL;
+                    ExitOnFailure(hr, "Outputted file doesn't match input file: \"%ls\" and \"%ls\"", sczFullPath, sczOutputPath);
+                }
+            }
+            finally
+            {
+                ReleaseStr(sczOutputPath);
+                ReleaseStr(sczFullPath);
+                ReleaseStr(sczContents);
+            }
+        LExit:
+            return;
+        }
+    };
+}
diff --git a/src/libs/dutil/test/DUtilUnitTest/GuidUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/GuidUtilTest.cpp
new file mode 100644
index 00000000..a6e27a09
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/GuidUtilTest.cpp
@@ -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.
+#include "precomp.h"
+using namespace System;
+using namespace Xunit;
+using namespace WixBuildTools::TestSupport;
+namespace DutilTests
+{
+    public ref class GuidUtil
+    {
+    public:
+        [Fact]
+        void GuidCreateTest()
+        {
+            HRESULT hr = S_OK;
+            WCHAR wzGuid1[GUID_STRING_LENGTH];
+            WCHAR wzGuid2[GUID_STRING_LENGTH];
+            hr = GuidFixedCreate(wzGuid1);
+            NativeAssert::Succeeded(hr, "Failed to create first guid.");
+            Guid firstGuid = Guid::Parse(gcnew String(wzGuid1));
+            hr = GuidFixedCreate(wzGuid2);
+            NativeAssert::Succeeded(hr, "Failed to create second guid.");
+            Guid secondGuid = Guid::Parse(gcnew String(wzGuid2));
+            NativeAssert::NotStringEqual(wzGuid1, wzGuid2);
+            NativeAssert::NotEqual(firstGuid, secondGuid);
+        }
+        [Fact]
+        void GuidCreateSczTest()
+        {
+            HRESULT hr = S_OK;
+            LPWSTR sczGuid1 = NULL;
+            LPWSTR sczGuid2 = NULL;
+            try
+            {
+                hr = GuidCreate(&sczGuid1);
+                NativeAssert::Succeeded(hr, "Failed to create first guid.");
+                Guid firstGuid = Guid::Parse(gcnew String(sczGuid1));
+                hr = GuidCreate(&sczGuid2);
+                NativeAssert::Succeeded(hr, "Failed to create second guid.");
+                Guid secondGuid = Guid::Parse(gcnew String(sczGuid2));
+                NativeAssert::NotStringEqual(sczGuid1, sczGuid2);
+                NativeAssert::NotEqual(firstGuid, secondGuid);
+            }
+            finally
+            {
+                ReleaseStr(sczGuid1);
+                ReleaseStr(sczGuid2);
+            }
+        }
+    };
+}
diff --git a/src/libs/dutil/test/DUtilUnitTest/IniUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/IniUtilTest.cpp
new file mode 100644
index 00000000..946f19c5
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/IniUtilTest.cpp
@@ -0,0 +1,345 @@
+// 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.
+#include "precomp.h"
+using namespace System;
+using namespace Xunit;
+using namespace WixBuildTools::TestSupport;
+typedef HRESULT (__clrcall *IniFormatParameters)(
+    INI_HANDLE
+    );
+namespace DutilTests
+{
+    public ref class IniUtil
+    {
+    public:
+        [Fact]
+        void IniUtilTest()
+        {
+            HRESULT hr = S_OK;
+            LPWSTR sczTempIniFilePath = NULL;
+            LPWSTR sczTempIniFileDir = NULL;
+            LPWSTR wzIniContents = L"           PlainValue             =       \t      Blah               \r\n;CommentHere\r\n[Section1]\r\n     ;Another Comment With = Equal Sign\r\nSection1ValueA=Foo\r\n\r\nSection1ValueB=Bar\r\n[Section2]\r\nSection2ValueA=Cha\r\nArray[0]=Arr\r\n";
+            LPWSTR wzScriptContents = L"setf ~PlainValue Blah\r\n;CommentHere\r\n\r\nsetf ~Section1\\Section1ValueA Foo\r\n\r\nsetf ~Section1\\Section1ValueB Bar\r\nsetf ~Section2\\Section2ValueA Cha\r\nsetf ~Section2\\Array[0] Arr\r\n";
+            DutilInitialize(&DutilTestTraceError);
+            try
+            {
+                hr = PathExpand(&sczTempIniFilePath, L"%TEMP%\\IniUtilTest\\Test.ini", PATH_EXPAND_ENVIRONMENT);
+                NativeAssert::Succeeded(hr, "Failed to get path to temp INI file");
+                hr = PathGetDirectory(sczTempIniFilePath, &sczTempIniFileDir);
+                NativeAssert::Succeeded(hr, "Failed to get directory to temp INI file");
+                hr = DirEnsureDelete(sczTempIniFileDir, TRUE, TRUE);
+                if (E_PATHNOTFOUND == hr)
+                {
+                    hr = S_OK;
+                }
+                NativeAssert::Succeeded(hr, "Failed to delete IniUtilTest directory: {0}", sczTempIniFileDir);
+                hr = DirEnsureExists(sczTempIniFileDir, NULL);
+                NativeAssert::Succeeded(hr, "Failed to ensure temp directory exists: {0}", sczTempIniFileDir);
+                // Tests parsing, then modifying a regular INI file
+                TestReadThenWrite(sczTempIniFilePath, StandardIniFormat, wzIniContents);
+                // Tests programmatically creating from scratch, then parsing an INI file
+                TestWriteThenRead(sczTempIniFilePath, StandardIniFormat);
+                // Tests parsing, then modifying a regular INI file
+                TestReadThenWrite(sczTempIniFilePath, ScriptFormat, wzScriptContents);
+                // Tests programmatically creating from scratch, then parsing an INI file
+                TestWriteThenRead(sczTempIniFilePath, ScriptFormat);
+            }
+            finally
+            {
+                ReleaseStr(sczTempIniFilePath);
+                ReleaseStr(sczTempIniFileDir);
+                DutilUninitialize();
+            }
+        }
+    private:
+        void AssertValue(INI_HANDLE iniHandle, LPCWSTR wzValueName, LPCWSTR wzValue)
+        {
+            HRESULT hr = S_OK;
+            LPWSTR sczValue = NULL;
+            try
+            {
+                hr = IniGetValue(iniHandle, wzValueName, &sczValue);
+                NativeAssert::Succeeded(hr, "Failed to get ini value: {0}", wzValueName);
+                if (0 != wcscmp(sczValue, wzValue))
+                {
+                    hr = E_FAIL;
+                    ExitOnFailure(hr, "Expected to find value in INI: '%ls'='%ls' - but found value '%ls' instead", wzValueName, wzValue, sczValue);
+                }
+            }
+            finally
+            {
+                ReleaseStr(sczValue);
+            }
+        LExit:
+            return;
+        }
+        void AssertNoValue(INI_HANDLE iniHandle, LPCWSTR wzValueName)
+        {
+            HRESULT hr = S_OK;
+            LPWSTR sczValue = NULL;
+            try
+            {
+                hr = IniGetValue(iniHandle, wzValueName, &sczValue);
+                if (E_NOTFOUND != hr)
+                {
+                    if (SUCCEEDED(hr))
+                    {
+                        hr = E_FAIL;
+                    }
+                    ExitOnFailure(hr, "INI value shouldn't have been found: %ls", wzValueName);
+                }
+            }
+            finally
+            {
+                ReleaseStr(sczValue);
+            }
+        LExit:
+            return;
+        }
+        static HRESULT StandardIniFormat(__inout INI_HANDLE iniHandle)
+        {
+            HRESULT hr = S_OK;
+            hr = IniSetOpenTag(iniHandle, L"[", L"]");
+            NativeAssert::Succeeded(hr, "Failed to set open tag settings on ini handle");
+            hr = IniSetValueStyle(iniHandle, NULL, L"=");
+            NativeAssert::Succeeded(hr, "Failed to set value separator setting on ini handle");
+            hr = IniSetCommentStyle(iniHandle, L";");
+            NativeAssert::Succeeded(hr, "Failed to set comment style setting on ini handle");
+            return hr;
+        }
+        static HRESULT ScriptFormat(__inout INI_HANDLE iniHandle)
+        {
+            HRESULT hr = S_OK;
+            hr = IniSetValueStyle(iniHandle, L"setf ~", L" ");
+            NativeAssert::Succeeded(hr, "Failed to set value separator setting on ini handle");
+            return hr;
+        }
+        void TestReadThenWrite(LPWSTR wzIniFilePath, IniFormatParameters SetFormat, LPCWSTR wzContents)
+        {
+            HRESULT hr = S_OK;
+            INI_HANDLE iniHandle = NULL;
+            INI_HANDLE iniHandle2 = NULL;
+            INI_VALUE *rgValues = NULL;
+            DWORD cValues = 0;
+            try
+            {
+                hr = FileWrite(wzIniFilePath, 0, reinterpret_cast<LPCBYTE>(wzContents), lstrlenW(wzContents) * sizeof(WCHAR), NULL);
+                NativeAssert::Succeeded(hr, "Failed to write out INI file");
+                hr = IniInitialize(&iniHandle);
+                NativeAssert::Succeeded(hr, "Failed to initialize INI object");
+                hr = SetFormat(iniHandle);
+                NativeAssert::Succeeded(hr, "Failed to set parameters for INI file");
+                hr = IniParse(iniHandle, wzIniFilePath, NULL);
+                NativeAssert::Succeeded(hr, "Failed to parse INI file");
+                hr = IniGetValueList(iniHandle, &rgValues, &cValues);
+                NativeAssert::Succeeded(hr, "Failed to get list of values in INI");
+                NativeAssert::Equal<DWORD>(5, cValues);
+                AssertValue(iniHandle, L"PlainValue", L"Blah");
+                AssertNoValue(iniHandle, L"PlainValue2");
+                AssertValue(iniHandle, L"Section1\\Section1ValueA", L"Foo");
+                AssertValue(iniHandle, L"Section1\\Section1ValueB", L"Bar");
+                AssertValue(iniHandle, L"Section2\\Section2ValueA", L"Cha");
+                AssertNoValue(iniHandle, L"Section1\\ValueDoesntExist");
+                AssertValue(iniHandle, L"Section2\\Array[0]", L"Arr");
+                hr = IniSetValue(iniHandle, L"PlainValue2", L"Blah2");
+                NativeAssert::Succeeded(hr, "Failed to set value in INI");
+                hr = IniSetValue(iniHandle, L"Section1\\CreatedValue", L"Woo");
+                NativeAssert::Succeeded(hr, "Failed to set value in INI");
+                hr = IniSetValue(iniHandle, L"Section2\\Array[0]", L"Arrmod");
+                NativeAssert::Succeeded(hr, "Failed to set value in INI");
+                hr = IniGetValueList(iniHandle, &rgValues, &cValues);
+                NativeAssert::Succeeded(hr, "Failed to get list of values in INI");
+                NativeAssert::Equal<DWORD>(7, cValues);
+                AssertValue(iniHandle, L"PlainValue", L"Blah");
+                AssertValue(iniHandle, L"PlainValue2", L"Blah2");
+                AssertValue(iniHandle, L"Section1\\Section1ValueA", L"Foo");
+                AssertValue(iniHandle, L"Section1\\Section1ValueB", L"Bar");
+                AssertValue(iniHandle, L"Section2\\Section2ValueA", L"Cha");
+                AssertNoValue(iniHandle, L"Section1\\ValueDoesntExist");
+                AssertValue(iniHandle, L"Section1\\CreatedValue", L"Woo");
+                AssertValue(iniHandle, L"Section2\\Array[0]", L"Arrmod");
+                // Try deleting a value as well
+                hr = IniSetValue(iniHandle, L"Section1\\Section1ValueB", NULL);
+                NativeAssert::Succeeded(hr, "Failed to kill value in INI");
+                hr = IniWriteFile(iniHandle, NULL, FILE_ENCODING_UNSPECIFIED);
+                NativeAssert::Succeeded(hr, "Failed to write ini file back out to disk");
+                ReleaseNullIni(iniHandle);
+                // Now re-parse the INI we just wrote and make sure it matches the values we expect
+                hr = IniInitialize(&iniHandle2);
+                NativeAssert::Succeeded(hr, "Failed to initialize INI object");
+                hr = SetFormat(iniHandle2);
+                NativeAssert::Succeeded(hr, "Failed to set parameters for INI file");
+                hr = IniParse(iniHandle2, wzIniFilePath, NULL);
+                NativeAssert::Succeeded(hr, "Failed to parse INI file");
+                hr = IniGetValueList(iniHandle2, &rgValues, &cValues);
+                NativeAssert::Succeeded(hr, "Failed to get list of values in INI");
+                NativeAssert::Equal<DWORD>(6, cValues);
+                AssertValue(iniHandle2, L"PlainValue", L"Blah");
+                AssertValue(iniHandle2, L"PlainValue2", L"Blah2");
+                AssertValue(iniHandle2, L"Section1\\Section1ValueA", L"Foo");
+                AssertNoValue(iniHandle2, L"Section1\\Section1ValueB");
+                AssertValue(iniHandle2, L"Section2\\Section2ValueA", L"Cha");
+                AssertNoValue(iniHandle2, L"Section1\\ValueDoesntExist");
+                AssertValue(iniHandle2, L"Section1\\CreatedValue", L"Woo");
+                AssertValue(iniHandle2, L"Section2\\Array[0]", L"Arrmod");
+            }
+            finally
+            {
+                ReleaseIni(iniHandle);
+                ReleaseIni(iniHandle2);
+            }
+        }
+        void TestWriteThenRead(LPWSTR wzIniFilePath, IniFormatParameters SetFormat)
+        {
+            HRESULT hr = S_OK;
+            INI_HANDLE iniHandle = NULL;
+            INI_HANDLE iniHandle2 = NULL;
+            INI_VALUE *rgValues = NULL;
+            DWORD cValues = 0;
+            try
+            {
+                hr = FileEnsureDelete(wzIniFilePath);
+                NativeAssert::Succeeded(hr, "Failed to ensure file is deleted");
+                hr = IniInitialize(&iniHandle);
+                NativeAssert::Succeeded(hr, "Failed to initialize INI object");
+                hr = SetFormat(iniHandle);
+                NativeAssert::Succeeded(hr, "Failed to set parameters for INI file");
+                hr = IniGetValueList(iniHandle, &rgValues, &cValues);
+                NativeAssert::Succeeded(hr, "Failed to get list of values in INI");
+                
+                NativeAssert::Equal<DWORD>(0, cValues);
+                hr = IniSetValue(iniHandle, L"Value1", L"BlahTypo");
+                NativeAssert::Succeeded(hr, "Failed to set value in INI");
+                hr = IniSetValue(iniHandle, L"Value2", L"Blah2");
+                NativeAssert::Succeeded(hr, "Failed to set value in INI");
+                hr = IniSetValue(iniHandle, L"Section1\\Value1", L"Section1Value1");
+                NativeAssert::Succeeded(hr, "Failed to set value in INI");
+                hr = IniSetValue(iniHandle, L"Section1\\Value2", L"Section1Value2");
+                NativeAssert::Succeeded(hr, "Failed to set value in INI");
+                hr = IniSetValue(iniHandle, L"Section2\\Value1", L"Section2Value1");
+                NativeAssert::Succeeded(hr, "Failed to set value in INI");
+                hr = IniSetValue(iniHandle, L"Section2\\Array[0]", L"Arr");
+                NativeAssert::Succeeded(hr, "Failed to set value in INI");
+                hr = IniSetValue(iniHandle, L"Value3", L"Blah3");
+                NativeAssert::Succeeded(hr, "Failed to set value in INI");
+                hr = IniSetValue(iniHandle, L"Value4", L"Blah4");
+                NativeAssert::Succeeded(hr, "Failed to set value in INI");
+                hr = IniSetValue(iniHandle, L"Value4", NULL);
+                NativeAssert::Succeeded(hr, "Failed to set value in INI");
+                hr = IniSetValue(iniHandle, L"Value1", L"Blah1");
+                NativeAssert::Succeeded(hr, "Failed to set value in INI");
+                hr = IniGetValueList(iniHandle, &rgValues, &cValues);
+                NativeAssert::Succeeded(hr, "Failed to get list of values in INI");
+                NativeAssert::Equal<DWORD>(8, cValues);
+                AssertValue(iniHandle, L"Value1", L"Blah1");
+                AssertValue(iniHandle, L"Value2", L"Blah2");
+                AssertValue(iniHandle, L"Value3", L"Blah3");
+                AssertNoValue(iniHandle, L"Value4");
+                AssertValue(iniHandle, L"Section1\\Value1", L"Section1Value1");
+                AssertValue(iniHandle, L"Section1\\Value2", L"Section1Value2");
+                AssertValue(iniHandle, L"Section2\\Value1", L"Section2Value1");
+                AssertValue(iniHandle, L"Section2\\Array[0]", L"Arr");
+                hr = IniWriteFile(iniHandle, wzIniFilePath, FILE_ENCODING_UNSPECIFIED);
+                NativeAssert::Succeeded(hr, "Failed to write ini file back out to disk");
+                ReleaseNullIni(iniHandle);
+                // Now re-parse the INI we just wrote and make sure it matches the values we expect
+                hr = IniInitialize(&iniHandle2);
+                NativeAssert::Succeeded(hr, "Failed to initialize INI object");
+                hr = SetFormat(iniHandle2);
+                NativeAssert::Succeeded(hr, "Failed to set parameters for INI file");
+                hr = IniParse(iniHandle2, wzIniFilePath, NULL);
+                NativeAssert::Succeeded(hr, "Failed to parse INI file");
+                hr = IniGetValueList(iniHandle2, &rgValues, &cValues);
+                NativeAssert::Succeeded(hr, "Failed to get list of values in INI");
+                NativeAssert::Equal<DWORD>(7, cValues);
+                AssertValue(iniHandle2, L"Value1", L"Blah1");
+                AssertValue(iniHandle2, L"Value2", L"Blah2");
+                AssertValue(iniHandle2, L"Value3", L"Blah3");
+                AssertNoValue(iniHandle2, L"Value4");
+                AssertValue(iniHandle2, L"Section1\\Value1", L"Section1Value1");
+                AssertValue(iniHandle2, L"Section1\\Value2", L"Section1Value2");
+                AssertValue(iniHandle2, L"Section2\\Value1", L"Section2Value1");
+                AssertValue(iniHandle2, L"Section2\\Array[0]", L"Arr");
+            }
+            finally
+            {
+                ReleaseIni(iniHandle);
+                ReleaseIni(iniHandle2);
+            }
+        }
+    };
+}
diff --git a/src/libs/dutil/test/DUtilUnitTest/MemUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/MemUtilTest.cpp
new file mode 100644
index 00000000..09692bfb
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/MemUtilTest.cpp
@@ -0,0 +1,505 @@
+// 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.
+#include "precomp.h"
+using namespace System;
+using namespace Xunit;
+using namespace WixBuildTools::TestSupport;
+namespace DutilTests
+{
+    struct ArrayValue
+    {
+        DWORD dwNum;
+        void *pvNull1;
+        LPWSTR sczString;
+        void *pvNull2;
+    };
+    public ref class MemUtil
+    {
+    public:
+        [Fact]
+        void MemUtilAppendTest()
+        {
+            HRESULT hr = S_OK;
+            DWORD dwSize;
+            ArrayValue *rgValues = NULL;
+            DWORD cValues = 0;
+            DutilInitialize(&DutilTestTraceError);
+            try
+            {
+                hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), cValues + 1, sizeof(ArrayValue), 5);
+                NativeAssert::Succeeded(hr, "Failed to grow array size to 1");
+                ++cValues;
+                SetItem(rgValues + 0, 0);
+                hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), cValues + 1, sizeof(ArrayValue), 5);
+                NativeAssert::Succeeded(hr, "Failed to grow array size to 2");
+                ++cValues;
+                SetItem(rgValues + 1, 1);
+                hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), cValues + 1, sizeof(ArrayValue), 5);
+                NativeAssert::Succeeded(hr, "Failed to grow array size to 3");
+                ++cValues;
+                SetItem(rgValues + 2, 2);
+                hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), cValues + 1, sizeof(ArrayValue), 5);
+                NativeAssert::Succeeded(hr, "Failed to grow array size to 4");
+                ++cValues;
+                SetItem(rgValues + 3, 3);
+                hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), cValues + 1, sizeof(ArrayValue), 5);
+                NativeAssert::Succeeded(hr, "Failed to grow array size to 5");
+                ++cValues;
+                SetItem(rgValues + 4, 4);
+                hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), cValues + 1, sizeof(ArrayValue), 5);
+                NativeAssert::Succeeded(hr, "Failed to grow array size to 6");
+                ++cValues;
+                SetItem(rgValues + 5, 5);
+                // OK, we used growth size 5, so let's try ensuring we have space for 6 (5 + first item) items
+                // and make sure it doesn't grow since we already have enough space
+                hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), cValues, sizeof(ArrayValue), 5);
+                NativeAssert::Succeeded(hr, "Failed to ensure array size matches what it should already be");
+                dwSize = MemSize(rgValues);
+                if (dwSize != 6 * sizeof(ArrayValue))
+                {
+                    hr = E_FAIL;
+                    ExitOnFailure(hr, "MemEnsureArraySize is growing an array that is already big enough!");
+                }
+                for (DWORD i = 0; i < cValues; ++i)
+                {
+                    CheckItem(rgValues + i, i);
+                }
+                hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), cValues + 1, sizeof(ArrayValue), 5);
+                NativeAssert::Succeeded(hr, "Failed to grow array size to 7");
+                ++cValues;
+                SetItem(rgValues + 6, 6);
+                hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), cValues + 1, sizeof(ArrayValue), 5);
+                NativeAssert::Succeeded(hr, "Failed to grow array size to 7");
+                ++cValues;
+                SetItem(rgValues + 7, 7);
+                hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), cValues + 1, sizeof(ArrayValue), 5);
+                NativeAssert::Succeeded(hr, "Failed to grow array size to 7");
+                ++cValues;
+                SetItem(rgValues + 8, 8);
+                for (DWORD i = 0; i < cValues; ++i)
+                {
+                    CheckItem(rgValues + i, i);
+                }
+            }
+            finally
+            {
+                ReleaseMem(rgValues);
+            }
+        LExit:
+            DutilUninitialize();
+        }
+        [Fact]
+        void MemUtilInsertTest()
+        {
+            HRESULT hr = S_OK;
+            ArrayValue *rgValues = NULL;
+            DWORD cValues = 0;
+            DutilInitialize(&DutilTestTraceError);
+            try
+            {
+                hr = MemInsertIntoArray(reinterpret_cast<LPVOID*>(&rgValues), 0, 1, cValues + 1, sizeof(ArrayValue), 5);
+                NativeAssert::Succeeded(hr, "Failed to insert into beginning of empty array");
+                ++cValues;
+                CheckNullItem(rgValues + 0);
+                SetItem(rgValues + 0, 5);
+                hr = MemInsertIntoArray(reinterpret_cast<LPVOID*>(&rgValues), 1, 1, cValues + 1, sizeof(ArrayValue), 5);
+                NativeAssert::Succeeded(hr, "Failed to insert at end of array");
+                ++cValues;
+                CheckNullItem(rgValues + 1);
+                SetItem(rgValues + 1, 6);
+                hr = MemInsertIntoArray(reinterpret_cast<LPVOID*>(&rgValues), 0, 1, cValues + 1, sizeof(ArrayValue), 5);
+                NativeAssert::Succeeded(hr, "Failed to insert into beginning of array");
+                ++cValues;
+                CheckNullItem(rgValues + 0);
+                SetItem(rgValues + 0, 4);
+                hr = MemInsertIntoArray(reinterpret_cast<LPVOID*>(&rgValues), 0, 1, cValues + 1, sizeof(ArrayValue), 5);
+                NativeAssert::Succeeded(hr, "Failed to insert into beginning of array");
+                ++cValues;
+                CheckNullItem(rgValues + 0);
+                SetItem(rgValues + 0, 3);
+                hr = MemInsertIntoArray(reinterpret_cast<LPVOID*>(&rgValues), 0, 1, cValues + 1, sizeof(ArrayValue), 5);
+                NativeAssert::Succeeded(hr, "Failed to insert into beginning of array");
+                ++cValues;
+                CheckNullItem(rgValues + 0);
+                SetItem(rgValues + 0, 1);
+                hr = MemInsertIntoArray(reinterpret_cast<LPVOID*>(&rgValues), 1, 1, cValues + 1, sizeof(ArrayValue), 5);
+                NativeAssert::Succeeded(hr, "Failed to insert into beginning of array");
+                ++cValues;
+                CheckNullItem(rgValues + 1);
+                SetItem(rgValues + 1, 2);
+                hr = MemInsertIntoArray(reinterpret_cast<LPVOID*>(&rgValues), 0, 1, cValues + 1, sizeof(ArrayValue), 5);
+                NativeAssert::Succeeded(hr, "Failed to insert into beginning of array");
+                ++cValues;
+                CheckNullItem(rgValues + 0);
+                SetItem(rgValues + 0, 0);
+                for (DWORD i = 0; i < cValues; ++i)
+                {
+                    CheckItem(rgValues + i, i);
+                }
+                hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), cValues + 1, sizeof(ArrayValue), 5);
+                NativeAssert::Succeeded(hr, "Failed to grow array size to 7");
+                ++cValues;
+                CheckNullItem(rgValues + 7);
+                SetItem(rgValues + 7, 7);
+                hr = MemInsertIntoArray(reinterpret_cast<LPVOID*>(&rgValues), 8, 1, cValues + 1, sizeof(ArrayValue), 5);
+                NativeAssert::Succeeded(hr, "Failed to insert into beginning of array");
+                ++cValues;
+                CheckNullItem(rgValues + 8);
+                SetItem(rgValues + 8, 8);
+                for (DWORD i = 0; i < cValues; ++i)
+                {
+                    CheckItem(rgValues + i, i);
+                }
+            }
+            finally
+            {
+                ReleaseMem(rgValues);
+                DutilUninitialize();
+            }
+        }
+        [Fact]
+        void MemUtilRemovePreserveOrderTest()
+        {
+            HRESULT hr = S_OK;
+            ArrayValue *rgValues = NULL;
+            DWORD cValues = 0;
+            DutilInitialize(&DutilTestTraceError);
+            try
+            {
+                hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), 10, sizeof(ArrayValue), 10);
+                NativeAssert::Succeeded(hr, "Failed to grow array size to 10");
+                cValues = 10;
+                for (DWORD i = 0; i < cValues; ++i)
+                {
+                    SetItem(rgValues + i, i);
+                }
+                // Remove last item
+                MemRemoveFromArray(rgValues, 9, 1, cValues, sizeof(ArrayValue), TRUE);
+                --cValues;
+                for (DWORD i = 0; i < cValues; ++i)
+                {
+                    CheckItem(rgValues + i, i);
+                }
+                // Remove last two items
+                MemRemoveFromArray(rgValues, 7, 2, cValues, sizeof(ArrayValue), TRUE);
+                cValues -= 2;
+                for (DWORD i = 0; i < cValues; ++i)
+                {
+                    CheckItem(rgValues + i, i);
+                }
+                // Remove first item
+                MemRemoveFromArray(rgValues, 0, 1, cValues, sizeof(ArrayValue), TRUE);
+                --cValues;
+                for (DWORD i = 0; i < cValues; ++i)
+                {
+                    CheckItem(rgValues + i, i + 1);
+                }
+                // Remove first two items
+                MemRemoveFromArray(rgValues, 0, 2, cValues, sizeof(ArrayValue), TRUE);
+                cValues -= 2;
+                for (DWORD i = 0; i < cValues; ++i)
+                {
+                    CheckItem(rgValues + i, i + 3);
+                }
+                // Remove middle two items
+                MemRemoveFromArray(rgValues, 1, 2, cValues, sizeof(ArrayValue), TRUE);
+                cValues -= 2;
+                CheckItem(rgValues, 3);
+                CheckItem(rgValues + 1, 6);
+                // Remove last 2 items to ensure we don't crash
+                MemRemoveFromArray(rgValues, 0, 2, cValues, sizeof(ArrayValue), TRUE);
+                cValues -= 2;
+            }
+            finally
+            {
+                ReleaseMem(rgValues);
+                DutilUninitialize();
+            }
+        }
+        [Fact]
+        void MemUtilRemoveFastTest()
+        {
+            HRESULT hr = S_OK;
+            ArrayValue *rgValues = NULL;
+            DWORD cValues = 0;
+            DutilInitialize(&DutilTestTraceError);
+            try
+            {
+                hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), 10, sizeof(ArrayValue), 10);
+                NativeAssert::Succeeded(hr, "Failed to grow array size to 10");
+                cValues = 10;
+                for (DWORD i = 0; i < cValues; ++i)
+                {
+                    SetItem(rgValues + i, i);
+                }
+                // Remove last item
+                MemRemoveFromArray(rgValues, 9, 1, cValues, sizeof(ArrayValue), FALSE);
+                --cValues;
+                for (DWORD i = 0; i < cValues; ++i)
+                {
+                    CheckItem(rgValues + i, i);
+                }
+                // Remove last two items
+                MemRemoveFromArray(rgValues, 7, 2, cValues, sizeof(ArrayValue), FALSE);
+                cValues -= 2;
+                for (DWORD i = 0; i < cValues; ++i)
+                {
+                    CheckItem(rgValues + i, i);
+                }
+                // Remove first item
+                MemRemoveFromArray(rgValues, 0, 1, cValues, sizeof(ArrayValue), FALSE);
+                --cValues;
+                CheckItem(rgValues, 6);
+                CheckItem(rgValues + 1, 1);
+                CheckItem(rgValues + 2, 2);
+                CheckItem(rgValues + 3, 3);
+                CheckItem(rgValues + 4, 4);
+                CheckItem(rgValues + 5, 5);
+                // Remove first two items
+                MemRemoveFromArray(rgValues, 0, 2, cValues, sizeof(ArrayValue), FALSE);
+                cValues -= 2;
+                CheckItem(rgValues, 4);
+                CheckItem(rgValues + 1, 5);
+                CheckItem(rgValues + 2, 2);
+                CheckItem(rgValues + 3, 3);
+                // Remove middle two items
+                MemRemoveFromArray(rgValues, 1, 2, cValues, sizeof(ArrayValue), FALSE);
+                cValues -= 2;
+                CheckItem(rgValues, 4);
+                CheckItem(rgValues + 1, 3);
+                // Remove last 2 items to ensure we don't crash
+                MemRemoveFromArray(rgValues, 0, 2, cValues, sizeof(ArrayValue), FALSE);
+                cValues -= 2;
+            }
+            finally
+            {
+                ReleaseMem(rgValues);
+                DutilUninitialize();
+            }
+        }
+        [Fact]
+        void MemUtilSwapTest()
+        {
+            HRESULT hr = S_OK;
+            ArrayValue *rgValues = NULL;
+            DWORD cValues = 0;
+            DutilInitialize(&DutilTestTraceError);
+            try
+            {
+                hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&rgValues), 10, sizeof(ArrayValue), 10);
+                NativeAssert::Succeeded(hr, "Failed to grow array size to 10");
+                cValues = 10;
+                for (DWORD i = 0; i < cValues; ++i)
+                {
+                    SetItem(rgValues + i, i);
+                }
+                // Swap first two
+                MemArraySwapItems(rgValues, 0, 1, sizeof(ArrayValue));
+                --cValues;
+                CheckItem(rgValues, 1);
+                CheckItem(rgValues + 1, 0);
+                for (DWORD i = 2; i < cValues; ++i)
+                {
+                    CheckItem(rgValues + i, i);
+                }
+                // Swap them back
+                MemArraySwapItems(rgValues, 0, 1, sizeof(ArrayValue));
+                --cValues;
+                for (DWORD i = 0; i < cValues; ++i)
+                {
+                    CheckItem(rgValues + i, i);
+                }
+                // Swap first and last items (index 0 and 9)
+                MemArraySwapItems(rgValues, 0, 9, sizeof(ArrayValue));
+                --cValues;
+                CheckItem(rgValues, 9);
+                CheckItem(rgValues + 9, 0);
+                for (DWORD i = 1; i < cValues - 1; ++i)
+                {
+                    CheckItem(rgValues + i, i);
+                }
+                // Swap index 1 and 8
+                MemArraySwapItems(rgValues, 1, 8, sizeof(ArrayValue));
+                --cValues;
+                CheckItem(rgValues, 9);
+                CheckItem(rgValues + 1, 8);
+                CheckItem(rgValues + 8, 1);
+                CheckItem(rgValues + 9, 0);
+                for (DWORD i = 2; i < cValues - 2; ++i)
+                {
+                    CheckItem(rgValues + i, i);
+                }
+                // Swap index 2 and 7
+                MemArraySwapItems(rgValues, 2, 7, sizeof(ArrayValue));
+                --cValues;
+                CheckItem(rgValues, 9);
+                CheckItem(rgValues + 1, 8);
+                CheckItem(rgValues + 2, 7);
+                CheckItem(rgValues + 7, 2);
+                CheckItem(rgValues + 8, 1);
+                CheckItem(rgValues + 9, 0);
+                for (DWORD i = 3; i < cValues - 3; ++i)
+                {
+                    CheckItem(rgValues + i, i);
+                }
+                // Swap index 0 and 1
+                MemArraySwapItems(rgValues, 0, 1, sizeof(ArrayValue));
+                --cValues;
+                CheckItem(rgValues, 8);
+                CheckItem(rgValues + 1, 9);
+                CheckItem(rgValues + 2, 7);
+                CheckItem(rgValues + 7, 2);
+                CheckItem(rgValues + 8, 1);
+                CheckItem(rgValues + 9, 0);
+                for (DWORD i = 3; i < cValues - 3; ++i)
+                {
+                    CheckItem(rgValues + i, i);
+                }
+            }
+            finally
+            {
+                ReleaseMem(rgValues);
+                DutilUninitialize();
+            }
+        }
+    private:
+        void SetItem(ArrayValue *pValue, DWORD dwValue)
+        {
+            HRESULT hr = S_OK;
+            pValue->dwNum = dwValue;
+            hr = StrAllocFormatted(&pValue->sczString, L"%u", dwValue);
+            NativeAssert::Succeeded(hr, "Failed to allocate string");
+        }
+        void CheckItem(ArrayValue *pValue, DWORD dwValue)
+        {
+            HRESULT hr = S_OK;
+            LPWSTR sczTemp = NULL;
+            try
+            {
+                NativeAssert::Equal(dwValue, pValue->dwNum);
+                hr = StrAllocFormatted(&sczTemp, L"%u", dwValue);
+                NativeAssert::Succeeded(hr, "Failed to allocate temp string");
+                NativeAssert::StringEqual(sczTemp, pValue->sczString, TRUE);
+                if (pValue->pvNull1 || pValue->pvNull2)
+                {
+                    hr = E_FAIL;
+                    ExitOnFailure(hr, "One of the expected NULL values wasn't NULL!");
+                }
+            }
+            finally
+            {
+                ReleaseStr(sczTemp);
+            }
+        LExit:
+            return;
+        }
+        void CheckNullItem(ArrayValue *pValue)
+        {
+            HRESULT hr = S_OK;
+            NativeAssert::Equal<DWORD>(0, pValue->dwNum);
+            if (pValue->sczString)
+            {
+                hr = E_FAIL;
+                ExitOnFailure(hr, "Item found isn't NULL!");
+            }
+            if (pValue->pvNull1 || pValue->pvNull2)
+            {
+                hr = E_FAIL;
+                ExitOnFailure(hr, "One of the expected NULL values wasn't NULL!");
+            }
+        LExit:
+            return;
+        }
+    };
+}
diff --git a/src/libs/dutil/test/DUtilUnitTest/MonUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/MonUtilTest.cpp
new file mode 100644
index 00000000..273f2eb6
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/MonUtilTest.cpp
@@ -0,0 +1,487 @@
+// 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.
+#include "precomp.h"
+#undef RemoveDirectory
+using namespace System;
+using namespace System::Collections::Generic;
+using namespace System::Runtime::InteropServices;
+using namespace Xunit;
+using namespace WixBuildTools::TestSupport;
+namespace DutilTests
+{
+    const int PREWAIT = 20;
+    const int POSTWAIT = 480;
+    const int FULLWAIT = 500;
+    const int SILENCEPERIOD = 100;
+    struct RegKey
+    {
+        HRESULT hr;
+        HKEY hkRoot;
+        LPCWSTR wzSubKey;
+        REG_KEY_BITNESS kbKeyBitness;
+        BOOL fRecursive;
+    };
+    struct Directory
+    {
+        HRESULT hr;
+        LPCWSTR wzPath;
+        BOOL fRecursive;
+    };
+    struct Results
+    {
+        RegKey *rgRegKeys;
+        DWORD cRegKeys;
+        Directory *rgDirectories;
+        DWORD cDirectories;
+    };
+    public delegate void MonGeneralDelegate(HRESULT, LPVOID);
+    public delegate void MonDriveStatusDelegate(WCHAR, BOOL, LPVOID);
+    public delegate void MonDirectoryDelegate(HRESULT, LPCWSTR, BOOL, LPVOID, LPVOID);
+    public delegate void MonRegKeyDelegate(HRESULT, HKEY, LPCWSTR, REG_KEY_BITNESS, BOOL, LPVOID, LPVOID);
+    static void MonGeneral(
+        __in HRESULT /*hrResult*/,
+        __in_opt LPVOID /*pvContext*/
+        )
+    {
+        Assert::True(false);
+    }
+    static void MonDriveStatus(
+        __in WCHAR /*chDrive*/,
+        __in BOOL /*fArriving*/,
+        __in_opt LPVOID /*pvContext*/
+        )
+    {
+    }
+    static void MonDirectory(
+        __in HRESULT hrResult,
+        __in_z LPCWSTR wzPath,
+        __in_z BOOL fRecursive,
+        __in_opt LPVOID pvContext,
+        __in_opt LPVOID pvDirectoryContext
+        )
+    {
+        Assert::Equal(S_OK, hrResult);
+        Assert::Equal<DWORD_PTR>(0, reinterpret_cast<DWORD_PTR>(pvDirectoryContext));
+        HRESULT hr = S_OK;
+        Results *pResults = reinterpret_cast<Results *>(pvContext);
+        hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&pResults->rgDirectories), pResults->cDirectories + 1, sizeof(Directory), 5);
+        NativeAssert::ValidReturnCode(hr, S_OK);
+        ++pResults->cDirectories;
+        pResults->rgDirectories[pResults->cDirectories - 1].hr = hrResult;
+        pResults->rgDirectories[pResults->cDirectories - 1].wzPath = wzPath;
+        pResults->rgDirectories[pResults->cDirectories - 1].fRecursive = fRecursive;
+    }
+    static void MonRegKey(
+        __in HRESULT hrResult,
+        __in HKEY hkRoot,
+        __in_z LPCWSTR wzSubKey,
+        __in REG_KEY_BITNESS kbKeyBitness,
+        __in_z BOOL fRecursive,
+        __in_opt LPVOID pvContext,
+        __in_opt LPVOID pvRegKeyContext
+        )
+    {
+        Assert::Equal<HRESULT>(S_OK, hrResult);
+        Assert::Equal<DWORD_PTR>(0, reinterpret_cast<DWORD_PTR>(pvRegKeyContext));
+        HRESULT hr = S_OK;
+        Results *pResults = reinterpret_cast<Results *>(pvContext);
+        hr = MemEnsureArraySize(reinterpret_cast<LPVOID*>(&pResults->rgRegKeys), pResults->cRegKeys + 1, sizeof(RegKey), 5);
+        NativeAssert::ValidReturnCode(hr, S_OK);
+        ++pResults->cRegKeys;
+        pResults->rgRegKeys[pResults->cRegKeys - 1].hr = hrResult;
+        pResults->rgRegKeys[pResults->cRegKeys - 1].hkRoot = hkRoot;
+        pResults->rgRegKeys[pResults->cRegKeys - 1].wzSubKey = wzSubKey;
+        pResults->rgRegKeys[pResults->cRegKeys - 1].kbKeyBitness = kbKeyBitness;
+        pResults->rgRegKeys[pResults->cRegKeys - 1].fRecursive = fRecursive;
+    }
+    public ref class MonUtil
+    {
+    public:
+        void ClearResults(Results *pResults)
+        {
+            ReleaseNullMem(pResults->rgDirectories);
+            pResults->cDirectories = 0;
+            ReleaseNullMem(pResults->rgRegKeys);
+            pResults->cRegKeys = 0;
+        }
+        void RemoveDirectory(LPCWSTR wzPath)
+        {
+            DWORD dwRetryCount = 0;
+            const DWORD c_dwMaxRetryCount = 100;
+            const DWORD c_dwRetryInterval = 50;
+            HRESULT hr = DirEnsureDelete(wzPath, TRUE, TRUE);
+            // Monitoring a directory opens a handle to that directory, which means delete requests for that directory will succeed
+            // (and deletion will be "pending" until our monitor handle is closed)
+            // but deletion of the directory containing that directory cannot complete until the handle is closed. This means DirEnsureDelete()
+            // can sometimes encounter HRESULT_FROM_WIN32(ERROR_DIR_NOT_EMPTY) failures, which just means it needs to retry a bit later
+            // (after the waiter thread wakes up, it will release the handle)
+            while (HRESULT_FROM_WIN32(ERROR_DIR_NOT_EMPTY) == hr && c_dwMaxRetryCount > dwRetryCount)
+            {
+                ::Sleep(c_dwRetryInterval);
+                ++dwRetryCount;
+                hr = DirEnsureDelete(wzPath, TRUE, TRUE);
+            }
+            NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE, E_PATHNOTFOUND);
+        }
+        void TestDirectory(MON_HANDLE handle, Results *pResults)
+        {
+            HRESULT hr  = S_OK;
+            LPWSTR sczShallowPath = NULL;
+            LPWSTR sczParentPath = NULL;
+            LPWSTR sczDeepPath = NULL;
+            LPWSTR sczChildPath = NULL;
+            LPWSTR sczChildFilePath = NULL;
+            try
+            {
+                hr = PathExpand(&sczShallowPath, L"%TEMP%\\MonUtilTest\\", PATH_EXPAND_ENVIRONMENT);
+                NativeAssert::ValidReturnCode(hr, S_OK);
+                hr = PathExpand(&sczParentPath, L"%TEMP%\\MonUtilTest\\sub\\folder\\that\\might\\not\\", PATH_EXPAND_ENVIRONMENT);
+                NativeAssert::ValidReturnCode(hr, S_OK);
+                hr = PathExpand(&sczDeepPath, L"%TEMP%\\MonUtilTest\\sub\\folder\\that\\might\\not\\exist\\", PATH_EXPAND_ENVIRONMENT);
+                NativeAssert::ValidReturnCode(hr, S_OK);
+                hr = PathExpand(&sczChildPath, L"%TEMP%\\MonUtilTest\\sub\\folder\\that\\might\\not\\exist\\some\\sub\\folder\\", PATH_EXPAND_ENVIRONMENT);
+                NativeAssert::ValidReturnCode(hr, S_OK);
+                hr = PathExpand(&sczChildFilePath, L"%TEMP%\\MonUtilTest\\sub\\folder\\that\\might\\not\\exist\\some\\sub\\folder\\file.txt", PATH_EXPAND_ENVIRONMENT);
+                NativeAssert::ValidReturnCode(hr, S_OK);
+                RemoveDirectory(sczShallowPath);
+                hr = MonAddDirectory(handle, sczDeepPath, TRUE, SILENCEPERIOD, NULL);
+                NativeAssert::ValidReturnCode(hr, S_OK);
+                hr = DirEnsureExists(sczParentPath, NULL);
+                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+                // Make sure creating the parent directory does nothing, even after silence period
+                ::Sleep(FULLWAIT);
+                Assert::Equal<DWORD>(0, pResults->cDirectories);
+                // Now create the target path, no notification until after the silence period
+                hr = DirEnsureExists(sczDeepPath, NULL);
+                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+                ::Sleep(PREWAIT);
+                Assert::Equal<DWORD>(0, pResults->cDirectories);
+                // Now after the full silence period, it should have triggered
+                ::Sleep(POSTWAIT);
+                Assert::Equal<DWORD>(1, pResults->cDirectories);
+                NativeAssert::ValidReturnCode(pResults->rgDirectories[0].hr, S_OK);
+                // Now delete the directory, along with a ton of parents. This verifies MonUtil will keep watching the closest parent that still exists.
+                RemoveDirectory(sczShallowPath);
+                ::Sleep(FULLWAIT);
+                Assert::Equal<DWORD>(2, pResults->cDirectories);
+                NativeAssert::ValidReturnCode(pResults->rgDirectories[1].hr, S_OK);
+                // Create the parent directory again, still should be nothing even after full silence period
+                hr = DirEnsureExists(sczParentPath, NULL);
+                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+                ::Sleep(FULLWAIT);
+                Assert::Equal<DWORD>(2, pResults->cDirectories);
+                hr = DirEnsureExists(sczChildPath, NULL);
+                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+                ::Sleep(PREWAIT);
+                Assert::Equal<DWORD>(2, pResults->cDirectories);
+                ::Sleep(POSTWAIT);
+                Assert::Equal<DWORD>(3, pResults->cDirectories);
+                NativeAssert::ValidReturnCode(pResults->rgDirectories[2].hr, S_OK);
+                // Write a file to a deep child subfolder, and make sure it's detected
+                hr = FileFromString(sczChildFilePath, 0, L"contents", FILE_ENCODING_UTF16_WITH_BOM);
+                NativeAssert::ValidReturnCode(hr, S_OK);
+                ::Sleep(PREWAIT);
+                Assert::Equal<DWORD>(3, pResults->cDirectories);
+                ::Sleep(POSTWAIT);
+                Assert::Equal<DWORD>(4, pResults->cDirectories);
+                NativeAssert::ValidReturnCode(pResults->rgDirectories[2].hr, S_OK);
+                RemoveDirectory(sczParentPath);
+                ::Sleep(FULLWAIT);
+                Assert::Equal<DWORD>(5, pResults->cDirectories);
+                NativeAssert::ValidReturnCode(pResults->rgDirectories[3].hr, S_OK);
+                // Now remove the directory from the list of things to monitor, and confirm changes are no longer tracked
+                hr = MonRemoveDirectory(handle, sczDeepPath, TRUE);
+                NativeAssert::ValidReturnCode(hr, S_OK);
+                ::Sleep(PREWAIT);
+                hr = DirEnsureExists(sczDeepPath, NULL);
+                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+                ::Sleep(FULLWAIT);
+                Assert::Equal<DWORD>(5, pResults->cDirectories);
+                NativeAssert::ValidReturnCode(pResults->rgDirectories[3].hr, S_OK);
+                // Finally, add it back so we can test multiple things to monitor at once
+                hr = MonAddDirectory(handle, sczDeepPath, TRUE, SILENCEPERIOD, NULL);
+                NativeAssert::ValidReturnCode(hr, S_OK);
+            }
+            finally
+            {
+                ReleaseStr(sczShallowPath);
+                ReleaseStr(sczDeepPath);
+                ReleaseStr(sczParentPath);
+            }
+        }
+        void TestRegKey(MON_HANDLE handle, Results *pResults)
+        {
+            HRESULT hr = S_OK;
+            LPCWSTR wzShallowRegKey = L"Software\\MonUtilTest\\";
+            LPCWSTR wzParentRegKey = L"Software\\MonUtilTest\\sub\\folder\\that\\might\\not\\";
+            LPCWSTR wzDeepRegKey = L"Software\\MonUtilTest\\sub\\folder\\that\\might\\not\\exist\\";
+            LPCWSTR wzChildRegKey = L"Software\\MonUtilTest\\sub\\folder\\that\\might\\not\\exist\\some\\sub\\folder\\";
+            HKEY hk = NULL;
+            try
+            {
+                hr = RegDelete(HKEY_CURRENT_USER, wzShallowRegKey, REG_KEY_32BIT, TRUE);
+                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE, E_PATHNOTFOUND);
+                hr = MonAddRegKey(handle, HKEY_CURRENT_USER, wzDeepRegKey, REG_KEY_DEFAULT, TRUE, SILENCEPERIOD, NULL);
+                NativeAssert::ValidReturnCode(hr, S_OK);
+                hr = RegCreate(HKEY_CURRENT_USER, wzParentRegKey, KEY_SET_VALUE | KEY_QUERY_VALUE | KEY_WOW64_32KEY, &hk);
+                ReleaseRegKey(hk);
+                // Make sure creating the parent key does nothing, even after silence period
+                ::Sleep(FULLWAIT);
+                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+                Assert::Equal<DWORD>(0, pResults->cRegKeys);
+                // Now create the target path, no notification until after the silence period
+                hr = RegCreate(HKEY_CURRENT_USER, wzDeepRegKey, KEY_SET_VALUE | KEY_QUERY_VALUE | KEY_WOW64_32KEY, &hk);
+                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+                ReleaseRegKey(hk);
+                ::Sleep(PREWAIT);
+                Assert::Equal<DWORD>(0, pResults->cRegKeys);
+                // Now after the full silence period, it should have triggered
+                ::Sleep(POSTWAIT);
+                Assert::Equal<DWORD>(1, pResults->cRegKeys);
+                NativeAssert::ValidReturnCode(pResults->rgRegKeys[0].hr, S_OK);
+                // Now delete the directory, along with a ton of parents. This verifies MonUtil will keep watching the closest parent that still exists.
+                hr = RegDelete(HKEY_CURRENT_USER, wzShallowRegKey, REG_KEY_32BIT, TRUE);
+                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE, E_PATHNOTFOUND);
+                ::Sleep(PREWAIT);
+                Assert::Equal<DWORD>(1, pResults->cRegKeys);
+                ::Sleep(FULLWAIT);
+                Assert::Equal<DWORD>(2, pResults->cRegKeys);
+                NativeAssert::ValidReturnCode(pResults->rgRegKeys[1].hr, S_OK);
+                // Create the parent directory again, still should be nothing even after full silence period
+                hr = RegCreate(HKEY_CURRENT_USER, wzParentRegKey, KEY_SET_VALUE | KEY_QUERY_VALUE | KEY_WOW64_32KEY, &hk);
+                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+                ReleaseRegKey(hk);
+                ::Sleep(FULLWAIT);
+                Assert::Equal<DWORD>(2, pResults->cRegKeys);
+                hr = RegCreate(HKEY_CURRENT_USER, wzChildRegKey, KEY_SET_VALUE | KEY_QUERY_VALUE | KEY_WOW64_32KEY, &hk);
+                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+                ::Sleep(PREWAIT);
+                Assert::Equal<DWORD>(2, pResults->cRegKeys);
+                ::Sleep(FULLWAIT);
+                Assert::Equal<DWORD>(3, pResults->cRegKeys);
+                NativeAssert::ValidReturnCode(pResults->rgRegKeys[2].hr, S_OK);
+                // Write a registry value to some deep child subkey, and make sure it's detected
+                hr = RegWriteString(hk, L"valuename", L"testvalue");
+                NativeAssert::ValidReturnCode(hr, S_OK);
+                ReleaseRegKey(hk);
+                ::Sleep(PREWAIT);
+                Assert::Equal<DWORD>(3, pResults->cRegKeys);
+                ::Sleep(FULLWAIT);
+                Assert::Equal<DWORD>(4, pResults->cRegKeys);
+                NativeAssert::ValidReturnCode(pResults->rgRegKeys[2].hr, S_OK);
+                hr = RegDelete(HKEY_CURRENT_USER, wzDeepRegKey, REG_KEY_32BIT, TRUE);
+                NativeAssert::ValidReturnCode(hr, S_OK);
+                ::Sleep(FULLWAIT);
+                Assert::Equal<DWORD>(5, pResults->cRegKeys);
+                // Now remove the regkey from the list of things to monitor, and confirm changes are no longer tracked
+                hr = MonRemoveRegKey(handle, HKEY_CURRENT_USER, wzDeepRegKey, REG_KEY_DEFAULT, TRUE);
+                NativeAssert::ValidReturnCode(hr, S_OK);
+                hr = RegCreate(HKEY_CURRENT_USER, wzDeepRegKey, KEY_SET_VALUE | KEY_QUERY_VALUE | KEY_WOW64_32KEY, &hk);
+                NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+                ReleaseRegKey(hk);
+                ::Sleep(FULLWAIT);
+                Assert::Equal<DWORD>(5, pResults->cRegKeys);
+            }
+            finally
+            {
+                ReleaseRegKey(hk);
+            }
+        }
+        void TestMoreThan64(MON_HANDLE handle, Results *pResults)
+        {
+            HRESULT hr  = S_OK;
+            LPWSTR sczBaseDir = NULL;
+            LPWSTR sczDir = NULL;
+            LPWSTR sczFile = NULL;
+            try
+            {
+                hr = PathExpand(&sczBaseDir, L"%TEMP%\\ScalabilityTest\\", PATH_EXPAND_ENVIRONMENT);
+                NativeAssert::ValidReturnCode(hr, S_OK);
+                for (DWORD i = 0; i < 200; ++i)
+                {
+                    hr = StrAllocFormatted(&sczDir, L"%ls%u\\", sczBaseDir, i);
+                    NativeAssert::ValidReturnCode(hr, S_OK);
+                    hr = DirEnsureExists(sczDir, NULL);
+                    NativeAssert::ValidReturnCode(hr, S_OK, S_FALSE);
+                    hr = MonAddDirectory(handle, sczDir, FALSE, SILENCEPERIOD, NULL);
+                    NativeAssert::ValidReturnCode(hr, S_OK);
+                }
+                hr = PathConcat(sczDir, L"file.txt", &sczFile);
+                NativeAssert::ValidReturnCode(hr, S_OK);
+                hr = FileFromString(sczFile, 0, L"contents", FILE_ENCODING_UTF16_WITH_BOM);
+                NativeAssert::ValidReturnCode(hr, S_OK);
+                ::Sleep(FULLWAIT);
+                Assert::Equal<DWORD>(1, pResults->cDirectories);
+                for (DWORD i = 0; i < 199; ++i)
+                {
+                    hr = StrAllocFormatted(&sczDir, L"%ls%u\\", sczBaseDir, i);
+                    NativeAssert::ValidReturnCode(hr, S_OK);
+                    hr = MonRemoveDirectory(handle, sczDir, FALSE);
+                    NativeAssert::ValidReturnCode(hr, S_OK);
+                }
+                ::Sleep(FULLWAIT);
+                hr = FileFromString(sczFile, 0, L"contents2", FILE_ENCODING_UTF16_WITH_BOM);
+                NativeAssert::ValidReturnCode(hr, S_OK);
+                ::Sleep(FULLWAIT);
+                Assert::Equal<DWORD>(2, pResults->cDirectories);
+                for (DWORD i = 0; i < 199; ++i)
+                {
+                    hr = StrAllocFormatted(&sczDir, L"%ls%u\\", sczBaseDir, i);
+                    NativeAssert::ValidReturnCode(hr, S_OK);
+                    hr = MonAddDirectory(handle, sczDir, FALSE, SILENCEPERIOD, NULL);
+                    NativeAssert::ValidReturnCode(hr, S_OK);
+                }
+                ::Sleep(FULLWAIT);
+                hr = FileFromString(sczFile, 0, L"contents3", FILE_ENCODING_UTF16_WITH_BOM);
+                NativeAssert::ValidReturnCode(hr, S_OK);
+                ::Sleep(FULLWAIT);
+                Assert::Equal<DWORD>(3, pResults->cDirectories);
+            }
+            finally
+            {
+                ReleaseStr(sczBaseDir);
+                ReleaseStr(sczDir);
+                ReleaseStr(sczFile);
+            }
+        }
+        [Fact(Skip = "Test demonstrates failure")]
+        void MonUtilTest()
+        {
+            HRESULT hr = S_OK;
+            MON_HANDLE handle = NULL;
+            List<GCHandle>^ gcHandles = gcnew List<GCHandle>();
+            Results *pResults = (Results *)MemAlloc(sizeof(Results), TRUE);
+            Assert::True(NULL != pResults);
+            try
+            {
+                // These ensure the function pointers we send point to this thread's appdomain, which helps with assembly binding when running tests within msbuild
+                MonGeneralDelegate^ fpMonGeneral = gcnew MonGeneralDelegate(MonGeneral);
+                GCHandle gchMonGeneral = GCHandle::Alloc(fpMonGeneral);
+                gcHandles->Add(gchMonGeneral);
+                IntPtr ipMonGeneral = Marshal::GetFunctionPointerForDelegate(fpMonGeneral);
+                MonDriveStatusDelegate^ fpMonDriveStatus = gcnew MonDriveStatusDelegate(MonDriveStatus);
+                GCHandle gchMonDriveStatus = GCHandle::Alloc(fpMonDriveStatus);
+                gcHandles->Add(gchMonDriveStatus);
+                IntPtr ipMonDriveStatus = Marshal::GetFunctionPointerForDelegate(fpMonDriveStatus);
+                MonDirectoryDelegate^ fpMonDirectory = gcnew MonDirectoryDelegate(MonDirectory);
+                GCHandle gchMonDirectory = GCHandle::Alloc(fpMonDirectory);
+                gcHandles->Add(gchMonDirectory);
+                IntPtr ipMonDirectory = Marshal::GetFunctionPointerForDelegate(fpMonDirectory);
+                MonRegKeyDelegate^ fpMonRegKey = gcnew MonRegKeyDelegate(MonRegKey);
+                GCHandle gchMonRegKey = GCHandle::Alloc(fpMonRegKey);
+                gcHandles->Add(gchMonRegKey);
+                IntPtr ipMonRegKey = Marshal::GetFunctionPointerForDelegate(fpMonRegKey);
+                // "Silence period" is 100 ms
+                hr = MonCreate(&handle, static_cast<PFN_MONGENERAL>(ipMonGeneral.ToPointer()), static_cast<PFN_MONDRIVESTATUS>(ipMonDriveStatus.ToPointer()), static_cast<PFN_MONDIRECTORY>(ipMonDirectory.ToPointer()), static_cast<PFN_MONREGKEY>(ipMonRegKey.ToPointer()), pResults);
+                NativeAssert::ValidReturnCode(hr, S_OK);
+                hr = RegInitialize();
+                NativeAssert::ValidReturnCode(hr, S_OK);
+                TestDirectory(handle, pResults);
+                ClearResults(pResults);
+                TestRegKey(handle, pResults);
+                ClearResults(pResults);
+                TestMoreThan64(handle, pResults);
+                ClearResults(pResults);
+            }
+            finally
+            {
+                ReleaseMon(handle);
+                for each (GCHandle gcHandle in gcHandles)
+                {
+                    gcHandle.Free();
+                }
+                ReleaseMem(pResults->rgDirectories);
+                ReleaseMem(pResults->rgRegKeys);
+                ReleaseMem(pResults);
+            }
+        }
+    };
+}
diff --git a/src/libs/dutil/test/DUtilUnitTest/PathUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/PathUtilTest.cpp
new file mode 100644
index 00000000..5a1f06fd
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/PathUtilTest.cpp
@@ -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.
+#include "precomp.h"
+using namespace System;
+using namespace Xunit;
+using namespace WixBuildTools::TestSupport;
+namespace DutilTests
+{
+    public ref class PathUtil
+    {
+    public:
+        [Fact]
+        void PathGetHierarchyArrayTest()
+        {
+            HRESULT hr = S_OK;
+            LPWSTR *rgsczPaths = NULL;
+            UINT cPaths = 0;
+            try
+            {
+                hr = PathGetHierarchyArray(L"c:\\foo\\bar\\bas\\a.txt", &rgsczPaths, &cPaths);
+                NativeAssert::Succeeded(hr, "Failed to get parent directories array for regular file path");
+                Assert::Equal<DWORD>(5, cPaths);
+                NativeAssert::StringEqual(L"c:\\", rgsczPaths[0]);
+                NativeAssert::StringEqual(L"c:\\foo\\", rgsczPaths[1]);
+                NativeAssert::StringEqual(L"c:\\foo\\bar\\", rgsczPaths[2]);
+                NativeAssert::StringEqual(L"c:\\foo\\bar\\bas\\", rgsczPaths[3]);
+                NativeAssert::StringEqual(L"c:\\foo\\bar\\bas\\a.txt", rgsczPaths[4]);
+                ReleaseNullStrArray(rgsczPaths, cPaths);
+                hr = PathGetHierarchyArray(L"c:\\foo\\bar\\bas\\", &rgsczPaths, &cPaths);
+                NativeAssert::Succeeded(hr, "Failed to get parent directories array for regular directory path");
+                Assert::Equal<DWORD>(4, cPaths);
+                NativeAssert::StringEqual(L"c:\\", rgsczPaths[0]);
+                NativeAssert::StringEqual(L"c:\\foo\\", rgsczPaths[1]);
+                NativeAssert::StringEqual(L"c:\\foo\\bar\\", rgsczPaths[2]);
+                NativeAssert::StringEqual(L"c:\\foo\\bar\\bas\\", rgsczPaths[3]);
+                ReleaseNullStrArray(rgsczPaths, cPaths);
+                hr = PathGetHierarchyArray(L"\\\\server\\share\\subdir\\file.txt", &rgsczPaths, &cPaths);
+                NativeAssert::Succeeded(hr, "Failed to get parent directories array for UNC file path");
+                Assert::Equal<DWORD>(3, cPaths);
+                NativeAssert::StringEqual(L"\\\\server\\share\\", rgsczPaths[0]);
+                NativeAssert::StringEqual(L"\\\\server\\share\\subdir\\", rgsczPaths[1]);
+                NativeAssert::StringEqual(L"\\\\server\\share\\subdir\\file.txt", rgsczPaths[2]);
+                ReleaseNullStrArray(rgsczPaths, cPaths);
+                hr = PathGetHierarchyArray(L"\\\\server\\share\\subdir\\", &rgsczPaths, &cPaths);
+                NativeAssert::Succeeded(hr, "Failed to get parent directories array for UNC directory path");
+                Assert::Equal<DWORD>(2, cPaths);
+                NativeAssert::StringEqual(L"\\\\server\\share\\", rgsczPaths[0]);
+                NativeAssert::StringEqual(L"\\\\server\\share\\subdir\\", rgsczPaths[1]);
+                ReleaseNullStrArray(rgsczPaths, cPaths);
+                hr = PathGetHierarchyArray(L"Software\\Microsoft\\Windows\\ValueName", &rgsczPaths, &cPaths);
+                NativeAssert::Succeeded(hr, "Failed to get parent directories array for UNC directory path");
+                Assert::Equal<DWORD>(4, cPaths);
+                NativeAssert::StringEqual(L"Software\\", rgsczPaths[0]);
+                NativeAssert::StringEqual(L"Software\\Microsoft\\", rgsczPaths[1]);
+                NativeAssert::StringEqual(L"Software\\Microsoft\\Windows\\", rgsczPaths[2]);
+                NativeAssert::StringEqual(L"Software\\Microsoft\\Windows\\ValueName", rgsczPaths[3]);
+                ReleaseNullStrArray(rgsczPaths, cPaths);
+                hr = PathGetHierarchyArray(L"Software\\Microsoft\\Windows\\", &rgsczPaths, &cPaths);
+                NativeAssert::Succeeded(hr, "Failed to get parent directories array for UNC directory path");
+                Assert::Equal<DWORD>(3, cPaths);
+                NativeAssert::StringEqual(L"Software\\", rgsczPaths[0]);
+                NativeAssert::StringEqual(L"Software\\Microsoft\\", rgsczPaths[1]);
+                NativeAssert::StringEqual(L"Software\\Microsoft\\Windows\\", rgsczPaths[2]);
+                ReleaseNullStrArray(rgsczPaths, cPaths);
+            }
+            finally
+            {
+                ReleaseStrArray(rgsczPaths, cPaths);
+            }
+        }
+    };
+}
diff --git a/src/libs/dutil/test/DUtilUnitTest/SceUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/SceUtilTest.cpp
new file mode 100644
index 00000000..75b9222a
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/SceUtilTest.cpp
@@ -0,0 +1,488 @@
+// 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.
+#include "precomp.h"
+#include <sqlce_oledb.h>
+#include <sceutil.h>
+using namespace System;
+using namespace Xunit;
+using namespace WixTest;
+#define ASSIGN_INDEX_STRUCT(a, b, c) {a.wzName = c; a.rgColumns = b; a.cColumns = countof(b);};
+namespace DutilTests
+{
+    enum TABLES
+    {
+        TABLE_A,
+        TABLE_COUNT
+    };
+    enum TABLE_A_COLUMNS
+    {
+        TABLE_A_KEY,
+        TABLE_A_BINARY,
+        TABLE_A_DWORD,
+        TABLE_A_QWORD,
+        TABLE_A_BOOL,
+        TABLE_A_STRING,
+        TABLE_A_DWORD_NULLABLE,
+        TABLE_A_INITIAL_COLUMNS,
+        TABLE_A_EXTRA_STRING = TABLE_A_INITIAL_COLUMNS,
+        TABLE_A_FINAL_COLUMNS
+    };
+    struct TableARowValue
+    {
+        DWORD dwAutoGenKey;
+        BYTE *pbBinary;
+        DWORD cBinary;
+        DWORD dw;
+        DWORD64 qw;
+        BOOL f;
+        LPWSTR scz;
+        BOOL fNullablePresent;
+        DWORD dwNullable;
+        BOOL fSchemaV2;
+        LPWSTR sczExtra;
+    };
+    public ref class SceUtil
+    {
+    public:
+        void ReleaseSceSchema(SCE_DATABASE_SCHEMA *pdsSchema)
+        {
+            DWORD dwTable;
+            for (dwTable = 0; dwTable < pdsSchema->cTables; ++dwTable)
+            {
+                ReleaseNullMem(pdsSchema->rgTables[dwTable].rgColumns);
+                ReleaseNullMem(pdsSchema->rgTables[dwTable].rgIndexes);
+            }
+            ReleaseMem(pdsSchema->rgTables);
+            return;
+        }
+        void SetupSchema(SCE_DATABASE_SCHEMA *pSchema, BOOL fIncludeExtended)
+        {
+            pSchema->cTables = TABLE_COUNT;
+            pSchema->rgTables = static_cast<SCE_TABLE_SCHEMA*>(MemAlloc(TABLE_COUNT * sizeof(SCE_TABLE_SCHEMA), TRUE));
+            NativeAssert::True(pSchema->rgTables != NULL);
+            pSchema->rgTables[TABLE_A].wzName = L"TableA";
+            pSchema->rgTables[TABLE_A].cColumns = fIncludeExtended ? TABLE_A_FINAL_COLUMNS : TABLE_A_INITIAL_COLUMNS;
+            pSchema->rgTables[TABLE_A].cIndexes = 2;
+            for (DWORD i = 0; i < pSchema->cTables; ++i)
+            {
+                pSchema->rgTables[i].rgColumns = static_cast<SCE_COLUMN_SCHEMA*>(MemAlloc(sizeof(SCE_COLUMN_SCHEMA) * pSchema->rgTables[i].cColumns, TRUE));
+                NativeAssert::True(pSchema->rgTables[i].rgColumns != NULL);
+                pSchema->rgTables[i].rgIndexes = static_cast<SCE_INDEX_SCHEMA*>(MemAlloc(sizeof(SCE_COLUMN_SCHEMA) * pSchema->rgTables[i].cIndexes, TRUE));
+                NativeAssert::True(pSchema->rgTables[i].rgIndexes != NULL);
+            }
+            pSchema->rgTables[TABLE_A].rgColumns[TABLE_A_KEY].wzName = L"Key";
+            pSchema->rgTables[TABLE_A].rgColumns[TABLE_A_KEY].dbtColumnType = DBTYPE_I4;
+            pSchema->rgTables[TABLE_A].rgColumns[TABLE_A_KEY].fPrimaryKey = TRUE;
+            pSchema->rgTables[TABLE_A].rgColumns[TABLE_A_KEY].fAutoIncrement = TRUE;
+            pSchema->rgTables[TABLE_A].rgColumns[TABLE_A_BINARY].wzName = L"Binary";
+            pSchema->rgTables[TABLE_A].rgColumns[TABLE_A_BINARY].dbtColumnType = DBTYPE_BYTES;
+            pSchema->rgTables[TABLE_A].rgColumns[TABLE_A_DWORD].wzName = L"Dword";
+            pSchema->rgTables[TABLE_A].rgColumns[TABLE_A_DWORD].dbtColumnType = DBTYPE_I4;
+            pSchema->rgTables[TABLE_A].rgColumns[TABLE_A_QWORD].wzName = L"Qword";
+            pSchema->rgTables[TABLE_A].rgColumns[TABLE_A_QWORD].dbtColumnType = DBTYPE_I8;
+            pSchema->rgTables[TABLE_A].rgColumns[TABLE_A_BOOL].wzName = L"Bool";
+            pSchema->rgTables[TABLE_A].rgColumns[TABLE_A_BOOL].dbtColumnType = DBTYPE_BOOL;
+            pSchema->rgTables[TABLE_A].rgColumns[TABLE_A_STRING].wzName = L"String";
+            pSchema->rgTables[TABLE_A].rgColumns[TABLE_A_STRING].dbtColumnType = DBTYPE_WSTR;
+            pSchema->rgTables[TABLE_A].rgColumns[TABLE_A_DWORD_NULLABLE].wzName = L"Nullable";
+            pSchema->rgTables[TABLE_A].rgColumns[TABLE_A_DWORD_NULLABLE].dbtColumnType = DBTYPE_I4;
+            pSchema->rgTables[TABLE_A].rgColumns[TABLE_A_DWORD_NULLABLE].fNullable = TRUE;
+            if (fIncludeExtended)
+            {
+                pSchema->rgTables[TABLE_A].rgColumns[TABLE_A_EXTRA_STRING].wzName = L"ExtraString";
+                pSchema->rgTables[TABLE_A].rgColumns[TABLE_A_EXTRA_STRING].dbtColumnType = DBTYPE_WSTR;
+                pSchema->rgTables[TABLE_A].rgColumns[TABLE_A_EXTRA_STRING].fNullable = TRUE;
+            }
+            static DWORD rgdwTableA_Index1[] = { TABLE_A_DWORD, TABLE_A_STRING, TABLE_A_QWORD };
+            static DWORD rgdwTableA_Index2[] = { TABLE_A_DWORD, TABLE_A_STRING };
+            ASSIGN_INDEX_STRUCT(pSchema->rgTables[TABLE_A].rgIndexes[0], rgdwTableA_Index1, L"Dword_String_Qword");
+            ASSIGN_INDEX_STRUCT(pSchema->rgTables[TABLE_A].rgIndexes[1], rgdwTableA_Index2, L"Dword_String");
+        }
+        void SetStructValues(TableARowValue *pValue, BYTE *pbBinary, DWORD cBinary, DWORD dw, DWORD64 qw, BOOL f, LPWSTR scz,  DWORD *pdw, LPWSTR sczExtra)
+        {
+            pValue->pbBinary = pbBinary;
+            pValue->cBinary = cBinary;
+            pValue->dw = dw;
+            pValue->qw = qw;
+            pValue->f = f;
+            pValue->scz = scz;
+            if (pdw)
+            {
+                pValue->fNullablePresent = TRUE;
+                pValue->dwNullable = *pdw;
+            }
+            else
+            {
+                pValue->fNullablePresent = FALSE;
+            }
+            if (sczExtra)
+            {
+                pValue->fSchemaV2 = TRUE;
+                pValue->sczExtra = sczExtra;
+            }
+            else
+            {
+                pValue->fSchemaV2 = FALSE;
+            }
+        }
+        void AssertStructValuesSame(TableARowValue *pValueExpected, TableARowValue *pValueOther)
+        {
+            NativeAssert::Equal(pValueExpected->cBinary, pValueOther->cBinary);
+            NativeAssert::True(0 == memcmp(pValueExpected->pbBinary, pValueOther->pbBinary, pValueOther->cBinary));
+            NativeAssert::Equal(pValueExpected->dw, pValueOther->dw);
+            NativeAssert::Equal(pValueExpected->qw, pValueOther->qw);
+            NativeAssert::Equal(pValueExpected->f, pValueOther->f);
+            NativeAssert::True(0 == wcscmp(pValueExpected->scz, pValueOther->scz));
+            
+            NativeAssert::Equal(pValueExpected->fNullablePresent, pValueOther->fNullablePresent);
+            if (pValueExpected->fNullablePresent)
+            {
+                NativeAssert::Equal(pValueExpected->dwNullable, pValueOther->dwNullable);
+            }
+            NativeAssert::Equal(pValueExpected->fSchemaV2, pValueOther->fSchemaV2);
+            if (pValueExpected->fSchemaV2)
+            {
+                NativeAssert::True(0 == wcscmp(pValueExpected->sczExtra, pValueOther->sczExtra));
+            }
+        }
+        void InsertRow(SCE_DATABASE *pDatabase, TableARowValue *pValue, BOOL fRollback)
+        {
+            HRESULT hr = S_OK;
+            SCE_ROW_HANDLE sceRow = NULL;
+            hr = SceBeginTransaction(pDatabase);
+            NativeAssert::Succeeded(hr, "Failed to begin transaction");
+            hr = ScePrepareInsert(pDatabase, TABLE_A, &sceRow);
+            NativeAssert::Succeeded(hr, "Failed to prepare to insert row");
+            hr = SceSetColumnBinary(sceRow, TABLE_A_BINARY, pValue->pbBinary, pValue->cBinary);
+            NativeAssert::Succeeded(hr, "Failed to set binary value");
+            hr = SceSetColumnDword(sceRow, TABLE_A_DWORD, pValue->dw);
+            NativeAssert::Succeeded(hr, "Failed to set dword value");
+            hr = SceSetColumnQword(sceRow, TABLE_A_QWORD, pValue->qw);
+            NativeAssert::Succeeded(hr, "Failed to set qword value");
+            hr = SceSetColumnBool(sceRow, TABLE_A_BOOL, pValue->f);
+            NativeAssert::Succeeded(hr, "Failed to set bool value");
+            hr = SceSetColumnString(sceRow, TABLE_A_STRING, pValue->scz);
+            NativeAssert::Succeeded(hr, "Failed to set string value");
+        
+            if (pValue->fNullablePresent)
+            {
+                hr = SceSetColumnDword(sceRow, TABLE_A_DWORD_NULLABLE, pValue->dwNullable);
+                NativeAssert::Succeeded(hr, "Failed to set dword value");
+            }
+            else
+            {
+                hr = SceSetColumnNull(sceRow, TABLE_A_DWORD_NULLABLE);
+                NativeAssert::Succeeded(hr, "Failed to set null value");
+            }
+            if (pValue->fSchemaV2)
+            {
+                hr = SceSetColumnString(sceRow, TABLE_A_EXTRA_STRING, pValue->sczExtra);
+                NativeAssert::Succeeded(hr, "Failed to set extra string value");
+            }
+        
+            hr = SceFinishUpdate(sceRow);
+            NativeAssert::Succeeded(hr, "Failed to finish insert");
+            if (fRollback)
+            {
+                hr = SceRollbackTransaction(pDatabase);
+                NativeAssert::Succeeded(hr, "Failed to rollback transaction");
+            }
+            else
+            {
+                hr = SceCommitTransaction(pDatabase);
+                NativeAssert::Succeeded(hr, "Failed to commit transaction");
+                hr = SceGetColumnDword(sceRow, TABLE_A_KEY, &pValue->dwAutoGenKey);
+                NativeAssert::Succeeded(hr, "Failed to get autogen key after insert");
+                NativeAssert::True(pValue->dwAutoGenKey != 0);
+            }
+            ReleaseSceRow(sceRow);
+        }
+        void VerifyRow(TableARowValue *pExpectedValue, SCE_ROW_HANDLE sceRow)
+        {
+            HRESULT hr = S_OK;
+            TableARowValue value = {};
+            hr = SceGetColumnBinary(sceRow, TABLE_A_BINARY, &value.pbBinary, &value.cBinary);
+            NativeAssert::Succeeded(hr, "Failed to get binary value from result row");
+            hr = SceGetColumnDword(sceRow, TABLE_A_DWORD, &value.dw);
+            NativeAssert::Succeeded(hr, "Failed to get dword value from result row");
+            hr = SceGetColumnQword(sceRow, TABLE_A_QWORD, &value.qw);
+            NativeAssert::Succeeded(hr, "Failed to get qword value from result row");
+            hr = SceGetColumnBool(sceRow, TABLE_A_BOOL, &value.f);
+            NativeAssert::Succeeded(hr, "Failed to get bool value from result row");
+            hr = SceGetColumnString(sceRow, TABLE_A_STRING, &value.scz);
+            NativeAssert::Succeeded(hr, "Failed to get string value from result row");
+            hr = SceGetColumnDword(sceRow, TABLE_A_DWORD_NULLABLE, &value.dwNullable);
+            if (hr == E_NOTFOUND)
+            {
+                value.fNullablePresent = FALSE;
+                hr = S_OK;
+            }
+            else
+            {
+                NativeAssert::Succeeded(hr, "Failed to get string value from result row");
+                value.fNullablePresent = TRUE;
+            }
+            if (pExpectedValue->fSchemaV2)
+            {
+                value.fSchemaV2 = TRUE;
+                hr = SceGetColumnString(sceRow, TABLE_A_EXTRA_STRING, &value.sczExtra);
+                NativeAssert::Succeeded(hr, "Failed to get extra string value from result row");
+            }
+            AssertStructValuesSame(pExpectedValue, &value);
+            ReleaseNullMem(value.pbBinary);
+            ReleaseNullStr(value.scz);
+        }
+        void VerifyQuery(TableARowValue **rgExpectedValues, DWORD cExpectedValues, SCE_QUERY_RESULTS_HANDLE queryResults)
+        {
+            HRESULT hr = S_OK;
+            SCE_ROW_HANDLE sceRow = NULL;
+            for (DWORD i = 0; i < cExpectedValues; ++i)
+            {
+                hr = SceGetNextResultRow(queryResults, &sceRow);
+                NativeAssert::Succeeded(hr, "Failed to get next result row");
+                VerifyRow(rgExpectedValues[i], sceRow);
+                ReleaseNullSceRow(sceRow);
+            }
+            // No more results
+            NativeAssert::True(NULL == queryResults || FAILED(SceGetNextResultRow(queryResults, &sceRow)));
+        }
+        void TestIndex(SCE_DATABASE *pDatabase)
+        {
+            HRESULT hr = S_OK;
+            BYTE binary1[50] = { 0x80, 0x70 };
+            BYTE binary2[40] = { 0x90, 0xAB };
+            BYTE binary3[40] = { 0x85, 0x88 };
+            DWORD dwValue1 = 0x55555555, dwValue2 = 0x88888888;
+            TableARowValue value1 = {}, value2 = {}, value3 = {}, value4 = {}, value5 = {};
+            SCE_QUERY_HANDLE query = NULL;
+            SCE_QUERY_RESULTS_HANDLE results = NULL;
+            SetStructValues(&value1, static_cast<BYTE *>(binary1), sizeof(binary1), 3, 1, TRUE, L"zzz", &dwValue1, NULL);
+            SetStructValues(&value2, static_cast<BYTE *>(binary2), sizeof(binary2), 3, 2, TRUE, L"yyy", &dwValue2, NULL);
+            SetStructValues(&value3, static_cast<BYTE *>(binary3), sizeof(binary3), 3, 3, TRUE, L"xxx", NULL, NULL);
+            SetStructValues(&value4, static_cast<BYTE *>(binary2), sizeof(binary2), 4, 4, TRUE, L"xyz", &dwValue2, NULL);
+            SetStructValues(&value5, static_cast<BYTE *>(binary3), sizeof(binary3), 3, 1, TRUE, L"yyy", &dwValue2, NULL);
+            // Rollback an insert to confirm the insert doesn't happen and database can still be interacted with normally afterwards
+            InsertRow(pDatabase, &value1, TRUE);
+            InsertRow(pDatabase, &value1, FALSE);
+            InsertRow(pDatabase, &value2, FALSE);
+            InsertRow(pDatabase, &value3, FALSE);
+            InsertRow(pDatabase, &value4, FALSE);
+            InsertRow(pDatabase, &value5, FALSE);
+            NativeAssert::True(value1.dwAutoGenKey != value2.dwAutoGenKey);
+            // Test setting 1 column
+            hr = SceBeginQuery(pDatabase, TABLE_A, 0, &query);
+            NativeAssert::Succeeded(hr, "Failed to begin query");
+            hr = SceSetQueryColumnDword(query, 3);
+            NativeAssert::Succeeded(hr, "Failed to set query column dword");
+            hr = SceRunQueryRange(&query, &results);
+            NativeAssert::Succeeded(hr, "Failed to run query");
+            NativeAssert::True(query == NULL);
+            TableARowValue *sortedAfterQuery1[] = { &value3, &value5, &value2, &value1 };
+            VerifyQuery(sortedAfterQuery1, _countof(sortedAfterQuery1), results);
+            ReleaseNullSceQueryResults(results);
+            // Test setting 2 columns, third column is unspecified so results are sorted by it
+            hr = SceBeginQuery(pDatabase, TABLE_A, 0, &query);
+            NativeAssert::Succeeded(hr, "Failed to begin query");
+            hr = SceSetQueryColumnDword(query, 3);
+            NativeAssert::Succeeded(hr, "Failed to set query column dword");
+            hr = SceSetQueryColumnString(query, L"yyy");
+            NativeAssert::Succeeded(hr, "Failed to set query column dword");
+            hr = SceRunQueryRange(&query, &results);
+            NativeAssert::Succeeded(hr, "Failed to run query");
+            NativeAssert::True(query == NULL);
+            TableARowValue *sortedAfterQuery2[] = { &value5, &value2 };
+            VerifyQuery(sortedAfterQuery2, _countof(sortedAfterQuery2), results);
+            ReleaseNullSceQueryResults(results);
+            // Test setting 2 columns, third column of index is unspecified so results are sorted by it
+            hr = SceBeginQuery(pDatabase, TABLE_A, 0, &query);
+            NativeAssert::Succeeded(hr, "Failed to begin query");
+            hr = SceSetQueryColumnDword(query, 3);
+            NativeAssert::Succeeded(hr, "Failed to set query column dword");
+            hr = SceSetQueryColumnString(query, L"yyy");
+            NativeAssert::Succeeded(hr, "Failed to set query column dword");
+            hr = SceRunQueryRange(&query, &results);
+            NativeAssert::Succeeded(hr, "Failed to run query");
+            NativeAssert::True(query == NULL);
+            TableARowValue *sortedAfterQuery3[] = { &value5, &value2 };
+            VerifyQuery(sortedAfterQuery3, _countof(sortedAfterQuery3), results);
+            ReleaseNullSceQueryResults(results);
+            // Test setting 2 columns in a different (2 column) index, so there is no 3rd column in index to sort by
+            hr = SceBeginQuery(pDatabase, TABLE_A, 1, &query);
+            NativeAssert::Succeeded(hr, "Failed to begin query");
+            hr = SceSetQueryColumnDword(query, 3);
+            NativeAssert::Succeeded(hr, "Failed to set query column dword");
+            hr = SceSetQueryColumnString(query, L"yyy");
+            NativeAssert::Succeeded(hr, "Failed to set query column dword");
+            hr = SceRunQueryRange(&query, &results);
+            NativeAssert::Succeeded(hr, "Failed to run query");
+            NativeAssert::True(query == NULL);
+            TableARowValue *sortedAfterQuery4[] = { &value2, &value5 };
+            VerifyQuery(sortedAfterQuery4, _countof(sortedAfterQuery4), results);
+            ReleaseNullSceQueryResults(results);
+        }
+        void TestReadWriteSchemaV2(SCE_DATABASE *pDatabase)
+        {
+            HRESULT hr = S_OK;
+            BYTE binary1[40] = { 0x55, 0x44 };
+            DWORD dwValue1 = 58;
+            TableARowValue value1 = {};
+            SCE_QUERY_HANDLE query = NULL;
+            SCE_ROW_HANDLE row = NULL;
+            SetStructValues(&value1, static_cast<BYTE *>(binary1), sizeof(binary1), 5, 1, TRUE, L"zzz", &dwValue1, L"newextrastring");
+            InsertRow(pDatabase, &value1, FALSE);
+            // Test setting 1 column
+            hr = SceBeginQuery(pDatabase, TABLE_A, 0, &query);
+            NativeAssert::Succeeded(hr, "Failed to begin query");
+            hr = SceSetQueryColumnDword(query, 5);
+            NativeAssert::Succeeded(hr, "Failed to set query column dword");
+            hr = SceRunQueryExact(&query, &row);
+            NativeAssert::Succeeded(hr, "Failed to run query exact");
+            VerifyRow(&value1, row);
+        }
+        [Fact]
+        void SceUtilTest()
+        {
+            HRESULT hr = S_OK;
+            BOOL fComInitialized = FALSE;
+            LPWSTR sczDbPath = NULL;
+            SCE_DATABASE *pDatabase = NULL;
+            SCE_DATABASE_SCHEMA schema1 = {};
+            SCE_DATABASE_SCHEMA schema2 = {};
+            try
+            {
+                hr = ::CoInitialize(0);
+                NativeAssert::Succeeded(hr, "Failed to initialize COM");
+                fComInitialized = TRUE;
+                SetupSchema(&schema1, FALSE);
+                SetupSchema(&schema2, TRUE);
+                hr = PathExpand(&sczDbPath, L"%TEMP%\\SceUtilTest\\UnitTest.sdf", PATH_EXPAND_ENVIRONMENT);
+                NativeAssert::Succeeded(hr, "Failed to get path to test database");
+                FileEnsureDelete(sczDbPath);
+                hr = SceEnsureDatabase(sczDbPath, L"sqlceoledb40.dll", L"Test", 1, &schema1, &pDatabase);
+                NativeAssert::Succeeded(hr, "Failed to ensure database schema");
+                TestIndex(pDatabase);
+                hr = SceCloseDatabase(pDatabase);
+                pDatabase = NULL;
+                NativeAssert::Succeeded(hr, "Failed to close database");
+                // Add column to schema
+                hr = SceEnsureDatabase(sczDbPath, L"sqlceoledb40.dll", L"Test", 1, &schema2, &pDatabase);
+                NativeAssert::Succeeded(hr, "Failed to ensure database schema");
+                TestReadWriteSchemaV2(pDatabase);
+            }
+            finally
+            {
+                ReleaseSceSchema(&schema1);
+                ReleaseSceSchema(&schema2);
+                if (NULL != pDatabase)
+                {
+                    hr = SceCloseDatabase(pDatabase);
+                    NativeAssert::Succeeded(hr, "Failed to close database");
+                }
+                ReleaseStr(sczDbPath);
+                if (fComInitialized)
+                {
+                    ::CoUninitialize();
+                }
+            }
+        }
+    };
+}
diff --git a/src/libs/dutil/test/DUtilUnitTest/StrUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/StrUtilTest.cpp
new file mode 100644
index 00000000..94fee280
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/StrUtilTest.cpp
@@ -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.
+#include "precomp.h"
+using namespace System;
+using namespace Xunit;
+using namespace WixBuildTools::TestSupport;
+namespace DutilTests
+{
+    public ref class StrUtil
+    {
+    public:
+        [Fact]
+        void StrUtilFormattedTest()
+        {
+            HRESULT hr = S_OK;
+            LPWSTR sczText = NULL;
+            try
+            {
+                hr = StrAllocFormatted(&sczText, L"%hs - %ls - %u", "ansi string", L"unicode string", 1234);
+                NativeAssert::Succeeded(hr, "Failed to format string.");
+                NativeAssert::StringEqual(L"ansi string - unicode string - 1234", sczText);
+                ReleaseNullStr(sczText);
+                hr = StrAllocString(&sczText, L"repeat", 0);
+                NativeAssert::Succeeded(hr, "Failed to allocate string.");
+                hr = StrAllocFormatted(&sczText, L"%ls and %ls", sczText, sczText);
+                NativeAssert::Succeeded(hr, "Failed to format string unto itself.");
+                NativeAssert::StringEqual(L"repeat and repeat", sczText);
+            }
+            finally
+            {
+                ReleaseStr(sczText);
+            }
+        }
+        [Fact]
+        void StrUtilTrimTest()
+        {
+            TestTrim(L"", L"");
+            TestTrim(L"Blah", L"Blah");
+            TestTrim(L"\t\t\tBlah", L"Blah");
+            TestTrim(L"\t    Blah     ", L"Blah");
+            TestTrim(L"Blah     ", L"Blah");
+            TestTrim(L"\t  Spaces  \t   Between   \t", L"Spaces  \t   Between");
+            TestTrim(L"    \t\t\t    ", L"");
+            TestTrimAnsi("", "");
+            TestTrimAnsi("Blah", "Blah");
+            TestTrimAnsi("\t\t\tBlah", "Blah");
+            TestTrimAnsi("    Blah     ", "Blah");
+            TestTrimAnsi("Blah     ", "Blah");
+            TestTrimAnsi("\t  Spaces  \t   Between   \t", "Spaces  \t   Between");
+            TestTrimAnsi("    \t\t\t    ", "");
+        }
+        [Fact]
+        void StrUtilConvertTest()
+        {
+            char a[] = { 'a', 'b', 'C', 'd', '\0', '\0' };
+            TestStrAllocStringAnsi(a, 5, L"abCd");
+            TestStrAllocStringAnsi(a, 4, L"abCd");
+            TestStrAllocStringAnsi(a, 3, L"abC");
+            TestStrAllocStringAnsi(a, 2, L"ab");
+            TestStrAllocStringAnsi(a, 1, L"a");
+            TestStrAllocStringAnsi(a, 0, L"abCd");
+            wchar_t b[] = { L'a', L'b', L'C', L'd', L'\0', L'\0' };
+            TestStrAnsiAllocString(b, 5, "abCd");
+            TestStrAnsiAllocString(b, 4, "abCd");
+            TestStrAnsiAllocString(b, 3, "abC");
+            TestStrAnsiAllocString(b, 2, "ab");
+            TestStrAnsiAllocString(b, 1, "a");
+            TestStrAnsiAllocString(b, 0, "abCd");
+        }
+    private:
+        void TestTrim(LPCWSTR wzInput, LPCWSTR wzExpectedResult)
+        {
+            HRESULT hr = S_OK;
+            LPWSTR sczOutput = NULL;
+            DutilInitialize(&DutilTestTraceError);
+            try
+            {
+                hr = StrTrimWhitespace(&sczOutput, wzInput);
+                NativeAssert::Succeeded(hr, "Failed to trim whitespace from string: {0}", wzInput);
+                if (0 != wcscmp(wzExpectedResult, sczOutput))
+                {
+                    hr = E_FAIL;
+                    ExitOnFailure(hr, "Trimmed string \"%ls\", expected result \"%ls\", actual result \"%ls\"", wzInput, wzExpectedResult, sczOutput);
+                }
+            }
+            finally
+            {
+                ReleaseStr(sczOutput);
+            }
+        LExit:
+            DutilUninitialize();
+        }
+        void TestTrimAnsi(LPCSTR szInput, LPCSTR szExpectedResult)
+        {
+            HRESULT hr = S_OK;
+            LPSTR sczOutput = NULL;
+            DutilInitialize(&DutilTestTraceError);
+            try
+            {
+                hr = StrAnsiTrimWhitespace(&sczOutput, szInput);
+                NativeAssert::Succeeded(hr, "Failed to trim whitespace from string: \"{0}\"", szInput);
+                if (0 != strcmp(szExpectedResult, sczOutput))
+                {
+                    hr = E_FAIL;
+                    ExitOnFailure(hr, "Trimmed string \"%hs\", expected result \"%hs\", actual result \"%hs\"", szInput, szExpectedResult, sczOutput);
+                }
+            }
+            finally
+            {
+                ReleaseStr(sczOutput);
+            }
+        LExit:
+            DutilUninitialize();
+        }
+        void TestStrAllocStringAnsi(LPCSTR szSource, DWORD cchSource, LPCWSTR wzExpectedResult)
+        {
+            HRESULT hr = S_OK;
+            LPWSTR sczOutput = NULL;
+            DutilInitialize(&DutilTestTraceError);
+            try
+            {
+                hr = StrAllocStringAnsi(&sczOutput, szSource, cchSource, CP_UTF8);
+                NativeAssert::Succeeded(hr, "Failed to call StrAllocStringAnsi on string: \"{0}\"", szSource);
+                if (0 != wcscmp(sczOutput, wzExpectedResult))
+                {
+                    hr = E_FAIL;
+                    ExitOnFailure(hr, "String doesn't match, expected result \"%ls\", actual result \"%ls\"", wzExpectedResult, sczOutput);
+                }
+            }
+            finally
+            {
+                ReleaseStr(sczOutput);
+            }
+        LExit:
+            DutilUninitialize();
+        }
+        void TestStrAnsiAllocString(LPWSTR wzSource, DWORD cchSource, LPCSTR szExpectedResult)
+        {
+            HRESULT hr = S_OK;
+            LPSTR sczOutput = NULL;
+            DutilInitialize(&DutilTestTraceError);
+            try
+            {
+                hr = StrAnsiAllocString(&sczOutput, wzSource, cchSource, CP_UTF8);
+                NativeAssert::Succeeded(hr, "Failed to call StrAllocStringAnsi on string: \"{0}\"", wzSource);
+                if (0 != strcmp(sczOutput, szExpectedResult))
+                {
+                    hr = E_FAIL;
+                    ExitOnFailure(hr, "String doesn't match, expected result \"%hs\", actual result \"%hs\"", szExpectedResult, sczOutput);
+                }
+            }
+            finally
+            {
+                ReleaseStr(sczOutput);
+            }
+        LExit:
+            DutilUninitialize();
+        }
+    };
+}
diff --git a/src/libs/dutil/test/DUtilUnitTest/TestData/ApupUtilTests/FeedBv2.0.xml b/src/libs/dutil/test/DUtilUnitTest/TestData/ApupUtilTests/FeedBv2.0.xml
new file mode 100644
index 00000000..d9f961fe
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/TestData/ApupUtilTests/FeedBv2.0.xml
@@ -0,0 +1,68 @@
+<?xml version='1.0' ?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<feed xmlns="http://www.w3.org/2005/Atom" xmlns:as="http://appsyndication.org/2006/appsyn">
+  <title type="text">BundleB v2.0</title>
+  <subtitle type="text">Bundle Subtitle.</subtitle>
+  <as:application type="application/exe">1116353B-7C6E-4C29-BFA1-D4A972CD421D</as:application>
+  <updated>2014-07-14T12:39:00.000Z</updated>
+  <id>http://localhost:9999/wix4/BundleB/feed</id>
+  <link rel="self" type="application/atom+xml" href="http://localhost:9999/wix4/BundleB/feed"/>
+  <generator version="0.1">manual build</generator>
+  <entry>
+    <title>Bundle v2.0</title>
+    <id>v2.0</id>
+    <author>
+      <name>Bundle_Author</name>
+      <uri>http://mycompany.com/software</uri>
+      <email>Bundle_Author@mycompany.com</email>
+    </author>
+    <link rel="alternate" href="http://www.mycompany.com/content/view/software"/>
+    <link rel="enclosure" href="http://localhost:9999/wix4/BundleB/2.0/BundleB.exe" length="0" type="application/octet-stream"/>
+    <content type="html">
+      &lt;p&gt;Change list:&lt;/p&gt;&lt;ul&gt;
+      &lt;li&gt;Updated release.&lt;/li&gt;
+      &lt;/ul&gt;
+    </content>
+    <as:version>2.0.0.0</as:version>
+    <updated>2014-11-10T12:39:00.000Z</updated>
+  </entry>
+  <entry>
+    <title>Bundle v1.0</title>
+    <id>v1.0</id>
+    <author>
+      <name>Bundle_Author</name>
+      <uri>http://mycompany.com/software</uri>
+      <email>Bundle_Author@mycompany.com</email>
+    </author>
+    <link rel="alternate" href="http://www.mycompany.com/content/view/software"/>
+    <link rel="enclosure" href="http://localhost:9999/wix4/BundleB/1.0/BundleB.exe" length="0" type="application/octet-stream"/>
+    <content type="html">
+      &lt;p&gt;Change list:&lt;/p&gt;&lt;ul&gt;
+      &lt;li&gt;Initial release.&lt;/li&gt;
+      &lt;/ul&gt;
+    </content>
+    <as:upgrade version="1.0.0.0-preview" />
+    <as:version>1.0.0.0</as:version>
+    <updated>2014-11-09T12:39:00.000Z</updated>
+  </entry>
+  <entry>
+    <title>Bundle v1.0-preview</title>
+    <id>v1.0-preview</id>
+    <author>
+      <name>Bundle_Author</name>
+      <uri>http://mycompany.com/software</uri>
+      <email>Bundle_Author@mycompany.com</email>
+    </author>
+    <link rel="alternate" href="http://www.mycompany.com/content/view/software"/>
+    <link rel="enclosure" href="http://localhost:9999/wix4/BundleB/1.0-preview/BundleB.exe" length="10000" type="application/octet-stream"/>
+    <content type="html">
+      &lt;p&gt;Change list:&lt;/p&gt;&lt;ul&gt;
+      &lt;li&gt;Initial release.&lt;/li&gt;
+      &lt;/ul&gt;
+    </content>
+    <as:version>1.0.0.0</as:version>
+    <updated>2014-11-09T12:39:00.000Z</updated>
+  </entry>
+</feed>
diff --git a/src/libs/dutil/test/DUtilUnitTest/UnitTest.rc b/src/libs/dutil/test/DUtilUnitTest/UnitTest.rc
new file mode 100644
index 00000000..14cebe1a
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/UnitTest.rc
@@ -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.
+#define VER_APP
+#define VER_ORIGINAL_FILENAME "UnitTest.dll"
+#define VER_INTERNAL_NAME "setup"
+#define VER_FILE_DESCRIPTION "WiX Toolset Bootstrapper unit tests"
diff --git a/src/libs/dutil/test/DUtilUnitTest/UriUtilTest.cpp b/src/libs/dutil/test/DUtilUnitTest/UriUtilTest.cpp
new file mode 100644
index 00000000..b3bf87a2
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/UriUtilTest.cpp
@@ -0,0 +1,98 @@
+// 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.
+#include "precomp.h"
+using namespace System;
+using namespace System::Text;
+using namespace System::Collections::Generic;
+using namespace Xunit;
+namespace CfgTests
+{
+        public ref class UriUtil
+        {
+        public:
+                [Fact]
+                void UriProtocolTest()
+                {
+                        HRESULT hr = S_OK;
+                        DutilInitialize(&DutilTestTraceError);
+                        LPCWSTR uri = L"https://localhost/";
+                        URI_PROTOCOL uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
+                        hr = UriProtocol(uri, &uriProtocol);
+                        ExitOnFailure(hr, "Failed to determine UriProtocol");
+                        Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_HTTPS, (int)uriProtocol);
+                        uri = L"HTTPS://localhost/";
+                        uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
+                        hr = UriProtocol(uri, &uriProtocol);
+                        ExitOnFailure(hr, "Failed to determine UriProtocol");
+                        Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_HTTPS, (int)uriProtocol);
+                        uri = L"HtTpS://localhost/";
+                        uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
+                        hr = UriProtocol(uri, &uriProtocol);
+                        ExitOnFailure(hr, "Failed to determine UriProtocol");
+                        Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_HTTPS, (int)uriProtocol);
+                        uri = L"HTTP://localhost/";
+                        uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
+                        hr = UriProtocol(uri, &uriProtocol);
+                        ExitOnFailure(hr, "Failed to determine UriProtocol");
+                        Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_HTTP, (int)uriProtocol);
+                        uri = L"http://localhost/";
+                        uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
+                        hr = UriProtocol(uri, &uriProtocol);
+                        ExitOnFailure(hr, "Failed to determine UriProtocol");
+                        Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_HTTP, (int)uriProtocol);
+                        uri = L"HtTp://localhost/";
+                        uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
+                        hr = UriProtocol(uri, &uriProtocol);
+                        ExitOnFailure(hr, "Failed to determine UriProtocol");
+                        Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_HTTP, (int)uriProtocol);
+                        uri = L"file://localhost/";
+                        uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
+                        hr = UriProtocol(uri, &uriProtocol);
+                        ExitOnFailure(hr, "Failed to determine UriProtocol");
+                        Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_FILE, (int)uriProtocol);
+                        uri = L"FILE://localhost/";
+                        uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
+                        hr = UriProtocol(uri, &uriProtocol);
+                        ExitOnFailure(hr, "Failed to determine UriProtocol");
+                        Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_FILE, (int)uriProtocol);
+                        uri = L"FiLe://localhost/";
+                        uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
+                        hr = UriProtocol(uri, &uriProtocol);
+                        ExitOnFailure(hr, "Failed to determine UriProtocol");
+                        Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_FILE, (int)uriProtocol);
+                        uri = L"FTP://localhost/";
+                        uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
+                        hr = UriProtocol(uri, &uriProtocol);
+                        ExitOnFailure(hr, "Failed to determine UriProtocol");
+                        Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_FTP, (int)uriProtocol);
+                        uri = L"ftp://localhost/";
+                        uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
+                        hr = UriProtocol(uri, &uriProtocol);
+                        ExitOnFailure(hr, "Failed to determine UriProtocol");
+                        Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_FTP, (int)uriProtocol);
+                        uri = L"FtP://localhost/";
+                        uriProtocol = URI_PROTOCOL::URI_PROTOCOL_UNKNOWN;
+                        hr = UriProtocol(uri, &uriProtocol);
+                        ExitOnFailure(hr, "Failed to determine UriProtocol");
+                        Assert::Equal((int)URI_PROTOCOL::URI_PROTOCOL_FTP, (int)uriProtocol);
+                LExit:
+                        DutilUninitialize();
+                }
+        };
+}
diff --git a/src/libs/dutil/test/DUtilUnitTest/VerUtilTests.cpp b/src/libs/dutil/test/DUtilUnitTest/VerUtilTests.cpp
new file mode 100644
index 00000000..8f24ad1a
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/VerUtilTests.cpp
@@ -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.
+#include "precomp.h"
+using namespace System;
+using namespace Xunit;
+using namespace WixBuildTools::TestSupport;
+namespace DutilTests
+{
+    public ref class VerUtil
+    {
+    public:
+        [Fact]
+        void VerCompareVersionsTreatsMissingRevisionAsZero()
+        {
+            HRESULT hr = S_OK;
+            VERUTIL_VERSION* pVersion1 = NULL;
+            VERUTIL_VERSION* pVersion2 = NULL;
+            VERUTIL_VERSION* pVersion3 = NULL;
+            LPCWSTR wzVersion1 = L"1.2.3.4";
+            LPCWSTR wzVersion2 = L"1.2.3";
+            LPCWSTR wzVersion3 = L"1.2.3.0";
+            try
+            {
+                hr = VerParseVersion(wzVersion1, 0, FALSE, &pVersion1);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion1);
+                hr = VerParseVersion(wzVersion2, 0, FALSE, &pVersion2);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion2);
+                hr = VerParseVersion(wzVersion3, 0, FALSE, &pVersion3);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion3);
+                NativeAssert::StringEqual(wzVersion1, pVersion1->sczVersion);
+                Assert::Equal<DWORD>(1, pVersion1->dwMajor);
+                Assert::Equal<DWORD>(2, pVersion1->dwMinor);
+                Assert::Equal<DWORD>(3, pVersion1->dwPatch);
+                Assert::Equal<DWORD>(4, pVersion1->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion1->cReleaseLabels);
+                Assert::Equal<DWORD>(7, pVersion1->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion1->fInvalid);
+                NativeAssert::StringEqual(wzVersion2, pVersion2->sczVersion);
+                Assert::Equal<DWORD>(1, pVersion2->dwMajor);
+                Assert::Equal<DWORD>(2, pVersion2->dwMinor);
+                Assert::Equal<DWORD>(3, pVersion2->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion2->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion2->cReleaseLabels);
+                Assert::Equal<DWORD>(5, pVersion2->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion2->fInvalid);
+                NativeAssert::StringEqual(wzVersion3, pVersion3->sczVersion);
+                Assert::Equal<DWORD>(1, pVersion3->dwMajor);
+                Assert::Equal<DWORD>(2, pVersion3->dwMinor);
+                Assert::Equal<DWORD>(3, pVersion3->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion3->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion3->cReleaseLabels);
+                Assert::Equal<DWORD>(7, pVersion3->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion3->fInvalid);
+                TestVerutilCompareParsedVersions(pVersion1, pVersion2, 1);
+                TestVerutilCompareParsedVersions(pVersion3, pVersion2, 0);
+            }
+            finally
+            {
+                ReleaseVerutilVersion(pVersion1);
+                ReleaseVerutilVersion(pVersion2);
+                ReleaseVerutilVersion(pVersion3);
+            }
+        }
+        [Fact]
+        void VerCompareVersionsTreatsNumericReleaseLabelsAsNumbers()
+        {
+            HRESULT hr = S_OK;
+            VERUTIL_VERSION* pVersion1 = NULL;
+            VERUTIL_VERSION* pVersion2 = NULL;
+            LPCWSTR wzVersion1 = L"1.0-2.0";
+            LPCWSTR wzVersion2 = L"1.0-19";
+            try
+            {
+                hr = VerParseVersion(wzVersion1, 0, FALSE, &pVersion1);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion1);
+                hr = VerParseVersion(wzVersion2, 0, FALSE, &pVersion2);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion2);
+                NativeAssert::StringEqual(wzVersion1, pVersion1->sczVersion);
+                Assert::Equal<DWORD>(1, pVersion1->dwMajor);
+                Assert::Equal<DWORD>(0, pVersion1->dwMinor);
+                Assert::Equal<DWORD>(0, pVersion1->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion1->dwRevision);
+                Assert::Equal<DWORD>(2, pVersion1->cReleaseLabels);
+                Assert::Equal<BOOL>(TRUE, pVersion1->rgReleaseLabels[0].fNumeric);
+                Assert::Equal<DWORD>(2, pVersion1->rgReleaseLabels[0].dwValue);
+                Assert::Equal<DWORD>(1, pVersion1->rgReleaseLabels[0].cchLabel);
+                Assert::Equal<DWORD>(4, pVersion1->rgReleaseLabels[0].cchLabelOffset);
+                Assert::Equal<BOOL>(TRUE, pVersion1->rgReleaseLabels[1].fNumeric);
+                Assert::Equal<DWORD>(0, pVersion1->rgReleaseLabels[1].dwValue);
+                Assert::Equal<DWORD>(1, pVersion1->rgReleaseLabels[1].cchLabel);
+                Assert::Equal<DWORD>(6, pVersion1->rgReleaseLabels[1].cchLabelOffset);
+                Assert::Equal<DWORD>(7, pVersion1->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion1->fInvalid);
+                NativeAssert::StringEqual(wzVersion2, pVersion2->sczVersion);
+                Assert::Equal<DWORD>(1, pVersion2->dwMajor);
+                Assert::Equal<DWORD>(0, pVersion2->dwMinor);
+                Assert::Equal<DWORD>(0, pVersion2->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion2->dwRevision);
+                Assert::Equal<DWORD>(1, pVersion2->cReleaseLabels);
+                Assert::Equal<BOOL>(TRUE, pVersion2->rgReleaseLabels[0].fNumeric);
+                Assert::Equal<DWORD>(19, pVersion2->rgReleaseLabels[0].dwValue);
+                Assert::Equal<DWORD>(2, pVersion2->rgReleaseLabels[0].cchLabel);
+                Assert::Equal<DWORD>(4, pVersion2->rgReleaseLabels[0].cchLabelOffset);
+                Assert::Equal<DWORD>(6, pVersion2->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion2->fInvalid);
+                TestVerutilCompareParsedVersions(pVersion1, pVersion2, -1);
+            }
+            finally
+            {
+                ReleaseVerutilVersion(pVersion1);
+                ReleaseVerutilVersion(pVersion2);
+            }
+        }
+        [Fact]
+        void VerCompareVersionsHandlesNormallyInvalidVersions()
+        {
+            HRESULT hr = S_OK;
+            VERUTIL_VERSION* pVersion1 = NULL;
+            VERUTIL_VERSION* pVersion2 = NULL;
+            VERUTIL_VERSION* pVersion3 = NULL;
+            VERUTIL_VERSION* pVersion4 = NULL;
+            VERUTIL_VERSION* pVersion5 = NULL;
+            VERUTIL_VERSION* pVersion6 = NULL;
+            LPCWSTR wzVersion1 = L"10.-4.0";
+            LPCWSTR wzVersion2 = L"10.-2.0";
+            LPCWSTR wzVersion3 = L"0";
+            LPCWSTR wzVersion4 = L"";
+            LPCWSTR wzVersion5 = L"10-2";
+            LPCWSTR wzVersion6 = L"10-4.@";
+            try
+            {
+                hr = VerParseVersion(wzVersion1, 0, FALSE, &pVersion1);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion1);
+                hr = VerParseVersion(wzVersion2, 0, FALSE, &pVersion2);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion2);
+                hr = VerParseVersion(wzVersion3, 0, FALSE, &pVersion3);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion3);
+                hr = VerParseVersion(wzVersion4, 0, FALSE, &pVersion4);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion4);
+                hr = VerParseVersion(wzVersion5, 0, FALSE, &pVersion5);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion5);
+                hr = VerParseVersion(wzVersion6, 0, FALSE, &pVersion6);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion6);
+                NativeAssert::StringEqual(wzVersion1, pVersion1->sczVersion);
+                Assert::Equal<DWORD>(10, pVersion1->dwMajor);
+                Assert::Equal<DWORD>(0, pVersion1->dwMinor);
+                Assert::Equal<DWORD>(0, pVersion1->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion1->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion1->cReleaseLabels);
+                Assert::Equal<DWORD>(3, pVersion1->cchMetadataOffset);
+                Assert::Equal<BOOL>(TRUE, pVersion1->fInvalid);
+                NativeAssert::StringEqual(wzVersion2, pVersion2->sczVersion);
+                Assert::Equal<DWORD>(10, pVersion2->dwMajor);
+                Assert::Equal<DWORD>(0, pVersion2->dwMinor);
+                Assert::Equal<DWORD>(0, pVersion2->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion2->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion2->cReleaseLabels);
+                Assert::Equal<DWORD>(3, pVersion2->cchMetadataOffset);
+                Assert::Equal<BOOL>(TRUE, pVersion2->fInvalid);
+                NativeAssert::StringEqual(wzVersion3, pVersion3->sczVersion);
+                Assert::Equal<DWORD>(0, pVersion3->dwMajor);
+                Assert::Equal<DWORD>(0, pVersion3->dwMinor);
+                Assert::Equal<DWORD>(0, pVersion3->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion3->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion3->cReleaseLabels);
+                Assert::Equal<DWORD>(1, pVersion3->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion3->fInvalid);
+                NativeAssert::StringEqual(wzVersion4, pVersion4->sczVersion);
+                Assert::Equal<DWORD>(0, pVersion4->dwMajor);
+                Assert::Equal<DWORD>(0, pVersion4->dwMinor);
+                Assert::Equal<DWORD>(0, pVersion4->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion4->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion4->cReleaseLabels);
+                Assert::Equal<DWORD>(0, pVersion4->cchMetadataOffset);
+                Assert::Equal<BOOL>(TRUE, pVersion4->fInvalid);
+                NativeAssert::StringEqual(wzVersion5, pVersion5->sczVersion);
+                Assert::Equal<DWORD>(10, pVersion5->dwMajor);
+                Assert::Equal<DWORD>(0, pVersion5->dwMinor);
+                Assert::Equal<DWORD>(0, pVersion5->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion5->dwRevision);
+                Assert::Equal<DWORD>(1, pVersion5->cReleaseLabels);
+                Assert::Equal<BOOL>(TRUE, pVersion5->rgReleaseLabels[0].fNumeric);
+                Assert::Equal<DWORD>(2, pVersion5->rgReleaseLabels[0].dwValue);
+                Assert::Equal<DWORD>(1, pVersion5->rgReleaseLabels[0].cchLabel);
+                Assert::Equal<DWORD>(3, pVersion5->rgReleaseLabels[0].cchLabelOffset);
+                Assert::Equal<DWORD>(4, pVersion5->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion5->fInvalid);
+                NativeAssert::StringEqual(wzVersion6, pVersion6->sczVersion);
+                Assert::Equal<DWORD>(10, pVersion6->dwMajor);
+                Assert::Equal<DWORD>(0, pVersion6->dwMinor);
+                Assert::Equal<DWORD>(0, pVersion6->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion6->dwRevision);
+                Assert::Equal<DWORD>(1, pVersion6->cReleaseLabels);
+                Assert::Equal<BOOL>(TRUE, pVersion6->rgReleaseLabels[0].fNumeric);
+                Assert::Equal<DWORD>(4, pVersion6->rgReleaseLabels[0].dwValue);
+                Assert::Equal<DWORD>(1, pVersion6->rgReleaseLabels[0].cchLabel);
+                Assert::Equal<DWORD>(3, pVersion6->rgReleaseLabels[0].cchLabelOffset);
+                Assert::Equal<DWORD>(5, pVersion6->cchMetadataOffset);
+                Assert::Equal<BOOL>(TRUE, pVersion6->fInvalid);
+                TestVerutilCompareParsedVersions(pVersion1, pVersion2, 1);
+                TestVerutilCompareParsedVersions(pVersion3, pVersion4, 1);
+                TestVerutilCompareParsedVersions(pVersion5, pVersion6, -1);
+            }
+            finally
+            {
+                ReleaseVerutilVersion(pVersion1);
+                ReleaseVerutilVersion(pVersion2);
+                ReleaseVerutilVersion(pVersion3);
+                ReleaseVerutilVersion(pVersion4);
+                ReleaseVerutilVersion(pVersion5);
+                ReleaseVerutilVersion(pVersion6);
+            }
+        }
+        [Fact]
+        void VerCompareVersionsTreatsHyphenAsVersionSeparator()
+        {
+            HRESULT hr = S_OK;
+            VERUTIL_VERSION* pVersion1 = NULL;
+            VERUTIL_VERSION* pVersion2 = NULL;
+            VERUTIL_VERSION* pVersion3 = NULL;
+            LPCWSTR wzVersion1 = L"0.0.1-a";
+            LPCWSTR wzVersion2 = L"0-2";
+            LPCWSTR wzVersion3 = L"1-2";
+            try
+            {
+                hr = VerParseVersion(wzVersion1, 0, FALSE, &pVersion1);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion1);
+                hr = VerParseVersion(wzVersion2, 0, FALSE, &pVersion2);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion2);
+                hr = VerParseVersion(wzVersion3, 0, FALSE, &pVersion3);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion3);
+                NativeAssert::StringEqual(wzVersion1, pVersion1->sczVersion);
+                Assert::Equal<DWORD>(0, pVersion1->dwMajor);
+                Assert::Equal<DWORD>(0, pVersion1->dwMinor);
+                Assert::Equal<DWORD>(1, pVersion1->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion1->dwRevision);
+                Assert::Equal<DWORD>(1, pVersion1->cReleaseLabels);
+                Assert::Equal<BOOL>(FALSE, pVersion1->rgReleaseLabels[0].fNumeric);
+                Assert::Equal<DWORD>(1, pVersion1->rgReleaseLabels[0].cchLabel);
+                Assert::Equal<DWORD>(6, pVersion1->rgReleaseLabels[0].cchLabelOffset);
+                Assert::Equal<DWORD>(7, pVersion1->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion1->fInvalid);
+                NativeAssert::StringEqual(wzVersion2, pVersion2->sczVersion);
+                Assert::Equal<DWORD>(0, pVersion2->dwMajor);
+                Assert::Equal<DWORD>(0, pVersion2->dwMinor);
+                Assert::Equal<DWORD>(0, pVersion2->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion2->dwRevision);
+                Assert::Equal<DWORD>(1, pVersion2->cReleaseLabels);
+                Assert::Equal<BOOL>(TRUE, pVersion2->rgReleaseLabels[0].fNumeric);
+                Assert::Equal<DWORD>(2, pVersion2->rgReleaseLabels[0].dwValue);
+                Assert::Equal<DWORD>(1, pVersion2->rgReleaseLabels[0].cchLabel);
+                Assert::Equal<DWORD>(2, pVersion2->rgReleaseLabels[0].cchLabelOffset);
+                Assert::Equal<DWORD>(3, pVersion2->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion2->fInvalid);
+                NativeAssert::StringEqual(wzVersion3, pVersion3->sczVersion);
+                Assert::Equal<DWORD>(1, pVersion3->dwMajor);
+                Assert::Equal<DWORD>(0, pVersion3->dwMinor);
+                Assert::Equal<DWORD>(0, pVersion3->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion3->dwRevision);
+                Assert::Equal<DWORD>(1, pVersion3->cReleaseLabels);
+                Assert::Equal<BOOL>(TRUE, pVersion3->rgReleaseLabels[0].fNumeric);
+                Assert::Equal<DWORD>(2, pVersion3->rgReleaseLabels[0].dwValue);
+                Assert::Equal<DWORD>(1, pVersion3->rgReleaseLabels[0].cchLabel);
+                Assert::Equal<DWORD>(2, pVersion3->rgReleaseLabels[0].cchLabelOffset);
+                Assert::Equal<DWORD>(3, pVersion3->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion3->fInvalid);
+                TestVerutilCompareParsedVersions(pVersion1, pVersion2, 1);
+                TestVerutilCompareParsedVersions(pVersion1, pVersion3, -1);
+            }
+            finally
+            {
+                ReleaseVerutilVersion(pVersion1);
+                ReleaseVerutilVersion(pVersion2);
+                ReleaseVerutilVersion(pVersion3);
+            }
+        }
+        [Fact]
+        void VerCompareVersionsIgnoresLeadingZeroes()
+        {
+            HRESULT hr = S_OK;
+            VERUTIL_VERSION* pVersion1 = NULL;
+            VERUTIL_VERSION* pVersion2 = NULL;
+            VERUTIL_VERSION* pVersion3 = NULL;
+            VERUTIL_VERSION* pVersion4 = NULL;
+            LPCWSTR wzVersion1 = L"0.01-a.1";
+            LPCWSTR wzVersion2 = L"0.1.0-a.1";
+            LPCWSTR wzVersion3 = L"0.1-a.b.0";
+            LPCWSTR wzVersion4 = L"0.1.0-a.b.000";
+            try
+            {
+                hr = VerParseVersion(wzVersion1, 0, FALSE, &pVersion1);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion1);
+                hr = VerParseVersion(wzVersion2, 0, FALSE, &pVersion2);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion2);
+                hr = VerParseVersion(wzVersion3, 0, FALSE, &pVersion3);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion3);
+                hr = VerParseVersion(wzVersion4, 0, FALSE, &pVersion4);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion4);
+                NativeAssert::StringEqual(wzVersion1, pVersion1->sczVersion);
+                Assert::Equal<DWORD>(0, pVersion1->dwMajor);
+                Assert::Equal<DWORD>(1, pVersion1->dwMinor);
+                Assert::Equal<DWORD>(0, pVersion1->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion1->dwRevision);
+                Assert::Equal<DWORD>(2, pVersion1->cReleaseLabels);
+                Assert::Equal<BOOL>(FALSE, pVersion1->rgReleaseLabels[0].fNumeric);
+                Assert::Equal<DWORD>(1, pVersion1->rgReleaseLabels[0].cchLabel);
+                Assert::Equal<DWORD>(5, pVersion1->rgReleaseLabels[0].cchLabelOffset);
+                Assert::Equal<BOOL>(TRUE, pVersion1->rgReleaseLabels[1].fNumeric);
+                Assert::Equal<DWORD>(1, pVersion1->rgReleaseLabels[1].dwValue);
+                Assert::Equal<DWORD>(1, pVersion1->rgReleaseLabels[1].cchLabel);
+                Assert::Equal<DWORD>(7, pVersion1->rgReleaseLabels[1].cchLabelOffset);
+                Assert::Equal<DWORD>(8, pVersion1->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion1->fInvalid);
+                NativeAssert::StringEqual(wzVersion2, pVersion2->sczVersion);
+                Assert::Equal<DWORD>(0, pVersion2->dwMajor);
+                Assert::Equal<DWORD>(1, pVersion2->dwMinor);
+                Assert::Equal<DWORD>(0, pVersion2->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion2->dwRevision);
+                Assert::Equal<DWORD>(2, pVersion2->cReleaseLabels);
+                Assert::Equal<BOOL>(FALSE, pVersion2->rgReleaseLabels[0].fNumeric);
+                Assert::Equal<DWORD>(1, pVersion2->rgReleaseLabels[0].cchLabel);
+                Assert::Equal<DWORD>(6, pVersion2->rgReleaseLabels[0].cchLabelOffset);
+                Assert::Equal<BOOL>(TRUE, pVersion2->rgReleaseLabels[1].fNumeric);
+                Assert::Equal<DWORD>(1, pVersion2->rgReleaseLabels[1].dwValue);
+                Assert::Equal<DWORD>(1, pVersion2->rgReleaseLabels[1].cchLabel);
+                Assert::Equal<DWORD>(8, pVersion2->rgReleaseLabels[1].cchLabelOffset);
+                Assert::Equal<DWORD>(9, pVersion2->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion2->fInvalid);
+                NativeAssert::StringEqual(wzVersion3, pVersion3->sczVersion);
+                Assert::Equal<DWORD>(0, pVersion3->dwMajor);
+                Assert::Equal<DWORD>(1, pVersion3->dwMinor);
+                Assert::Equal<DWORD>(0, pVersion3->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion3->dwRevision);
+                Assert::Equal<DWORD>(3, pVersion3->cReleaseLabels);
+                Assert::Equal<BOOL>(FALSE, pVersion3->rgReleaseLabels[0].fNumeric);
+                Assert::Equal<DWORD>(1, pVersion3->rgReleaseLabels[0].cchLabel);
+                Assert::Equal<DWORD>(4, pVersion3->rgReleaseLabels[0].cchLabelOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion3->rgReleaseLabels[1].fNumeric);
+                Assert::Equal<DWORD>(1, pVersion3->rgReleaseLabels[1].cchLabel);
+                Assert::Equal<DWORD>(6, pVersion3->rgReleaseLabels[1].cchLabelOffset);
+                Assert::Equal<BOOL>(TRUE, pVersion3->rgReleaseLabels[2].fNumeric);
+                Assert::Equal<DWORD>(0, pVersion3->rgReleaseLabels[2].dwValue);
+                Assert::Equal<DWORD>(1, pVersion3->rgReleaseLabels[2].cchLabel);
+                Assert::Equal<DWORD>(8, pVersion3->rgReleaseLabels[2].cchLabelOffset);
+                Assert::Equal<DWORD>(9, pVersion3->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion3->fInvalid);
+                NativeAssert::StringEqual(wzVersion4, pVersion4->sczVersion);
+                Assert::Equal<DWORD>(0, pVersion4->dwMajor);
+                Assert::Equal<DWORD>(1, pVersion4->dwMinor);
+                Assert::Equal<DWORD>(0, pVersion4->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion4->dwRevision);
+                Assert::Equal<DWORD>(3, pVersion4->cReleaseLabels);
+                Assert::Equal<BOOL>(FALSE, pVersion4->rgReleaseLabels[0].fNumeric);
+                Assert::Equal<DWORD>(1, pVersion4->rgReleaseLabels[0].cchLabel);
+                Assert::Equal<DWORD>(6, pVersion4->rgReleaseLabels[0].cchLabelOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion4->rgReleaseLabels[1].fNumeric);
+                Assert::Equal<DWORD>(1, pVersion4->rgReleaseLabels[1].cchLabel);
+                Assert::Equal<DWORD>(8, pVersion4->rgReleaseLabels[1].cchLabelOffset);
+                Assert::Equal<BOOL>(TRUE, pVersion4->rgReleaseLabels[2].fNumeric);
+                Assert::Equal<DWORD>(0, pVersion4->rgReleaseLabels[2].dwValue);
+                Assert::Equal<DWORD>(3, pVersion4->rgReleaseLabels[2].cchLabel);
+                Assert::Equal<DWORD>(10, pVersion4->rgReleaseLabels[2].cchLabelOffset);
+                Assert::Equal<DWORD>(13, pVersion4->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion4->fInvalid);
+                TestVerutilCompareParsedVersions(pVersion1, pVersion2, 0);
+                TestVerutilCompareParsedVersions(pVersion3, pVersion4, 0);
+            }
+            finally
+            {
+                ReleaseVerutilVersion(pVersion1);
+                ReleaseVerutilVersion(pVersion2);
+                ReleaseVerutilVersion(pVersion3);
+                ReleaseVerutilVersion(pVersion4);
+            }
+        }
+        [Fact]
+        void VerCompareVersionsTreatsUnexpectedContentAsMetadata()
+        {
+            HRESULT hr = S_OK;
+            VERUTIL_VERSION* pVersion1 = NULL;
+            VERUTIL_VERSION* pVersion2 = NULL;
+            VERUTIL_VERSION* pVersion3 = NULL;
+            LPCWSTR wzVersion1 = L"1.2.3+abcd";
+            LPCWSTR wzVersion2 = L"1.2.3.abcd";
+            LPCWSTR wzVersion3 = L"1.2.3.-abcd";
+            try
+            {
+                hr = VerParseVersion(wzVersion1, 0, FALSE, &pVersion1);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion1);
+                hr = VerParseVersion(wzVersion2, 0, FALSE, &pVersion2);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion2);
+                hr = VerParseVersion(wzVersion3, 0, FALSE, &pVersion3);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion3);
+                NativeAssert::StringEqual(wzVersion1, pVersion1->sczVersion);
+                Assert::Equal<DWORD>(1, pVersion1->dwMajor);
+                Assert::Equal<DWORD>(2, pVersion1->dwMinor);
+                Assert::Equal<DWORD>(3, pVersion1->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion1->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion1->cReleaseLabels);
+                Assert::Equal<DWORD>(6, pVersion1->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion1->fInvalid);
+                NativeAssert::StringEqual(wzVersion2, pVersion2->sczVersion);
+                Assert::Equal<DWORD>(1, pVersion2->dwMajor);
+                Assert::Equal<DWORD>(2, pVersion2->dwMinor);
+                Assert::Equal<DWORD>(3, pVersion2->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion2->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion2->cReleaseLabels);
+                Assert::Equal<DWORD>(6, pVersion2->cchMetadataOffset);
+                Assert::Equal<BOOL>(TRUE, pVersion2->fInvalid);
+                NativeAssert::StringEqual(wzVersion3, pVersion3->sczVersion);
+                Assert::Equal<DWORD>(1, pVersion3->dwMajor);
+                Assert::Equal<DWORD>(2, pVersion3->dwMinor);
+                Assert::Equal<DWORD>(3, pVersion3->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion3->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion3->cReleaseLabels);
+                Assert::Equal<DWORD>(6, pVersion3->cchMetadataOffset);
+                Assert::Equal<BOOL>(TRUE, pVersion3->fInvalid);
+                TestVerutilCompareParsedVersions(pVersion1, pVersion2, 1);
+                TestVerutilCompareParsedVersions(pVersion1, pVersion3, 1);
+                TestVerutilCompareParsedVersions(pVersion2, pVersion3, -1);
+            }
+            finally
+            {
+                ReleaseVerutilVersion(pVersion1);
+                ReleaseVerutilVersion(pVersion2);
+                ReleaseVerutilVersion(pVersion3);
+            }
+        }
+        [Fact]
+        void VerCompareVersionsIgnoresLeadingV()
+        {
+            HRESULT hr = S_OK;
+            VERUTIL_VERSION* pVersion1 = NULL;
+            VERUTIL_VERSION* pVersion2 = NULL;
+            VERUTIL_VERSION* pVersion3 = NULL;
+            LPCWSTR wzVersion1 = L"10.20.30.40";
+            LPCWSTR wzVersion2 = L"v10.20.30.40";
+            LPCWSTR wzVersion3 = L"V10.20.30.40";
+            try
+            {
+                hr = VerParseVersion(wzVersion1, 0, FALSE, &pVersion1);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion1);
+                hr = VerParseVersion(wzVersion2, 0, FALSE, &pVersion2);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion2);
+                hr = VerParseVersion(wzVersion3, 0, FALSE, &pVersion3);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion3);
+                NativeAssert::StringEqual(wzVersion1, pVersion1->sczVersion);
+                Assert::Equal<DWORD>(10, pVersion1->dwMajor);
+                Assert::Equal<DWORD>(20, pVersion1->dwMinor);
+                Assert::Equal<DWORD>(30, pVersion1->dwPatch);
+                Assert::Equal<DWORD>(40, pVersion1->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion1->cReleaseLabels);
+                Assert::Equal<DWORD>(11, pVersion1->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion1->fInvalid);
+                NativeAssert::StringEqual(wzVersion1, pVersion2->sczVersion);
+                Assert::Equal<DWORD>(10, pVersion2->dwMajor);
+                Assert::Equal<DWORD>(20, pVersion2->dwMinor);
+                Assert::Equal<DWORD>(30, pVersion2->dwPatch);
+                Assert::Equal<DWORD>(40, pVersion2->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion2->cReleaseLabels);
+                Assert::Equal<DWORD>(11, pVersion2->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion2->fInvalid);
+                NativeAssert::StringEqual(wzVersion1, pVersion3->sczVersion);
+                Assert::Equal<DWORD>(10, pVersion3->dwMajor);
+                Assert::Equal<DWORD>(20, pVersion3->dwMinor);
+                Assert::Equal<DWORD>(30, pVersion3->dwPatch);
+                Assert::Equal<DWORD>(40, pVersion3->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion3->cReleaseLabels);
+                Assert::Equal<DWORD>(11, pVersion3->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion3->fInvalid);
+                TestVerutilCompareParsedVersions(pVersion1, pVersion2, 0);
+                TestVerutilCompareParsedVersions(pVersion1, pVersion3, 0);
+            }
+            finally
+            {
+                ReleaseVerutilVersion(pVersion1);
+                ReleaseVerutilVersion(pVersion2);
+                ReleaseVerutilVersion(pVersion3);
+            }
+        }
+        [Fact]
+        void VerCompareVersionsHandlesTooLargeNumbers()
+        {
+            HRESULT hr = S_OK;
+            VERUTIL_VERSION* pVersion1 = NULL;
+            VERUTIL_VERSION* pVersion2 = NULL;
+            LPCWSTR wzVersion1 = L"4294967295.4294967295.4294967295.4294967295";
+            LPCWSTR wzVersion2 = L"4294967296.4294967296.4294967296.4294967296";
+            try
+            {
+                hr = VerParseVersion(wzVersion1, 0, FALSE, &pVersion1);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion1);
+                hr = VerParseVersion(wzVersion2, 0, FALSE, &pVersion2);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion2);
+                NativeAssert::StringEqual(wzVersion1, pVersion1->sczVersion);
+                Assert::Equal<DWORD>(4294967295, pVersion1->dwMajor);
+                Assert::Equal<DWORD>(4294967295, pVersion1->dwMinor);
+                Assert::Equal<DWORD>(4294967295, pVersion1->dwPatch);
+                Assert::Equal<DWORD>(4294967295, pVersion1->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion1->cReleaseLabels);
+                Assert::Equal<DWORD>(43, pVersion1->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion1->fInvalid);
+                NativeAssert::StringEqual(wzVersion2, pVersion2->sczVersion);
+                Assert::Equal<DWORD>(0, pVersion2->dwMajor);
+                Assert::Equal<DWORD>(0, pVersion2->dwMinor);
+                Assert::Equal<DWORD>(0, pVersion2->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion2->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion2->cReleaseLabels);
+                Assert::Equal<DWORD>(0, pVersion2->cchMetadataOffset);
+                Assert::Equal<BOOL>(TRUE, pVersion2->fInvalid);
+                TestVerutilCompareParsedVersions(pVersion1, pVersion2, 1);
+            }
+            finally
+            {
+                ReleaseVerutilVersion(pVersion1);
+                ReleaseVerutilVersion(pVersion2);
+            }
+        }
+        [Fact]
+        void VerCompareVersionsIgnoresMetadataForValidVersions()
+        {
+            HRESULT hr = S_OK;
+            VERUTIL_VERSION* pVersion1 = NULL;
+            VERUTIL_VERSION* pVersion2 = NULL;
+            LPCWSTR wzVersion1 = L"1.2.3+abc";
+            LPCWSTR wzVersion2 = L"1.2.3+xyz";
+            try
+            {
+                hr = VerParseVersion(wzVersion1, 0, FALSE, &pVersion1);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion1);
+                hr = VerParseVersion(wzVersion2, 0, FALSE, &pVersion2);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion2);
+                NativeAssert::StringEqual(wzVersion1, pVersion1->sczVersion);
+                Assert::Equal<DWORD>(1, pVersion1->dwMajor);
+                Assert::Equal<DWORD>(2, pVersion1->dwMinor);
+                Assert::Equal<DWORD>(3, pVersion1->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion1->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion1->cReleaseLabels);
+                Assert::Equal<DWORD>(6, pVersion1->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion1->fInvalid);
+                NativeAssert::StringEqual(wzVersion2, pVersion2->sczVersion);
+                Assert::Equal<DWORD>(1, pVersion2->dwMajor);
+                Assert::Equal<DWORD>(2, pVersion2->dwMinor);
+                Assert::Equal<DWORD>(3, pVersion2->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion2->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion2->cReleaseLabels);
+                Assert::Equal<DWORD>(6, pVersion2->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion2->fInvalid);
+                TestVerutilCompareParsedVersions(pVersion1, pVersion2, 0);
+            }
+            finally
+            {
+                ReleaseVerutilVersion(pVersion1);
+                ReleaseVerutilVersion(pVersion2);
+            }
+        }
+        [Fact]
+        void VerCopyVersionCopiesVersion()
+        {
+            HRESULT hr = S_OK;
+            LPCWSTR wzVersion = L"1.2.3.4+abc123";
+            VERUTIL_VERSION* pSource = NULL;
+            VERUTIL_VERSION* pCopy = NULL;
+            int nResult = 0;
+            try
+            {
+                hr = VerParseVersion(wzVersion, 0, FALSE, &pSource);
+                NativeAssert::Succeeded(hr, "VerParseVersion failed");
+                NativeAssert::StringEqual(wzVersion, pSource->sczVersion);
+                Assert::Equal<DWORD>(1, pSource->dwMajor);
+                Assert::Equal<DWORD>(2, pSource->dwMinor);
+                Assert::Equal<DWORD>(3, pSource->dwPatch);
+                Assert::Equal<DWORD>(4, pSource->dwRevision);
+                Assert::Equal<DWORD>(0, pSource->cReleaseLabels);
+                Assert::Equal<DWORD>(8, pSource->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pSource->fInvalid);
+                hr = VerCopyVersion(pSource, &pCopy);
+                NativeAssert::Succeeded(hr, "VerCopyVersion failed");
+                Assert::False(pSource == pCopy);
+                Assert::False(pSource->sczVersion == pCopy->sczVersion);
+                hr = VerCompareParsedVersions(pSource, pCopy, &nResult);
+                NativeAssert::Succeeded(hr, "VerCompareParsedVersions failed");
+                Assert::Equal<int>(nResult, 0);
+            }
+            finally
+            {
+                ReleaseVerutilVersion(pCopy);
+                ReleaseVerutilVersion(pSource);
+            }
+        }
+        [Fact]
+        void VerCopyVersionCopiesPrereleaseVersion()
+        {
+            HRESULT hr = S_OK;
+            LPCWSTR wzVersion = L"1.2.3.4-a.b.c.d.5.+abc123";
+            VERUTIL_VERSION* pSource = NULL;
+            VERUTIL_VERSION* pCopy = NULL;
+            int nResult = 0;
+            try
+            {
+                hr = VerParseVersion(wzVersion, 0, FALSE, &pSource);
+                NativeAssert::Succeeded(hr, "VerParseVersion failed");
+                NativeAssert::StringEqual(wzVersion, pSource->sczVersion);
+                Assert::Equal<DWORD>(1, pSource->dwMajor);
+                Assert::Equal<DWORD>(2, pSource->dwMinor);
+                Assert::Equal<DWORD>(3, pSource->dwPatch);
+                Assert::Equal<DWORD>(4, pSource->dwRevision);
+                Assert::Equal<DWORD>(5, pSource->cReleaseLabels);
+                Assert::Equal<BOOL>(FALSE, pSource->rgReleaseLabels[0].fNumeric);
+                Assert::Equal<DWORD>(1, pSource->rgReleaseLabels[0].cchLabel);
+                Assert::Equal<DWORD>(8, pSource->rgReleaseLabels[0].cchLabelOffset);
+                Assert::Equal<BOOL>(FALSE, pSource->rgReleaseLabels[1].fNumeric);
+                Assert::Equal<DWORD>(1, pSource->rgReleaseLabels[1].cchLabel);
+                Assert::Equal<DWORD>(10, pSource->rgReleaseLabels[1].cchLabelOffset);
+                Assert::Equal<BOOL>(FALSE, pSource->rgReleaseLabels[2].fNumeric);
+                Assert::Equal<DWORD>(1, pSource->rgReleaseLabels[2].cchLabel);
+                Assert::Equal<DWORD>(12, pSource->rgReleaseLabels[2].cchLabelOffset);
+                Assert::Equal<BOOL>(FALSE, pSource->rgReleaseLabels[3].fNumeric);
+                Assert::Equal<DWORD>(1, pSource->rgReleaseLabels[3].cchLabel);
+                Assert::Equal<DWORD>(14, pSource->rgReleaseLabels[3].cchLabelOffset);
+                Assert::Equal<BOOL>(TRUE, pSource->rgReleaseLabels[4].fNumeric);
+                Assert::Equal<DWORD>(5, pSource->rgReleaseLabels[4].dwValue);
+                Assert::Equal<DWORD>(1, pSource->rgReleaseLabels[4].cchLabel);
+                Assert::Equal<DWORD>(16, pSource->rgReleaseLabels[4].cchLabelOffset);
+                Assert::Equal<DWORD>(18, pSource->cchMetadataOffset);
+                Assert::Equal<BOOL>(TRUE, pSource->fInvalid);
+                hr = VerCopyVersion(pSource, &pCopy);
+                NativeAssert::Succeeded(hr, "VerCopyVersion failed");
+                Assert::False(pSource == pCopy);
+                Assert::False(pSource->sczVersion == pCopy->sczVersion);
+                Assert::False(pSource->rgReleaseLabels == pCopy->rgReleaseLabels);
+                hr = VerCompareParsedVersions(pSource, pCopy, &nResult);
+                NativeAssert::Succeeded(hr, "VerCompareParsedVersions failed");
+                Assert::Equal<int>(nResult, 0);
+            }
+            finally
+            {
+                ReleaseVerutilVersion(pCopy);
+                ReleaseVerutilVersion(pSource);
+            }
+        }
+        [Fact]
+        void VerParseVersionTreatsTrailingDotsAsInvalid()
+        {
+            HRESULT hr = S_OK;
+            VERUTIL_VERSION* pVersion1 = NULL;
+            VERUTIL_VERSION* pVersion2 = NULL;
+            VERUTIL_VERSION* pVersion3 = NULL;
+            VERUTIL_VERSION* pVersion4 = NULL;
+            VERUTIL_VERSION* pVersion5 = NULL;
+            VERUTIL_VERSION* pVersion6 = NULL;
+            VERUTIL_VERSION* pVersion7 = NULL;
+            LPCWSTR wzVersion1 = L".";
+            LPCWSTR wzVersion2 = L"1.";
+            LPCWSTR wzVersion3 = L"2.1.";
+            LPCWSTR wzVersion4 = L"3.2.1.";
+            LPCWSTR wzVersion5 = L"4.3.2.1.";
+            LPCWSTR wzVersion6 = L"5-.";
+            LPCWSTR wzVersion7 = L"6-a.";
+            try
+            {
+                hr = VerParseVersion(wzVersion1, 0, FALSE, &pVersion1);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion1);
+                hr = VerParseVersion(wzVersion2, 0, FALSE, &pVersion2);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion2);
+                hr = VerParseVersion(wzVersion3, 0, FALSE, &pVersion3);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion3);
+                hr = VerParseVersion(wzVersion4, 0, FALSE, &pVersion4);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion4);
+                hr = VerParseVersion(wzVersion5, 0, FALSE, &pVersion5);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion5);
+                hr = VerParseVersion(wzVersion6, 0, FALSE, &pVersion6);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion6);
+                hr = VerParseVersion(wzVersion7, 0, FALSE, &pVersion7);
+                NativeAssert::Succeeded(hr, "Failed to parse version '{0}'", wzVersion7);
+                NativeAssert::StringEqual(wzVersion1, pVersion1->sczVersion);
+                Assert::Equal<DWORD>(0, pVersion1->dwMajor);
+                Assert::Equal<DWORD>(0, pVersion1->dwMinor);
+                Assert::Equal<DWORD>(0, pVersion1->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion1->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion1->cReleaseLabels);
+                Assert::Equal<DWORD>(0, pVersion1->cchMetadataOffset);
+                Assert::Equal<BOOL>(TRUE, pVersion1->fInvalid);
+                NativeAssert::StringEqual(wzVersion2, pVersion2->sczVersion);
+                Assert::Equal<DWORD>(1, pVersion2->dwMajor);
+                Assert::Equal<DWORD>(0, pVersion2->dwMinor);
+                Assert::Equal<DWORD>(0, pVersion2->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion2->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion2->cReleaseLabels);
+                Assert::Equal<DWORD>(2, pVersion2->cchMetadataOffset);
+                Assert::Equal<BOOL>(TRUE, pVersion2->fInvalid);
+                NativeAssert::StringEqual(wzVersion3, pVersion3->sczVersion);
+                Assert::Equal<DWORD>(2, pVersion3->dwMajor);
+                Assert::Equal<DWORD>(1, pVersion3->dwMinor);
+                Assert::Equal<DWORD>(0, pVersion3->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion3->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion3->cReleaseLabels);
+                Assert::Equal<DWORD>(4, pVersion3->cchMetadataOffset);
+                Assert::Equal<BOOL>(TRUE, pVersion3->fInvalid);
+                NativeAssert::StringEqual(wzVersion4, pVersion4->sczVersion);
+                Assert::Equal<DWORD>(3, pVersion4->dwMajor);
+                Assert::Equal<DWORD>(2, pVersion4->dwMinor);
+                Assert::Equal<DWORD>(1, pVersion4->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion4->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion4->cReleaseLabels);
+                Assert::Equal<DWORD>(6, pVersion4->cchMetadataOffset);
+                Assert::Equal<BOOL>(TRUE, pVersion4->fInvalid);
+                NativeAssert::StringEqual(wzVersion5, pVersion5->sczVersion);
+                Assert::Equal<DWORD>(4, pVersion5->dwMajor);
+                Assert::Equal<DWORD>(3, pVersion5->dwMinor);
+                Assert::Equal<DWORD>(2, pVersion5->dwPatch);
+                Assert::Equal<DWORD>(1, pVersion5->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion5->cReleaseLabels);
+                Assert::Equal<DWORD>(8, pVersion5->cchMetadataOffset);
+                Assert::Equal<BOOL>(TRUE, pVersion5->fInvalid);
+                NativeAssert::StringEqual(wzVersion6, pVersion6->sczVersion);
+                Assert::Equal<DWORD>(5, pVersion6->dwMajor);
+                Assert::Equal<DWORD>(0, pVersion6->dwMinor);
+                Assert::Equal<DWORD>(0, pVersion6->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion6->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion6->cReleaseLabels);
+                Assert::Equal<DWORD>(2, pVersion6->cchMetadataOffset);
+                Assert::Equal<BOOL>(TRUE, pVersion6->fInvalid);
+                NativeAssert::StringEqual(wzVersion7, pVersion7->sczVersion);
+                Assert::Equal<DWORD>(6, pVersion7->dwMajor);
+                Assert::Equal<DWORD>(0, pVersion7->dwMinor);
+                Assert::Equal<DWORD>(0, pVersion7->dwPatch);
+                Assert::Equal<DWORD>(0, pVersion7->dwRevision);
+                Assert::Equal<DWORD>(1, pVersion7->cReleaseLabels);
+                Assert::Equal<BOOL>(FALSE, pVersion7->rgReleaseLabels[0].fNumeric);
+                Assert::Equal<DWORD>(1, pVersion7->rgReleaseLabels[0].cchLabel);
+                Assert::Equal<DWORD>(2, pVersion7->rgReleaseLabels[0].cchLabelOffset);
+                Assert::Equal<DWORD>(4, pVersion7->cchMetadataOffset);
+                Assert::Equal<BOOL>(TRUE, pVersion7->fInvalid);
+            }
+            finally
+            {
+                ReleaseVerutilVersion(pVersion1);
+                ReleaseVerutilVersion(pVersion2);
+                ReleaseVerutilVersion(pVersion3);
+                ReleaseVerutilVersion(pVersion4);
+                ReleaseVerutilVersion(pVersion5);
+                ReleaseVerutilVersion(pVersion6);
+                ReleaseVerutilVersion(pVersion7);
+            }
+        }
+        [Fact]
+        void VerVersionFromQwordCreatesVersion()
+        {
+            HRESULT hr = S_OK;
+            VERUTIL_VERSION* pVersion1 = NULL;
+            try
+            {
+                hr = VerVersionFromQword(MAKEQWORDVERSION(1, 2, 3, 4), &pVersion1);
+                NativeAssert::Succeeded(hr, "VerVersionFromQword failed");
+                NativeAssert::StringEqual(L"1.2.3.4", pVersion1->sczVersion);
+                Assert::Equal<DWORD>(1, pVersion1->dwMajor);
+                Assert::Equal<DWORD>(2, pVersion1->dwMinor);
+                Assert::Equal<DWORD>(3, pVersion1->dwPatch);
+                Assert::Equal<DWORD>(4, pVersion1->dwRevision);
+                Assert::Equal<DWORD>(0, pVersion1->cReleaseLabels);
+                Assert::Equal<DWORD>(7, pVersion1->cchMetadataOffset);
+                Assert::Equal<BOOL>(FALSE, pVersion1->fInvalid);
+            }
+            finally
+            {
+                ReleaseVerutilVersion(pVersion1);
+            }
+        }
+    private:
+        void TestVerutilCompareParsedVersions(VERUTIL_VERSION* pVersion1, VERUTIL_VERSION* pVersion2, int nExpectedResult)
+        {
+            HRESULT hr = S_OK;
+            int nResult = 0;
+            hr = VerCompareParsedVersions(pVersion1, pVersion2, &nResult);
+            NativeAssert::Succeeded(hr, "Failed to compare versions '{0}' and '{1}'", pVersion1->sczVersion, pVersion2->sczVersion);
+            Assert::Equal(nExpectedResult, nResult);
+            hr = VerCompareParsedVersions(pVersion2, pVersion1, &nResult);
+            NativeAssert::Succeeded(hr, "Failed to compare versions '{0}' and '{1}'", pVersion1->sczVersion, pVersion2->sczVersion);
+            Assert::Equal(nExpectedResult, -nResult);
+        }
+    };
+}
diff --git a/src/libs/dutil/test/DUtilUnitTest/error.cpp b/src/libs/dutil/test/DUtilUnitTest/error.cpp
new file mode 100644
index 00000000..e51971c3
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/error.cpp
@@ -0,0 +1,26 @@
+// 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.
+#include "precomp.h"
+const int ERROR_STRING_BUFFER = 1024;
+static char szMsg[ERROR_STRING_BUFFER];
+static WCHAR wzMsg[ERROR_STRING_BUFFER];
+void CALLBACK DutilTestTraceError(
+    __in_z LPCSTR /*szFile*/,
+    __in int /*iLine*/,
+    __in REPORT_LEVEL /*rl*/,
+    __in UINT source,
+    __in HRESULT hrError,
+    __in_z __format_string LPCSTR szFormat,
+    __in va_list args
+    )
+{
+    if (DUTIL_SOURCE_EXTERNAL == source)
+    {
+        ::StringCchPrintfA(szMsg, countof(szMsg), szFormat, args);
+        MultiByteToWideChar(CP_ACP, 0, szMsg, -1, wzMsg, countof(wzMsg));
+        throw gcnew System::Exception(System::String::Format("hr = 0x{0:X8}, message = {1}", hrError, gcnew System::String(wzMsg)));
+    }
+}
diff --git a/src/libs/dutil/test/DUtilUnitTest/error.h b/src/libs/dutil/test/DUtilUnitTest/error.h
new file mode 100644
index 00000000..b973acaf
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/error.h
@@ -0,0 +1,14 @@
+#pragma once
+// 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.
+#define DUTIL_SOURCE_DEFAULT DUTIL_SOURCE_EXTERNAL
+void CALLBACK DutilTestTraceError(
+    __in_z LPCSTR szFile,
+    __in int iLine,
+    __in REPORT_LEVEL rl,
+    __in UINT source,
+    __in HRESULT hrError,
+    __in_z __format_string LPCSTR szFormat,
+    __in va_list args
+    );
diff --git a/src/libs/dutil/test/DUtilUnitTest/packages.config b/src/libs/dutil/test/DUtilUnitTest/packages.config
new file mode 100644
index 00000000..a4fef2bf
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/packages.config
@@ -0,0 +1,13 @@
+<?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. -->
+<packages>
+  <package id="xunit.abstractions" version="2.0.3" />
+  <package id="xunit.assert" version="2.4.1" />
+  <package id="xunit.core" version="2.4.1" />
+  <package id="xunit.extensibility.core" version="2.4.1" />
+  <package id="xunit.extensibility.execution" version="2.4.1" />
+  <package id="xunit.runner.msbuild" version="2.4.1" />
+  <package id="xunit.runner.visualstudio" version="2.4.1" />
+  <package id="WixBuildTools.TestSupport" version="4.0.47" />
+  <package id="WixBuildTools.TestSupport.Native" version="4.0.47" />
+</packages>
+\ No newline at end of file
diff --git a/src/libs/dutil/test/DUtilUnitTest/precomp.cpp b/src/libs/dutil/test/DUtilUnitTest/precomp.cpp
new file mode 100644
index 00000000..37664a1c
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/precomp.cpp
@@ -0,0 +1,3 @@
+// 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.
+#include "precomp.h"
diff --git a/src/libs/dutil/test/DUtilUnitTest/precomp.h b/src/libs/dutil/test/DUtilUnitTest/precomp.h
new file mode 100644
index 00000000..e9f8770b
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/precomp.h
@@ -0,0 +1,32 @@
+#pragma once
+// 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.
+#include <windows.h>
+#include <strsafe.h>
+#include <ShlObj.h>
+// Include error.h before dutil.h
+#include <dutilsources.h>
+#include "error.h"
+#include <dutil.h>
+#include <verutil.h>
+#include <atomutil.h>
+#include <dictutil.h>
+#include <dirutil.h>
+#include <fileutil.h>
+#include <guidutil.h>
+#include <iniutil.h>
+#include <memutil.h>
+#include <pathutil.h>
+#include <strutil.h>
+#include <monutil.h>
+#include <regutil.h>
+#include <rssutil.h>
+#include <apuputil.h> // NOTE: this must come after atomutil.h and rssutil.h since it uses them.
+#include <uriutil.h>
+#include <xmlutil.h>
+#pragma managed
+#include <vcclr.h>
diff --git a/src/libs/dutil/test/DUtilUnitTest/resource.h b/src/libs/dutil/test/DUtilUnitTest/resource.h
new file mode 100644
index 00000000..bdf252f6
--- /dev/null
+++ b/src/libs/dutil/test/DUtilUnitTest/resource.h
@@ -0,0 +1,2 @@
+// 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.
diff --git a/src/samples/Dtf/DDiff/CabDiffEngine.cs b/src/samples/Dtf/DDiff/CabDiffEngine.cs
new file mode 100644
index 00000000..6100ced8
--- /dev/null
+++ b/src/samples/Dtf/DDiff/CabDiffEngine.cs
@@ -0,0 +1,131 @@
+// 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;
+using System.Collections.Generic;
+using WixToolset.Dtf.Compression.Cab;
+namespace WixToolset.Dtf.Samples.DDiff
+{
+        public class CabDiffEngine : IDiffEngine
+        {
+                public CabDiffEngine()
+                {
+                }
+                private bool IsCabinetFile(string file)
+                {
+                        using(FileStream fileStream = File.OpenRead(file))
+                        {
+                                return new CabEngine().IsArchive(fileStream);
+                        }
+                }
+                public virtual float GetDiffQuality(string diffInput1, string diffInput2, string[] options, IDiffEngineFactory diffFactory)
+                {
+                        if(diffInput1 != null && File.Exists(diffInput1) &&
+                           diffInput2 != null && File.Exists(diffInput2) &&
+                           (IsCabinetFile(diffInput1) || IsCabinetFile(diffInput2)))
+                        {
+                                return .80f;
+                        }
+                        else
+                        {
+                                return 0;
+                        }
+                }
+                public bool GetDiff(string diffInput1, string diffInput2, string[] options, TextWriter diffOutput, string linePrefix, IDiffEngineFactory diffFactory)
+                {
+                        bool difference = false;
+                        IComparer caseInsComp = CaseInsensitiveComparer.Default;
+                        // TODO: Make this faster by extracting the whole cab at once.
+                        // TODO: Optimize for the match case by first comparing the whole cab files.
+            CabInfo cab1 = new CabInfo(diffInput1);
+            CabInfo cab2 = new CabInfo(diffInput2);
+                        IList<CabFileInfo> cabFilesList1 = cab1.GetFiles();
+            IList<CabFileInfo> cabFilesList2 = cab2.GetFiles();
+            CabFileInfo[] cabFiles1 = new CabFileInfo[cabFilesList1.Count];
+            CabFileInfo[] cabFiles2 = new CabFileInfo[cabFilesList2.Count];
+            cabFilesList1.CopyTo(cabFiles1, 0);
+            cabFilesList2.CopyTo(cabFiles2, 0);
+                        string[] files1 = new string[cabFiles1.Length];
+                        string[] files2 = new string[cabFiles2.Length];
+                        for(int i1 = 0; i1 < cabFiles1.Length; i1++) files1[i1] = cabFiles1[i1].Name;
+                        for(int i2 = 0; i2 < cabFiles2.Length; i2++) files2[i2] = cabFiles2[i2].Name;
+                        Array.Sort(files1, cabFiles1, caseInsComp);
+                        Array.Sort(files2, cabFiles2, caseInsComp);
+                        for(int i1 = 0, i2 = 0; i1 < files1.Length || i2 < files2.Length; )
+                        {
+                                int comp;
+                                if(i1 == files1.Length)
+                                {
+                                        comp = 1;
+                                }
+                                else if(i2 == files2.Length)
+                                {
+                                        comp = -1;
+                                }
+                                else
+                                {
+                                        comp = caseInsComp.Compare(files1[i1], files2[i2]);
+                                }
+                                if(comp < 0)
+                                {
+                                        diffOutput.WriteLine("{0}< {1}", linePrefix, files1[i1]);
+                                        i1++;
+                                        difference = true;
+                                }
+                                else if(comp > 0)
+                                {
+                                        diffOutput.WriteLine("{0}> {1}", linePrefix, files2[i2]);
+                                        i2++;
+                                        difference = true;
+                                }
+                                else
+                                {
+                                        string tempFile1 = Path.GetTempFileName();
+                                        string tempFile2 = Path.GetTempFileName();
+                                        cabFiles1[i1].CopyTo(tempFile1, true);
+                                        cabFiles2[i2].CopyTo(tempFile2, true);
+                                        IDiffEngine diffEngine = diffFactory.GetDiffEngine(tempFile1, tempFile2, options);
+                                        StringWriter sw = new StringWriter();
+                                        if(diffEngine.GetDiff(tempFile1, tempFile2, options, sw, linePrefix + "    ", diffFactory))
+                                        {
+                                                diffOutput.WriteLine("{0}{1}", linePrefix, files1[i1]);
+                                                diffOutput.Write(sw.ToString());
+                                                difference = true;
+                                        }
+                                        File.SetAttributes(tempFile1, File.GetAttributes(tempFile1) & ~FileAttributes.ReadOnly);
+                                        File.SetAttributes(tempFile2, File.GetAttributes(tempFile2) & ~FileAttributes.ReadOnly);
+                                        try
+                                        {
+                                                File.Delete(tempFile1);
+                                                File.Delete(tempFile2);
+                                        }
+                                        catch(IOException)
+                                        {
+#if DEBUG
+                                                Console.WriteLine("Could not delete temporary files {0} and {1}", tempFile1, tempFile2);
+#endif
+                                        }
+                                        i1++;
+                                        i2++;
+                                }
+                        }
+                        return difference;
+                }
+                public virtual IDiffEngine Clone()
+                {
+                        return new CabDiffEngine();
+                }
+        }
+}
diff --git a/src/samples/Dtf/DDiff/DDiff.cs b/src/samples/Dtf/DDiff/DDiff.cs
new file mode 100644
index 00000000..27a5a782
--- /dev/null
+++ b/src/samples/Dtf/DDiff/DDiff.cs
@@ -0,0 +1,72 @@
+// 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;
+namespace WixToolset.Dtf.Samples.DDiff
+{
+        public class DDiff
+        {
+        public static void Usage(TextWriter w)
+        {
+                        w.WriteLine("Usage: DDiff target1 target2 [options]");
+                        w.WriteLine("Example: DDiff d:\\dir1 d:\\dir2");
+                        w.WriteLine("Example: DDiff patch1.msp patch2.msp /patchtarget target.msi");
+            w.WriteLine();
+            w.WriteLine("Options:");
+            w.WriteLine("  /o [filename]     Output results to text file (UTF8)");
+            w.WriteLine("  /p [package.msi]  Diff patches relative to target MSI");
+        }
+                public static int Main(string[] args)
+                {
+                        if(args.Length < 2)
+                        {
+                Usage(Console.Out);
+                                return -1;
+                        }
+                        string input1 = args[0];
+                        string input2 = args[1];
+                        string[] options = new string[args.Length - 2];
+                        for(int i = 0; i < options.Length; i++) options[i] = args[i+2];
+                        TextWriter output = Console.Out;
+                        for(int i = 0; i < options.Length - 1; i++)
+                        {
+                                switch(options[i].ToLower())
+                                {
+                                        case "/o": goto case "-output";
+                                        case "-o": goto case "-output";
+                                        case "/output": goto case "-output";
+                                        case "-output": output = new StreamWriter(options[i+1], false, Encoding.UTF8); break;
+                                }
+                        }
+                        IDiffEngineFactory diffFactory = new BestQualityDiffEngineFactory(new IDiffEngine[]
+                        {
+                                new DirectoryDiffEngine(),
+                                new FileDiffEngine(),
+                                new VersionedFileDiffEngine(),
+                                new TextFileDiffEngine(),
+                                new MsiDiffEngine(),
+                                new CabDiffEngine(),
+                                new MspDiffEngine(),
+                        });
+                        IDiffEngine diffEngine = diffFactory.GetDiffEngine(input1, input2, options);
+                        if(diffEngine != null)
+                        {
+                                bool different = diffEngine.GetDiff(input1, input2, options, output, "", diffFactory);
+                                return different ? 1 : 0;
+                        }
+                        else
+                        {
+                                Console.Error.WriteLine("Dont know how to diff those inputs.");
+                                return -1;
+                        }
+                }
+        }
+}
diff --git a/src/samples/Dtf/DDiff/DDiff.csproj b/src/samples/Dtf/DDiff/DDiff.csproj
new file mode 100644
index 00000000..332ad4d0
--- /dev/null
+++ b/src/samples/Dtf/DDiff/DDiff.csproj
@@ -0,0 +1,39 @@
+<!-- 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>{1CDF4242-4C00-4744-BBCD-085128978FF3}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>WixToolset.Dtf.Samples.DDiff</RootNamespace>
+    <AssemblyName>DDiff</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="CabDiffEngine.cs" />
+    <Compile Include="DDiff.cs" />
+    <Compile Include="DirectoryDiffEngine.cs" />
+    <Compile Include="FileDiffEngine.cs" />
+    <Compile Include="IDiffEngine.cs" />
+    <Compile Include="MsiDiffEngine.cs" />
+    <Compile Include="MspDiffEngine.cs" />
+    <Compile Include="TextFileDiffEngine.cs" />
+    <Compile Include="VersionedFileDiffEngine.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <ProjectReference Include="..\..\Libraries\Compression.Cab\Compression.Cab.csproj" />
+    <ProjectReference Include="..\..\Libraries\Compression.Zip\Compression.Zip.csproj" />
+    <ProjectReference Include="..\..\Libraries\Compression\Compression.csproj" />
+    <ProjectReference Include="..\..\Libraries\WindowsInstaller.Package\WindowsInstaller.Package.csproj" />
+    <ProjectReference Include="..\..\Libraries\WindowsInstaller\WindowsInstaller.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
+</Project>
diff --git a/src/samples/Dtf/DDiff/DirectoryDiffEngine.cs b/src/samples/Dtf/DDiff/DirectoryDiffEngine.cs
new file mode 100644
index 00000000..89e8b47e
--- /dev/null
+++ b/src/samples/Dtf/DDiff/DirectoryDiffEngine.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.
+using System;
+using System.IO;
+using System.Collections;
+namespace WixToolset.Dtf.Samples.DDiff
+{
+        public class DirectoryDiffEngine : IDiffEngine
+        {
+                public DirectoryDiffEngine()
+                {
+                }
+                public virtual float GetDiffQuality(string diffInput1, string diffInput2, string[] options, IDiffEngineFactory diffFactory)
+                {
+                        if(diffInput1 != null && Directory.Exists(diffInput1) &&
+                           diffInput2 != null && Directory.Exists(diffInput2))
+                        {
+                                return .70f;
+                        }
+                        else
+                        {
+                                return 0;
+                        }
+                }
+                public bool GetDiff(string diffInput1, string diffInput2, string[] options, TextWriter diffOutput, string linePrefix, IDiffEngineFactory diffFactory)
+                {
+                        bool difference = false;
+                        IComparer caseInsComp = CaseInsensitiveComparer.Default;
+                        string[] files1 = Directory.GetFiles(diffInput1);
+                        string[] files2 = Directory.GetFiles(diffInput2);
+                        for(int i1 = 0; i1 < files1.Length; i1++)
+                        {
+                                files1[i1] = Path.GetFileName(files1[i1]);
+                        }
+                        for(int i2 = 0; i2 < files2.Length; i2++)
+                        {
+                                files2[i2] = Path.GetFileName(files2[i2]);
+                        }
+                        Array.Sort(files1, caseInsComp);
+                        Array.Sort(files2, caseInsComp);
+                        for(int i1 = 0, i2 = 0; i1 < files1.Length || i2 < files2.Length; )
+                        {
+                                int comp;
+                                if(i1 == files1.Length)
+                                {
+                                        comp = 1;
+                                }
+                                else if(i2 == files2.Length)
+                                {
+                                        comp = -1;
+                                }
+                                else
+                                {
+                                        comp = caseInsComp.Compare(files1[i1], files2[i2]);
+                                }
+                                if(comp < 0)
+                                {
+                                        diffOutput.WriteLine("{0}< {1}", linePrefix, files1[i1]);
+                                        i1++;
+                                        difference = true;
+                                }
+                                else if(comp > 0)
+                                {
+                                        diffOutput.WriteLine("{0}> {1}", linePrefix, files2[i2]);
+                                        i2++;
+                                        difference = true;
+                                }
+                                else
+                                {
+                                        string file1 = Path.Combine(diffInput1, files1[i1]);
+                                        string file2 = Path.Combine(diffInput2, files2[i2]);
+                                        IDiffEngine diffEngine = diffFactory.GetDiffEngine(file1, file2, options);
+                                        StringWriter sw = new StringWriter();
+                                        if(diffEngine.GetDiff(file1, file2, options, sw, linePrefix + "    ", diffFactory))
+                                        {
+                                                diffOutput.WriteLine("{0}{1}", linePrefix, files1[i1]);
+                                                diffOutput.Write(sw.ToString());
+                                                difference = true;
+                                        }
+                                        i1++;
+                                        i2++;
+                                }
+                        }
+                        string[] dirs1 = Directory.GetDirectories(diffInput1);
+                        string[] dirs2 = Directory.GetDirectories(diffInput2);
+                        for(int i1 = 0; i1 < dirs1.Length; i1++)
+                        {
+                                dirs1[i1] = Path.GetFileName(dirs1[i1]);
+                        }
+                        for(int i2 = 0; i2 < dirs2.Length; i2++)
+                        {
+                                dirs2[i2] = Path.GetFileName(dirs2[i2]);
+                        }
+                        Array.Sort(dirs1, caseInsComp);
+                        Array.Sort(dirs2, caseInsComp);
+                        for(int i1 = 0, i2 = 0; i1 < dirs1.Length || i2 < dirs2.Length; )
+                        {
+                                int comp;
+                                if(i1 == dirs1.Length)
+                                {
+                                        comp = 1;
+                                }
+                                else if(i2 == dirs2.Length)
+                                {
+                                        comp = -1;
+                                }
+                                else
+                                {
+                                        comp = caseInsComp.Compare(dirs1[i1], dirs2[i2]);
+                                }
+                                if(comp < 0)
+                                {
+                                        diffOutput.WriteLine("{0}< {1}", linePrefix, dirs1[i1]);
+                                        i1++;
+                                        difference = true;
+                                }
+                                else if(comp > 0)
+                                {
+                                        diffOutput.WriteLine("{0}> {1}", linePrefix, dirs2[i2]);
+                                        i2++;
+                                        difference = true;
+                                }
+                                else
+                                {
+                                        string dir1 = Path.Combine(diffInput1, dirs1[i1]);
+                                        string dir2 = Path.Combine(diffInput2, dirs2[i2]);
+                                        IDiffEngine diffEngine = diffFactory.GetDiffEngine(dir1, dir2, options);
+                                        StringWriter sw = new StringWriter();
+                                        if(diffEngine.GetDiff(dir1, dir2, options, sw, linePrefix + "    ", diffFactory))
+                                        {
+                                                diffOutput.WriteLine("{0}{1}\\", linePrefix, dirs1[i1]);
+                                                diffOutput.Write(sw.ToString());
+                                                difference = true;
+                                        }
+                                        i1++;
+                                        i2++;
+                                }
+                        }
+                        return difference;
+                }
+                public virtual IDiffEngine Clone()
+                {
+                        return new DirectoryDiffEngine();
+                }
+        }
+}
diff --git a/src/samples/Dtf/DDiff/FileDiffEngine.cs b/src/samples/Dtf/DDiff/FileDiffEngine.cs
new file mode 100644
index 00000000..20ecd857
--- /dev/null
+++ b/src/samples/Dtf/DDiff/FileDiffEngine.cs
@@ -0,0 +1,83 @@
+// 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;
+namespace WixToolset.Dtf.Samples.DDiff
+{
+        public class FileDiffEngine : IDiffEngine
+        {
+                public FileDiffEngine()
+                {
+                }
+                public virtual float GetDiffQuality(string diffInput1, string diffInput2, string[] options, IDiffEngineFactory diffFactory)
+                {
+                        if(diffInput1 != null && File.Exists(diffInput1) &&
+                           diffInput2 != null && File.Exists(diffInput2))
+                        {
+                                return .10f;
+                        }
+                        else
+                        {
+                                return 0;
+                        }
+                }
+                public bool GetDiff(string diffInput1, string diffInput2, string[] options, TextWriter diffOutput, string linePrefix, IDiffEngineFactory diffFactory)
+                {
+                        bool difference = false;
+                        FileInfo file1 = new FileInfo(diffInput1);
+                        FileInfo file2 = new FileInfo(diffInput2);
+                        if(file1.Length != file2.Length)
+                        {
+                                diffOutput.WriteLine("{0}File size: {1} -> {2}", linePrefix, file1.Length, file2.Length);
+                                difference = true;
+                        }
+                        else
+                        {
+                                FileStream stream1 = file1.Open(FileMode.Open, FileAccess.Read, FileShare.Read);
+                                FileStream stream2 = file2.Open(FileMode.Open, FileAccess.Read, FileShare.Read);
+                                byte[] buf1 = new byte[512];
+                                byte[] buf2 = new byte[512];
+                                while(!difference)
+                                {
+                                        int count1 = stream1.Read(buf1, 0, buf1.Length);
+                                        int count2 = stream2.Read(buf2, 0, buf2.Length);
+                                        for(int i = 0; i < count1; i++)
+                                        {
+                                                if(i == count2 || buf1[i] != buf2[i])
+                                                {
+                                                        difference = true;
+                                                        break;
+                                                }
+                                        }
+                                        if(count1 < buf1.Length) // EOF
+                                        {
+                                                break;
+                                        }
+                                }
+                                stream1.Close();
+                                stream2.Close();
+                                if(difference)
+                                {
+                                        diffOutput.WriteLine("{0}Files differ.", linePrefix);
+                                }
+                        }
+                        return difference;
+                }
+                public virtual IDiffEngine Clone()
+                {
+                        return new FileDiffEngine();
+                }
+        }
+}
diff --git a/src/samples/Dtf/DDiff/IDiffEngine.cs b/src/samples/Dtf/DDiff/IDiffEngine.cs
new file mode 100644
index 00000000..9895d6ff
--- /dev/null
+++ b/src/samples/Dtf/DDiff/IDiffEngine.cs
@@ -0,0 +1,68 @@
+// 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;
+namespace WixToolset.Dtf.Samples.DDiff
+{
+        public interface IDiffEngine
+        {
+                float GetDiffQuality(string diffInput1, string diffInput2, string[] options, IDiffEngineFactory diffFactory);
+                bool GetDiff(string diffInput1, string diffInput2, string[] options, TextWriter diffOutput, string linePrefix, IDiffEngineFactory diffFactory);
+                IDiffEngine Clone();
+        }
+        public interface IDiffEngineFactory
+        {
+                IDiffEngine GetDiffEngine(string diffInput1, string diffInput2, string[] options);
+        }
+        public class BestQualityDiffEngineFactory : IDiffEngineFactory
+        {
+                public virtual IDiffEngine GetDiffEngine(string diffInput1, string diffInput2, string[] options)
+                {
+                        float bestDiffQuality = 0;
+                        IDiffEngine bestDiffEngine = null;
+                        foreach(IDiffEngine diffEngine in diffEngines)
+                        {
+                                float diffQuality = diffEngine.GetDiffQuality(diffInput1, diffInput2, options, this);
+                                if(diffQuality > bestDiffQuality)
+                                {
+                                        bestDiffQuality = diffQuality;
+                                        bestDiffEngine = diffEngine;
+                                }
+                        }
+                        return (bestDiffEngine != null ? bestDiffEngine.Clone() : null);
+                }
+                public BestQualityDiffEngineFactory() : this(null) { }
+                public BestQualityDiffEngineFactory(IDiffEngine[] diffEngines)
+                {
+                        this.diffEngines = (diffEngines != null ? new ArrayList(diffEngines) : new ArrayList());
+                }
+                protected IList diffEngines;
+                public virtual void Add(IDiffEngine diffEngine)
+                {
+                        diffEngines.Add(diffEngine);
+                }
+                public virtual void Remove(IDiffEngine diffEngine)
+                {
+                        diffEngines.Remove(diffEngine);
+                }
+                public IList DiffEngines
+                {
+                        get
+                        {
+                                return ArrayList.ReadOnly(diffEngines);
+                        }
+                }
+        }
+}
diff --git a/src/samples/Dtf/DDiff/MsiDiffEngine.cs b/src/samples/Dtf/DDiff/MsiDiffEngine.cs
new file mode 100644
index 00000000..91bc2969
--- /dev/null
+++ b/src/samples/Dtf/DDiff/MsiDiffEngine.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.
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using WixToolset.Dtf.WindowsInstaller;
+using WixToolset.Dtf.WindowsInstaller.Package;
+namespace WixToolset.Dtf.Samples.DDiff
+{
+    public class MsiDiffEngine : IDiffEngine
+    {
+        public MsiDiffEngine()
+        {
+        }
+        protected bool IsMsiDatabase(string file)
+        {
+            // TODO: use something smarter?
+            switch(Path.GetExtension(file).ToLower())
+            {
+                case ".msi":  return true;
+                case ".msm":  return true;
+                case ".pcp":  return true;
+                default    :  return false;
+            }
+        }
+        protected bool IsMspPatch(string file)
+        {
+            // TODO: use something smarter?
+            switch(Path.GetExtension(file).ToLower())
+            {
+                case ".msp":  return true;
+                default    :  return false;
+            }
+        }
+        public virtual float GetDiffQuality(string diffInput1, string diffInput2, string[] options, IDiffEngineFactory diffFactory)
+        {
+            if(diffInput1 != null && File.Exists(diffInput1) &&
+               diffInput2 != null && File.Exists(diffInput2) &&
+               (IsMsiDatabase(diffInput1) || IsMsiDatabase(diffInput2)))
+            {
+                return .70f;
+            }
+            else if(diffInput1 != null && File.Exists(diffInput1) &&
+                    diffInput2 != null && File.Exists(diffInput2) &&
+                    (IsMspPatch(diffInput1) || IsMspPatch(diffInput2)))
+            {
+                return .60f;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+        public virtual bool GetDiff(string diffInput1, string diffInput2, string[] options, TextWriter diffOutput, string linePrefix, IDiffEngineFactory diffFactory)
+        {
+            bool difference = false;
+            Database db1 = new Database(diffInput1, DatabaseOpenMode.ReadOnly);
+            Database db2 = new Database(diffInput2, DatabaseOpenMode.ReadOnly);
+            if(GetSummaryInfoDiff(db1, db2, options, diffOutput, linePrefix, diffFactory)) difference = true;
+            if(GetDatabaseDiff(db1, db2, options, diffOutput, linePrefix, diffFactory)) difference = true;
+            if(GetStreamsDiff(db1, db2, options, diffOutput, linePrefix, diffFactory)) difference = true;
+            db1.Close();
+            db2.Close();
+            return difference;
+        }
+        protected bool GetSummaryInfoDiff(Database db1, Database db2, string[] options, TextWriter diffOutput, string linePrefix, IDiffEngineFactory diffFactory)
+        {
+            bool difference = false;
+            SummaryInfo summInfo1 = db1.SummaryInfo;
+            SummaryInfo summInfo2 = db2.SummaryInfo;
+            if(summInfo1.Title          != summInfo2.Title         ) { diffOutput.WriteLine("{0}SummaryInformation.Title {{{1}}}->{{{2}}}", linePrefix, summInfo1.Title, summInfo2.Title); difference = true; }
+            if(summInfo1.Subject        != summInfo2.Subject       ) { diffOutput.WriteLine("{0}SummaryInformation.Subject {{{1}}}->{{{2}}}", linePrefix, summInfo1.Subject, summInfo2.Subject); difference = true; }
+            if(summInfo1.Author         != summInfo2.Author        ) { diffOutput.WriteLine("{0}SummaryInformation.Author {{{1}}}->{{{2}}}", linePrefix, summInfo1.Author, summInfo2.Author); difference = true; }
+            if(summInfo1.Keywords       != summInfo2.Keywords      ) { diffOutput.WriteLine("{0}SummaryInformation.Keywords {{{1}}}->{{{2}}}", linePrefix, summInfo1.Keywords, summInfo2.Keywords); difference = true; }
+            if(summInfo1.Comments       != summInfo2.Comments      ) { diffOutput.WriteLine("{0}SummaryInformation.Comments {{{1}}}->{{{2}}}", linePrefix, summInfo1.Comments, summInfo2.Comments); difference = true; }
+            if(summInfo1.Template       != summInfo2.Template      ) { diffOutput.WriteLine("{0}SummaryInformation.Template {{{1}}}->{{{2}}}", linePrefix, summInfo1.Template, summInfo2.Template); difference = true; }
+            if(summInfo1.LastSavedBy    != summInfo2.LastSavedBy   ) { diffOutput.WriteLine("{0}SummaryInformation.LastSavedBy {{{1}}}->{{{2}}}", linePrefix, summInfo1.LastSavedBy, summInfo2.LastSavedBy); difference = true; }
+            if(summInfo1.RevisionNumber != summInfo2.RevisionNumber) { diffOutput.WriteLine("{0}SummaryInformation.RevisionNumber {{{1}}}->{{{2}}}", linePrefix, summInfo1.RevisionNumber, summInfo2.RevisionNumber); difference = true; }
+            if(summInfo1.CreatingApp    != summInfo2.CreatingApp   ) { diffOutput.WriteLine("{0}SummaryInformation.CreatingApp {{{1}}}->{{{2}}}", linePrefix, summInfo1.CreatingApp, summInfo2.CreatingApp); difference = true; }
+            if(summInfo1.LastPrintTime  != summInfo2.LastPrintTime ) { diffOutput.WriteLine("{0}SummaryInformation.LastPrintTime {{{1}}}->{{{2}}}", linePrefix, summInfo1.LastPrintTime, summInfo2.LastPrintTime); difference = true; }
+            if(summInfo1.CreateTime     != summInfo2.CreateTime    ) { diffOutput.WriteLine("{0}SummaryInformation.CreateTime {{{1}}}->{{{2}}}", linePrefix, summInfo1.CreateTime, summInfo2.CreateTime); difference = true; }
+            if(summInfo1.LastSaveTime   != summInfo2.LastSaveTime  ) { diffOutput.WriteLine("{0}SummaryInformation.LastSaveTime {{{1}}}->{{{2}}}", linePrefix, summInfo1.LastSaveTime, summInfo2.LastSaveTime); difference = true; }
+            if(summInfo1.CodePage       != summInfo2.CodePage      ) { diffOutput.WriteLine("{0}SummaryInformation.Codepage {{{1}}}->{{{2}}}", linePrefix, summInfo1.CodePage, summInfo2.CodePage); difference = true; }
+            if(summInfo1.PageCount      != summInfo2.PageCount     ) { diffOutput.WriteLine("{0}SummaryInformation.PageCount {{{1}}}->{{{2}}}", linePrefix, summInfo1.PageCount, summInfo2.PageCount); difference = true; }
+            if(summInfo1.WordCount      != summInfo2.WordCount     ) { diffOutput.WriteLine("{0}SummaryInformation.WordCount {{{1}}}->{{{2}}}", linePrefix, summInfo1.WordCount, summInfo2.WordCount); difference = true; }
+            if(summInfo1.CharacterCount != summInfo2.CharacterCount) { diffOutput.WriteLine("{0}SummaryInformation.CharacterCount {{{1}}}->{{{2}}}", linePrefix, summInfo1.CharacterCount, summInfo2.CharacterCount); difference = true; }
+            if(summInfo1.Security       != summInfo2.Security      ) { diffOutput.WriteLine("{0}SummaryInformation.Security {{{1}}}->{{{2}}}", linePrefix, summInfo1.Security, summInfo2.Security); difference = true; }
+            summInfo1.Close();
+            summInfo2.Close();
+            return difference;
+        }
+        protected bool GetDatabaseDiff(Database db1, Database db2, string[] options, TextWriter diffOutput, string linePrefix, IDiffEngineFactory diffFactory)
+        {
+            bool difference = false;
+            string tempFile = Path.GetTempFileName();
+            if(db2.GenerateTransform(db1, tempFile))
+            {
+                difference = true;
+                Database db = db1;
+                db.ViewTransform(tempFile);
+                string row, column, change;
+                using (View view = db.OpenView("SELECT `Table`, `Column`, `Row`, `Data`, `Current` " +
+                    "FROM `_TransformView` ORDER BY `Table`, `Row`"))
+                {
+                    view.Execute();
+                    
+                    foreach (Record rec in view) using (rec)
+                    {
+                        column = String.Format("{0} {1}", rec[1], rec[2]);
+                        change = "";
+                        if (rec.IsNull(3))
+                        {
+                            row = "<DDL>";
+                            if (!rec.IsNull(4))
+                            {
+                                change = "[" + rec[5] + "]: " + DecodeColDef(rec.GetInteger(4));
+                            }
+                        }
+                        else
+                        {
+                            row = "[" + String.Join(",", rec.GetString(3).Split('\t')) + "]";
+                            if (rec.GetString(2) != "INSERT" && rec.GetString(2) != "DELETE")
+                            {
+                                column = String.Format("{0}.{1}", rec[1], rec[2]);
+                                change = "{" + rec[5] + "}->{" + rec[4] + "}";
+                            }
+                        }
+                        diffOutput.WriteLine("{0}{1,-25} {2} {3}", linePrefix, column, row, change);
+                    }
+                }
+            }
+            File.Delete(tempFile);
+            return difference;
+        }
+        private string DecodeColDef(int colDef)
+        {
+            const int icdLong       = 0x0000;
+            const int icdShort      = 0x0400;
+            const int icdObject     = 0x0800;
+            const int icdString     = 0x0C00;
+            const int icdTypeMask   = 0x0F00;
+            const int icdNullable   = 0x1000;
+            const int icdPrimaryKey = 0x2000;
+            string def = "";
+            switch(colDef & (icdTypeMask))
+            {
+                case icdLong  :  def = "LONG";  break;
+                case icdShort :  def = "SHORT";  break;
+                case icdObject:  def = "OBJECT";  break;
+                case icdString:  def = "CHAR[" + (colDef & 0xFF) + "]";  break;
+            }
+            if((colDef & icdNullable) != 0)
+            {
+                def = def + " NOT NULL";
+            }
+            if((colDef & icdPrimaryKey) != 0)
+            {
+                def = def + " PRIMARY KEY";
+            }
+            return def;
+        }
+        protected bool GetStreamsDiff(Database db1, Database db2, string[] options, TextWriter diffOutput, string linePrefix, IDiffEngineFactory diffFactory)
+        {
+            bool difference = false;
+            IList<string> streams1List = db1.ExecuteStringQuery("SELECT `Name` FROM `_Streams`");
+            IList<string> streams2List = db2.ExecuteStringQuery("SELECT `Name` FROM `_Streams`");
+            string[] streams1 = new string[streams1List.Count];
+            string[] streams2 = new string[streams2List.Count];
+            streams1List.CopyTo(streams1, 0);
+            streams2List.CopyTo(streams2, 0);
+            IComparer caseInsComp = CaseInsensitiveComparer.Default;
+            Array.Sort(streams1, caseInsComp);
+            Array.Sort(streams2, caseInsComp);
+            for (int i1 = 0, i2 = 0; i1 < streams1.Length || i2 < streams2.Length; )
+            {
+                int comp;
+                if (i1 == streams1.Length)
+                {
+                    comp = 1;
+                }
+                else if (i2 == streams2.Length)
+                {
+                    comp = -1;
+                }
+                else
+                {
+                    comp = caseInsComp.Compare(streams1[i1], streams2[i2]);
+                }
+                if(comp < 0)
+                {
+                    diffOutput.WriteLine("{0}< {1}", linePrefix, streams1[i1]);
+                    i1++;
+                    difference = true;
+                }
+                else if(comp > 0)
+                {
+                    diffOutput.WriteLine("{0}> {1}", linePrefix, streams2[i2]);
+                    i2++;
+                    difference = true;
+                }
+                else
+                {
+                    if(streams1[i1] != ("" + ((char)5) + "SummaryInformation"))
+                    {
+                        string tempFile1 = Path.GetTempFileName();
+                        string tempFile2 = Path.GetTempFileName();
+                    
+                        using (View view = db1.OpenView(String.Format("SELECT `Data` FROM `_Streams` WHERE `Name` = '{0}'", streams1[i1])))
+                        {
+                            view.Execute();
+                            using (Record rec = view.Fetch())
+                            {
+                                rec.GetStream(1, tempFile1);
+                            }
+                        }
+                        using (View view = db2.OpenView(String.Format("SELECT `Data` FROM `_Streams` WHERE `Name` = '{0}'", streams2[i2])))
+                        {
+                            view.Execute();
+                            using (Record rec = view.Fetch())
+                            {
+                                rec.GetStream(1, tempFile2);
+                            }
+                        }
+                        IDiffEngine diffEngine = diffFactory.GetDiffEngine(tempFile1, tempFile2, options);
+                        StringWriter sw = new StringWriter();
+                        if(diffEngine.GetDiff(tempFile1, tempFile2, options, sw, linePrefix + "    ", diffFactory))
+                        {
+                            diffOutput.WriteLine("{0}{1}", linePrefix, streams1[i1]);
+                            diffOutput.Write(sw.ToString());
+                            difference = true;
+                        }
+                        File.Delete(tempFile1);
+                        File.Delete(tempFile2);
+                    }
+                    i1++;
+                    i2++;
+                }
+            }
+            return difference;
+        }
+        public virtual IDiffEngine Clone()
+        {
+            return new MsiDiffEngine();
+        }
+    }
+}
diff --git a/src/samples/Dtf/DDiff/MspDiffEngine.cs b/src/samples/Dtf/DDiff/MspDiffEngine.cs
new file mode 100644
index 00000000..285bc83d
--- /dev/null
+++ b/src/samples/Dtf/DDiff/MspDiffEngine.cs
@@ -0,0 +1,127 @@
+// 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 WixToolset.Dtf.WindowsInstaller;
+using WixToolset.Dtf.WindowsInstaller.Package;
+namespace WixToolset.Dtf.Samples.DDiff
+{
+        public class MspDiffEngine : MsiDiffEngine
+        {
+                public MspDiffEngine()
+                {
+                }
+                private string GetPatchTargetOption(string[] options)
+                {
+                        for(int i = 0; i < options.Length - 1; i++)
+                        {
+                                switch(options[i].ToLower())
+                                {
+                                        case "/p": goto case "-patchtarget";
+                                        case "-p": goto case "-patchtarget";
+                                        case "/patchtarget": goto case "-patchtarget";
+                                        case "-patchtarget": return options[i+1];
+                                }
+                        }
+                        return null;
+                }
+                public override float GetDiffQuality(string diffInput1, string diffInput2, string[] options, IDiffEngineFactory diffFactory)
+                {
+                        if(diffInput1 != null && File.Exists(diffInput1) &&
+                                diffInput2 != null && File.Exists(diffInput2) &&
+                                GetPatchTargetOption(options) != null &&
+                                (IsMspPatch(diffInput1) && IsMspPatch(diffInput2)))
+                        {
+                                return .80f;
+                        }
+                        else if(diffInput1 != null && File.Exists(diffInput1) &&
+                                diffInput2 != null && File.Exists(diffInput2) &&
+                                GetPatchTargetOption(options) == null &&
+                                (IsMspPatch(diffInput1) && IsMsiDatabase(diffInput2)) ||
+                                (IsMsiDatabase(diffInput1) && IsMspPatch(diffInput2)))
+                        {
+                                return .75f;
+                        }
+                        else
+                        {
+                                return 0;
+                        }
+                }
+                public override bool GetDiff(string diffInput1, string diffInput2, string[] options, TextWriter diffOutput, string linePrefix, IDiffEngineFactory diffFactory)
+                {
+                        bool difference = false;
+                        InstallPackage db1, db2;
+                        if(IsMspPatch(diffInput1))
+                        {
+                                string patchTargetDbFile = GetPatchTargetOption(options);
+                                if(patchTargetDbFile == null) patchTargetDbFile = diffInput2;
+                                string tempPatchedDbFile = Path.GetTempFileName();
+                                File.Copy(patchTargetDbFile, tempPatchedDbFile, true);
+                                File.SetAttributes(tempPatchedDbFile, File.GetAttributes(tempPatchedDbFile) & ~System.IO.FileAttributes.ReadOnly);
+                                db1 = new InstallPackage(tempPatchedDbFile, DatabaseOpenMode.Direct);
+                                db1.ApplyPatch(new PatchPackage(diffInput1), null);
+                                db1.Commit();
+                        }
+                        else
+                        {
+                                db1 = new InstallPackage(diffInput1, DatabaseOpenMode.ReadOnly);
+                        }
+                        if(IsMspPatch(diffInput2))
+                        {
+                                string patchTargetDbFile = GetPatchTargetOption(options);
+                                if(patchTargetDbFile == null) patchTargetDbFile = diffInput1;
+                                string tempPatchedDbFile = Path.GetTempFileName();
+                                File.Copy(patchTargetDbFile, tempPatchedDbFile, true);
+                                File.SetAttributes(tempPatchedDbFile, File.GetAttributes(tempPatchedDbFile) & ~System.IO.FileAttributes.ReadOnly);
+                                db2 = new InstallPackage(tempPatchedDbFile, DatabaseOpenMode.Direct);
+                                db2.ApplyPatch(new PatchPackage(diffInput2), null);
+                                db2.Commit();
+                        }
+                        else
+                        {
+                                db2 = new InstallPackage(diffInput2, DatabaseOpenMode.ReadOnly);
+                        }
+                        if(GetSummaryInfoDiff(db1, db2, options, diffOutput, linePrefix, diffFactory)) difference = true;
+                        if(GetDatabaseDiff(db1, db2, options, diffOutput, linePrefix, diffFactory)) difference = true;
+                        if(GetStreamsDiff(db1, db2, options, diffOutput, linePrefix, diffFactory)) difference = true;
+                        db1.Close();
+                        db2.Close();
+                        try
+                        {
+                                if(IsMspPatch(diffInput1)) File.Delete(db1.FilePath);
+                                if(IsMspPatch(diffInput1)) File.Delete(db2.FilePath);
+                        }
+                        catch(IOException)
+                        {
+                                #if DEBUG
+                                Console.WriteLine("Could not delete temporary files {0} and {1}", db1.FilePath, db2.FilePath);
+                                #endif
+                        }
+                        if(IsMspPatch(diffInput1) && IsMspPatch(diffInput2))
+                        {
+                                Database dbp1 = new Database(diffInput1, DatabaseOpenMode.ReadOnly);
+                                Database dbp2 = new Database(diffInput2, DatabaseOpenMode.ReadOnly);
+                                if(GetStreamsDiff(dbp1, dbp2, options, diffOutput, linePrefix, diffFactory)) difference = true;
+                                dbp1.Close();
+                                dbp2.Close();
+                        }
+                        return difference;
+                }
+                public override IDiffEngine Clone()
+                {
+                        return new MspDiffEngine();
+                }
+        }
+}
diff --git a/src/samples/Dtf/DDiff/TextFileDiffEngine.cs b/src/samples/Dtf/DDiff/TextFileDiffEngine.cs
new file mode 100644
index 00000000..22567023
--- /dev/null
+++ b/src/samples/Dtf/DDiff/TextFileDiffEngine.cs
@@ -0,0 +1,83 @@
+// 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.Diagnostics;
+namespace WixToolset.Dtf.Samples.DDiff
+{
+        public class TextFileDiffEngine : IDiffEngine
+        {
+                public TextFileDiffEngine()
+                {
+                }
+                private bool IsTextFile(string file)
+                {
+                        // Guess whether this is a text file by reading the first few bytes and checking for non-ascii chars.
+                        bool isText = true;
+                        FileStream stream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read);
+                        byte[] buf = new byte[256];
+                        int count = stream.Read(buf, 0, buf.Length);
+                        for(int i = 0; i < count; i++)
+                        {
+                                if((buf[i] & 0x80) != 0)
+                                {
+                                        isText = false;
+                                        break;
+                                }
+                        }
+                        stream.Close();
+                        return isText;
+                }
+                public float GetDiffQuality(string diffInput1, string diffInput2, string[] options, IDiffEngineFactory diffFactory)
+                {
+                        if(diffInput1 != null && File.Exists(diffInput1) &&
+                                diffInput2 != null && File.Exists(diffInput2) &&
+                                (IsTextFile(diffInput1) && IsTextFile(diffInput2)))
+                        {
+                                return .70f;
+                        }
+                        else
+                        {
+                                return 0;
+                        }
+                }
+                public bool GetDiff(string diffInput1, string diffInput2, string[] options, TextWriter diffOutput, string linePrefix, IDiffEngineFactory diffFactory)
+                {
+                        try
+                        {
+                                bool difference = false;
+                                ProcessStartInfo psi = new ProcessStartInfo("diff.exe");
+                                psi.Arguments = String.Format("\"{0}\" \"{1}\"", diffInput1, diffInput2);
+                                psi.WorkingDirectory = null;
+                                psi.UseShellExecute = false;
+                                psi.WindowStyle = ProcessWindowStyle.Hidden;
+                                psi.RedirectStandardOutput = true;
+                                Process proc = Process.Start(psi);
+                                string line;
+                                while((line = proc.StandardOutput.ReadLine()) != null)
+                                {
+                                        diffOutput.WriteLine("{0}{1}", linePrefix, line);
+                                        difference = true;
+                                }
+                                proc.WaitForExit();
+                                return difference;
+                        }
+                        catch(System.ComponentModel.Win32Exception)  // If diff.exe is not found, just compare the bytes
+                        {
+                                return new FileDiffEngine().GetDiff(diffInput1, diffInput2, options, diffOutput, linePrefix, diffFactory);
+                        }
+                }
+                public IDiffEngine Clone()
+                {
+                        return new TextFileDiffEngine();
+                }
+        }
+}
diff --git a/src/samples/Dtf/DDiff/VersionedFileDiffEngine.cs b/src/samples/Dtf/DDiff/VersionedFileDiffEngine.cs
new file mode 100644
index 00000000..ad4014f3
--- /dev/null
+++ b/src/samples/Dtf/DDiff/VersionedFileDiffEngine.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.
+using System;
+using System.IO;
+using WixToolset.Dtf.WindowsInstaller;
+namespace WixToolset.Dtf.Samples.DDiff
+{
+        public class VersionedFileDiffEngine : IDiffEngine
+        {
+                public VersionedFileDiffEngine()
+                {
+                }
+                private bool IsVersionedFile(string file)
+                {
+                        return Installer.GetFileVersion(file) != "";
+                }
+                public float GetDiffQuality(string diffInput1, string diffInput2, string[] options, IDiffEngineFactory diffFactory)
+                {
+                        if(diffInput1 != null && File.Exists(diffInput1) &&
+                           diffInput2 != null && File.Exists(diffInput2) &&
+                           (IsVersionedFile(diffInput1) || IsVersionedFile(diffInput2)))
+                        {
+                                return .20f;
+                        }
+                        else
+                        {
+                                return 0;
+                        }
+                }
+                public bool GetDiff(string diffInput1, string diffInput2, string[] options, TextWriter diffOutput, string linePrefix, IDiffEngineFactory diffFactory)
+                {
+                        bool difference = false;
+                        string ver1 = Installer.GetFileVersion(diffInput1);
+                        string ver2 = Installer.GetFileVersion(diffInput2);
+                        if(ver1 != ver2)
+                        {
+                                diffOutput.WriteLine("{0}File version: {1} -> {2}", linePrefix, ver1, ver2);
+                                difference = true;
+                        }
+                        else
+                        {
+                                FileStream stream1 = new FileStream(diffInput1, FileMode.Open, FileAccess.Read, FileShare.Read);
+                                FileStream stream2 = new FileStream(diffInput2, FileMode.Open, FileAccess.Read, FileShare.Read);
+                                byte[] buf1 = new byte[512];
+                                byte[] buf2 = new byte[512];
+                                while(!difference)
+                                {
+                                        int count1 = stream1.Read(buf1, 0, buf1.Length);
+                                        int count2 = stream2.Read(buf2, 0, buf2.Length);
+                                        for(int i = 0; i < count1; i++)
+                                        {
+                                                if(i == count2 || buf1[i] != buf2[i])
+                                                {
+                                                        difference = true;
+                                                        break;
+                                                }
+                                        }
+                                        if(count1 < buf1.Length) // EOF
+                                        {
+                                                break;
+                                        }
+                                }
+                                stream1.Close();
+                                stream2.Close();
+                                if(difference)
+                                {
+                                        diffOutput.WriteLine("{0}File versions match but bits differ.", linePrefix);
+                                }
+                        }
+                        return difference;
+                }
+                public IDiffEngine Clone()
+                {
+                        return new VersionedFileDiffEngine();
+                }
+        }
+}
diff --git a/src/samples/Dtf/Documents/Guide/Content/about.htm b/src/samples/Dtf/Documents/Guide/Content/about.htm
new file mode 100644
index 00000000..393b5a81
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/about.htm
@@ -0,0 +1,59 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Deployment Tools Foundation Overview</title>
+  <link rel="stylesheet" type="text/css" href="../styles/presentation.css" />
+  <link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" />
+</head>
+<body>
+  <div id="control">
+    <span class="productTitle">Deployment Tools Foundation</span><br />
+    <span class="topicTitle">Deployment Tools Foundation</span><br />
+    <div id="toolbar">
+      <span id="chickenFeet"><span class="nolink">Overview</span></span>
+      <span id="languageFilter">v4.0</span>
+    </div>
+    </div>
+    <div id="main">
+      <div id="header">
+      </div>
+      <div class="summary">
+        <p>Deployment Tools Foundation is a rich set of .NET class libraries and
+        related resources that together bring the Windows deployment platform
+        technologies into the .NET world. It is designed to greatly simplify
+        deployment-related development tasks while still exposing the complete
+        functionality of the underlying technology.</p>
+        
+        <p>The primary focus of DTF is to provide a foundation for development of
+        various kinds of tools to support deployment throughout the product
+        lifecycle, including setup authoring, building, analysis, debugging, and
+        testing tools. In addition to tools, DTF can also be useful for install-time
+        activities such as setup bootstrappers, external UI, and custom actions,
+        and for application run-time activities that need to access the deployment
+        platform.</p>
+        
+        <p>For a description of the the latest changes, see <a
+        href="whatsnew.htm">What's New</a>.</p>
+        
+      </div>
+        
+      <div id="footer">
+        <p />
+        Send comments on this topic to <a id="HT_MailLink" href="mailto:wix-users%40lists.sourceforge.net?Subject=Deployment Tools Foundation Documentation">
+        wix-users@lists.sourceforge.net</a>
+        <script type="text/javascript">
+          var HT_mailLink = document.getElementById("HT_MailLink");
+          var HT_mailLinkText = HT_mailLink.innerHTML;
+          HT_mailLink.href += ": " + document.title;
+          HT_mailLink.innerHTML = HT_mailLinkText;
+        </script>
+        <p />
+        
+      </div>
+   </div>
+    
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/buildingcas.htm b/src/samples/Dtf/Documents/Guide/Content/buildingcas.htm
new file mode 100644
index 00000000..e88ad552
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/buildingcas.htm
@@ -0,0 +1,94 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Building Managed Custom Actions</title>
+  <link rel="stylesheet" type="text/css" href="../styles/presentation.css" />
+  <link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" />
+</head>
+<body>
+  <div id="control">
+    <span class="productTitle">Deployment Tools Foundation</span><br />
+    <span class="topicTitle">Building Managed Custom Actions</span><br />
+    <div id="toolbar">
+      <span id="chickenFeet">
+        <a href="using.htm">Development Guide</a> &gt;
+        <a href="managedcas.htm">Managed CAs</a> &gt;
+        <span class="nolink">Building</span>
+      </span>
+    </div>
+    </div>
+    <div id="main">
+      <div id="header">
+      </div>
+      <div class="summary">
+      
+                        <p>The build process for managed CA DLLs is a little complicated becuase of the 
+                        proxy-wrapper and dll-export requirements. Here's an overview:</p>
+                        <ol>
+                                <li>
+                                        <p>Compile your CA assembly, which references WixToolset.Dtf.WindowsInstaller.dll and 
+                                                marks exported custom actions with a CustomActionAttribute.</p>
+                                <li>
+                                        <p>Package the CA assembly, CustomAction.config, WixToolset.Dtf.WindowsInstaller.dll, 
+                                                and any other dependencies using <b>MakeSfxCA.exe</b>. The filenames of CustomAction.config
+                                                and WixToolset.Dtf.WindowsInstaller.dll must not be changed, since
+                                                the custom action proxy specifically looks for those files.</p>
+                        </ol>
+                        <p><br>
+                        </p>
+                        <p><b>Compiling</b></p>
+                        <pre><font face="Consolas, Courier New">
+    csc.exe
+        /target:library
+        /r:$(DTFbin)\WixToolset.Dtf.WindowsInstaller.dll
+        /out:SampleCAs.dll
+        *.cs
+            </font></pre>
+                        <p><b>Wrapping</b><pre><font face="Consolas, Courier New">
+    MakeSfxCA.exe
+        $(OutDir)\SampleCAsPackage.dll
+        $(DTFbin)\SfxCA.dll
+        SampleCAs.dll
+        CustomAction.config
+        $(DTFbin)\WixToolset.Dtf.WindowsInstaller.dll
+            </font></pre>
+            </p>
+                        <p>Now the resulting package, SampleCAsPackage.dll, is ready to be inserted
+                        into the Binary table of the MSI.</p>
+                        <p><br/>
+                        </p>
+                        <p>For a working example of building a managed custom action package
+                        you can look at included sample ManagedCAs project.</p>
+                        <p><br/>
+                        </p>
+                        
+                <p><br/></p>
+        <p><b>See also:</b></p>
+        <ul>
+            <li><a href="writingcas.htm">Writing Managed Custom Actions</a></li>
+            <li><a href="caconfig.htm">Specifying the Runtime Version</a></li>
+        </ul>
+        <p><br/></p>
+      </div>
+        
+      <div id="footer">
+        <p />
+        Send comments on this topic to <a id="HT_MailLink" href="mailto:wix-users%40lists.sourceforge.net?Subject=Deployment Tools Foundation Documentation">
+        wix-users@lists.sourceforge.net</a>
+        <script type="text/javascript">
+          var HT_mailLink = document.getElementById("HT_MailLink");
+          var HT_mailLinkText = HT_mailLink.innerHTML;
+          HT_mailLink.href += ": " + document.title;
+          HT_mailLink.innerHTML = HT_mailLinkText;
+        </script>
+        <p />
+        
+      </div>
+   </div>
+    
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/cabpack.htm b/src/samples/Dtf/Documents/Guide/Content/cabpack.htm
new file mode 100644
index 00000000..2d9f725e
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/cabpack.htm
@@ -0,0 +1,63 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Archive Pack/Unpack Tool</title>
+  <link rel="stylesheet" type="text/css" href="../styles/presentation.css" />
+  <link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" />
+</head>
+<body>
+  <div id="control">
+    <span class="productTitle">Deployment Tools Foundation</span><br />
+    <span class="topicTitle">Archive Pack/Unpack Tool</span><br />
+    <div id="toolbar">
+      <span id="chickenFeet">
+        <a href="using.htm">Development Guide</a> &gt;
+        <a href="samples.htm">Samples</a> &gt;
+        <span class="nolink">XPack</span>
+      </span>
+    </div>
+    </div>
+    <div id="main">
+      <div id="header">
+      </div>
+      <div class="summary">
+            <p><pre><font face="Consolas, Courier New">Usage: CabPack.exe &lt;directory&gt; &lt;package.cab&gt;
+Usage: XPack /P &lt;archive.cab&gt; &lt;directory&gt;
+Usage: XPack /P &lt;archive.zip&gt; &lt;directory&gt;
+Packs all files in a directory tree into an archive,
+using either the cab or zip format. Any existing archive
+with the same name will be overwritten.
+Usage: XPack /U &lt;archive.cab&gt; &lt;directory&gt;
+Usage: XPack /U &lt;archive.zip&gt; &lt;directory&gt;
+Unpacks all files from a cab or zip archive to the
+specified directory. Any existing files with the same
+names will be overwritten.</font></pre>
+            </p>
+            <p><br/></p>
+      </div>
+        
+      <div id="footer">
+        <p />
+        Send comments on this topic to <a id="HT_MailLink" href="mailto:wix-users%40lists.sourceforge.net?Subject=Deployment Tools Foundation Documentation">
+        wix-users@lists.sourceforge.net</a>
+        <script type="text/javascript">
+          var HT_mailLink = document.getElementById("HT_MailLink");
+          var HT_mailLinkText = HT_mailLink.innerHTML;
+          HT_mailLink.href += ": " + document.title;
+          HT_mailLink.innerHTML = HT_mailLinkText;
+        </script>
+        <p />
+        
+      </div>
+   </div>
+    
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/cabs.htm b/src/samples/Dtf/Documents/Guide/Content/cabs.htm
new file mode 100644
index 00000000..e88d1e15
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/cabs.htm
@@ -0,0 +1,101 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Working with Cabinet Files</title>
+  <link rel="stylesheet" type="text/css" href="../styles/presentation.css" />
+  <link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" />
+</head>
+<body>
+  <div id="control">
+    <span class="productTitle">Deployment Tools Foundation</span><br />
+    <span class="topicTitle">Working with Cabinet Files</span><br />
+    <div id="toolbar">
+      <span id="chickenFeet">
+        <a href="using.htm">Development Guide</a> &gt;
+        <span class="nolink">Cabinet Files</span>
+      </span>
+    </div>
+    </div>
+    <div id="main">
+      <div id="header">
+      </div>
+      <div class="summary">
+            <h3>Creating a cabinet</h3>
+            <pre><font face="Consolas, Courier New">    CabInfo cabInfo = <font color="blue">new</font> CabInfo(<font color="purple">"package.cab"</font>);
+    cabInfo.Pack(<font color="purple">"D:\\FilesToCompress"</font>);</font></pre><br />
+            <p>1.&nbsp; Create a <a href="DTFAPI.chm::/html/M_Microsoft_Deployment_Compression_Cab_CabInfo__ctor_1.htm">new CabInfo</a> instance referring to the (future) location of the .cab file.</p>
+            <p>2.&nbsp; Compress files:</p><ul>
+                <li>Easily compress an entire directory with the <a href="DTFAPI.chm::/html/Overload_Microsoft_Deployment_Compression_ArchiveInfo_Pack.htm">Pack</a> method.</li>
+                <li>Compress a specific list of exernal and internal filenames with the <a href="DTFAPI.chm::/html/Overload_Microsoft_Deployment_Compression_ArchiveInfo_PackFiles.htm">PackFiles</a> method.</li>
+                <li>Compress a dictionary mapping of internal to external filenames with the <a href="DTFAPI.chm::/html/Overload_Microsoft_Deployment_Compression_ArchiveInfo_PackFileSet.htm">PackFileSet</a> method.</li>
+            </ul>
+            
+            <p><br/></p>
+            <h3>Listing a cabinet</h3>
+            <pre><font face="Consolas, Courier New">    CabInfo cabInfo = <font color="blue">new</font> CabInfo(<font color="purple">"package.cab"</font>);
+    <font color="blue">foreach</font> (CabFileInfo fileInfo <font color="blue">in</font> cabInfo.GetFiles())
+        Console.WriteLine(fileInfo.Name + <font color="purple">"\t"</font> + fileInfo.Length);</font></pre><br />
+            <p>1.&nbsp; Create a <a href="DTFAPI.chm::/html/M_Microsoft_Deployment_Compression_Cab_CabInfo__ctor_1.htm">new CabInfo</a> instance referring to the location of the .cab file.</p>
+            <p>2.&nbsp; Enumerate files returned by the <a href="DTFAPI.chm::/html/Overload_Microsoft_Deployment_Compression_Cab_CabInfo_GetFiles.htm">GetFiles</a> method.</p><ul>
+                <li>Each <a href="DTFAPI.chm::/html/T_Microsoft_Deployment_Compression_Cab_CabFileInfo.htm">CabFileInfo</a> instance contains metadata about one file.</li>
+            </ul>
+            
+            <p><br/></p>
+            <h3>Extracting a cabinet</h3>
+            <pre><font face="Consolas, Courier New">    CabInfo cabInfo = <font color="blue">new</font> CabInfo(<font color="purple">"package.cab"</font>);
+    cabInfo.Unpack(<font color="purple">"D:\\ExtractedFiles"</font>);</font></pre><br />
+            <p>1.&nbsp; Create a <a href="DTFAPI.chm::/html/M_Microsoft_Deployment_Compression_Cab_CabInfo__ctor_1.htm">new CabInfo</a> instance referring to the location of the .cab file.</p>
+            <p>2.&nbsp; Extract files:</p><ul>
+                <li>Easily extract all files to a directory with the <a href="DTFAPI.chm::/html/Overload_Microsoft_Deployment_Compression_ArchiveInfo_Unpack.htm">Unpack</a> method.</li>
+                <li>Easily extract a single file with the <a href="DTFAPI.chm::/html/M_Microsoft_Deployment_Compression_ArchiveInfo_UnpackFile.htm">UnpackFile</a> method.</li>
+                <li>Extract a specific list of filenames with the <a href="DTFAPI.chm::/html/Overload_Microsoft_Deployment_Compression_ArchiveInfo_UnpackFiles.htm">UnpackFiles</a> method.</li>
+                <li>Extract a dictionary mapping of internal to external filenames with the <a href="DTFAPI.chm::/html/Overload_Microsoft_Deployment_Compression_ArchiveInfo_UnpackFileSet.htm">UnpackFileSet</a> method.</li>
+            </ul>
+ 
+            <p><br/></p>
+            <h3>Getting progress</h3>
+            Most cabinet operation methods have an overload that allows you to specify a event handler
+            for receiving <a href="DTFAPI.chm::/html/T_Microsoft_Deployment_Compression_ArchiveProgressEventArgs.htm">archive
+            progress events</a>. The <a href="cabpack.htm">XPack sample</a>
+            demonstrates use of the callback to report detailed progress to the console.
+           
+            <p><br/></p>
+            <h3>Stream-based compression</h3>
+            The CabEngine class contains static methods for performing compression/decompression operations directly
+            on any kind of Stream. However these methods are more difficult to use, since the caller must implement a
+            <a href="DTFAPI.chm::/html/T_Microsoft_Deployment_Compression_ArchiveFileStreamContext.htm">stream context</a>
+            that provides the file metadata which would otherwise have been provided by the filesystem. The CabInfo class
+            uses the CabEngine class with FileStreams to provide the more traditional file-based interface.
+           
+            <p><br/></p>
+            <p><b>See also:</b></p>
+            <ul>
+                <li><a href="DTFAPI.chm::/html/T_Microsoft_Deployment_Compression_Cab_CabInfo.htm">CabInfo class</a></li>
+                <li><a href="DTFAPI.chm::/html/T_Microsoft_Deployment_Compression_Cab_CabEngine.htm">CabEngine class</a></li>
+                <li><a href="cabpack.htm">XPack Sample Tool</a></li>
+            </ul>
+            <p><br/></p>
+            
+      </div>
+        
+      <div id="footer">
+        <p />
+        Send comments on this topic to <a id="HT_MailLink" href="mailto:wix-users%40lists.sourceforge.net?Subject=Deployment Tools Foundation Documentation">
+        wix-users@lists.sourceforge.net</a>
+        <script type="text/javascript">
+          var HT_mailLink = document.getElementById("HT_MailLink");
+          var HT_mailLinkText = HT_mailLink.innerHTML;
+          HT_mailLink.href += ": " + document.title;
+          HT_mailLink.innerHTML = HT_mailLinkText;
+        </script>
+        <p />
+        
+      </div>
+   </div>
+    
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/cabwrapper.htm b/src/samples/Dtf/Documents/Guide/Content/cabwrapper.htm
new file mode 100644
index 00000000..fd88437c
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/cabwrapper.htm
@@ -0,0 +1,63 @@
+<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<html>
+        <head>
+                <title>Managed Wrapper Library for Cabinet APIs</title>
+                <meta http-equiv="Content-Type" content="text/html; charset=Windows-1252">
+                <link rel="stylesheet" type="text/css" href="MSDN.css">
+        </head>
+        <body id="bodyID" class="dtBODY">
+                <div id="nsbanner">
+                        <div id="bannerrow1">
+                                <table class="bannerparthead" cellspacing="0" id="Table1">
+                                        <tr id="hdr">
+                                                <td class="runninghead">Managed Libraries for Windows Installer</td>
+                                                <td class="product"></td>
+                                        </tr>
+                                </table>
+                        </div>
+                        <div id="TitleRow">
+                                <h1 class="dtH1">Managed Wrapper Library for Cabinet APIs</h1>
+                        </div>
+                </div>
+                <div id="nstext">
+            <p>This is a managed library that provides the ability to 
+            create and extract cabinet files. It uses cabinet.dll (present on all versions of Windows) 
+            to do the actual compression/decompression. It provides access to nearly all 
+            cabinet capabilities, including spanning of multiple cab files. It even has support for
+            preserving directory structures and UTF8 paths.</p>
+            <p>There are two ways to use the library. <a href="ms-its:MMLRef.chm::/Microsoft.Cab.CabinetInfo.html">CabinetInfo</a> 
+            and <a href="ms-its:MMLRef.chm::/Microsoft.Cab.CabinetFileInfo.html">CabinetFileInfo</a>
+            (similar to DirectoryInfo and FileInfo respectively) 
+            provide high-level object-oriented methods for doing common file-based cabinet creation and 
+            extraction tasks. On the other hand, the <a href="ms-its:MMLRef.chm::/Microsoft.Cab.Cabinet.html">Cabinet</a>
+            class provides low-level access to all
+            functionality, and operates completely in terms of .NET Streams. The previous two classes use
+            the Cabinet class to do all the actual work.</p>
+            <p>There are also two ways to build the library. 
+            Compiling it normally will produce the fully functional 
+            library in the <a href="ms-its:MMLRef.chm::/Microsoft.Cab.html">Microsoft.Cab</a>
+            namespace, while compiling it with the <tt>/D:CABMINIMAL 
+            /D:CABEXTRACTONLY</tt> flags will create a compact assembly with only the core extraction 
+            functionality, in the <a href="ms-its:MMLRef.chm::/Microsoft.Cab.MiniExtract.html">Microsoft.Cab.MiniExtract</a>
+            namespace.</p>
+            <p>The cabinet library interops with native cabinet APIs which use the 'cdecl'
+            calling-convention. When building against .NET Framework versions before 2.0,
+            this library requires a special post-build step to process the UnmanagedFunctionPointerAttribute.
+            If you use this code in another assembly, don't forget to run <a href="augmentil.htm">AugmentIL</a>
+            on it to fix the delegate calling-conventions, otherwise you will encounter a
+            NullReferenceException when attempting to call the cabinet APIs. When building against
+            .NET Framework version 2.0 or later, the UnmanagedFunctionPointerAttribute.cs source file
+            should be omitted.</p>
+            
+            <p><br/></p>
+            <p><b>See also:</b></p>
+            <ul>
+                <li><a href="cabs.htm">Working with Cabinet Files</a></li>
+                <li><a href="ms-its:MMLRef.chm::/Microsoft.Cab.CabinetInfoMethods.html">CabinetInfo Methods</a></li>
+                <li><a href="ms-its:MMLRef.chm::/Microsoft.Cab.CabinetMethods.html">Cabinet Methods</a></li>
+                <li><a href="cabpack.htm">CabPack Sample Tool</a></li>
+            </ul>
+            <p><br/></p>
+                </div>
+        </body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/caconfig.htm b/src/samples/Dtf/Documents/Guide/Content/caconfig.htm
new file mode 100644
index 00000000..a6c97d2b
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/caconfig.htm
@@ -0,0 +1,83 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Specifying the Runtime Version</title>
+  <link rel="stylesheet" type="text/css" href="../styles/presentation.css" />
+  <link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" />
+</head>
+<body>
+  <div id="control">
+    <span class="productTitle">Deployment Tools Foundation</span><br />
+    <span class="topicTitle">Specifying the Runtime Version</span><br />
+    <div id="toolbar">
+      <span id="chickenFeet">
+        <a href="using.htm">Development Guide</a> &gt;
+        <a href="managedcas.htm">Managed CAs</a> &gt;
+        <a href="writingcas.htm">Writing CAs</a> &gt;
+        <span class="nolink">CustomAction.config</span>
+      </span>
+    </div>
+    </div>
+    <div id="main">
+      <div id="header">
+      </div>
+      <div class="summary">
+      
+                        <p>Every managed custom action package should contain a CustomAction.config file, even though it is not required by the toolset.
+                        Here is a sample:</p><pre><font face="Consolas, Courier New">
+&lt;?xml version="1.0" encoding="utf-8" ?&gt;
+&lt;configuration&gt;
+    &lt;startup&gt;
+        &lt;supportedRuntime version=&quot;v2.0.50727&quot;/&gt;
+    &lt;/startup&gt;
+&lt;/configuration&gt;</font></pre><br />
+                        <p>The configuration file follows the standard schema for .NET Framework
+                        configuration files <a target=_blank href="http://msdn2.microsoft.com/en-us/library/9w519wzk(VS.80).aspx">documented on MSDN</a>.</p>
+                <p><br/></p>
+        <p><b>Supported Runtime Version</b></p>
+        <p>In the startup section, use <a target=_blank href="http://msdn2.microsoft.com/en-us/library/w4atty68(VS.80).aspx">supportedRuntime</a>
+        tags to explicitly specify the version(s) of the .NET Framework that the custom action should run on.
+        If no versions are specified, the chosen version of the .NET Framework will be
+                the "best" match to what WixToolset.Dtf.WindowsInstaller.dll was built against.</p>
+                <p><font color="red"><b>Warning: leaving the version unspecified is dangerous</b></font>
+                as it introduces a risk of compatibility problems with future versions of the .NET Framework.
+                It is highly recommended that you specify only the version(s)
+                of the .NET Framework that you have tested against.</p> 
+                <p><br/></p>
+                
+                <p><b>Other Configuration</b></p>
+                <p>Various other kinds of configuration settings may also be added to this file, as it is a standard
+                <a target=_blank href="http://msdn2.microsoft.com/en-us/library/kza1yk3a(VS.80).aspx">.NET Framework application config file</a>
+                for the custom action.</p>
+                <p><br/></p>
+                
+        <p><b>See also:</b></p>
+        <ul>
+            <li><a href="writingcas.htm">Writing Managed Custom Actions</a></li>
+            <li><a href="buildingcas.htm">Building Managed Custom Actions</a></li>
+            <li><a href="caproxy.htm">Proxy for Managed Custom Actions</a></li>
+        </ul>
+        <p><br/></p>
+      </div>
+        
+      <div id="footer">
+        <p />
+        Send comments on this topic to <a id="HT_MailLink" href="mailto:wix-users%40lists.sourceforge.net?Subject=Deployment Tools Foundation Documentation">
+        wix-users@lists.sourceforge.net</a>
+        <script type="text/javascript">
+          var HT_mailLink = document.getElementById("HT_MailLink");
+          var HT_mailLinkText = HT_mailLink.innerHTML;
+          HT_mailLink.href += ": " + document.title;
+          HT_mailLink.innerHTML = HT_mailLinkText;
+        </script>
+        <p />
+        
+      </div>
+   </div>
+    
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/caproxy.htm b/src/samples/Dtf/Documents/Guide/Content/caproxy.htm
new file mode 100644
index 00000000..2ee962d5
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/caproxy.htm
@@ -0,0 +1,74 @@
+<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<html>
+        <head>
+                <title>Proxy Class for Managed Custom Actions</title>
+                <meta http-equiv="Content-Type" content="text/html; charset=Windows-1252">
+                <link rel="stylesheet" type="text/css" href="MSDN.css">
+        </head>
+        <body id="bodyID" class="dtBODY">
+                <div id="nsbanner">
+                        <div id="bannerrow1">
+                                <table class="bannerparthead" cellspacing="0" id="Table1">
+                                        <tr id="hdr">
+                                                <td class="runninghead">Managed Libraries for Windows Installer</td>
+                                                <td class="product"></td>
+                                        </tr>
+                                </table>
+                        </div>
+                        <div id="TitleRow">
+                                <h1 class="dtH1">Proxy for Managed Custom Actions</h1>
+                        </div>
+                </div>
+                <div id="nstext">
+            <p>The custom action proxy allows an MSI developer to write
+            custom actions in managed code, while maintaing all the advantages of type 1
+            DLL custom actions including full access to installer state, properties,
+            and the session database.</p>
+            <p>There are generally four problems that needed to be 
+            solved in order to create a type 1 custom action in managed code:</p>
+            <ol>
+            <li><p><strong>Exporting the CA function as a native entry point callable by 
+            MSI:</strong> The Windows Installer engine expects to call a LoadLibrary and
+            GetProcAddress on the custom action DLL, so an unmanaged DLL needs to implement
+            the function that is initially called by MSI and ultimately returns the result.
+            This function acts as a proxy to relay the custom action call into the
+            managed custom action assembly, and relay the result back to the caller. </p>
+            <li><strong>Providing supporting assemblies without 
+            requiring them to be installed as files:</strong> If a DLL custom 
+            action runs before the product's files are installed, then it is difficult 
+            to provide any supporting files, because of the way the CA DLL is singly 
+            extracted and executed from a temp file. (This can be a problem for
+            unmanaged CAs as well.) With managed custom actions we have already hit
+            that problem since both the CA assembly  and the MSI wrapper assembly
+            need to be loaded. To solve this, the proxy DLL carries an appended
+            cab package. When invoked, it will extract all contents of the
+            cab package to a temporary working directory. This way the cab package can
+            carry any arbitrary dependencies the custom action may require.</li>
+            <li><p><strong>Hosting and configuring the Common Language Runtime:</strong>
+            In order to invoke a method in a managed assembly from a previously
+            unmanaged process, the CLR needs to be "hosted". This involves choosing
+            the correct version of the .NET Framework to use out of the available
+            version(s) on the system, binding that version to the current process, and
+            configuring it to load assemblies from the temporary working directory.</p>
+            <li><p><strong>Converting the integer session handle into a 
+            Session object:</strong> The <a href="">Session</a> class in the managed
+            wrapper library has a constructor which takes an integer session handle as 
+            its parameter. So the proxy simply instantiates this object before
+            calling the real CA function.</p>
+            </ol>
+            <p>The unmanaged CAPack module, when used in combination with the managed proxy in
+                the
+            Microsoft.WindowsInstaller assembly, accomplishes the tasks above to enable
+            fully-functional managed DLL custom actions.</p>
+            <p><br/></p>
+            <p><b>See also:</b></p>
+            <ul>
+                <li><a href="writingcas.htm">Writing Managed Custom Actions</a></li>
+                <li><a href="caconfig.htm">Writing the CustomAction.config file</a></li>
+                <li><a href="samplecas.htm">Sample C# Custom Actions</a></li>
+                <li><a href="buildingcas.htm">Building Managed Custom Actions</a></li>
+            </ul>
+            <p><br/></p>
+                </div>
+        </body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/databases.htm b/src/samples/Dtf/Documents/Guide/Content/databases.htm
new file mode 100644
index 00000000..4fe1fba9
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/databases.htm
@@ -0,0 +1,120 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Working with MSI Databases</title>
+  <link rel="stylesheet" type="text/css" href="../styles/presentation.css" />
+  <link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" />
+</head>
+<body>
+  <div id="control">
+    <span class="productTitle">Deployment Tools Foundation</span><br />
+    <span class="topicTitle">Working with MSI Databases</span><br />
+    <div id="toolbar">
+      <span id="chickenFeet">
+        <a href="using.htm">Development Guide</a> &gt;
+        <span class="nolink">MSI Databases</span>
+      </span>
+    </div>
+    </div>
+    <div id="main">
+      <div id="header">
+      </div>
+      <div class="summary">
+      
+            <h3>Querying a database</h3>
+            <pre><font face="Consolas, Courier New">    <font color=blue>using</font> (Database db = <font color=blue>new</font> Database(<font color="purple">"product.msi"</font>, DatabaseOpenMode.ReadOnly))
+    {
+        <font color=blue>string</font> value = (<font color=blue>string</font>) db.ExecuteScalar(
+            <font color="purple">"SELECT `Value` FROM `Property` WHERE `Property` = '{0}'"</font>, propName);
+    }</font></pre><br />
+            <p>1.&nbsp; Create a <a href="DTFAPI.chm::/html/Overload_Microsoft_Deployment_WindowsInstaller_Database__ctor.htm">new Database</a>
+            instance referring to the location of the .msi or .msm file.</p>
+            <p>2.&nbsp; Execute the query:</p><ul>
+                <li>The <a href="DTFAPI.chm::/html/Overload_Microsoft_Deployment_WindowsInstaller_Database_ExecuteScalar.htm">ExecuteScalar</a>
+                method is a shortcut for opening a view, executing the view, and fetching a single value.</li>
+                <li>The <a href="DTFAPI.chm::/html/Overload_Microsoft_Deployment_WindowsInstaller_Database_ExecuteQuery.htm">ExecuteQuery</a>
+                method is a shortcut for opening a view, executing the view, and fetching all values.</li>
+                <li>Or do it all manually with <a href="DTFAPI.chm::/html/M_Microsoft_Deployment_WindowsInstaller_Database_OpenView.htm">Database.OpenView</a>,
+                <a href="DTFAPI.chm::/html/Overload_Microsoft_Deployment_WindowsInstaller_View_Execute.htm">View.Execute</a>, and
+                <a href="DTFAPI.chm::/html/M_Microsoft_Deployment_WindowsInstaller_View_Fetch.htm">View.Fetch</a>.</li>
+            </ul>
+            
+            <p><br/></p>
+            <h3>Updating a binary</h3>
+            <pre><font face="Consolas, Courier New">    Database db = <font color=blue>null</font>;
+    View view = <font color=blue>null</font>;
+    Record rec = <font color=blue>null</font>;
+    <font color=blue>try</font>
+    {
+        db = <font color=blue>new</font> Database(<font color="purple">"product.msi"</font>, DatabaseOpenMode.Direct);
+        view = db.OpenView(<font color="purple">"UPDATE `Binary` SET `Data` = ? WHERE `Name` = '{0}'"</font>, binName))
+        rec = <font color=blue>new</font> Record(1);
+        rec.SetStream(1, binFile);
+        view.Execute(rec);
+        db.Commit();
+    }
+    <font color=blue>finally</font>
+    {
+        <font color=blue>if</font> (rec != <font color=blue>null</font>) rec.Close();
+        <font color=blue>if</font> (view != <font color=blue>null</font>) view.Close();
+        <font color=blue>if</font> (db != <font color=blue>null</font>) db.Close();
+    }</font></pre><br />
+            <p>1.&nbsp; Create a <a href="DTFAPI.chm::/html/Overload_Microsoft_Deployment_WindowsInstaller_Database__ctor.htm">new Database</a>
+            instance referring to the location of the .msi or .msm file.</p>
+            <p>2.&nbsp; Open a view by calling one of the <a href="DTFAPI.chm::/html/M_Microsoft_Deployment_WindowsInstaller_Database_OpenView.htm">Database.OpenView</a> overloads.</p><ul>
+                <li>Parameters can be substituted in the SQL string using the String.Format syntax.</li>
+            </ul>
+            <p>3.&nbsp; Create a record with one field containing the new binary value.</p>
+            <p>4.&nbsp; Execute the view by calling one of the <a href="DTFAPI.chm::/html/Overload_Microsoft_Deployment_WindowsInstaller_View_Execute.htm">View.Execute</a> overloads.</p><ul>
+                <li>A record can be supplied for substitution of field tokens (?) in the query.</li>
+            </ul>
+            <p>5.&nbsp; <a href="DTFAPI.chm::/html/M_Microsoft_Deployment_WindowsInstaller_Database_Commit.htm">Commit</a> the Database.</p>
+            <p>6.&nbsp; <a href="DTFAPI.chm::/html/M_Microsoft_Deployment_WindowsInstaller_InstallerHandle_Close.htm">Close</a> the handles.</p>
+            
+            <p><br/></p>
+            <h3>About handles</h3>
+            <p>Handle objects (Database, View, Record, SummaryInfo, Session) will remain open until
+            they are explicitly closed or until the objects are collected by the GC. So for the tightest
+            code, handle objects should be explicitly closed when they are no longer needed,
+            since closing them can release significant resources, and too many unnecessary
+            open handles can degrade performance. This is especially important within a loop
+            construct: for example when iterating over all the Records in a table, it is much cleaner
+            and faster to close each Record after it is used.</p>
+            <p>The handle classes in the managed library all extend the
+            <a href="DTFAPI.chm::/html/T_Microsoft_Deployment_WindowsInstaller_InstallerHandle.htm">InstallerHandle</a>
+            class, which implements the IDisposable interface. This makes them easily managed with C#'s
+            using statement. Alternatively, they can be closed in a finally block.</p>
+            <p>As a general rule, <i>methods</i> in the library return new handle objects that should be managed
+            and closed by the calling code, while <i>properties</i> only return a reference to a prexisting handle
+            object.</p>
+            
+            <p><br/></p>
+            <p><b>See also:</b></p>
+            <ul>
+                <li><a href="powerdiff.htm">MSI Diff Sample Tool</a></li>
+                <li><a href="DTFAPI.chm::/html/T_Microsoft_Deployment_WindowsInstaller_Database.htm">Database Class</a></li>
+            </ul>
+            <p><br/></p>
+            
+      </div>
+        
+      <div id="footer">
+        <p />
+        Send comments on this topic to <a id="HT_MailLink" href="mailto:wix-users%40lists.sourceforge.net?Subject=Deployment Tools Foundation Documentation">
+        wix-users@lists.sourceforge.net</a>
+        <script type="text/javascript">
+          var HT_mailLink = document.getElementById("HT_MailLink");
+          var HT_mailLinkText = HT_mailLink.innerHTML;
+          HT_mailLink.href += ": " + document.title;
+          HT_mailLink.innerHTML = HT_mailLinkText;
+        </script>
+        <p />
+        
+      </div>
+   </div>
+    
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/debuggingcas.htm b/src/samples/Dtf/Documents/Guide/Content/debuggingcas.htm
new file mode 100644
index 00000000..ca1be161
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/debuggingcas.htm
@@ -0,0 +1,66 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Debugging Managed Custom Actions</title>
+  <link rel="stylesheet" type="text/css" href="../styles/presentation.css" />
+  <link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" />
+</head>
+<body>
+  <div id="control">
+    <span class="productTitle">Deployment Tools Foundation</span><br />
+    <span class="topicTitle">Debugging Managed Custom Actions</span><br />
+    <div id="toolbar">
+      <span id="chickenFeet">
+        <a href="using.htm">Development Guide</a> &gt;
+        <a href="managedcas.htm">Managed CAs</a> &gt;
+        <span class="nolink">Debugging</span>
+      </span>
+    </div>
+    </div>
+    <div id="main">
+      <div id="header">
+      </div>
+      <div class="summary">
+            <p>There are two ways to attach a debugger to a managed custom action.</p>
+            <p><b>Attach to message-box:</b> Add some temporary code to your custom action to display a
+            message box. Then when the message box pops up at install time, you can attch your
+            debugger to that process (usually identifiable by the title of the message box).
+            Once attached, you can ensure that symbols are loaded if necessary (they will be automatically
+            loaded if PDB files were embedded in the CA assembly at build time), then set breakpoints
+            anywhere in the custom action code.</p>
+            <p><b>MMsiBreak environment variable:</b> When debugging <i>managed</i> custom actions,
+            you should use the MMsiBreak environment variable instead of MsiBreak. Set the MMsiBreak
+            variable to the custom action entrypoint name. (Remember this might be different from
+            the method name if it was overridden by the CustomActionAttribute.) When the CA proxy
+            finds a matching name, the CLR JIT-debugging dialog
+            will appear with text similar to "An exception 'Launch for user' has occurred
+            in <i>YourCustomActionName</i>." The debug break occurs after the custom
+            action assembly has been loaded, but just before custom action method is invoked.
+            Once attached, you can ensure that symbols are loaded if necessary,
+            then set breakpoints anywhere in the custom action code. Note: the MMsiBreak
+            environment variable can also accept a comma-separated list of action names, any of
+            which will cause a break when hit.</p>
+            <p><br/></p>
+            
+      </div>
+        
+      <div id="footer">
+        <p />
+        Send comments on this topic to <a id="HT_MailLink" href="mailto:wix-users%40lists.sourceforge.net?Subject=Deployment Tools Foundation Documentation">
+        wix-users@lists.sourceforge.net</a>
+        <script type="text/javascript">
+          var HT_mailLink = document.getElementById("HT_MailLink");
+          var HT_mailLinkText = HT_mailLink.innerHTML;
+          HT_mailLink.href += ": " + document.title;
+          HT_mailLink.innerHTML = HT_mailLinkText;
+        </script>
+        <p />
+        
+      </div>
+   </div>
+    
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/dependencies.htm b/src/samples/Dtf/Documents/Guide/Content/dependencies.htm
new file mode 100644
index 00000000..cfec5880
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/dependencies.htm
@@ -0,0 +1,88 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Dependencies</title>
+  <link rel="stylesheet" type="text/css" href="../styles/presentation.css" />
+  <link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" />
+</head>
+<body>
+  <div id="control">
+    <span class="productTitle">Deployment Tools Foundation</span><br />
+    <span class="topicTitle">Dependencies</span><br />
+    <div id="toolbar">
+      <span id="chickenFeet">
+        <a href="about.htm">Overview</a> &gt;
+        <span class="nolink">Dependencies</span>
+      </span>
+    </div>
+    </div>
+    <div id="main">
+      <div id="header">
+      </div>
+      <div class="summary">
+        
+        <p>This page lists all the components that the DTF project depends on, at build time and at run-time.</p>
+        
+        <h3>Build-time Dependencies</h3>
+        <ul>
+          <li><p><b>Visual Studio / .NET Framework</b> - Most of DTF can be built with Visual Studio 2005 &
+          .NET Framework 2.0. However, the LINQ project requires VS 2008 & .NET Framework 3.5.</p></li>
+          
+          <li><p><b>Sandcastle</b> - .NET documentation build engine from Microsoft, used to process all the XML doc-comments
+          in DTF libraries into DTFAPI.chm.
+          <a href="http://www.codeplex.com/Sandcastle/" target="_blank">(official site)</a></p></li>
+          
+          <li><p><b>Sandcastle Builder</b> - Sandcastle by itself is complex and difficult to use; this free tool
+          from Codeplex provides an easy-to-use project system around it to automate the documentation build process.
+          <a href="http://www.codeplex.com/SHFB/" target="_blank">(project link)</a></p></li>
+          
+          <li><p><b>HTML Help Workshop</b> - Tools for building HTML Help 1.x (CHM files). Used to build DTF.chm.
+          <a href="http://msdn2.microsoft.com/en-us/library/ms669985.aspx" target="_blank">(download link)</a></p></li>
+        </ul>
+        
+        <h3>Run-time Dependencies</h3>
+        <ul>
+          <li><p><b>.NET Framework</b> - Most of DTF requires .NET Framework 2.0. (.NET 1.1 is no longer supported.)
+          The only exception is the LINQ assembly which requires .NET Framework 3.5.</p></li>
+          
+          <li><p><b>Windows Installer</b> - Windows Installer introduced new APIs and capabilities with each successive
+          version. Obviously, the corresponding functionality in the managed APIs is only available when the required
+          version of the Windows Instaler (msi.dll) is installed on the system. Use the Installer.Version property
+          to easily check the currently installed MSI version. Attempting to use an API not supported by the current
+          version will result in an EntryPointNotFoundException. To check what version is required for a particular API,
+          see the documentation link to the corresponding unmanaged API in MSI.chm.</p>
+          <p>In some instances when a newer version of MSI provides an "Ex" alternative to a function, only the "Ex"
+          function is used by the managed library. This may hide some functionality that would have otherwise been
+          available on a system with an older version of MSI.</p></li>
+          
+          <li><p><b>cabinet.dll</b> - The DTF cabinet compression library uses cabinet.dll to implement the
+          low-level cabinet compression and decompression. This DLL is part of all versions of Windows, 
+          located in the system directory.</p></li>
+          
+          <li><p><b>System.IO.Compression.DeflateStream</b> - The DTF zip compression library uses this class
+          to implement the low-level zip compression and decompression. This class is part of .NET Framework
+          2.0 and later.</p></li>
+        </ul>
+        
+      </div>
+        
+      <div id="footer">
+        <p />
+        Send comments on this topic to <a id="HT_MailLink" href="mailto:wix-users%40lists.sourceforge.net?Subject=Deployment Tools Foundation Documentation">
+        wix-users@lists.sourceforge.net</a>
+        <script type="text/javascript">
+          var HT_mailLink = document.getElementById("HT_MailLink");
+          var HT_mailLinkText = HT_mailLink.innerHTML;
+          HT_mailLink.href += ": " + document.title;
+          HT_mailLink.innerHTML = HT_mailLinkText;
+        </script>
+        <p />
+        
+      </div>
+   </div>
+    
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/filepatchwrapper.htm b/src/samples/Dtf/Documents/Guide/Content/filepatchwrapper.htm
new file mode 100644
index 00000000..6bab69b5
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/filepatchwrapper.htm
@@ -0,0 +1,34 @@
+<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<html>
+        <head>
+                <title>Managed Wrapper for Binary File Patch APIs</title>
+                <meta http-equiv="Content-Type" content="text/html; charset=Windows-1252">
+                <link rel="stylesheet" type="text/css" href="MSDN.css">
+        </head>
+        <body id="bodyID" class="dtBODY">
+                <div id="nsbanner">
+                        <div id="bannerrow1">
+                                <table class="bannerparthead" cellspacing="0" id="Table1">
+                                        <tr id="hdr">
+                                                <td class="runninghead">Managed Libraries for Windows Installer</td>
+                                                <td class="product"></td>
+                                        </tr>
+                                </table>
+                        </div>
+                        <div id="TitleRow">
+                                <h1 class="dtH1">Managed Wrapper for Binary File Patch APIs</h1>
+                        </div>
+                </div>
+                <div id="nstext">
+            <p>The binary file patch creation and application APIs (supplied by MsPatchC.dll and
+            MsPatchA.dll) are wrapped in the Microsoft.WindowsInstaller.FilePatch.dll assembly.</p>
+            
+            <p><br/></p>
+            <p><b>See also:</b></p>
+            <ul>
+                <li><a href="ms-its:MMLRef.chm::/Microsoft.WindowsInstaller.FilePatch.html">FilePatch Class</a></li>
+            </ul>
+            <p><br/></p>
+                </div>
+        </body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/history.htm b/src/samples/Dtf/Documents/Guide/Content/history.htm
new file mode 100644
index 00000000..704ce875
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/history.htm
@@ -0,0 +1,437 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Change History</title>
+  <link rel="stylesheet" type="text/css" href="../styles/presentation.css" />
+  <link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" />
+</head>
+<body>
+  <div id="control">
+    <span class="productTitle">Deployment Tools Foundation</span><br />
+    <span class="topicTitle">Change History</span><br />
+    <div id="toolbar">
+      <span id="chickenFeet">
+        <a href="about.htm">Overview</a> &gt;
+        <span class="nolink">Change History</span>
+      </span>
+    </div>
+    </div>
+    <div id="main">
+      <div id="header">
+      </div>
+      <div class="summary">
+<h3><b>2007-07-03</b></h3>
+<i>See <a href="whatsnew.htm">What's New?</a></i><br />&nbsp;<br />&nbsp;<br />
+<hr size="2"/>
+<h3><b>2005-03-30</b></h3>
+<ul>
+<li>New custom action proxy<ul>
+    <li><b>Managed custom actions use an XML config file to specify the CLR version.</b></li>
+    <li>New CAPack module is an unmanaged self-extracting CA DLL that can wrap both
+    managed and unmanaged custom actions. (The old managed CAProxy module is obsolete.)</li>
+    <li>Custom action build process is different but still complicated --
+    see documentation for details.</li>
+    <li>CustomActionAttribute no longer accepts the optional NativeDependencies
+    parameter since it does not apply to the new proxy (all packaged files
+    are always extracted and available when the CA executes). </li>
+</ul></li>
+<li>64bit support<ul>
+    <li>Various code fixes to pointer/handle types and structure alignments.</li>
+    <li>Cabinet and MSI libraries tested on AMD64 CLR.</li>
+    <li>Unmanaged and managed parts of custom action proxy tested on AMD64.</li>
+</ul></li>
+<li>MSI 3.1 APIs added:<ul>
+    <li>Installer.SetExternalUI(ExternalUIRecordHandler)</li>
+    <li>Installer.NotifySidChange</li>
+</ul></li>
+<li>Code builds easier with .NET Famework 2.0<ul>
+    <li>AugmentIL post-build step is no longer necessary when compiling the cabinet code
+    against .NET Framework 2.0, which has builtin support for cdecl delegates.</li>
+    <li>All C# code compiles against .NET Framework 2.0 without obsolete warnings,
+    when setting the NETFX2 preprocessor define.</li>
+    <li>Same code is still compatible with .NET Framework 1.0 + AugmentIL.</li>
+</ul></li>
+<li>Miscellaneous bugfixes/changes:<ul>
+    <li>InstallPackage.ExtractFiles could fail in some cominations of
+    compressed/uncompressed files - fixed.</li>
+    <li>Installer.DeterminePatchSequence was broken due to an incorrect interop struct - fixed.</li>
+    <li>CabinetInfo and CabinetFileInfo classes made serializable.</li>
+    <li>Added Session.FormatString method to simplify formatting a string with
+    property substitutions.</li>
+</ul></li>
+<li>Documentation updates:<ul>
+    <li>Updated all documentation for new CA proxy.</li>
+    <li>Added new topic discussing InstallUtil.</li>
+</ul></li>
+</ul>
+<hr size="2"/>
+<h3><b>2004-04-13</b></h3>
+<ul>
+<li>Documentation<ul>
+  <li>Consolidated all documentation into a single CHM file.</li>
+  <li>Added new topics about working with MSI databases & cabinet files,
+  to help new users get oriented more easily.</li>
+</ul></li>
+<li>WindowsInstaller<ul>
+    <li>Removed [Beta] tags from MSI 3.0 APIs, but otherwise there
+    have been no changes since 3.0 Beta 1.<ul>
+        <li>Be warned these are still the least-tested parts of
+        the library, so early users may encounter bugs.</li>
+    </ul></li>
+</ul></li>
+<li>InstallPackage<ul>
+  <li>Fixed InstallPackage.ExtractFiles() bug when directory doesn't exist.</li>
+  <li>Added ability to handle uncompressed files in a package marked as compressed.</li>
+</ul></li>
+<li>Cabinet<ul>
+    <li>Fixed improper handling of file attributes.<ul>
+        <li>This bug caused some packages to not be extractable by other tools.</li>
+    </ul></li>
+    <li>Added support for UTF filenames.<ul>
+        <li>Non-ASCII filenames will automatically be stored as UTF-8.
+        (But note most other tools don't know how to extract them.)</li>
+    </ul></li>
+</ul></li>
+</ul>
+<hr size="2"/>
+<h3><b>2003-10-13</b></h3>
+<ul>
+<li>Cab<ul>
+  <li>Fixed a bug introduced in v2.4.0 that caused files to be left in the %TEMP%
+  directory after creating a cab.</li>
+  <li>Unsealed the CabinetInfo, CabinetFileInfo, CabinetStatus classes and made a few methods
+  protected and virtual.</li>
+</ul></li>
+<li>AugmentIL<ul>
+  <li>Fixed a bug that sometimes caused a crash when specifying a relative output path
+  on the command-line.</li>
+  <li>Fixed a bug that sometimes caused the Win32 version to be missing from the output file.</li>
+</ul></li>
+<li>Samples\Diff: added new sample tool<ul>
+    <li>Recursively diffs directories, MSIs, MSPs, CABs, other files.</li>
+</ul></li>
+</ul>
+<hr size="2"/>
+<h3><b>2003-09-23</b></h3>
+<ul>
+<li>Cab<ul>
+  <li>Fixed a bug that caused compressing very large files/file sets to use way too 
+  much memory. Performance on large inputs is now within a few % of native cab tools
+  (sometimes even a little faster!) for the same compression level.</li>
+</ul></li>
+<li>WindowsInstaller<ul>
+  <li>All the new MSI 3.0 beta APIs are wrapped, resulting in the following additions:<ul>
+    <li>New classes - Product, Patch (for accessing sourcelist and other config)</li>
+    <li>New methods on Install class - GetProducts, GetPatches, RemovePatches,
+    ApplyMultiplePatches, DetermineApplicablePatches, ExtractPatchXmlData</li>
+    <li>New enumerations - InstallContext, PatchStates, SourceType</li>
+    <li>Additional InstallProperty values</li>
+  </ul></li>
+  <li>Note, MSI 3.0 support should be considered preliminary for now,
+        as APIs (both native and managed) are subject to change.</li>
+  <li>For MSI 2.0 compatibility, developers should not use any classes or
+        methods that are marked as [MSI 3.0 beta] in the documentation.</li>
+  <li>And unrelated to 3.0, a few additional enums have been added:
+        DialogAttributes, ControlAttributes, CustomActionTypes,
+        IniFileAction, RegistryRoot, RemoveFileInstallMode,
+        ServiceControlEvents, ServiceInstallFlags, TextStyles,
+        UpgradeAttributes, LocatorType</li>
+  <li>Also made a few minor non-breaking changes to keep the library FxCop-clean.</li>
+</ul></li>
+<li>AugmentIL<ul>
+  <li>Added support for strongname signing and delay-signing.  AugmentIL tries to
+  locate the keyfile using the AssemblyKeyFileAttribute, or you may specify the
+  path with the new /key option.</li>
+  <li>All &quot;released&quot; assemblies will now be strongname-signed
+  (with an unofficial key).</li>
+</ul></li>
+<li>CAProxy<ul>
+  <li>Added support for NativeDependencies property on CustomActionAttribute.  This enables
+  custom actions to P/Invoke into native DLLs that are carried with them.</li>
+</ul></li>
+<li>Samples\SampleCAs<ul>
+  <li>In SampleCA2, changed MessageBox.Show(&quot;&quot;) to session.Message(User,&quot;&quot;),
+  because generally it is a bad practice for CAs to show independent UI.</li>
+  <li>Added test of CustomActionAttribute.NativeDependencies functionality.</li>
+</ul></li>
+<li>Samples\CabPack: added new sample<ul>
+    <li>Demonstrates &amp; tests the cab library by creating self-extracting packages</li>
+</ul></li>
+<li>Samples\Inventory: added new sample<ul>
+    <li>Shows a hierarchical, relational, searchable view of all of the product,
+    feature, component, file, and patch data managed by MSI, for all products
+    installed on the system.</li>
+</ul></li>
+</ul>
+<hr size="2"/>
+<h3><b>2003-09-12</b></h3>
+<ul>
+<li>Cab:<ul>
+    <li>Added CabinetInfo.CompressDirectory method, capable of compressing an
+        entire directory tree structure.</li>
+    <li>Updated documentation of various methods concerning support of directory
+        structure inside cabs.</li>
+    <li>CabinetInfo case-sensitivity was inconsistent - 
+        now it is case-insensitive by default, though case is still preserved</li>
+    <li>Separated assembly attributes into assembly.cs</li>
+</ul></li>
+<li>Msi:<ul>
+    <li>InstallerException and subclasses automatically get extended error data
+        from MSI's last-error-record when available.  The data is stored
+        in the exception and made available through the GetErrorRecord()
+        method, and the exception's Message includes the formatted error
+        message and data.  This makes most exceptions extremely informative!</li>
+    <li>Added View.GetValidationErrors() method, and supporting ValidationErrorInfo
+        struct and ValidationError enum.  This wrapper for the MsiViewGetError
+        API had been accidentally left out.</li>
+    <li>Session.Message() now supports message-box flags to specify buttons &amp; icon</li>
+    <li>Added doc remarks to various methods about closing handles.</li>
+    <li>Separated assembly attributes into assembly.cs</li>
+</ul></li>
+<li>AugmentIL:<ul>
+    <li>Recent builds of ildasm v2.0.* have a slightly different output format,
+        which could break AugmentIL in some cases - fixed</li>
+</ul></li>
+<li>SampleCAs:<ul>
+    <li>Removed 'using' clause from SampleCA1 -- there's no need to close the session's active database handle</li>
+</ul></li>
+<li>Documentation:<ul>
+    <li>Added note to ReadMe about compiling the cab source into another assembly</li>
+</ul></li>
+</ul>
+<hr size="2"/>
+<h3><b>2003-08-07</b></h3>
+<ul>
+<li>Cab:<ul>
+    <li>CabinetInfo.IsValid() usually returned false even for valid cabs - fixed</li>
+    <li>Extracting cab files with null timestamps generated exception - fixed</li>
+</ul></li>
+<li>Msi:<ul>
+    <li>Added InstallCanceledException, subclass of InstallerException;
+        Methods which may be canceled by the user can throw this exception</li>
+    <li>Added MessageResult enumeration;
+        Used by Session.Message() and ExternalUIHandler delegate</li>
+    <li>Installer.EnableLog() now supports extended attributes correctly:
+        Append mode and flush-every-line</li>
+    <li>Added Session.DoActionSequence() -
+        This wrapper for the MsiSequence API had been accidentally left out</li>
+</ul></li>
+<li>CAProxy:<ul>
+    <li>Catches InstallCanceledException, returns ERROR_INSTALL_USEREXIT
+        so CA developer doesn't necessarily have to handle the exception</li>
+</ul></li>
+<li>Msi\Package:<ul>
+    <li>Added TransformInfo class: metadata about an individual patch transform</li>
+    <li>Added PatchPackage.GetTransform*() methods which return TransformInfo</li>
+</ul></li>
+<li>Documentation:<ul>
+    <li>Added section to ReadMe.htm about building managed custom actions</li>
+</ul></li>
+</ul>
+<hr size="2"/>
+<h3><b>2003-06-02</b></h3>
+<ul>
+<li>Msi:<ul>
+    <li>Validation didn't work on merge modules - fixed</li>
+</ul></li>
+<li>CAProxy:<ul>
+    <li>Was broken in 2.1 - fixed</li>
+</ul></li>
+</ul>
+<hr size="2"/>
+<h3><b>2003-05-14</b></h3>
+<ul>
+<li>Msi:<ul>
+    <li>External UI handler didn't survive a garbage collection - fixed</li>
+    <li>Validation engine was completely broken - now it should work
+        at least for MSIs which are already mostly valid</li>
+    <li>Added DynamicLoad property to CustomActionAttribute<br />
+        Usage: set DynamicLoad=false when using XmlSerialization; default is true</li>
+</ul></li>
+<li>Msi\Package:<ul>
+    <li>File extraction and update methods didn't work on merge modules - fixed</li>
+    <li>Made file update code slightly more robust</li>
+    <li>Removed hard-reference to the FilePatch assembly - now it is only
+        loaded if working with binary file patches</li>
+</ul></li>
+<li>AugmentIL:<ul>
+    <li>AugmentIL would crash if some input files had read-only attr - fixed</li>
+    <li>Made /verbose switch slightly more verbose</li>
+</ul></li>
+<li>CAProxy:<ul>
+    <li>Added support for the DynamicLoad property of CustomActionAttribute</li>
+    <li>Added MMsiBreak debugging functionality - see doc</li>
+</ul></li>
+<li>Samples\WiFile:<ul>
+    <li>Added /l (list files) switch</li>
+</ul></li>
+<li>Samples\SampleCAs:<ul>
+    <li>In the makefile the comments about debug builds had an error;
+        Now the sample builds debug packages (correctly) by default.</li>
+</ul></li>
+<li>Documentation:<ul>
+    <li>Wrote AugmentIL.htm describing the AugmentIL tool and its options.</li>
+    <li>Wrote WiFile.htm describing the WiFile sample tool.</li>
+    <li>Added section to ReadMe.htm about debugging managed custom actions.</li>
+</ul></li>
+</ul>
+<hr size="2"/>
+<h3><b>2003-03-31</b></h3>
+<ul>
+<li>Msi: Implemented the remaining APIs, also minor improvements and bugfixes<ul>
+    <li>All published APIs are wrapped, with the exception of four:
+        MsiGetFileSignatureInformation (because I don't know of a .NET analog
+        for the returned certificate structure), and 3 APIs for previewing UI</li>
+    <li>Database.OpenView and Database.Execute* now take String.Format style params</li>
+    <li>Database.ApplyTransform can optionally use the error-suppression flags
+        stored in the transform summary info</li>
+    <li>Added a few supporting enumerations and structures for the remaining APIs</li>
+    <li>InstallerException gets a descriptive message for any MSI or system error</li>
+    <li>Fixed a bug in InstallerException which would usually report &quot;error 0&quot;</li>
+    <li>Added optimization for setting a Record field to a MemoryStream</li>
+    <li>Record.GetStream is capable of extracting substorages</li>
+    <li>Moved InstallPath class to Microsoft.WindowsInstaller.Package assembly</li>
+</ul></li>
+<li>Msi\FilePatch: added new project<ul>
+    <li>Binary file patch API wrapper</li>
+</ul></li>
+<li>Msi\Package: added new project<ul>
+    <li>Helper classes for working with MSI and MSP packages</li>
+</ul></li>
+<li>Cab: some minor bugfixes<ul>
+    <li>Cabinet.Extract(stream, name) threw a NullReferenceException if the file
+        didn't exist in the cab -- now it returns null</li>
+    <li>CabinetInfo.CompressFileSet() was broken -- fixed</li>
+    <li>If a Cabinet callback throws an exception, it is propogated as the
+        inner-exception of the CabinetException</li>
+</ul></li>
+<li>Samples\WiFile: added new sample<ul>
+    <li>Demonstrates some features of InstallPackage class in Msi\Package project</li>
+</ul></li>
+</ul>
+<hr size="2"/>
+<h3><b>2003-03-20</b></h3>
+Documentation!<ul>
+    <li>Msi and Cab sources include complete C# XML documentation.</li>
+    <li>Msi and Cab makefiles generate XML documentation files.</li>
+    <li>Reference CHM compiled from XML documentation with NDoc.</li>
+</ul>
+<p>I am aware that exceptions are still not documented in most areas.
+        Other than that, feel free to send me a note if it's still not clear
+        how to use parts of the API after reading the documentation.</p>
+<p>Version is still 1.1 because there are no code changes in this release.</p>
+<hr size="2"/>
+<h3><b>2003-03-13</b></h3>
+<ul>
+<li>Msi: lots of small improvements for usability and consistency<ul>
+    <li>Reworked ExternalUIHandler support</li>
+    <li>Added Installer properties/methods:<ul>
+        <li>Components</li>
+        <li>ComponentClients()</li>
+        <li>ComponentState()</li>
+        <li>ComponentPath()</li>
+        <li>EnableLog()</li>
+        </ul></li>
+    <li>Added Session.EvaluateCondition() method</li>
+    <li>Improved exception-handling in many methods in Installer, Database,
+        &amp; Session classes</li>
+    <li>Added extensive XML doc-comments to Installer, Database, View,
+        &amp; Session classes</li>
+    <li>A few breaking changes:<ul>
+        <li>View.ModifyMode enumeration moved outside View and
+            renamed ViewModifyMode</li>
+        <li>InstallLogMode enumeration renamed to InstallLogModes
+            (naming convention for bitfields)</li>
+        <li>Record constructor takes arbitrary number of parameters</li>
+        </ul></li>
+</ul></li>
+<li>AugmentIL: almost completely rewritten<ul>
+    <li>Ildasm/ilasm steps are built-in<ul>
+        <li>The round-trip can be done in one step</li>
+        <li>IL source input/output is still supported</li>
+        </ul></li>
+    <li>Never throws an unhandled exception</li>
+    <li>Organized command-line options, consistent with other .NET tools</li>
+    <li>Uses a plugin architecture to allow additional augmentations</li>
+</ul></li>
+<li>CAProxy: Added AIL_CAProxy.cs - AugmentIL plugin generates CA proxy methods</li>
+<li>SampleCAs: Updated makefile for new AugmentIL usage</li>
+</ul>
+<hr size="2"/>
+<h3><b>2003-01-16</b></h3>
+<ul>
+<li>ReadMe.htm: Added section on writing managed CAs</li>
+<li>SampleCAs: Added missing reference to System.Windows.Forms.dll to the makefile</li>
+<li>AugmentIL: Added specific warning messages for when CA method has wrong signature</li>
+<li>Put sources in Toolbox-hosted Source Depot.</li>
+</ul>
+<hr size="2"/>
+<h3><b>2003-01-14</b></h3>
+Initial posting to http://toolbox
+<p>&nbsp;</p>
+      </div>
+        
+      <div id="footer">
+        <p />
+        Send comments on this topic to <a id="HT_MailLink" href="mailto:wix-users%40lists.sourceforge.net?Subject=Deployment Tools Foundation Documentation">
+        wix-users@lists.sourceforge.net</a>
+        <script type="text/javascript">
+          var HT_mailLink = document.getElementById("HT_MailLink");
+          var HT_mailLinkText = HT_mailLink.innerHTML;
+          HT_mailLink.href += ": " + document.title;
+          HT_mailLink.innerHTML = HT_mailLinkText;
+        </script>
+        <p />
+        
+      </div>
+   </div>
+    
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/installutil.htm b/src/samples/Dtf/Documents/Guide/Content/installutil.htm
new file mode 100644
index 00000000..e235a7b6
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/installutil.htm
@@ -0,0 +1,94 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>About InstallUtil</title>
+  <link rel="stylesheet" type="text/css" href="../styles/presentation.css" />
+  <link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" />
+</head>
+<body>
+  <div id="control">
+    <span class="productTitle">Deployment Tools Foundation</span><br />
+    <span class="topicTitle">About InstallUtil</span><br />
+    <div id="toolbar">
+      <span id="chickenFeet">
+        <a href="using.htm">Development Guide</a> &gt;
+        <a href="managedcas.htm">Managed CAs</a> &gt;
+        <span class="nolink">InstallUtil</span>
+      </span>
+    </div>
+    </div>
+    <div id="main">
+      <div id="header">
+      </div>
+      <div class="summary">
+            <p>
+                InstallUtil is often considered as another option for executing MSI custom actions
+                written in managed code. But in most cases it is not the best solution, for a number
+                of reasons.</p>
+            <p>
+                InstallUtil (in either InstallUtil.exe or InstallUtilLib.dll form) is a .NET Framework
+                tool for executing the System.Configuration.Installer classes that are implemented
+                in an assembly. That way the assembly can contain any special code required to install
+                itself and uninstall itself. Essentially it is the .NET replacement for COM self-registration
+                aka DllRegisterServer.</p>
+            <p>
+                Self-reg or System.Configuration.Installer is convenient for development use in
+                order to test code without creating an actual setup package, or for an IDE which
+                wants to generate self-installing code. But experienced setup developers and the
+                <a href="MSI.chm::/setup/selfreg_table.htm">Windows Installer documentation</a>
+                all agree that self-reg is a bad practice for a
+                production-quality setup. The current theory of state-of-the-art setup is that it
+                should be as data-driven as possible. That is, the setup package describes as fully
+                as possible the desired state of the system, and then the installer engine calculates
+                the necessary actions to install, uninstall, patch, etc.</p>
+            <p>
+                S.C.I encourages developers to write code for things such as registering services
+                or registering COM classes or other things which are more appropriately done using
+                built-in MSI functionality (the ServiceInstall and Registry tables). The Visual
+                Studio .NET wizards also tend to generate this kind of install code. Again, that
+                is nice for development but not good for real installations. You end up with similar
+                but slightly different code in many places for doing the same thing. And that code
+                is a black-box to the installer engine.</p>
+            <p>
+                An ideal MSI custom action is a logical extension of the setup engine, meaning it
+                is data-driven and written in a very generic way to read from existing or custom
+                tables in the MSI database, following a very similar pattern to the built-in actions.
+                This makes the CA re-usable, and makes the installation more transparent. S.C.I
+                custom actions invoked by InstallUtil cannot be data-driven because they don't have
+                full access to the install session or database. They also cannot write to the install
+                session's regular MSI log, but instead use a separate log which is bad for supportability.</p>
+            <p>
+                InstallUtil also requires that the assembly be installed before the CA is able to
+                execute. This is a problem for CAs that need to execute during the UI phase, or
+                gather information before installation. For that purpose MSI allows custom action
+                binaries to be embedded as non-installed files, but InstallUtil cannot make use
+                of those.</p>
+            <p>
+                Custom actions developed with DTF have none of the limitations of InstallUtil,
+                giving a setup developer full capabilities to write well-designed custom actions,
+                only now in managed code.
+            </p>
+            
+            <p>&nbsp;</p>
+      </div>
+        
+      <div id="footer">
+        <p />
+        Send comments on this topic to <a id="HT_MailLink" href="mailto:wix-users%40lists.sourceforge.net?Subject=Deployment Tools Foundation Documentation">
+        wix-users@lists.sourceforge.net</a>
+        <script type="text/javascript">
+          var HT_mailLink = document.getElementById("HT_MailLink");
+          var HT_mailLinkText = HT_mailLink.innerHTML;
+          HT_mailLink.href += ": " + document.title;
+          HT_mailLink.innerHTML = HT_mailLinkText;
+        </script>
+        <p />
+        
+      </div>
+   </div>
+    
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/inventory.htm b/src/samples/Dtf/Documents/Guide/Content/inventory.htm
new file mode 100644
index 00000000..40a6ef74
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/inventory.htm
@@ -0,0 +1,78 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Windows Installer System Inventory Viewer</title>
+  <link rel="stylesheet" type="text/css" href="../styles/presentation.css" />
+  <link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" />
+</head>
+<body>
+  <div id="control">
+    <span class="productTitle">Deployment Tools Foundation</span><br />
+    <span class="topicTitle">Windows Installer System Inventory Viewer</span><br />
+    <div id="toolbar">
+      <span id="chickenFeet">
+        <a href="using.htm">Development Guide</a> &gt;
+        <a href="samples.htm">Samples</a> &gt;
+        <span class="nolink">Inventory</span>
+      </span>
+    </div>
+    </div>
+    <div id="main">
+      <div id="header">
+      </div>
+      <div class="summary">
+            <p>This application shows a hierarchical, relational, searchable
+            view of all of the product, feature, component, file, and patch
+            data managed by MSI, for all products installed on the system.</p>
+            <p><br/></p>
+            <h4>Navigation</h4>
+            <ol>
+            <li><p>The tree on the left is self-explanatory.</p></li>
+            <li><p>Click on a row-header (grey box on the left side of the
+            grid) to jump to a table with more details about the item referred
+            to by that row. For example, clicking on a row-header of a
+            table that lists components will take you to a table that lists
+            the files in that component. Not every table has this ability,
+            but the cursor will turn to a hand shape to indicate when this is
+            possible.</p></li>
+            <li><p>Also you can navigate back and forward through your history
+            using the buttons in the application or mouse buttons 4 and 5.</p></li>
+            </ol>
+            <p><br/></p>
+            <h4>Searching</h4>
+            <p>The search feature is not hard to find. By default, searches
+            are limited to the current table. However, if you choose to find
+            &quot;In Subtree&quot; by checking the box, the search will include
+            the current table as well as all tables under the current location in
+            the tree. While this can take a long time if there is a lot of
+            data under the current node, you can stop the search at any time with
+            the stop button. The search pauses when a match is found, but
+            clicking &quot;Find&quot; again will continue the same search from that
+            point (unless you uncheck the &quot;Continue&quot; checkbox or change
+            the search string).</p>
+            <p><br/></p>
+      </div>
+        
+      <div id="footer">
+        <p />
+        Send comments on this topic to <a id="HT_MailLink" href="mailto:wix-users%40lists.sourceforge.net?Subject=Deployment Tools Foundation Documentation">
+        wix-users@lists.sourceforge.net</a>
+        <script type="text/javascript">
+          var HT_mailLink = document.getElementById("HT_MailLink");
+          var HT_mailLinkText = HT_mailLink.innerHTML;
+          HT_mailLink.href += ": " + document.title;
+          HT_mailLink.innerHTML = HT_mailLinkText;
+        </script>
+        <p />
+        
+      </div>
+   </div>
+    
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/managedcas.htm b/src/samples/Dtf/Documents/Guide/Content/managedcas.htm
new file mode 100644
index 00000000..9cce0432
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/managedcas.htm
@@ -0,0 +1,53 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Managed Custom Actions</title>
+  <link rel="stylesheet" type="text/css" href="../styles/presentation.css" />
+  <link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" />
+</head>
+<body>
+  <div id="control">
+    <span class="productTitle">Deployment Tools Foundation</span><br />
+    <span class="topicTitle">Managed Custom Actions</span><br />
+    <div id="toolbar">
+      <span id="chickenFeet">
+        <a href="using.htm">Development Guide</a> &gt;
+        <span class="nolink">Managed CAs</span>
+      </span>
+    </div>
+    </div>
+    <div id="main">
+      <div id="header">
+      </div>
+      <div class="summary">
+      
+                <ul>
+                    <li><a href="writingcas.htm">Writing Managed Custom Actions</a></li>
+            <li><a href="caconfig.htm">Specifying the Runtime Version</a></li>
+            <li><a href="buildingcas.htm">Building Managed Custom Actions</a></li>
+            <li><a href="debuggingcas.htm">Debugging Managed Custom Actions</a></li>
+            <li><a href="installutil.htm">About InstallUtil</a></li>
+        </ul>
+        
+      </div>
+        
+      <div id="footer">
+        <p />
+        Send comments on this topic to <a id="HT_MailLink" href="mailto:wix-users%40lists.sourceforge.net?Subject=Deployment Tools Foundation Documentation">
+        wix-users@lists.sourceforge.net</a>
+        <script type="text/javascript">
+          var HT_mailLink = document.getElementById("HT_MailLink");
+          var HT_mailLinkText = HT_mailLink.innerHTML;
+          HT_mailLink.href += ": " + document.title;
+          HT_mailLink.innerHTML = HT_mailLinkText;
+        </script>
+        <p />
+        
+      </div>
+   </div>
+    
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/msihelper.htm b/src/samples/Dtf/Documents/Guide/Content/msihelper.htm
new file mode 100644
index 00000000..c1493117
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/msihelper.htm
@@ -0,0 +1,59 @@
+<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<html>
+        <head>
+                <title>Included Components</title>
+                <meta http-equiv="Content-Type" content="text/html; charset=Windows-1252">
+                <link rel="stylesheet" type="text/css" href="MSDN.css">
+        </head>
+        <body id="bodyID" class="dtBODY">
+                <div id="nsbanner">
+                        <div id="bannerrow1">
+                                <table class="bannerparthead" cellspacing="0" id="Table1">
+                                        <tr id="hdr">
+                                                <td class="runninghead">Managed Libraries for Windows Installer</td>
+                                                <td class="product"></td>
+                                        </tr>
+                                </table>
+                        </div>
+                        <div id="TitleRow">
+                                <h1 class="dtH1">Helper Classes for Windows Installer Packages</h1>
+                        </div>
+                </div>
+                <div id="nstext">
+            <p>Included are some useful helper classes for working with
+            MSI and MSP packages:</p>
+            <ul>
+            <li><p><a href="ms-its:MMLRef.chm::/Microsoft.WindowsInstaller.InstallPackage.html"
+            ><strong>InstallPackage</strong></a> - extends the Database class to provide powerful
+            package-based operations such as:</p>
+            <ul>
+                <li>direct extraction of files to uncompressed source 
+                path 
+                <li>updating files from uncompressed source path back 
+                into the compressed source for the package (including updating file 
+                metadata) 
+                <li>applying a patch directly to the package 
+                <li>consolidating a package with uncompressed source files or multiple msm-cabs
+                into a package with a single compressed cabinet</li>
+            </ul>
+            <P></P>
+            <li><p><a href="ms-its:MMLRef.chm::/Microsoft.WindowsInstaller.InstallPathMap.html"
+            ><strong>InstallPathMap</strong>, <a href="ms-its:MMLRef.chm::/Microsoft.WindowsInstaller.InstallPath.html"
+            ><strong>InstallPath</strong></a> - represent the directory structure
+            of an installation package, including file, component, and directory source and target
+            install paths.  Accessible by file, component, or directory keys; searchable by
+            filename.</p>
+            <li><p><a href="ms-its:MMLRef.chm::/Microsoft.WindowsInstaller.PatchPackage.html"
+            ><strong>PatchPackage</strong></a> - allows convenient access to patch properties,
+            and analysis and extraction of transforms</p></li>
+            </ul>
+            <p><br/></p>
+            <p>These classes are in the Microsoft.WindowsInstaller.Package.dll assembly.</p>
+            <p><br/></p>
+            <p><b>See also:</b></p>
+            <p>The <a href="wifile.htm">WiFile</a> sample tool demonstrates some usage of the
+            InstallPackage class.</p>
+            <p><br/></p>
+                </div>
+        </body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/msiwrapper.htm b/src/samples/Dtf/Documents/Guide/Content/msiwrapper.htm
new file mode 100644
index 00000000..70190ac4
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/msiwrapper.htm
@@ -0,0 +1,80 @@
+<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<html>
+        <head>
+                <title>Included Components</title>
+                <meta http-equiv="Content-Type" content="text/html; charset=Windows-1252">
+                <link rel="stylesheet" type="text/css" href="MSDN.css">
+        </head>
+        <body id="bodyID" class="dtBODY">
+                <div id="nsbanner">
+                        <div id="bannerrow1">
+                                <table class="bannerparthead" cellspacing="0" id="Table1">
+                                        <tr id="hdr">
+                                                <td class="runninghead">Managed Libraries for Windows Installer</td>
+                                                <td class="product"></td>
+                                        </tr>
+                                </table>
+                        </div>
+                        <div id="TitleRow">
+                                <h1 class="dtH1">Managed wrapper library for Windows Installer APIs</h1>
+                        </div>
+                </div>
+                <div id="nstext">
+                    <p>Microsoft.WindowsInstaller.dll is a complete .NET wrapper for the
+                    Windows Installer APIs. It provides a convenient object model that is
+                    comfortable to .NET developers and still familiar to anyone who has used
+                    the MSI scripting object model.</p>
+            <h3>Notes</h3>
+            <ul>
+            <li><p>All published MSI APIs are wrapped, with the exception of four:
+            MsiGetFileSignatureInformation (because I don't know of a .NET analog for the
+            returned certificate structure), and three APIs for previewing UI dialogs.
+            Other than that, you should be able to do everything that you can
+            do via the C APIs or the COM automation interface.</p>
+            <li><p>Some parts of this code have never had a formal test 
+            pass, so use at your own risk. But much of the code is exercised daily, used 
+            by the Developer Division Sustaining Engineering team's BRIQS system to build
+            and test patches. And it has been in use by many other teams for over two
+            years now with only a few minor fixes, so it can be considered very stable.</p>
+            <li><p>Despite its official-sounding namespace, this assembly is not officially 
+            sanctioned by the Windows Installer team. But currently there are not any
+            plans for an official set of managed even in Longhorn, so I don't see a
+            conflict for now.</p></li>
+            </ul>
+            <h3>Why rewrite it?</h3>
+            <p>It is possible to access MSI's COM Automation interfaces via C# and VB.NET.
+            So why create yet another wrapper? Here are some of my reasons:</p>
+            <ul>
+            <li><p>One of the primary things I wanted to be able to do 
+            was write custom actions in C#. The automation interface was not usable in 
+            that case, because there is no way to convert the integer session handle 
+            (received as a parameter to the type 1 custom action function) into a Session 
+            automation object.</p>
+            <li><p>The automation interface does not provide a way to 
+            specify an external UI handler. Besides external UI, this is also needed 
+            to do validation.</p>
+            <li><p>The automation interface does not provide a way to 
+            explicitly close handles (other than Views). I ran into this problem when I 
+            wanted to programmatically delete a database that I'd just finished using, but 
+            couldn't because it was still open!</p>
+            <li><p>Finally, COM Automation is somewhat slower than invoking 
+            the APIs directly.</p></li>
+            </ul>
+            
+            <p><br/></p>
+            <p><b>See also:</b></p>
+            <ul>
+                <li><a href="ms-its:MMLRef.chm::/Microsoft.WindowsInstaller.html">Microsoft.WindowsInstaller Namespace</a></li>
+                <ul>
+                    <li><a href="ms-its:MMLRef.chm::/Microsoft.WindowsInstaller.Installer.html">Installer Class</a></li>
+                    <li><a href="ms-its:MMLRef.chm::/Microsoft.WindowsInstaller.Database.html">Database Class</a></li>
+                    <li><a href="ms-its:MMLRef.chm::/Microsoft.WindowsInstaller.Session.html">Session Class</a></li>
+                </ul>
+                <li><a href="msihelper.htm">Helper Classes for Windows Installer Packages</a></li>
+                <li><a href="writingcas.htm">Writing Managed Custom Actions</a></li>
+                <li><a href="databases.htm">Working with MSI Databases</a></li>
+            </ul>
+            <p><br/></p>
+                </div>
+        </body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/packages.htm b/src/samples/Dtf/Documents/Guide/Content/packages.htm
new file mode 100644
index 00000000..aa521685
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/packages.htm
@@ -0,0 +1,86 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Working with Install Packages</title>
+  <link rel="stylesheet" type="text/css" href="../styles/presentation.css" />
+  <link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" />
+</head>
+<body>
+  <div id="control">
+    <span class="productTitle">Deployment Tools Foundation</span><br />
+    <span class="topicTitle">Working with Install Packages</span><br />
+    <div id="toolbar">
+      <span id="chickenFeet">
+        <a href="using.htm">Development Guide</a> &gt;
+        <span class="nolink">Install Packages</span>
+      </span>
+    </div>
+    </div>
+    <div id="main">
+      <div id="header">
+      </div>
+      <div class="summary">
+            <h3>Updating files in a product layout</h3>
+            <p>The InstallPackage class makes it easy to work with files and cabinets
+            in the context of a compressed or uncompressed product layout.</p>
+            <p>This hypothetical example takes an IDictionary 'files' which maps file keys to file paths. Each
+            file is to be updated in the package layout; cabinets are even recompressed if necessary to include the new files.</p>
+            <pre><font face="Consolas, Courier New">    <font color=blue>using</font> (InstallPackage pkg = <font color=blue>new</font> InstallPackage(<font color=purple>"d:\builds\product.msi"</font>,
+        DatabaseOpenMode.Transact))
+    {
+        pkg.WorkingDirectory = Path.Combine(Path.GetTempFolder(), <font color=purple>"pkgtmp"</font>);
+        <font color=blue>foreach</font> (string fileKey in files.Keys)
+        {
+            <font color=blue>string</font> sourceFilePath = files[fileKey];
+            <font color=blue>string</font> destFilePath = pkg.Files[fileKey].SourcePath;
+            destFilePath = Path.Combine(pkg.WorkingDirectory, destFilePath);
+            File.Copy(sourceFilePath, destFilePath, <font color=blue>true</font>);
+        }
+        pkg.UpdateFiles(<font color=blue>new</font> ArrayList(files.Keys));
+        pkg.Commit();
+        Directory.Delete(pkg.WorkingDirectory, <font color=blue>true</font>);
+    }</font></pre><br />
+            <p>1.&nbsp; Create a <a href="DTFAPI.chm::/html/Overload_Microsoft_Deployment_WindowsInstaller_Package_InstallPackage__ctor.htm">new InstallPackage</a>
+            instance referring to the location of the .msi. This is actually just a specialized subclass of a Database.</p>
+            <p>2.&nbsp; Set the <a href="DTFAPI.chm::/html/P_Microsoft_Deployment_WindowsInstaller_Package_InstallPackage_WorkingDirectory.htm">WorkingDirectory</a>.
+            This is the root directory where the package expects to find the new source files.</p>
+            <p>3.&nbsp; Copy each file to its proper location in the working directory. The
+            <a href="DTFAPI.chm::/html/P_Microsoft_Deployment_WindowsInstaller_Package_InstallPackage_Files.htm">InstallPackage.Files</a>
+            property is used to look up the relative source path of each file.</p>
+            <p>4.&nbsp; Call <a href="DTFAPI.chm::/html/Overload_Microsoft_Deployment_WindowsInstaller_Package_InstallPackage_UpdateFiles.htm">InstallPackage.UpdateFiles</a>
+            with the list of file keys. This will re-compress and package the files if necessary, and also update the
+                following data: File.FileSize, File.Version, File.Language, MsiFileHash.HashPart*.</p>
+            <p>5.&nbsp; Commit the database changes and cleanup the working directory.</p>
+            </ul>
+            
+            <p><br/></p>
+            <p><b>See also:</b></p>
+            <ul>
+                <li><a href="wifile.htm">WiFile Sample Tool</a> - a more complete tool that expands on the above example.</li>
+                <li><a href="DTFAPI.chm::/html/T_Microsoft_Deployment_WindowsInstaller_Package_InstallPackage.htm">InstallPackage Class</a></li>
+            </ul>
+            <p><br/></p>
+            
+      </div>
+        
+      <div id="footer">
+        <p />
+        Send comments on this topic to <a id="HT_MailLink" href="mailto:wix-users%40lists.sourceforge.net?Subject=Deployment Tools Foundation Documentation">
+        wix-users@lists.sourceforge.net</a>
+        <script type="text/javascript">
+          var HT_mailLink = document.getElementById("HT_MailLink");
+          var HT_mailLinkText = HT_mailLink.innerHTML;
+          HT_mailLink.href += ": " + document.title;
+          HT_mailLink.innerHTML = HT_mailLinkText;
+        </script>
+        <p />
+        
+      </div>
+   </div>
+    
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/powerdiff.htm b/src/samples/Dtf/Documents/Guide/Content/powerdiff.htm
new file mode 100644
index 00000000..f420b47e
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/powerdiff.htm
@@ -0,0 +1,71 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>MSI, MSP, CAB Diff Tool</title>
+  <link rel="stylesheet" type="text/css" href="../styles/presentation.css" />
+  <link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" />
+</head>
+<body>
+  <div id="control">
+    <span class="productTitle">Deployment Tools Foundation</span><br />
+    <span class="topicTitle">MSI, MSP, CAB Diff Tool</span><br />
+    <div id="toolbar">
+      <span id="chickenFeet">
+        <a href="using.htm">Development Guide</a> &gt;
+        <a href="samples.htm">Samples</a> &gt;
+        <span class="nolink">DDiff</span>
+      </span>
+    </div>
+    </div>
+    <div id="main">
+      <div id="header">
+      </div>
+      <div class="summary">
+            <h2>MSI, MSP, CAB Diff Tool</h2>
+            <p><pre><font face="Consolas, Courier New">Usage: DDiff target1 target2 [options]
+Example: DDiff d:\dir1 d:\dir2
+Example: DDiff setup1.msi setup2.msi
+Example: DDiff patch1.msp patch2.msp -patchtarget target.msi
+Example: DDiff package1.cab package2.cab
+Options:
+  /o [filename]    Output results to text file (UTF8)
+  /p [package.msi] Diff patches relative to target MSI</font></pre>
+            </p>
+            <p><br/></p>
+            <p>The following types of inputs can be diffed:
+            <ul>
+                            <li><b>Directories</b>: files and subdirectories are compared.</li>
+                            <li><b>Cab files</b>: internal file list and files are compared.</li>
+                            <li><b>MSI/MSM database files</b>: summary info, tables, and embedded binary and cab streams are compared.</li>
+                            <li><b>MSP files</b>: summary info and embedded file cab are compared.  When a patch target MSI is provided, the MSP's tables are also compared.</li>
+                            <li><b>Versioned files</b>: Win32 file version is compared.</li>
+                            <li><b>Text files</b>: if diff.exe is in the path, it is used to get a line-by-line diff.</li>
+                            <li><b>Other files</b>: file size and bytes are compared.</li>
+            </ul>
+            All processing is done recursively. So a versioned file within a cab within an MSI within a directory will have meaningful diff results.</p>
+            <p><br/></p>
+                </div>
+      <div id="footer">
+        <p />
+        Send comments on this topic to <a id="HT_MailLink" href="mailto:wix-users%40lists.sourceforge.net?Subject=Deployment Tools Foundation Documentation">
+        wix-users@lists.sourceforge.net</a>
+        <script type="text/javascript">
+          var HT_mailLink = document.getElementById("HT_MailLink");
+          var HT_mailLinkText = HT_mailLink.innerHTML;
+          HT_mailLink.href += ": " + document.title;
+          HT_mailLink.innerHTML = HT_mailLinkText;
+        </script>
+        <p />
+        
+      </div>
+   </div>
+    
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/samplecas.htm b/src/samples/Dtf/Documents/Guide/Content/samplecas.htm
new file mode 100644
index 00000000..4dfed6f0
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/samplecas.htm
@@ -0,0 +1,84 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Sample C# Custom Action</title>
+  <link rel="stylesheet" type="text/css" href="../styles/presentation.css" />
+  <link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" />
+</head>
+<body>
+  <div id="control">
+    <span class="productTitle">Deployment Tools Foundation</span><br />
+    <span class="topicTitle">Sample C# Custom Action</span><br />
+    <div id="toolbar">
+      <span id="chickenFeet">
+        <a href="using.htm">Development Guide</a> &gt;
+        <a href="managedcas.htm">Managed CAs</a> &gt;
+        <a href="writingcas.htm">Writing CAs</a> &gt;
+        <span class="nolink">C# Sample</span>
+      </span>
+    </div>
+    </div>
+    <div id="main">
+      <div id="header">
+      </div>
+      <div class="summary">
+      
+            <p>MSI custom actions are MUCH easier to write in C# than 
+            in C++!</p><pre><font face="Consolas, Courier New">    [CustomAction]
+    <font color=blue>public</font> <font color=blue>static</font> ActionResult SampleCustomAction1(Session session)
+    {
+        session.Log(<font color="purple">"Hello from SampleCA1"</font>);
+        
+        <font color=blue>string</font> testProp = session[<font color="purple">"SampleCATest"</font>];
+        <font color=blue>string</font> testProp2;
+        testProp2 = (<font color="blue">string</font>) session.Database.ExecuteScalar(
+            <font color="purple">"SELECT `Value` FROM `Property` WHERE `Property` = 'SampleCATest'"</font>);
+        
+        <font color=blue>if</font>(testProp == testProp2)
+        {
+            session.Log(<font color="purple">"Simple property test passed."</font>);
+            <font color=blue>return</font> ActionResult.Success;
+        }
+        <font color=blue>else</font>
+            <font color=blue>return</font> ActionResult.Failure;
+    }
+            </font></pre>
+            <p>A sample CA project with two CAs is included in the
+            Samples\ManagedCA directory.&nbsp; Running the CustomActionTest project will package the CA and insert
+            it into a test MSI. The MSI will invoke the custom actions, but it will not install anything
+            since the second sample CA returns ActionResult.UserExit.
+            </p>
+            
+        <p><br/></p>
+        <p><b>See also:</b></p>
+        <ul>
+            <li><a href="writingcas.htm">Writing Managed Custom Actions</a></li>
+            <li><a href="caconfig.htm">Specifying the Runtime Version</a></li>
+            <li><a href="databases.htm">Working with MSI Databases</a></li>
+            <li><a href="buildingcas.htm">Building Managed Custom Actions</a></li>
+            <li><a href="debuggingcas.htm">Debugging Managed Custom Actions</a></li>
+        </ul>
+        <p><br/></p>
+      </div>
+        
+      <div id="footer">
+        <p />
+        Send comments on this topic to <a id="HT_MailLink" href="mailto:wix-users%40lists.sourceforge.net?Subject=Deployment Tools Foundation Documentation">
+        wix-users@lists.sourceforge.net</a>
+        <script type="text/javascript">
+          var HT_mailLink = document.getElementById("HT_MailLink");
+          var HT_mailLinkText = HT_mailLink.innerHTML;
+          HT_mailLink.href += ": " + document.title;
+          HT_mailLink.innerHTML = HT_mailLinkText;
+        </script>
+        <p />
+        
+      </div>
+   </div>
+    
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/samples.htm b/src/samples/Dtf/Documents/Guide/Content/samples.htm
new file mode 100644
index 00000000..3bcd379a
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/samples.htm
@@ -0,0 +1,59 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Sample Applications</title>
+  <link rel="stylesheet" type="text/css" href="../styles/presentation.css" />
+  <link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" />
+</head>
+<body>
+  <div id="control">
+    <span class="productTitle">Deployment Tools Foundation</span><br />
+    <span class="topicTitle">Sample Applications</span><br />
+    <div id="toolbar">
+      <span id="chickenFeet">
+        <a href="using.htm">Development Guide</a> &gt;
+        <span class="nolink">Samples</span>
+      </span>
+    </div>
+    </div>
+    <div id="main">
+      <div id="header">
+      </div>
+      <div class="summary">
+            <p>Besides the simple managed custom action sample, there are three functional
+            and useful sample tools included in this distribution:</p>
+            <p><a href="Inventory.htm"><b>MSI Inventory</b></a><br/>
+            Shows a hierarchical, relational, searchable view of all of the product,
+            feature, component, file, and patch data managed by MSI, for all products
+            installed on the system.</p>
+            <p><a href="WiFile.htm"><b>WiFile</b></a><br/>
+            Extracts and updates cabbed files in an MSI setup.</p>
+            <p><a href="CabPack.htm"><b>CabPack</b></a><br/>
+            Creates simple self-extracting cab packages. OK, so this one isn't
+            especially useful as a tool, but the code should be helpful.</p>
+            <p><a href="PowerDiff.htm"><b>DDiff</b></a><br/>
+            Recursively diffs MSI, MSP, CAB, and other files and directories.
+            Much more thorough than widiffdb.vbs.</p>
+            <p><br/></p>
+      </div>
+        
+      <div id="footer">
+        <p />
+        Send comments on this topic to <a id="HT_MailLink" href="mailto:wix-users%40lists.sourceforge.net?Subject=Deployment Tools Foundation Documentation">
+        wix-users@lists.sourceforge.net</a>
+        <script type="text/javascript">
+          var HT_mailLink = document.getElementById("HT_MailLink");
+          var HT_mailLinkText = HT_mailLink.innerHTML;
+          HT_mailLink.href += ": " + document.title;
+          HT_mailLink.innerHTML = HT_mailLinkText;
+        </script>
+        <p />
+        
+      </div>
+   </div>
+    
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/support.htm b/src/samples/Dtf/Documents/Guide/Content/support.htm
new file mode 100644
index 00000000..89acbadf
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/support.htm
@@ -0,0 +1,52 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Support/Bugs</title>
+  <link rel="stylesheet" type="text/css" href="../styles/presentation.css" />
+  <link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" />
+</head>
+<body>
+  <div id="control">
+    <span class="productTitle">Deployment Tools Foundation</span><br />
+    <span class="topicTitle">Support/Bugs</span><br />
+    <div id="toolbar">
+      <span id="chickenFeet">
+        <a href="about.htm">Overview</a> &gt;
+        <span class="nolink">Support/Bugs</span>
+      </span>
+    </div>
+    </div>
+    <div id="main">
+      <div id="header">
+      </div>
+      <div class="summary">
+            <p>Please send general support questions or comments to the
+            <a href="mailto:wix-users@sourceforge.net">wix-users</a> discussion list.</p>
+            <p>Bugs, suggestions, or feature requests can be submitted at the
+            <a href="http://wix.sourceforge.net/">WiX project</a>
+            on Sourceforge.net.</p>
+            <p><br/></p>
+      </div>
+        
+      <div id="footer">
+        <p />
+        Send comments on this topic to <a id="HT_MailLink" href="mailto:wix-users%40lists.sourceforge.net?Subject=Deployment Tools Foundation Documentation">
+        wix-users@lists.sourceforge.net</a>
+        <script type="text/javascript">
+          var HT_mailLink = document.getElementById("HT_MailLink");
+          var HT_mailLinkText = HT_mailLink.innerHTML;
+          HT_mailLink.href += ": " + document.title;
+          HT_mailLink.innerHTML = HT_mailLinkText;
+        </script>
+        <p />
+        
+      </div>
+   </div>
+    
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/using.htm b/src/samples/Dtf/Documents/Guide/Content/using.htm
new file mode 100644
index 00000000..6fe960e8
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/using.htm
@@ -0,0 +1,50 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Deployment Tools Foundation Development Guide</title>
+  <link rel="stylesheet" type="text/css" href="../styles/presentation.css" />
+  <link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" />
+</head>
+<body>
+  <div id="control">
+    <span class="productTitle">Deployment Tools Foundation</span><br />
+    <span class="topicTitle">Deployment Tools Foundation Development Guide</span><br />
+    <div id="toolbar">
+      <span id="chickenFeet">
+        <span class="nolink">Development Guide</span>
+      </span>
+    </div>
+    </div>
+    <div id="main">
+      <div id="header">
+      </div>
+      <div class="summary">
+                <ul>
+                    <li><a href="managedcas.htm">Managed Custom Actions</a></li>
+            <li><a href="databases.htm">Working with MSI Databases</a></li>
+            <li><a href="cabs.htm">Working with Cabinet Files</a></li>
+            <li><a href="packages.htm">Working with Install Packages</a></li>
+            <li><a href="samples.htm">Sample Applications</a></li>
+        </ul>
+      </div>
+        
+      <div id="footer">
+        <p />
+        Send comments on this topic to <a id="HT_MailLink" href="mailto:wix-users%40lists.sourceforge.net?Subject=Deployment Tools Foundation Documentation">
+        wix-users@lists.sourceforge.net</a>
+        <script type="text/javascript">
+          var HT_mailLink = document.getElementById("HT_MailLink");
+          var HT_mailLinkText = HT_mailLink.innerHTML;
+          HT_mailLink.href += ": " + document.title;
+          HT_mailLink.innerHTML = HT_mailLinkText;
+        </script>
+        <p />
+        
+      </div>
+   </div>
+    
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/whatsnew.htm b/src/samples/Dtf/Documents/Guide/Content/whatsnew.htm
new file mode 100644
index 00000000..3efe67bd
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/whatsnew.htm
@@ -0,0 +1,257 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>What's New?</title>
+  <link rel="stylesheet" type="text/css" href="../styles/presentation.css" />
+  <link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" />
+</head>
+<body>
+  <div id="control">
+    <span class="productTitle">Deployment Tools Foundation</span><br />
+    <span class="topicTitle">What's New?</span><br />
+    <div id="toolbar">
+      <span id="chickenFeet">
+        <a href="about.htm">Overview</a> &gt;
+        <span class="nolink">What's New?</span>
+      </span>
+      <span id="languageFilter">2007-07-03</span>
+    </div>
+    </div>
+    <div id="main">
+      <div id="header">
+      </div>
+      <div class="summary">
+        
+        <h3>Highlights</h3>
+        <ul>
+            <li><p>New project name name "Deployment Tools Foundation", and
+            new namespaces <font face="Consolas, Courier New">WixToolset.Dtf.*</font></p></li>
+            <li><p>Added ZIP compression library</p></li>
+            <li><p>Added library for reading/writing Win32 resources including file versions</p></li>
+            <li><p>Managed custom action improvements:</p><ul>
+                <li><p>Simplified authoring and building -- new MakeSfxCA tool
+                automatically maps DLL entrypoints to CA methods.</p></li>
+                <li><p>Managed custom action DLLs now run in a separate process for
+                better reliability with respect to CLR versions, but still have
+                full access to the MSI session.</p></li>
+            </ul></li>
+            <li><p>Found and fixed many bugs with extensive unit test suite</p></li>
+            <li><p>LINQ to MSI ! (preview)</p></li>
+        </ul>
+        
+        <p>Unfortunately, all these changes do mean that migrating tools and applications from
+        the previous release can be a moderate amount of work.</p>
+        
+        <h3>Breaking Changes</h3>
+        <p>For the first time since v1.0, this release contains some major breaking
+        changes, due to a significant redesign and cleanup effort that has been a
+        long time coming. The overall purpose of the changes is to bring the class
+        libraries much closer to ship-quality.</p>
+        <ul>
+            <li><p>All libraries use a new namespace hierarchy
+            under <font face="Consolas, Courier New">WixToolset.Dtf</font>.
+            The new namespace aligns with the new project name, gives all the various
+            libraries an identity that makes them obviously related to the DTF project,
+            and mostly avoids "taking over" a namespace that might be rightfully owned
+            by the platform technology owner.</p></li>
+            
+            <li><p>Assemblies are also renamed to follow namespaces.</p></li>
+            
+            <li><p>A new unified compression framework forms the basis for the new ZIP
+            library and a redesigned CAB library. Additional archive formats can
+            be plugged into the framework. The stream-based compression APIs have
+            been redesigned to be more object-oriented and easier to use. The file-based
+            APIs are mostly unchanged from the old cabinet library, although some names
+            have changed in order to fit into the new unified framework.</p></li>
+            
+            <li><p>Large parts of the WindowsInstaller library have been redesigned
+            to be more object-oriented and to better follow .NET Framework design
+            guidelines. And various APIs throughout the library have naming or other
+            changes for better consistency and to follow conventions and best
+            pratices as enforced by FxCop.</p></li>
+            
+            <li><p>The WindowsInstaller APIs no longer make any attempt to mimic the
+            MSI COM automation interfaces. The naming and object patterns in the
+            automation interfaces often conflicted with with best practices for
+            .NET Framework class libraries. Since most people start using DTF
+            without having ever experienced MSI scripting, there is little
+            reason to match the scripting object model. Making the APIs more
+            consistent with .NET conventions will make them much easier to use
+            for people already experienced with the .NET Framework.</p></li>
+            
+            <li><p>APIs in all class libraries use generics where appropriate, especially
+            the generic collection interfaces. This means .NET Framework 2.0 or later
+            is required.</p></li>
+            
+            <li><p>The FilePatch library is missing from this release. An updated
+            and redesigned file-delta library is in development.</p></li>
+        </ul>
+        
+        <h3>Other Changes</h3>
+        <ul>
+            <li><p>New MakeSfxCA tool for building managed custom action packages: In addition to
+            packaging the CA DLL and dependencies, it automatically detects managed CA methods
+            and generates corresponding unmanaged DLL entrypoints in the CA host DLL (SfxCA.dll),
+            where they are called by MSI. Previously it was necessary to either provide this
+            mapping in a CustomAction.config file, or live with the generic "ManagedCustomActionN"
+            names when authoring the CustomAction table in the MSI. For more info, see the
+            help topic on building managed custom actions.</p></li>
+            
+            <li><p>Out-of-proc managed custom action DLLs:
+            When a managed custom action runs, it normally requests a specific major
+            version of the CLR via CustomAction.config. However in the previous implementation,
+            the request could be ignored if there was already a different version of the CLR
+            loaded into the MSI process, either from a previous custom action or by some other
+            means. (The CLR doesn't allow side-by-side versions within the same process.)
+            While there have been no reports of this issue causing setup failures in practice,
+            it may be only a matter of time, as new CLR versions keep coming out.</p>
+            
+            <p>The redesigned native host for managed custom actions, SfxCA.dll, re-launches
+            itself in a separate process before loading the CLR and invoking the managed CA.
+            This ensures that the desired CLR version is always loaded, assuming it is available
+            on the system. It also sets up a named-pipe remoting channel between the two processes.
+            All session-related MSI API calls are routed through that channel, so that the
+            custom action has full access to the installer session just as if it were
+            running in-process.</p></li>
+            
+            <li><p>The new zip compression library supports nearly all features of the zip
+            file format. This includes the ZIP64 extensions for archives greater than 4GB,
+            as well as disk-spanning capabilities. Zip encryption is not supported. The zip
+            library has been tested against a variety of third-party zip tools; please
+            report any issues with incompatible packages.</p>
+            
+            <p>Currently only the basic DEFLATE compression algorithm is supported
+            (via System.IO.Compression.DeflateStream), and the compression level is not adjustable
+            when packing an archive. The zip file format has a mechanism for plugging in arbitrary
+            compression algorithms, and that capability is exposed: you can provide a Stream object
+            capable of compressing and decompressing bytes as an alternative to DeflateStream.</p></li>
+            
+            <li><p>Added support for the few APIs new in MSI 4.0:</p>
+            <ul>
+                <li><font face="Consolas, Courier New">Installer.GetPatchFileList()</font></li>
+                <li><font face="Consolas, Courier New">InstallLogModes.RMFilesInUse</font></li>
+                <li><font face="Consolas, Courier New">ComponentAttributes.DisableRegistryReflection</font></li>
+                <li><font face="Consolas, Courier New">ControlAttributes.ElevationShield</font></li>
+            </ul>&nbsp;<br /></li>
+            <li><p>The documentation is now built with the
+            <a href="http://msdn2.microsoft.com/en-us/vstudio/bb608422.aspx" target="_blank">Sandcastle</a> doc build engine,
+            with help from the <a href="http://www.codeplex.com/SHFB" target="_blank">Sandcastle
+            Help File Builder</a>. (The old CHM was built with NDoc.)</p></li>
+            <li><p>The documentation includes detailed class diagrams for the
+            WindowsInstaller and Compression namespaces.</p></li>
+            <li><p>WindowsInstaller API doc topics now link straight to the corresponding
+            unmanaged MSI API topics in MSDN. If you know an unmanaged MSI API you want to
+            use but don't know the managed equivalent, you can search for it and find what
+            managed APIs link to it.</p></li>
+            <li><p>Unit tests cover about 90% of the Compression, Compression.Zip, and
+            Compression.Cab assemblies -- basically everything except some rare
+            error-handling cases.</p></li>
+            
+            <li><p>Unit tests along with samples cover over 50% of the WindowsInstaller and
+            WindowsInstaller.Package assemblies (including custom action functionality). More
+            test cases are still being added.</p></li>
+        </ul>
+        
+        <h3>Bugfixes</h3>
+        <p>In addition to the extensive cleanup due to redesigns and unit tests, the following
+        reported bugs have been fixed:</p>
+        <ul>
+          <li><p>Managed custom actions could in rare instances fail to load with error 183
+          (directory already exists)</p></li>
+          <li><p>Timestamps of files in a cabinet could be incorrectly offset based on the timezone.
+          (This was due to a behavior change in the DateTime class between .NET 1.1 and 2.0.)</p></li>
+          <li><p>Unicode file paths for cabbed files could be handled incorrectly in some cases</p></li>
+          <li><p>Installer.DetermineApplicablePatches just didn't work</p></li>
+          <li><p>InstallPackage.ApplyPatch couldn't handle applying multiple patches to the same layout</p></li>
+        </ul>
+        <h3>LINQ to MSI</h3>
+        <p><i>You'll never want to write MSI SQL again!</i></p>
+        <p>Language INtegrated Query is a new feature in .NET Framework 3.5 and C# 3.0. Through
+        a combination of intuitive language syntax and powerful query operations, LINQ provides
+        a whole new level of productivity for working with data in your code. While the .NET
+        Framework 3.5 provides LINQ capability for SQL databases and XML data, now you
+        can write LINQ queries to fetch and even update data in MSI databases!</p>
+        
+        <p>Look at the following example:<br />
+        
+<pre><font face="Consolas, Courier New">    <font color="blue">var</font> actions = <font color="blue">from</font> a <font color="blue">in</font> db.InstallExecuteSequences
+                  <font color="blue">join</font> ca <font color="blue">in</font> db.CustomActions <font color="blue">on</font> a.Action <font color="blue">equals</font> ca.Action
+                  <font color="blue">where</font> ca.Type == CustomActionTypes.Dll
+                  <font color="blue">orderby</font> a.Sequence
+                  <font color="blue">select new</font> {
+                      Name = a.Action,
+                      Target = ca.Target,
+                      Sequence = a.Sequence };
+          
+    <font color="blue">foreach</font> (<font color="blue">var</font> a <font color="blue">in</font> actions)
+    {
+        Console.WriteLine(a);
+    }
+    </font></pre>
+        The query above gets automatically translated to MSI SQL:</p>
+        
+        <p><font face="Consolas, Courier New">&nbsp;&nbsp;&nbsp;&nbsp;SELECT `InstallExecuteSequence`.`Action`,
+        `CustomAction`.`Target`, `InstallExecuteSequence`.`Sequence` FROM `InstallExecuteSequence`, `CustomAction`
+        WHERE `InstallExecuteSequence`.Action` = `CustomAction`.`Action` ORDER BY `InstallExecuteSequence`.`Sequence`</font></p>
+        
+        <p>But the query is not executed until the <font face="Consolas, Courier New">foreach</font>
+        enumeration. Then records are fetched from the results incrementally as the enumeration progresses.
+        The objects fetched are actually of an anonymous type created there in the query with exactly
+        the desired fields. So the result of this code will be to print the Action, Target, and Sequence
+        of all Type 1 custom actions.</p>
+        
+        <p>The query functionality is currently limited by the capabilities of the MSI SQL engine. For
+        example, a query can't use <font face="Consolas, Courier New">where (ca.Type &amp;
+        CustomActionTypes.Dll) != 0</font> because the bitwise-and operator is not supported by
+        MSI SQL. The preview version of LINQ to MSI will throw an exception for cases like that, but
+        the eventual goal is to have it automatically move the data and operation outside of MSI when
+        necessary, so that any arbitrary expressions are supported in the query.</p>
+        
+        <p>Note there are no MSI handles (or <font face="Consolas, Courier New">IDisposable</font>s)
+        to worry about! Handles are all managed internally and closed deterministically. Also,
+        with the entity object model for common tables, the compiler will tell you if you get a
+        column name wrong or misspelled. The entity objects even support easy inserting, updating,
+        and deleting (not shown here).</p>
+        
+        <p>For more examples, see the LinqTest project in the source. More documentation
+        is being written.</p>
+        
+        <p>Obviously, LINQ to MSI requires .NET Framework 3.5. Everything else
+        in DTF requires only .NET Framework 2.0.</p>
+        
+        <p><font color="red">Note: The LINQ functionality in this DTF release is of preview quality only
+        and should not be used in production. While there are unit tests covering a wide
+        variety of queries, using advanced queries outside what is covered by the tests
+        is likely to result in unexpected exceptions, and retrieved data might possibly be
+        incorrect or incomplete. An updated LINQ to MSI library is in development.</font></p>
+        
+        <p>&nbsp;</p>
+        
+      </div>
+        
+      <div id="footer">
+        <p />
+        Send comments on this topic to <a id="HT_MailLink" href="mailto:wix-users%40lists.sourceforge.net?Subject=Deployment Tools Foundation Documentation">
+        wix-users@lists.sourceforge.net</a>
+        <script type="text/javascript">
+          var HT_mailLink = document.getElementById("HT_MailLink");
+          var HT_mailLinkText = HT_mailLink.innerHTML;
+          HT_mailLink.href += ": " + document.title;
+          HT_mailLink.innerHTML = HT_mailLinkText;
+        </script>
+        <p />
+        
+      </div>
+   </div>
+    
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/wifile.htm b/src/samples/Dtf/Documents/Guide/Content/wifile.htm
new file mode 100644
index 00000000..20998b73
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/wifile.htm
@@ -0,0 +1,73 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Windows Installer Package File Manipulation Tool</title>
+  <link rel="stylesheet" type="text/css" href="../styles/presentation.css" />
+  <link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" />
+</head>
+<body>
+  <div id="control">
+    <span class="productTitle">Deployment Tools Foundation</span><br />
+    <span class="topicTitle">Windows Installer Package File Manipulation Tool</span><br />
+    <div id="toolbar">
+      <span id="chickenFeet">
+        <a href="using.htm">Development Guide</a> &gt;
+        <a href="samples.htm">Samples</a> &gt;
+        <span class="nolink">WiFile</span>
+      </span>
+    </div>
+    </div>
+    <div id="main">
+      <div id="header">
+      </div>
+      <div class="summary">
+            <p><pre><font face="Consolas, Courier New">Usage: WiFile.exe package.msi /l [filename,filename2,...]
+Usage: WiFile.exe package.msi /x [filename,filename2,...]
+Usage: WiFile.exe package.msi /u [filename,filename2,...]
+Lists (/l), extracts (/x) or updates (/u) files in an MSI or MSM.
+Files are extracted using their source path relative to the package.
+Specified filenames do not include paths.
+Filenames may be a pattern such as *.exe or file?.dll</font></pre>
+            </p>
+            <p><br/></p>
+            <h4>Example</h4>
+            <p>The most powerful use of WiFile.exe is to do a round-trip update of files in a
+            compressed MSI/MSM package. It works like this:<ol>
+            <li>Extract specific file(s) or all files from the package:
+                <tt>WiFile.exe package.msi /x *</tt></li>
+            <li>The files are now expanded into their directory structure. You can edit/update
+                the files however you like.</li>
+            <li>Update the package with the changed files: <tt>WiFile.exe package.msi /u *</tt>&nbsp;
+                This also updates the file metadata in the MSI including the file version, size, and hash.</li>
+            </ol></p>
+            <p><br/></p>
+            <h4>Notes</h4>
+            <ul>
+            <li><p>Also works with packages that have multiple and/or external cab(s).</p></li>
+            </ul>
+            <p><br/></p>
+                </div>
+      <div id="footer">
+        <p />
+        Send comments on this topic to <a id="HT_MailLink" href="mailto:wix-users%40lists.sourceforge.net?Subject=Deployment Tools Foundation Documentation">
+        wix-users@lists.sourceforge.net</a>
+        <script type="text/javascript">
+          var HT_mailLink = document.getElementById("HT_MailLink");
+          var HT_mailLinkText = HT_mailLink.innerHTML;
+          HT_mailLink.href += ": " + document.title;
+          HT_mailLink.innerHTML = HT_mailLinkText;
+        </script>
+        <p />
+        
+      </div>
+   </div>
+    
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/Content/writingcas.htm b/src/samples/Dtf/Documents/Guide/Content/writingcas.htm
new file mode 100644
index 00000000..6beccf5f
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/Content/writingcas.htm
@@ -0,0 +1,114 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Writing Managed Custom Actions</title>
+  <link rel="stylesheet" type="text/css" href="../styles/presentation.css" />
+  <link rel="stylesheet" type="text/css" href="ms-help://Hx/HxRuntime/HxLink.css" />
+</head>
+<body>
+  <div id="control">
+    <span class="productTitle">Deployment Tools Foundation</span><br />
+    <span class="topicTitle">Writing Managed Custom Actions</span><br />
+    <div id="toolbar">
+      <span id="chickenFeet">
+        <a href="using.htm">Development Guide</a> &gt;
+        <a href="managedcas.htm">Managed CAs</a> &gt;
+        <span class="nolink">Writing CAs</span>
+      </span>
+    </div>
+    </div>
+    <div id="main">
+      <div id="header">
+      </div>
+      <div class="summary">
+                <p><b>Caveats</b></p>
+                <p>Before choosing to write a custom action in managed code instead of
+                traditional native C++ code, you should carefully consider the following:</p>
+                <ul>
+                    <li><p>Obviously, it introduces a dependency on the .NET Framework. Your
+                    MSI package should probably have a LaunchCondition to check for the presence
+                    of the correct version of the .NET Framework before anything else happens.</p></li>
+                    <li><p>If the custom action runs at uninstall time, then even the uninstall of
+                    your product may fail if the .NET Framework is not present. This means a
+                    user could run into a problem if they uninstall the .NET Framework before
+                    your product.</p></li>
+                    <li><p>A managed custom action should be configured to run against a specific
+                    version of the .NET Framework, and that version should match the version your
+                    actual product runs against. Allowing the version to "float" to the latest
+                    installed .NET Framework is likely to lead to compatibility problems with
+                    future versions. The .NET Framework provides side-by-side functionality for
+                    good reason -- use it.</p></li>
+                </ul>
+                <p><br/></p>
+                <p><b>How To</b></p>
+        <ul>
+        <li><p>A custom action function needs to be declared as 
+        <tt>public static</tt> (aka <tt>Public Shared</tt> in VB.NET). It takes one parameter which is 
+        a <a href="DTFAPI.chm::/html/T_Microsoft_Deployment_WindowsInstaller_Session.htm">Session</a> object, and returns a 
+        <a href="DTFAPI.chm::/html/T_Microsoft_Deployment_WindowsInstaller_ActionResult.htm">ActionResult</a> enumeration.</p>
+        <pre><font face="Consolas, Courier New">    [CustomAction]
+    <font color=blue>public</font> <font color=blue>static</font> ActionResult MyCustomAction(Session session)</font></pre><br />
+        <li><p>The function must have a 
+        <a href="DTFAPI.chm::/html/T_Microsoft_Deployment_WindowsInstaller_CustomActionAttribute.htm"
+        >CustomActionAttribute</a>, which enables it to be 
+        linked to a proxy function. The attribute can take an optional 
+        &quot;name&quot; parameter, which is the name of the entrypoint
+        that is exported from the custom action DLL.</p>
+        <li><p>Fill in MSI CustomAction table entries just like you 
+        would for a normal type 1 native-DLL CA. Managed CAs can also work just 
+        as well in deferred, rollback, and commit modes.</p>
+        <li><p>If the custom action function throws any kind of 
+        Exception that isn't handled internally, then it will be caught by the proxy 
+        function. The Exception message and stack trace will be printed to the 
+        MSI log if logging is enabled, and the CA will return a failure code.</p>
+        <li><p>To be technically correct, any MSI handles obtained should be 
+        closed before a custom action function exits -- otherwise a warning 
+        gets printed to the log. The handle classes in the managed library 
+        (<a href="DTFAPI.chm::/html/T_Microsoft_Deployment_WindowsInstaller_Database.htm">Database</a>,
+        <a href="DTFAPI.chm::/html/T_Microsoft_Deployment_WindowsInstaller_View.htm">View</a>,
+        <a href="DTFAPI.chm::/html/T_Microsoft_Deployment_WindowsInstaller_Record.htm">Record</a>,
+        <a href="DTFAPI.chm::/html/T_Microsoft_Deployment_WindowsInstaller_SummaryInfo.htm">SummaryInfo</a>)
+        all implement the IDisposable interface, 
+        which makes them easily managed with C#'s <tt>using</tt> 
+        statement. Alternatively, they can be closed in a finally block. 
+        As a general rule, <i>methods</i> return new handle objects that should be 
+        managed and closed by the user code, while <i>properties</i> only return a reference
+        to a prexisting handle object.</p></li>
+        <li><p>Don't forget to use a <a href="caconfig.htm">CustomAction.config</a> file to
+        specify what version of the .NET Framework the custom action should run against.</p></li>
+        </ul>
+            
+        <p><br/></p>
+        <p><b>See also:</b></p>
+        <ul>
+            <li><a href="samplecas.htm">Sample C# Custom Actions</a></li>
+            <li><a href="caconfig.htm">Specifying the Runtime Version</a></li>
+            <li><a href="databases.htm">Working with MSI Databases</a></li>
+            <li><a href="buildingcas.htm">Building Managed Custom Actions</a></li>
+            <li><a href="debuggingcas.htm">Debugging Managed Custom Actions</a></li>
+        </ul>
+        <p><br/></p>
+        
+      </div>
+        
+      <div id="footer">
+        <p />
+        Send comments on this topic to <a id="HT_MailLink" href="mailto:wix-users%40lists.sourceforge.net?Subject=Deployment Tools Foundation Documentation">
+        wix-users@lists.sourceforge.net</a>
+        <script type="text/javascript">
+          var HT_mailLink = document.getElementById("HT_MailLink");
+          var HT_mailLinkText = HT_mailLink.innerHTML;
+          HT_mailLink.href += ": " + document.title;
+          HT_mailLink.innerHTML = HT_mailLinkText;
+        </script>
+        <p />
+        
+      </div>
+   </div>
+    
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Guide/DTF.hhc b/src/samples/Dtf/Documents/Guide/DTF.hhc
new file mode 100644
index 00000000..bf43e447
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/DTF.hhc
@@ -0,0 +1,132 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<HTML>
+<HEAD>
+<!-- Sitemap 1.0 -->
+</HEAD><BODY>
+<UL>
+        <LI><OBJECT type="text/sitemap">
+                        <param name="Name" value="Deployment Tools Foundation Overview">
+                        <param name="Local" value="Content\about.htm">
+                </OBJECT>
+                <UL>
+                        <LI><OBJECT type="text/sitemap">
+                                        <param name="Name" value="What's New?">
+                                        <param name="Local" value="Content\whatsnew.htm">
+                                </OBJECT>
+                        </LI>
+                        <LI><OBJECT type="text/sitemap">
+                                        <param name="Name" value="Change History">
+                                        <param name="Local" value="Content\history.htm">
+                                </OBJECT>
+                        </LI>
+                        <LI><OBJECT type="text/sitemap">
+                                        <param name="Name" value="Dependencies">
+                                        <param name="Local" value="Content\dependencies.htm">
+                                </OBJECT>
+                        </LI>
+                        <LI><OBJECT type="text/sitemap">
+                                        <param name="Name" value="Support/Bugs">
+                                        <param name="Local" value="Content\support.htm">
+                                </OBJECT>
+                        </LI>
+                </UL>
+        </LI>
+        <LI><OBJECT type="text/sitemap">
+                        <param name="Name" value="Deployment Tools Foundation Development Guide">
+                        <param name="Local" value="Content\using.htm">
+                </OBJECT>
+                <UL>
+                        <LI><OBJECT type="text/sitemap">
+                                        <param name="Name" value="Managed Custom Actions">
+                                        <param name="Local" value="Content\managedcas.htm">
+                                </OBJECT>
+                                <UL>
+                                        <LI><OBJECT type="text/sitemap">
+                                                        <param name="Name" value="Writing Managed Custom Actions">
+                                                        <param name="Local" value="Content\writingcas.htm">
+                                                </OBJECT>
+                                                <UL>
+                                                        <LI><OBJECT type="text/sitemap">
+                                                                        <param name="Name" value="Specifying the Runtime Version">
+                                                                                <param name="Local" value="Content\caconfig.htm">
+                                                                </OBJECT>
+                                                        </LI>
+                                                        <LI><OBJECT type="text/sitemap">
+                                                                        <param name="Name" value="Sample C# Custom Actions">
+                                                                        <param name="Local" value="Content\samplecas.htm">
+                                                                </OBJECT>
+                                                        </LI>
+                                                </UL>
+                                        </LI>
+                                        <LI><OBJECT type="text/sitemap">
+                                                        <param name="Name" value="Building Managed Custom Actions">
+                                                        <param name="Local" value="Content\buildingcas.htm">
+                                                </OBJECT>
+                                        </LI>
+                                        <LI><OBJECT type="text/sitemap">
+                                                        <param name="Name" value="Debugging Managed Custom Actions">
+                                                        <param name="Local" value="Content\debuggingcas.htm">
+                                                </OBJECT>
+                                        </LI>
+                                        <LI><OBJECT type="text/sitemap">
+                                                        <param name="Name" value="InstallUtil Notes">
+                                                        <param name="Local" value="Content\installutil.htm">
+                                                </OBJECT>
+                                        </LI>
+                                </UL>
+                        </LI>
+                        <LI><OBJECT type="text/sitemap">
+                                        <param name="Name" value="Working with MSI Databases">
+                                        <param name="Local" value="Content\databases.htm">
+                                </OBJECT>
+                        </LI>
+                        <LI><OBJECT type="text/sitemap">
+                                        <param name="Name" value="Working with Cabinet Files">
+                                        <param name="Local" value="Content\cabs.htm">
+                                </OBJECT>
+                        </LI>
+                        <LI><OBJECT type="text/sitemap">
+                                        <param name="Name" value="Working with Install Packages">
+                                        <param name="Local" value="Content\packages.htm">
+                                </OBJECT>
+                        </LI>
+                        <LI><OBJECT type="text/sitemap">
+                                        <param name="Name" value="Sample Applications">
+                                        <param name="Local" value="Content\samples.htm">
+                                </OBJECT>
+                                <UL>
+                                        <LI><OBJECT type="text/sitemap">
+                                                        <param name="Name" value="MSI Inventory">
+                                                        <param name="Local" value="Content\inventory.htm">
+                                                </OBJECT>
+                                        </LI>
+                                        <LI><OBJECT type="text/sitemap">
+                                                        <param name="Name" value="WiFile">
+                                                        <param name="Local" value="Content\wifile.htm">
+                                                </OBJECT>
+                                        </LI>
+                                        <LI><OBJECT type="text/sitemap">
+                                                        <param name="Name" value="XPack">
+                                                        <param name="Local" value="Content\cabpack.htm">
+                                                </OBJECT>
+                                        </LI>
+                                        <LI><OBJECT type="text/sitemap">
+                                                        <param name="Name" value="DDiff">
+                                                        <param name="Local" value="Content\powerdiff.htm">
+                                                </OBJECT>
+                                        </LI>
+                                </UL>
+                        </LI>
+                </UL>
+        </LI>
+        <LI><OBJECT type="text/sitemap">
+                        <param name="Name" value="Deployment Tools Foundation Reference">
+                        <param name="Local" value="DTFAPI.chm::/html/R_Project.htm">
+                </OBJECT>
+                <OBJECT type="text/sitemap">
+                        <param name="Merge" value="DTFAPI.chm::/DTFAPI.hhc">
+                </OBJECT>
+        </LI>
+</UL>
+</BODY>
+</HTML>
diff --git a/src/samples/Dtf/Documents/Guide/DTF.hhk b/src/samples/Dtf/Documents/Guide/DTF.hhk
new file mode 100644
index 00000000..bc6e49b3
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/DTF.hhk
@@ -0,0 +1,126 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<HTML>
+<HEAD>
+<!-- Sitemap 1.0 -->
+</HEAD><BODY>
+<UL>
+        <LI><OBJECT type="text/sitemap">
+                        <param name="Name" value="Deployment Tools Foundation Overview">
+                        <param name="Local" value="Content\about.htm">
+                </OBJECT>
+        </LI>
+        <LI><OBJECT type="text/sitemap">
+                        <param name="Name" value="What's New?">
+                        <param name="Local" value="Content\whatsnew.htm">
+                </OBJECT>
+        </LI>
+        <LI><OBJECT type="text/sitemap">
+                        <param name="Name" value="Dependencies">
+                        <param name="Local" value="Content\dependencies.htm">
+                </OBJECT>
+        </LI>
+        <LI><OBJECT type="text/sitemap">
+                        <param name="Name" value="Sample Applications">
+                        <param name="Local" value="Content\samples.htm">
+                </OBJECT>
+        </LI>
+        <LI><OBJECT type="text/sitemap">
+                        <param name="Name" value="Inventory Sample Application">
+                        <param name="Local" value="Content\inventory.htm">
+                </OBJECT>
+        </LI>
+        <LI><OBJECT type="text/sitemap">
+                        <param name="Name" value="WiFile Sample Tool">
+                        <param name="Local" value="Content\wifile.htm">
+                </OBJECT>
+        </LI>
+        <LI><OBJECT type="text/sitemap">
+                        <param name="Name" value="CabPack Sample Tool">
+                        <param name="Local" value="Content\cabpack.htm">
+                </OBJECT>
+        </LI>
+        <LI><OBJECT type="text/sitemap">
+                        <param name="Name" value="DDiff Sample Tool">
+                        <param name="Local" value="Content\powerdiff.htm">
+                </OBJECT>
+        </LI>
+        <LI><OBJECT type="text/sitemap">
+                        <param name="Name" value="Support/Bugs">
+                        <param name="Local" value="Content\support.htm">
+                </OBJECT>
+        </LI>
+        <LI><OBJECT type="text/sitemap">
+                        <param name="Name" value="Change History">
+                        <param name="Local" value="Content\history.htm">
+                </OBJECT>
+        </LI>
+        <LI><OBJECT type="text/sitemap">
+                        <param name="Name" value="Using Deployment Tools Foundation">
+                        <param name="Local" value="Content\using.htm">
+                </OBJECT>
+        </LI>
+        <LI><OBJECT type="text/sitemap">
+                        <param name="Name" value="Custom Actions">
+                        <param name="Local" value="Content\managedcas.htm">
+                </OBJECT>
+                <UL>
+                        <LI><OBJECT type="text/sitemap">
+                                        <param name="Name" value="Writing">
+                                        <param name="Local" value="Content\writingcas.htm">
+                                </OBJECT>
+                        </LI>
+                        <LI>
+                                <OBJECT type="text/sitemap">
+                                        <param name="Name" value="CustomAction.config">
+                                                <param name="Local" value="Content\caconfig.htm">
+                                </OBJECT>
+                        </LI>
+                        <LI><OBJECT type="text/sitemap">
+                                        <param name="Name" value="Building">
+                                        <param name="Local" value="Content\buildingcas.htm">
+                                </OBJECT>
+                        </LI>
+                        <LI><OBJECT type="text/sitemap">
+                                        <param name="Name" value="Debugging">
+                                        <param name="Local" value="Content\debuggingcas.htm">
+                                </OBJECT>
+                        </LI>
+                        <LI><OBJECT type="text/sitemap">
+                                        <param name="Name" value="Samples">
+                                        <param name="Local" value="Content\samplecas.htm">
+                                </OBJECT>
+                        </LI>
+                </UL>
+        </LI>
+        <LI><OBJECT type="text/sitemap">
+                        <param name="Name" value="InstallUtil">
+                                <param name="Local" value="Content\installutil.htm">
+                </OBJECT>
+        </LI>
+        <LI><OBJECT type="text/sitemap">
+                        <param name="Name" value="CustomAction.config file">
+                                <param name="Local" value="Content\caconfig.htm">
+                </OBJECT>
+        </LI>
+        <LI><OBJECT type="text/sitemap">
+                        <param name="Name" value="Sample C# Custom Actions">
+                        <param name="Local" value="Content\samplecas.htm">
+                </OBJECT>
+        </LI>
+        <LI><OBJECT type="text/sitemap">
+                        <param name="Name" value="Databases, Working with">
+                        <param name="Local" value="Content\databases.htm">
+                </OBJECT>
+        </LI>
+        <LI><OBJECT type="text/sitemap">
+                        <param name="Name" value="Cabinets, Working with">
+                        <param name="Local" value="Content\cabs.htm">
+                </OBJECT>
+        </LI>
+        <LI><OBJECT type="text/sitemap">
+                        <param name="Name" value="Packages, Working with">
+                        <param name="Local" value="Content\packages.htm">
+                </OBJECT>
+        </LI>
+</UL>
+</BODY></HTML>
diff --git a/src/samples/Dtf/Documents/Guide/DTF.hhp b/src/samples/Dtf/Documents/Guide/DTF.hhp
new file mode 100644
index 00000000..e9b8ad90
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/DTF.hhp
@@ -0,0 +1,49 @@
+[OPTIONS]
+Auto Index=Yes
+Compatibility=1.1 or later
+Compiled file=DTF.chm
+Contents file=DTF.hhc
+Default Window=DTF
+Default topic=Content\about.htm
+Display compile progress=Yes
+Error log file=DTFhelp.log
+Full-text search=Yes
+Index file=DTF.hhk
+Language=0x409 English (United States)
+Title=Deployment Tools Foundation
+[WINDOWS]
+DTF="Deployment Tools Foundation","DTF.hhc","DTF.hhk","Content\about.htm","Content\about.htm",,,,,0x22520,,0x384e,[143,72,937,601],,,,,,,0
+[FILES]
+styles\presentation.css
+Content\about.htm
+Content\whatsnew.htm
+Content\dependencies.htm
+Content\using.htm
+DTF.hhc
+DTF.hhk
+Content\samples.htm
+Content\support.htm
+Content\history.htm
+Content\inventory.htm
+Content\wifile.htm
+Content\cabpack.htm
+Content\powerdiff.htm
+Content\cabs.htm
+Content\databases.htm
+Content\packages.htm
+Content\managedcas.htm
+Content\samplecas.htm
+Content\writingcas.htm
+Content\buildingcas.htm
+Content\debuggingcas.htm
+Content\caproxy.htm
+Content\caconfig.htm
+Content\installutil.htm
+[MERGE FILES]
+DTFAPI.chm
+[INFOTYPES]
diff --git a/src/samples/Dtf/Documents/Guide/dtfguide.helpproj b/src/samples/Dtf/Documents/Guide/dtfguide.helpproj
new file mode 100644
index 00000000..4df2765d
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/dtfguide.helpproj
@@ -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. -->
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{3CFD8620-B41C-470C-ABEF-9D38076A2A8D}</ProjectGuid>
+    <TargetName>dtf</TargetName>
+  </PropertyGroup>
+  <ItemGroup>
+    <HelpProjectFile Include="dtf.hhp" />
+    <HelpProjectContent Include="DTF.hhc" />
+    <HelpProjectContent Include="DTF.hhk" />
+    <HelpProjectContent Include="Content\*.*" />
+    <HelpProjectContent Include="styles\*.*" />
+    <HelpProjectContent Include="DTFAPI.chm">
+      <SourcePath>$(OutputPath)DTFAPI.chm</SourcePath>
+    </HelpProjectContent>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Reference\dtfref.shfbproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
+</Project>
diff --git a/src/samples/Dtf/Documents/Guide/styles/presentation.css b/src/samples/Dtf/Documents/Guide/styles/presentation.css
new file mode 100644
index 00000000..b71c8582
--- /dev/null
+++ b/src/samples/Dtf/Documents/Guide/styles/presentation.css
@@ -0,0 +1,394 @@
+/* page style */
+body {
+        margin: 0;
+        background-color: #FFFFFF;
+        padding: 0;
+        font-size: 80%;
+        font-family: verdana, sans-serif;
+        color: #000000;
+}
+table {
+        /* this is a trick to force tables to inherit the body font size */
+        font-size: 100%;
+}
+/* non-scrolling (control) region style */
+div#control {
+        margin: 0;
+        background-color: #D4DFFF;
+        padding: 4px;
+        width: 100%;
+        border-bottom-color: #C8CDDE;
+        border-bottom-style: solid;
+        border-bottom-width: 1;
+}
+span.productTitle {
+        font-size: 80%;
+}
+span.topicTitle {
+        font-size: 140%;
+        font-weight: bold;
+        color: #003399;
+}
+span#chickenFeet {
+        float: left;
+}
+span#languageFilter {
+        float: right;
+}
+/* scrolling (content) region style */
+div#main {
+        margin: 0;
+        padding: 1em;
+        width: 100%;
+        clear: both;
+}
+/* sections */
+div#header {
+        font-size: 70%;
+        color: #666666;
+        margin-bottom: 0.5em;
+}
+div.section {
+        margin-bottom: 1em;
+}
+div.sectionTitle {
+        display: inline;
+        font-size: 120%;
+        font-weight: bold;
+        color: #003399;
+}
+div.sectionContent {
+        margin-top: 0.2em;
+}
+span.subsectionTitle {
+        font-weight: bold;
+}
+div#footer {
+        margin-top: 1em;
+        border-top: thin solid #003399;
+        padding-top: 0.5em;
+}
+/* authored content (block) */
+p {
+        margin-top: 0;
+        margin-bottom: 1em;
+}
+dl {
+        margin-top: 0;
+        margin-bottom: 1em;
+}
+div.code {
+        clear: both;
+        width: 100%;
+        background: #F7F7FF;
+        padding: 0.4em;
+        font-family: "Andale Mono";
+        /* font-family: "Courier New"; */
+        /* font-family: "This is not a monospace font", monospace; */
+        font-size: inherit;
+        margin-bottom: 1em;
+}
+pre {
+        margin: 0;
+        padding: 0;
+}
+table.authoredTable {
+        table-layout: fixed;
+        width: 100%;
+        margin-bottom: 1em;
+}
+table.authoredTable th {
+        border-bottom-color: #C8CDDE;
+        border-bottom-style: solid;
+        border-bottom-width: 1;
+        background: #EFEFF7;
+        padding: 0.2em;
+        text-align: left;
+        color: #000066;
+        font-weight: bold;
+}
+table.authoredTable td {
+        border-bottom-style: solid;
+        border-bottom-color: #C8CDDE;
+        border-bottom-width: 1px;
+        background: #F7F7FF;
+        padding: 0.2em;
+        vertical-align: top;    
+}
+div.alert {
+        border: 1px solid #C8CDDE;
+        background: #F7F7FF;
+}
+div.media {
+        text-align: center;
+        margin-bottom: 1em;
+}
+/* authored content (inline) */
+span.keyword {
+        font-weight: bold;
+}
+span.code {
+        font-family: "Andale Mono", "Courier New", Courier, monospace; 
+}
+/* auto-generated controls */
+div.langTabs {
+        width: 100%;
+}
+div.langTab {
+        float: left;
+        width: 16%;
+        border-top: 1px solid #C8CDDE;
+        border-left: 1px solid #C8CDDE;
+        border-right: 1px solid #C8CDDE;
+        background: #F7F7FF;
+        padding: 0.2em;
+        text-align: left;
+        color: #000066;
+        font-weight: normal;
+}
+div.activeLangTab {
+        float: left;
+        width: 16%;
+        border-top: 1px solid #C8CDDE;
+        border-left: 1px solid #C8CDDE;
+        border-right: 1px solid #C8CDDE;
+        background: #EFEFF7;
+        padding: 0.2em;
+        text-align: left;
+        color: #000066;
+        font-weight: bold;
+}
+table.members {
+        table-layout: fixed;
+        width: 100%;
+}
+table.members th.iconColumn {
+        width: 60px;
+}
+table.members th.nameColumn {
+        width: 33%;
+}
+table.members th.descriptionColumn {
+        width: 66%;
+}
+table.members th {
+        border-bottom-color: #C8CDDE;
+        border-bottom-style: solid;
+        border-bottom-width: 1;
+        background: #EFEFF7;
+        padding: 0.2em;
+        text-align: left;
+        color: #000066;
+        font-weight: bold;
+}
+table.members td {
+        border-bottom-style: solid;
+        border-bottom-color: #C8CDDE;
+        border-bottom-width: 1px;
+        background: #F7F7FF;
+        padding: 0.2em;
+        vertical-align: top;
+        overflow: hidden;
+}
+table.exceptions {
+        table-layout: fixed;
+        width: 100%;
+}
+table.exceptions th.exceptionNameColumn {
+        width: 33%;
+}
+table.exceptions th.exceptionConditionColumn {
+        width: 66%;
+}
+table.exceptions th {
+        border-bottom-color: #C8CDDE;
+        border-bottom-style: solid;
+        border-bottom-width: 1;
+        background: #EFEFF7;
+        padding: 0.2em;
+        text-align: left;
+        color: #000066;
+        font-weight: bold;
+}
+table.exceptions td {
+        border-bottom-style: solid;
+        border-bottom-color: #C8CDDE;
+        border-bottom-width: 1px;
+        background: #F7F7FF;
+        padding: 0.2em;
+        vertical-align: top;
+}
+table.permissions {
+        table-layout: fixed;
+        width: 100%;
+}
+table.permissions th.permissionNameColumn {
+        width: 33%;
+}
+table.permissions th.permissionConditionColumn {
+        width: 66%;
+}
+table.permissions th {
+        border-bottom-color: #C8CDDE;
+        border-bottom-style: solid;
+        border-bottom-width: 1;
+        background: #EFEFF7;
+        padding: 0.2em;
+        text-align: left;
+        color: #000066;
+        font-weight: bold;
+}
+table.permissions td {
+        border-bottom-style: solid;
+        border-bottom-color: #C8CDDE;
+        border-bottom-width: 1px;
+        background: #F7F7FF;
+        padding: 0.2em;
+        vertical-align: top;
+}
+span.obsolete {
+        color: red;
+}
+span.cs {
+        display: inline;
+}
+span.vb {
+        display: none;
+}
+span.cpp {
+        display: none;
+}
+/* syntax styling */
+div.code span.identifier {
+        font-size: 120%;
+        font-weight: bold;
+}
+div.code span.keyword {
+        color: green;
+}
+div.code span.parameter {
+        font-style: italic;
+        color: purple;
+}
+div.code span.literal {
+        color: purple;
+}
+div.code span.comment {
+        color: red;
+}
+span.foreignPhrase {
+        font-style: italic;
+}
+span.placeholder {
+        font-style: italic;
+}
+a {
+        color: blue;
+        font-weight: bold;
+        text-decoration: none;  
+}
+MSHelp\:link {
+        color: blue;
+        font-weight: bold;
+        hoverColor: #3366ff;
+}
+span.nolink {
+        font-weight: bold;
+}
+table.filter {
+        table-layout: fixed;
+}
+tr.tabs td.tab {
+        width: 10em;
+        background: #F7F7FF;
+        padding: 0.2em;
+        text-align: left;
+        color: #000066;
+        font-weight: normal;
+        overflow: hidden;
+        cursor: pointer;
+}
+tr.tabs td.activeTab {
+        width: 10em;
+        background: #EFEFF7;
+        padding: 0.2em;
+        text-align: left;
+        color: #000066;
+        font-weight: bold;
+        overflow: hidden;
+}
+td.line {
+        background: #EFEFF7;
+}
diff --git a/src/samples/Dtf/Documents/Reference/Compression.htm b/src/samples/Dtf/Documents/Reference/Compression.htm
new file mode 100644
index 00000000..7782bea1
--- /dev/null
+++ b/src/samples/Dtf/Documents/Reference/Compression.htm
@@ -0,0 +1,13 @@
+<html>
+<head>
+  <title>Class Diagram: WixToolset.Dtf.Compression</title>
+</head>
+<body>
+<h3><font face="Verdana">WixToolset.Dtf.Compression Namespace</font></h3>
+<img src="Compression1.png" width="870" height="596" border="0" />
+<img src="Compression2.png" width="870" height="596" border="0" />
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Reference/Compression1.png b/src/samples/Dtf/Documents/Reference/Compression1.png
new file mode 100644
index 00000000..5b2e177f
--- /dev/null
+++ b/src/samples/Dtf/Documents/Reference/Compression1.png
Binary files differ
diff --git a/src/samples/Dtf/Documents/Reference/Compression2.png b/src/samples/Dtf/Documents/Reference/Compression2.png
new file mode 100644
index 00000000..394a5f18
--- /dev/null
+++ b/src/samples/Dtf/Documents/Reference/Compression2.png
Binary files differ
diff --git a/src/samples/Dtf/Documents/Reference/WindowsInstaller.htm b/src/samples/Dtf/Documents/Reference/WindowsInstaller.htm
new file mode 100644
index 00000000..28990ce4
--- /dev/null
+++ b/src/samples/Dtf/Documents/Reference/WindowsInstaller.htm
@@ -0,0 +1,14 @@
+<html>
+<head>
+  <title>Class Diagram: WixToolset.Dtf.WindowsInstaller</title>
+</head>
+<body>
+<h3><font face="Verdana">WixToolset.Dtf.WindowsInstaller Namespace</font></h3>
+<img src="WindowsInstaller1.png" width="1136" height="1247" border="0" />
+<img src="WindowsInstaller2.png" width="1108" height="1247" border="0" />
+<img src="WindowsInstaller3.png" width="866" height="1247" border="0" />
+</body>
+</html>
diff --git a/src/samples/Dtf/Documents/Reference/WindowsInstaller1.png b/src/samples/Dtf/Documents/Reference/WindowsInstaller1.png
new file mode 100644
index 00000000..cc769cc7
--- /dev/null
+++ b/src/samples/Dtf/Documents/Reference/WindowsInstaller1.png
Binary files differ
diff --git a/src/samples/Dtf/Documents/Reference/WindowsInstaller2.png b/src/samples/Dtf/Documents/Reference/WindowsInstaller2.png
new file mode 100644
index 00000000..0c11e501
--- /dev/null
+++ b/src/samples/Dtf/Documents/Reference/WindowsInstaller2.png
Binary files differ
diff --git a/src/samples/Dtf/Documents/Reference/WindowsInstaller3.png b/src/samples/Dtf/Documents/Reference/WindowsInstaller3.png
new file mode 100644
index 00000000..68acd7d8
--- /dev/null
+++ b/src/samples/Dtf/Documents/Reference/WindowsInstaller3.png
Binary files differ
diff --git a/src/samples/Dtf/Documents/Reference/dtfref.shfbproj b/src/samples/Dtf/Documents/Reference/dtfref.shfbproj
new file mode 100644
index 00000000..e45d2a07
--- /dev/null
+++ b/src/samples/Dtf/Documents/Reference/dtfref.shfbproj
@@ -0,0 +1,75 @@
+<?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>{27C20359-3910-423D-8058-6403935B98C6}</ProjectGuid>
+    <Name>Documentation</Name>
+    <!-- SHFB properties -->
+    <SHFBSchemaVersion>1.9.9.0</SHFBSchemaVersion>
+    <HtmlHelpName>DTFAPI</HtmlHelpName>
+    <MissingTags>Namespace, TypeParameter</MissingTags>
+    <VisibleItems>InheritedMembers, InheritedFrameworkMembers, Protected, ProtectedInternalAsProtected, SealedProtected</VisibleItems>
+    <RootNamespaceTitle>Deployment Tools Foundation Namespaces</RootNamespaceTitle>
+    <HelpTitle>Deployment Tools Foundation</HelpTitle>
+    <FeedbackEMailAddress>wix-users%40lists.sourceforge.net</FeedbackEMailAddress>
+    <FooterText>&amp;lt%3bscript src=&amp;quot%3bhelplink.js&amp;quot%3b&amp;gt%3b&amp;lt%3b/script&amp;gt%3b</FooterText>
+    <PresentationStyle>Prototype</PresentationStyle>
+    <NamingMethod>MemberName</NamingMethod>
+    <FrameworkVersion>.NET Framework 3.5</FrameworkVersion>
+  </PropertyGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.props" />
+  <PropertyGroup>
+    <NamespaceSummaries>
+      <NamespaceSummaryItem name="(global)" isDocumented="False" xmlns="" />
+      <NamespaceSummaryItem name="WixToolset.Dtf.Compression" isDocumented="True" xmlns="">Framework for archive packing and unpacking.</NamespaceSummaryItem>
+      <NamespaceSummaryItem name="WixToolset.Dtf.Compression.Cab" isDocumented="True" xmlns="">Implements cabinet archive packing and unpacking.</NamespaceSummaryItem>
+      <NamespaceSummaryItem name="WixToolset.Dtf.Compression.Zip" isDocumented="True" xmlns="">Implements zip archive packing and unpacking.</NamespaceSummaryItem>
+      <NamespaceSummaryItem name="WixToolset.Dtf.Resources" isDocumented="True" xmlns="">Classes for reading and writing resource data in executable files.</NamespaceSummaryItem>
+      <NamespaceSummaryItem name="WixToolset.Dtf.WindowsInstaller" isDocumented="True" xmlns="">Complete class library for the Windows Installer APIs.</NamespaceSummaryItem>
+      <NamespaceSummaryItem name="WixToolset.Dtf.WindowsInstaller.Linq" isDocumented="True" xmlns="">LINQ extensions for querying Windows Installer databases (experimental).</NamespaceSummaryItem>
+      <NamespaceSummaryItem name="WixToolset.Dtf.WindowsInstaller.Linq.Entities" isDocumented="False" xmlns="" />
+      <NamespaceSummaryItem name="WixToolset.Dtf.WindowsInstaller.Package" isDocumented="True" xmlns="">Extended classes for working with Windows Installer installation and patch packages.</NamespaceSummaryItem>
+    </NamespaceSummaries>
+    <DocumentationSources>
+      <DocumentationSource sourceFile="$(DirTargetWix)\WixToolset.Dtf.Compression.dll" xmlns="" />
+      <DocumentationSource sourceFile="$(DirTargetWix)\WixToolset.Dtf.Compression.xml" xmlns="" />
+      <DocumentationSource sourceFile="$(DirTargetWix)\WixToolset.Dtf.Compression.Cab.dll" xmlns="" />
+      <DocumentationSource sourceFile="$(DirTargetWix)\WixToolset.Dtf.Compression.Cab.xml" xmlns="" />
+      <DocumentationSource sourceFile="$(DirTargetWix)\WixToolset.Dtf.Compression.Zip.dll" xmlns="" />
+      <DocumentationSource sourceFile="$(DirTargetWix)\WixToolset.Dtf.Compression.Zip.xml" xmlns="" />
+      <DocumentationSource sourceFile="$(DirTargetWix)\WixToolset.Dtf.Resources.dll" xmlns="" />
+      <DocumentationSource sourceFile="$(DirTargetWix)\WixToolset.Dtf.Resources.xml" xmlns="" />
+      <DocumentationSource sourceFile="$(DirTargetWix)\WixToolset.Dtf.WindowsInstaller.dll" xmlns="" />
+      <DocumentationSource sourceFile="$(DirTargetWix)\WixToolset.Dtf.WindowsInstaller.xml" xmlns="" />
+      <DocumentationSource sourceFile="$(DirTargetWix)\WixToolset.Dtf.WindowsInstaller.Package.dll" xmlns="" />
+      <DocumentationSource sourceFile="$(DirTargetWix)\WixToolset.Dtf.WindowsInstaller.Package.xml" xmlns="" />
+      <DocumentationSource sourceFile="$(DirTargetWix)\WixToolset.Dtf.WindowsInstaller.Linq.dll" xmlns="" />
+      <DocumentationSource sourceFile="$(DirTargetWix)\WixToolset.Dtf.WindowsInstaller.Linq.xml" xmlns="" />
+    </DocumentationSources>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="helplink.js" />
+    <Content Include="Compression2.png" />
+    <Content Include="Compression1.png" />
+    <Content Include="Compression.htm" />
+    <Content Include="WindowsInstaller.htm" />
+    <Content Include="WindowsInstaller3.png" />
+    <Content Include="WindowsInstaller2.png" />
+    <Content Include="WindowsInstaller1.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <Reference Include="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
+</Project>
diff --git a/src/samples/Dtf/Documents/Reference/helplink.js b/src/samples/Dtf/Documents/Reference/helplink.js
new file mode 100644
index 00000000..a4989824
--- /dev/null
+++ b/src/samples/Dtf/Documents/Reference/helplink.js
@@ -0,0 +1,184 @@
+// 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.
+FixHelpLinks();
+function GetHelpCode(apiName)
+{
+    switch (apiName.toLowerCase())
+    {
+        case "msiadvertiseproduct":           return 370056;
+        case "msiadvertiseproductex":         return 370057;
+        case "msiapplymultiplepatches":       return 370059;
+        case "msiapplypatch":                 return 370060;
+        case "msibegintransaction":           return 736312;
+        case "msiclosehandle":                return 370067;
+        case "msicollectuserinfo":            return 370068;
+        case "msiconfigurefeature":           return 370069;
+        case "msiconfigureproduct":           return 370070;
+        case "msiconfigureproductex":         return 370071;
+        case "msicreaterecord":               return 370072;
+        case "msicreatetransformsummaryinfo": return 370073;
+        case "msidatabaseapplytransform":     return 370074;
+        case "msidatabasecommit":             return 370075;
+        case "msidatabaseexport":             return 370076;
+        case "msidatabasegeneratetransform":  return 370077;
+        case "msidatabasegetprimarykeys":     return 370078;
+        case "msidatabaseimport":             return 370079;
+        case "msidatabaseistablepersistent":  return 370080;
+        case "msidatabasemerge":              return 370081;
+        case "msidatabaseopenview":           return 370082;
+        case "msidetermineapplicablepatches": return 370084;
+        case "msideterminepatchsequence":     return 370085;
+        case "msidoaction":                   return 370090;
+        case "msienablelog":                  return 370091;
+        case "msiendtransaction":             return 736318;
+        case "msienumclients":                return 370094;
+        case "msienumcomponentcosts":         return 370095;
+        case "msienumcomponentqualifiers":    return 370096;
+        case "msienumcomponents":             return 370097;
+        case "msienumfeatures":               return 370098;
+        case "msienumpatches":                return 370099;
+        case "msienumpatchesex":              return 370100;
+        case "msienumproducts":               return 370101;
+        case "msienumproductsex":             return 370102;
+        case "msienumrelatedproducts":        return 370103;
+        case "msievaluatecondition":          return 370104;
+        case "msiextractpatchxmldata":        return 370105;
+        case "msiformatrecord":               return 370109;
+        case "msigetactivedatabase":          return 370110;
+        case "msigetcomponentpath":           return 370112;
+        case "msigetcomponentstate":          return 370113;
+        case "msigetdatabasestate":           return 370114;
+        case "msigetfeaturecost":             return 370115;
+        case "msigetfeatureinfo":             return 370116;
+        case "msigetfeaturestate":            return 370117;
+        case "msigetfeatureusage":            return 370118;
+        case "msigetfeaturevalidstates":      return 370119;
+        case "msigetfilehash":                return 370120;
+        case "msigetfileversion":             return 370122;
+        case "msigetlanguage":                return 370123;
+        case "msigetlasterrorrecord":         return 370124;
+        case "msigetmode":                    return 370125;
+        case "msigetpatchfilelist":           return 370126;
+        case "msigetpatchinfo":               return 370127;
+        case "msigetpatchinfoex":             return 370128;
+        case "msigetproductcode":             return 370129;
+        case "msigetproductinfo":             return 370130;
+        case "msigetproductinfoex":           return 370131;
+        case "msigetproductinfofromscript":   return 370132;
+        case "msigetproductproperty":         return 370133;
+        case "msigetproperty":                return 370134;
+        case "msigetshortcuttarget":          return 370299;
+        case "msigetsourcepath":              return 370300;
+        case "msigetsummaryinformation":      return 370301;
+        case "msigettargetpath":              return 370303;
+        case "msiinstallmissingcomponent":    return 370311;
+        case "msiinstallmissingfile":         return 370313;
+        case "msiinstallproduct":             return 370315;
+        case "msijointransaction":            return 736319;
+        case "msilocatecomponent":            return 370320;
+        case "msinotifysidchange":            return 370328;
+        case "msiopendatabase":               return 370338;
+        case "msiopenpackage":                return 370339;
+        case "msiopenpackageex":              return 370340;
+        case "msiopenproduct":                return 370341;
+        case "msiprocessadvertisescript":     return 370353;
+        case "msiprocessmessage":             return 370354;
+        case "msiprovideassembly":            return 370355;
+        case "msiprovidecomponent":           return 370356;
+        case "msiprovidequalifiedcomponent":  return 370357;
+        case "msiprovidequalifiedcomponentex":return 370358;
+        case "msiquerycomponnetstate":        return 370360;
+        case "msiqueryfeaturestate":          return 370361;
+        case "msiqueryfeaturestateex":        return 370362;
+        case "msiqueryproductstate":          return 370363;
+        case "msirecordcleardata":            return 370364;
+        case "msirecorddatasize":             return 370365;
+        case "msirecordgetfieldcount":        return 370366;
+        case "msirecordgetinteger":           return 370367;
+        case "msirecordgetstring":            return 370368;
+        case "msirecordisnull":               return 370369;
+        case "msirecordreadstream":           return 370370;
+        case "msirecordsetinteger":           return 370371;
+        case "msirecordsetstream":            return 370372;
+        case "msirecordsetstring":            return 370373;
+        case "msireinstallfeature":           return 370374;
+        case "msireinstallproduct":           return 370375;
+        case "msiremovepatches":              return 370376;
+        case "msisequence":                   return 370382;
+        case "msisetcomponentstate":          return 370383;
+        case "msisetexternalui":              return 370384;
+        case "msisetexternaluirecord":        return 370385;
+        case "msisetfeatureattributes":       return 370386;
+        case "msisetfeaturestate":            return 370387;
+        case "msisetinstalllevel":            return 370388;
+        case "msisetinternalui":              return 370389;
+        case "msisetmode":                    return 370390;
+        case "msisetproperty":                return 370391;
+        case "msisettargetpath":              return 370392;
+        case "msisourcelistaddmediadisk":     return 370394;
+        case "msisourcelistaddsource":        return 370395;
+        case "msisourcelistaddsourceex":      return 370396;
+        case "msisourcelistclearall":         return 370397;
+        case "msisourcelistclearallex":       return 370398;
+        case "msisourcelistclearmediadisk":   return 370399;
+        case "msisourcelistclearsource":      return 370401;
+        case "msisourcelistenummediadisks":   return 370402;
+        case "msisourcelistenumsources":      return 370403;
+        case "msisourcelistforceresolution":  return 370404;
+        case "msisourcelistforceresolutionex":return 370405;
+        case "msisourcelistgetinfo":          return 370406;
+        case "msisourcelistsetinfo":          return 370407;
+        case "msisummaryinfogetproperty":     return 370409;
+        case "msisummaryinfopersist":         return 370490;
+        case "msisummaryinfosetproperty":     return 370491;
+        case "msiusefeature":                 return 370502;
+        case "msiusefeatureex":               return 370503;
+        case "msiverifydiskspace":            return 370506;
+        case "msiverifypackage":              return 370508;
+        case "msiviewexecute":                return 370513;
+        case "msiviewfetch":                  return 370514;
+        case "msiviewgetcolumninfo":          return 370516;
+        case "msiviewgeterror":               return 370518;
+        case "msiviewmodify":                 return 370519;
+        case "productid":                     return 370855;
+        default:
+            return 0;
+    }
+}
+function GetHelpLink(apiName)
+{
+    var helpCode = GetHelpCode(apiName);
+    if (helpCode != 0)
+    {
+        // Found a direct link!
+        var prefix = (helpCode < 500000 ? "aa" : "bb");
+        return "http://msdn2.microsoft.com/en-us/library/" + prefix + helpCode + ".aspx";
+    }
+    else
+    {
+        // This link works, but goes through an annoying 5-sec redirect page.
+        return "http://msdn.microsoft.com/library/en-us/msi/setup/" + apiName.toLowerCase() + ".asp";
+    }
+}
+// Change any MSI API help links from indirect MSDN references to direct references.
+function FixHelpLinks()
+{
+    var msiLinkRegex = /msdn\.microsoft\.com\/library\/en-us\/msi\/setup\/([a-z]+)\.asp/i;
+    var links = document.body.all.tags("a");
+    var i;
+    for (i = 0; i < links.length; i++)
+    {
+        var linkElem = links(i);
+        var match = msiLinkRegex.exec(linkElem.href);
+        if (match)
+        {
+            var apiName = match[1];
+            linkElem.href = GetHelpLink(apiName);
+            linkElem.target = "_blank";
+            linkElem.title = "MSDN Library";
+        }
+    }
+}
diff --git a/src/samples/Dtf/EmbeddedUI/AssemblyInfo.cs b/src/samples/Dtf/EmbeddedUI/AssemblyInfo.cs
new file mode 100644
index 00000000..7a2fa039
--- /dev/null
+++ b/src/samples/Dtf/EmbeddedUI/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.Reflection;
+[assembly: AssemblyDescription("Sample managed embedded external UI")]
diff --git a/src/samples/Dtf/EmbeddedUI/EmbeddedUI.csproj b/src/samples/Dtf/EmbeddedUI/EmbeddedUI.csproj
new file mode 100644
index 00000000..e4c52a26
--- /dev/null
+++ b/src/samples/Dtf/EmbeddedUI/EmbeddedUI.csproj
@@ -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. -->
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{864B8C50-7895-4485-AC89-900D86FD8C0D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>WixToolset.Dtf.Samples.EmbeddedUI</RootNamespace>
+    <AssemblyName>WixToolset.Dtf.Samples.EmbeddedUI</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="InstallProgressCounter.cs" />
+    <Compile Include="SampleEmbeddedUI.cs" />
+    <Compile Include="SetupWizard.xaml.cs">
+      <DependentUpon>SetupWizard.xaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="SetupWizard.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="PresentationCore">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="PresentationFramework">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj">
+      <Project>{24121677-0ed0-41b5-833f-1b9a18e87bf4}</Project>
+      <Name>WixToolset.Dtf.WindowsInstaller</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+<!--
+  <PropertyGroup>
+    <PostBuildEvent>"$(TargetDir)..\x86\MakeSfxCA.exe" "$(TargetPath)" "$(TargetDir)SfxCA.dll" "$(IntermediateOutputPath)$(TargetFileName)" "$(TargetDir)WixToolset.Dtf.WindowsInstaller.dll"</PostBuildEvent>
+  </PropertyGroup>
+-->
+  
+</Project>
diff --git a/src/samples/Dtf/EmbeddedUI/InstallProgressCounter.cs b/src/samples/Dtf/EmbeddedUI/InstallProgressCounter.cs
new file mode 100644
index 00000000..df77e106
--- /dev/null
+++ b/src/samples/Dtf/EmbeddedUI/InstallProgressCounter.cs
@@ -0,0 +1,176 @@
+// 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.Samples.EmbeddedUI
+{
+    using System;
+    using WixToolset.Dtf.WindowsInstaller;
+    /// <summary>
+    /// Tracks MSI progress messages and converts them to usable progress.
+    /// </summary>
+    public class InstallProgressCounter
+    {
+        private int total;
+        private int completed;
+        private int step;
+        private bool moveForward;
+        private bool enableActionData;
+        private int progressPhase;
+        private double scriptPhaseWeight;
+        public InstallProgressCounter() : this(0.3)
+        {
+        }
+        public InstallProgressCounter(double scriptPhaseWeight)
+        {
+            if (!(0 <= scriptPhaseWeight && scriptPhaseWeight <= 1))
+            {
+                throw new ArgumentOutOfRangeException("scriptPhaseWeight");
+            }
+            this.scriptPhaseWeight = scriptPhaseWeight;
+        }
+        /// <summary>
+        /// Gets a number between 0 and 1 that indicates the overall installation progress.
+        /// </summary>
+        public double Progress { get; private set; }
+        public void ProcessMessage(InstallMessage messageType, Record messageRecord)
+        {
+            // This MSI progress-handling code was mostly borrowed from burn and translated from C++ to C#.
+            switch (messageType)
+            {
+                case InstallMessage.ActionStart:
+                    if (this.enableActionData)
+                    {
+                        this.enableActionData = false;
+                    }
+                    break;
+                case InstallMessage.ActionData:
+                    if (this.enableActionData)
+                    {
+                        if (this.moveForward)
+                        {
+                            this.completed += this.step;
+                        }
+                        else
+                        {
+                            this.completed -= this.step;
+                        }
+                        this.UpdateProgress();
+                    }
+                    break;
+                case InstallMessage.Progress:
+                    this.ProcessProgressMessage(messageRecord);
+                    break;
+            }
+        }
+        private void ProcessProgressMessage(Record progressRecord)
+        {
+            // This MSI progress-handling code was mostly borrowed from burn and translated from C++ to C#.
+            if (progressRecord == null || progressRecord.FieldCount == 0)
+            {
+                return;
+            }
+            int fieldCount = progressRecord.FieldCount;
+            int progressType = progressRecord.GetInteger(1);
+            string progressTypeString = String.Empty;
+            switch (progressType)
+            {
+                case 0: // Master progress reset
+                    if (fieldCount < 4)
+                    {
+                        return;
+                    }
+                    this.progressPhase++;
+                    this.total = progressRecord.GetInteger(2);
+                    if (this.progressPhase == 1)
+                    {
+                        // HACK!!! this is a hack courtesy of the Windows Installer team. It seems the script planning phase
+                        // is always off by "about 50".  So we'll toss an extra 50 ticks on so that the standard progress
+                        // doesn't go over 100%.  If there are any custom actions, they may blow the total so we'll call this
+                        // "close" and deal with the rest.
+                        this.total += 50;
+                    }
+                    this.moveForward = (progressRecord.GetInteger(3) == 0);
+                    this.completed = (this.moveForward ? 0 : this.total); // if forward start at 0, if backwards start at max
+                    this.enableActionData = false;
+                    this.UpdateProgress();
+                    break;
+                case 1: // Action info
+                    if (fieldCount < 3)
+                    {
+                        return;
+                    }
+                    if (progressRecord.GetInteger(3) == 0)
+                    {
+                        this.enableActionData = false;
+                    }
+                    else
+                    {
+                        this.enableActionData = true;
+                        this.step = progressRecord.GetInteger(2);
+                    }
+                    break;
+                case 2: // Progress report
+                    if (fieldCount < 2 || this.total == 0 || this.progressPhase == 0)
+                    {
+                        return;
+                    }
+                    if (this.moveForward)
+                    {
+                        this.completed += progressRecord.GetInteger(2);
+                    }
+                    else
+                    {
+                        this.completed -= progressRecord.GetInteger(2);
+                    }
+                    this.UpdateProgress();
+                    break;
+                case 3: // Progress total addition
+                    this.total += progressRecord.GetInteger(2);
+                    break;
+            }
+        }
+        private void UpdateProgress()
+        {
+            if (this.progressPhase < 1 || this.total == 0)
+            {
+                this.Progress = 0;
+            }
+            else if (this.progressPhase == 1)
+            {
+                this.Progress = this.scriptPhaseWeight * Math.Min(this.completed, this.total) / this.total;
+            }
+            else if (this.progressPhase == 2)
+            {
+                this.Progress = this.scriptPhaseWeight +
+                    (1 - this.scriptPhaseWeight) * Math.Min(this.completed, this.total) / this.total;
+            }
+            else
+            {
+                this.Progress = 1;
+            }
+        }
+    }
+}
diff --git a/src/samples/Dtf/EmbeddedUI/SampleEmbeddedUI.cs b/src/samples/Dtf/EmbeddedUI/SampleEmbeddedUI.cs
new file mode 100644
index 00000000..9b26bef5
--- /dev/null
+++ b/src/samples/Dtf/EmbeddedUI/SampleEmbeddedUI.cs
@@ -0,0 +1,132 @@
+// 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.Samples.EmbeddedUI
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Configuration;
+    using System.Threading;
+    using System.Windows;
+    using System.Windows.Threading;
+    using WixToolset.Dtf.WindowsInstaller;
+    using Application = System.Windows.Application;
+    public class SampleEmbeddedUI : IEmbeddedUI
+    {
+        private Thread appThread;
+        private Application app;
+        private SetupWizard setupWizard;
+        private ManualResetEvent installStartEvent;
+        private ManualResetEvent installExitEvent;
+        /// <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>
+        public bool Initialize(Session session, string resourcePath, ref InstallUIOptions internalUILevel)
+        {
+            if (session != null)
+            {
+                if ((internalUILevel & InstallUIOptions.Full) != InstallUIOptions.Full)
+                {
+                    // Don't show custom UI when the UI level is set to basic.
+                    return false;
+                    // An embedded UI could display an alternate dialog sequence for reduced or
+                    // basic modes, but it's not implemented here. We'll just fall back to the
+                    // built-in MSI basic UI.
+                }
+                if (String.Equals(session["REMOVE"], "All", StringComparison.OrdinalIgnoreCase))
+                {
+                    // Don't show custom UI when uninstalling.
+                    return false;
+                    // An embedded UI could display an uninstall wizard, it's just not imlemented here.
+                }
+            }
+            // Start the setup wizard on a separate thread.
+            this.installStartEvent = new ManualResetEvent(false);
+            this.installExitEvent = new ManualResetEvent(false);
+            this.appThread = new Thread(this.Run);
+            this.appThread.SetApartmentState(ApartmentState.STA);
+            this.appThread.Start();
+            // Wait for the setup wizard to either kickoff the install or prematurely exit.
+            int waitResult = WaitHandle.WaitAny(new WaitHandle[] { this.installStartEvent, this.installExitEvent });
+            if (waitResult == 1)
+            {
+                // The setup wizard set the exit event instead of the start event. Cancel the installation.
+                throw new InstallCanceledException();
+            }
+            else
+            {
+                // Start the installation with a silenced internal UI.
+                // This "embedded external UI" will handle message types except for source resolution.
+                internalUILevel = InstallUIOptions.NoChange | InstallUIOptions.SourceResolutionOnly;
+                return true;
+            }
+        }
+        /// <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 box buttons.</param>
+        /// <param name="icon">Message box icon.</param>
+        /// <param name="defaultButton">Message box default button.</param>
+        /// <returns>Result of processing the message.</returns>
+        public MessageResult ProcessMessage(InstallMessage messageType, Record messageRecord,
+            MessageButtons buttons, MessageIcon icon, MessageDefaultButton defaultButton)
+        {
+            // Synchronously send the message to the setup wizard window on its thread.
+            object result = this.setupWizard.Dispatcher.Invoke(DispatcherPriority.Send,
+                new Func<MessageResult>(delegate()
+                {
+                    return this.setupWizard.ProcessMessage(messageType, messageRecord, buttons, icon, defaultButton);
+                }));
+            return (MessageResult) result;
+        }
+        /// <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.
+        /// </remarks>
+        public void Shutdown()
+        {
+            // Wait for the user to exit the setup wizard.
+            this.setupWizard.Dispatcher.BeginInvoke(DispatcherPriority.Normal,
+                new Action(delegate()
+                {
+                    this.setupWizard.EnableExit();
+                }));
+            this.appThread.Join();
+        }
+        /// <summary>
+        /// Creates the setup wizard and runs the application thread.
+        /// </summary>
+        private void Run()
+        {
+            this.app = new Application();
+            this.setupWizard = new SetupWizard(this.installStartEvent);
+            this.setupWizard.InitializeComponent();
+            this.app.Run(this.setupWizard);
+            this.installExitEvent.Set();
+        }
+    }
+}
diff --git a/src/samples/Dtf/EmbeddedUI/SetupWizard.xaml b/src/samples/Dtf/EmbeddedUI/SetupWizard.xaml
new file mode 100644
index 00000000..a43059e8
--- /dev/null
+++ b/src/samples/Dtf/EmbeddedUI/SetupWizard.xaml
@@ -0,0 +1,17 @@
+<!-- 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. -->
+<Window x:Class="WixToolset.Dtf.Samples.EmbeddedUI.SetupWizard"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="Sample Embedded UI" Height="400" Width="540" Visibility="Visible">
+        <Grid>
+                <TextBox Margin="8,8,8,63" Name="messagesTextBox" IsReadOnly="True" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Auto" FontFamily="Lucida Console" FontSize="10" />
+                <Button Height="23" HorizontalAlignment="Right" Name="installButton" VerticalAlignment="Bottom" Width="75" Click="installButton_Click" Margin="0,0,91,8">Install</Button>
+                <Button Height="23" HorizontalAlignment="Right" Name="exitButton" VerticalAlignment="Bottom" Width="75" Visibility="Hidden" Click="exitButton_Click" Margin="0,0,8,8">Exit</Button>
+                <Button Height="23" Margin="0,0,8,8" Name="cancelButton" VerticalAlignment="Bottom" Width="75" HorizontalAlignment="Right" Click="cancelButton_Click">Cancel</Button>
+                <ProgressBar Height="16" Margin="8,0,8,39" Name="progressBar" VerticalAlignment="Bottom" Visibility="Hidden" IsIndeterminate="False" />
+                <Label Height="28" HorizontalAlignment="Left" Margin="8,0,0,4.48" Name="progressLabel" VerticalAlignment="Bottom" Width="120" Visibility="Hidden">0%</Label>
+        </Grid>
+</Window>
diff --git a/src/samples/Dtf/EmbeddedUI/SetupWizard.xaml.cs b/src/samples/Dtf/EmbeddedUI/SetupWizard.xaml.cs
new file mode 100644
index 00000000..b25b8a9e
--- /dev/null
+++ b/src/samples/Dtf/EmbeddedUI/SetupWizard.xaml.cs
@@ -0,0 +1,111 @@
+// 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.Samples.EmbeddedUI
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Text;
+    using System.Threading;
+    using System.Windows;
+    using System.Windows.Controls;
+    using System.Windows.Data;
+    using System.Windows.Documents;
+    using System.Windows.Input;
+    using System.Windows.Media;
+    using System.Windows.Media.Imaging;
+    using System.Windows.Navigation;
+    using System.Windows.Shapes;
+    using WixToolset.Dtf.WindowsInstaller;
+    /// <summary>
+    /// Interaction logic for SetupWizard.xaml
+    /// </summary>
+    public partial class SetupWizard : Window
+    {
+        private ManualResetEvent installStartEvent;
+        private InstallProgressCounter progressCounter;
+        private bool canceled;
+        public SetupWizard(ManualResetEvent installStartEvent)
+        {
+            this.installStartEvent = installStartEvent;
+            this.progressCounter = new InstallProgressCounter(0.5);
+        }
+        public MessageResult ProcessMessage(InstallMessage messageType, Record messageRecord,
+            MessageButtons buttons, MessageIcon icon, MessageDefaultButton defaultButton)
+        {
+            try
+            {
+                this.progressCounter.ProcessMessage(messageType, messageRecord);
+                this.progressBar.Value = this.progressBar.Minimum +
+                    this.progressCounter.Progress * (this.progressBar.Maximum - this.progressBar.Minimum);
+                this.progressLabel.Content = "" + (int) Math.Round(100 * this.progressCounter.Progress) + "%";
+                switch (messageType)
+                {
+                    case InstallMessage.Error:
+                    case InstallMessage.Warning:
+                    case InstallMessage.Info:
+                        string message = String.Format("{0}: {1}", messageType, messageRecord);
+                        this.LogMessage(message);
+                        break;
+                }
+                if (this.canceled)
+                {
+                    this.canceled = false;
+                    return MessageResult.Cancel;
+                }
+            }
+            catch (Exception ex)
+            {
+                this.LogMessage(ex.ToString());
+                this.LogMessage(ex.StackTrace);
+            }
+            return MessageResult.OK;
+        }
+        private void LogMessage(string message)
+        {
+            this.messagesTextBox.Text += Environment.NewLine + message;
+            this.messagesTextBox.ScrollToEnd();
+        }
+        internal void EnableExit()
+        {
+            this.progressBar.Visibility = Visibility.Hidden;
+            this.progressLabel.Visibility = Visibility.Hidden;
+            this.cancelButton.Visibility = Visibility.Hidden;
+            this.exitButton.Visibility = Visibility.Visible;
+        }
+        private void installButton_Click(object sender, RoutedEventArgs e)
+        {
+            this.installButton.Visibility = Visibility.Hidden;
+            this.progressBar.Visibility = Visibility.Visible;
+            this.progressLabel.Visibility = Visibility.Visible;
+            this.installStartEvent.Set();
+        }
+        private void exitButton_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+        private void cancelButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (this.installButton.Visibility == Visibility.Visible)
+            {
+                this.Close();
+            }
+            else
+            {
+                this.canceled = true;
+                this.cancelButton.IsEnabled = false;
+            }
+        }
+    }
+}
diff --git a/src/samples/Dtf/Inventory/Columns.resx b/src/samples/Dtf/Inventory/Columns.resx
new file mode 100644
index 00000000..cfeb11e3
--- /dev/null
+++ b/src/samples/Dtf/Inventory/Columns.resx
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ProductsProductName" xml:space="preserve">
+    <value>Product Name,250</value>
+  </data>
+  <data name="ProductsProductCode" xml:space="preserve">
+    <value>Product Code,250</value>
+  </data>
+  <data name="ProductPropertiesProperty" xml:space="preserve">
+    <value>Property,100</value>
+  </data>
+  <data name="ProductPropertiesValue" xml:space="preserve">
+    <value>Value,300</value>
+  </data>
+  <data name="ProductFeaturesFeatureTitle" xml:space="preserve">
+    <value>Feature Title,230</value>
+  </data>
+  <data name="ProductFeaturesFeatureName" xml:space="preserve">
+    <value>Feature,200</value>
+  </data>
+  <data name="ProductFeaturesInstallState" xml:space="preserve">
+    <value>Install State,70</value>
+  </data>
+  <data name="ProductFeatureComponentsComponentName" xml:space="preserve">
+    <value>Component,250</value>
+  </data>
+  <data name="ProductFeatureComponentsComponentID" xml:space="preserve">
+    <value>Component ID,250</value>
+  </data>
+  <data name="ProductComponentsComponentName" xml:space="preserve">
+    <value>Component,180</value>
+  </data>
+  <data name="ProductComponentsComponentID" xml:space="preserve">
+    <value>Component ID,250</value>
+  </data>
+  <data name="ProductComponentsInstallState" xml:space="preserve">
+    <value>Install State,70</value>
+  </data>
+  <data name="ComponentProductsProductName" xml:space="preserve">
+    <value>Product Name,250</value>
+  </data>
+  <data name="ComponentProductsProductCode" xml:space="preserve">
+    <value>Product Code,250</value>
+  </data>
+  <data name="ComponentProductsComponentPath" xml:space="preserve">
+    <value>Component Path,300</value>
+  </data>
+  <data name="ProductComponentItemsIsKey" xml:space="preserve">
+    <value>Key,35</value>
+  </data>
+  <data name="ProductComponentItemsKey" xml:space="preserve">
+    <value>Name,250</value>
+  </data>
+  <data name="ProductComponentItemsPath" xml:space="preserve">
+    <value>Install Path,350</value>
+  </data>
+  <data name="ProductComponentItemsExists" xml:space="preserve">
+    <value>Exists,40</value>
+  </data>
+  <data name="ProductComponentItemsDbVersion" xml:space="preserve">
+    <value>Version in Database,100</value>
+  </data>
+  <data name="ProductComponentItemsInstalledVersion" xml:space="preserve">
+    <value>Version Installed,100</value>
+  </data>
+  <data name="ProductComponentItemsInstalledMatch" xml:space="preserve">
+    <value>Match,40</value>
+  </data>
+  <data name="ProductFilesIsKey" xml:space="preserve">
+    <value>Key,35</value>
+  </data>
+  <data name="ProductFilesKey" xml:space="preserve">
+    <value>Name,250</value>
+  </data>
+  <data name="ProductFilesPath" xml:space="preserve">
+    <value>Install Path,350</value>
+  </data>
+  <data name="ProductFilesExists" xml:space="preserve">
+    <value>Exists,40</value>
+  </data>
+  <data name="ProductFilesDbVersion" xml:space="preserve">
+    <value>Version in Database,120</value>
+  </data>
+  <data name="ProductFilesInstalledVersion" xml:space="preserve">
+    <value>Version Installed,120</value>
+  </data>
+  <data name="ProductFilesInstalledMatch" xml:space="preserve">
+    <value>Match,40</value>
+  </data>
+  <data name="ProductFilesComponentID" xml:space="preserve">
+    <value>Component ID,250</value>
+  </data>
+  <data name="ProductRegistryIsKey" xml:space="preserve">
+    <value>Key,35</value>
+  </data>
+  <data name="ProductRegistryKey" xml:space="preserve">
+    <value>Name,250</value>
+  </data>
+  <data name="ProductRegistryPath" xml:space="preserve">
+    <value>Install Path,350</value>
+  </data>
+  <data name="ProductRegistryExists" xml:space="preserve">
+    <value>Exists,40</value>
+  </data>
+  <data name="ProductRegistryDbVersion" xml:space="preserve">
+    <value>Value in Database,120</value>
+  </data>
+  <data name="ProductRegistryInstalledVersion" xml:space="preserve">
+    <value>Value Installed,120</value>
+  </data>
+  <data name="ProductRegistryInstalledMatch" xml:space="preserve">
+    <value>Match,40</value>
+  </data>
+  <data name="ProductRegistryComponentID" xml:space="preserve">
+    <value>Component ID,250</value>
+  </data>
+  <data name="PatchesPatchCode" xml:space="preserve">
+    <value>Patch Code,250</value>
+  </data>
+  <data name="ProductPatchesPatchCode" xml:space="preserve">
+    <value>Patch Code,250</value>
+  </data>
+  <data name="PatchPropertiesProperty" xml:space="preserve">
+    <value>Property,130</value>
+  </data>
+  <data name="PatchPropertiesValue" xml:space="preserve">
+    <value>Value,360</value>
+  </data>
+  <data name="PatchTargetsProductName" xml:space="preserve">
+    <value>Product Name,360</value>
+  </data>
+  <data name="PatchTargetsProductCode" xml:space="preserve">
+    <value>Product Code,360</value>
+  </data>
+</root>
+\ No newline at end of file
diff --git a/src/samples/Dtf/Inventory/Features.cs b/src/samples/Dtf/Inventory/Features.cs
new file mode 100644
index 00000000..c114da86
--- /dev/null
+++ b/src/samples/Dtf/Inventory/Features.cs
@@ -0,0 +1,107 @@
+// 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.Data;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Windows.Forms;
+using WixToolset.Dtf.WindowsInstaller;
+namespace WixToolset.Dtf.Samples.Inventory
+{
+        /// <summary>
+        /// Provides inventory data about features of products installed on the system.
+        /// </summary>
+        public class FeaturesInventory : IInventoryDataProvider
+        {
+        private static object syncRoot = new object();
+                public FeaturesInventory()
+                {
+                }
+                public string Description
+                {
+                        get { return "Features of installed products"; }
+                }
+                public string[] GetNodes(InventoryDataLoadStatusCallback statusCallback)
+                {
+            statusCallback(0, @"Products\...\Features");
+            ArrayList nodes = new ArrayList();
+                        foreach (ProductInstallation product in ProductInstallation.AllProducts)
+                        {
+                nodes.Add(String.Format(@"Products\{0}\Features", MsiUtils.GetProductName(product.ProductCode)));
+                        }
+                        statusCallback(nodes.Count, String.Empty);
+                        return (string[]) nodes.ToArray(typeof(string));
+                }
+                public bool IsNodeSearchable(string searchRoot, string searchNode)
+                {
+                        return true;
+                }
+                public DataView GetData(string nodePath)
+                {
+                        string[] path = nodePath.Split('\\');
+                        if(path.Length == 3 && path[0] == "Products" && path[2] == "Features")
+                        {
+                                return GetProductFeaturesData(MsiUtils.GetProductCode(path[1]));
+                        }
+                        return null;
+                }
+                public DataView GetProductFeaturesData(string productCode)
+                {
+                        DataTable table = new DataTable("ProductFeatures");
+                        table.Locale = CultureInfo.InvariantCulture;
+                        table.Columns.Add("ProductFeaturesFeatureTitle", typeof(string));
+                        table.Columns.Add("ProductFeaturesFeatureName", typeof(string));
+                        table.Columns.Add("ProductFeaturesInstallState", typeof(string));
+                        try
+                        {
+                                IntPtr hWnd = IntPtr.Zero;
+                Installer.SetInternalUI(InstallUIOptions.Silent, ref hWnd);
+                                lock(syncRoot)  // Only one Installer session can be active at a time
+                                {
+                                        using(Session session = Installer.OpenProduct(productCode))
+                                        {
+                                                session.DoAction("CostInitialize");
+                                                session.DoAction("FileCost");
+                                                session.DoAction("CostFinalize");
+                                                IList<string> featuresAndTitles = session.Database.ExecuteStringQuery(
+                                                        "SELECT `Title`, `Feature` FROM `Feature`");
+                                                for(int i = 0; i < featuresAndTitles.Count; i += 2)
+                                                {
+                            InstallState featureState = session.Features[featuresAndTitles[i + 1]].CurrentState;
+                                                        table.Rows.Add(new object[] { featuresAndTitles[i], featuresAndTitles[i+1],
+                                                                                                                        (featureState == InstallState.Advertised ? "Advertised" : featureState.ToString()) });
+                                                }
+                                        }
+                                }
+                                return new DataView(table, "", "ProductFeaturesFeatureTitle ASC", DataViewRowState.CurrentRows);
+                        }
+                        catch(InstallerException) { }
+                        catch(IOException) { }
+                        return null;
+                }
+                public string GetLink(string nodePath, DataRow row)
+                {
+                        string[] path = nodePath.Split('\\');
+                        if(path.Length == 3 && path[0] == "Products" && path[2] == "Features")
+                        {
+                                return String.Format(@"Products\{0}\Features\{1}", path[1], row["ProductFeaturesFeatureName"]);
+                        }
+                        return null;
+                }
+        }
+}
diff --git a/src/samples/Dtf/Inventory/IInventoryDataProvider.cs b/src/samples/Dtf/Inventory/IInventoryDataProvider.cs
new file mode 100644
index 00000000..23f2c187
--- /dev/null
+++ b/src/samples/Dtf/Inventory/IInventoryDataProvider.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.
+using System;
+using System.Data;
+namespace WixToolset.Dtf.Samples.Inventory
+{
+        /// <summary>
+        /// Reports the total number of items loaded so far by <see cref="IInventoryDataProvider.GetNodes"/>.
+        /// </summary>
+        public delegate void InventoryDataLoadStatusCallback(int itemsLoaded, string currentNode);
+        /// <summary>
+        /// Inventory data providers implement this interface to provide a particular type of data.
+        /// Implementors must provide a parameterless constructor.
+        /// </summary>
+        public interface IInventoryDataProvider
+        {
+                /// <summary>
+                /// Gets a description of the data provided.  This description allows
+                /// the user to choose what type of data to gather.
+                /// </summary>
+                string Description { get; }
+                /// <summary>
+                /// Gets the paths of all nodes for which this object provides data.
+                /// </summary>
+                /// <param name="statusCallback">Callback for reporting status.
+                /// The callback should not necessarily be invoked for every individual
+                /// node loaded, rather only every significant chunk.</param>
+                /// <returns>An array of node paths. The parts of the node paths
+                /// are delimited by backslashes (\).</returns>
+                string[] GetNodes(InventoryDataLoadStatusCallback statusCallback);
+                /// <summary>
+                /// When related nodes of a tree consist of duplicate data, it's
+                /// inefficient to search them all. This method indicates which
+                /// nodes should be search and which should be ignored.
+                /// </summary>
+                /// <param name="searchRoot">Root node of the subtree-search.</param>
+                /// <param name="searchNode">Node which may or may not be searched.</param>
+                /// <returns>True if the node should be searched, false otherwise.</returns>
+                bool IsNodeSearchable(string searchRoot, string searchNode);
+                /// <summary>
+                /// Gets the data for a particular node.
+                /// </summary>
+                /// <param name="nodePath">Path of the node for which data is requested.
+                /// This is one of the paths returned by <see cref="GetNodes"/>.</param>
+                /// <returns>DataView of a table filled with data, or null if data is
+                /// not available.</returns>
+                DataView GetData(string nodePath);
+                /// <summary>
+                /// Gets the path of another node which provides more details about
+                /// a particular data row.
+                /// </summary>
+                /// <param name="nodePath">Path of the node containing the data
+                /// row being queried.</param>
+                /// <param name="row">Data row being queried.</param>
+                /// <returns>Path to another node.  This is not necessarily
+                /// one of the nodes returned by <see cref="GetNodes"/>.  If the
+                /// node path is unknown, it will be ignored.  This method may
+                /// return null if there is no detail node for the row.</returns>
+                string GetLink(string nodePath, DataRow row);
+        }
+}
diff --git a/src/samples/Dtf/Inventory/Inventory.cs b/src/samples/Dtf/Inventory/Inventory.cs
new file mode 100644
index 00000000..02793be8
--- /dev/null
+++ b/src/samples/Dtf/Inventory/Inventory.cs
@@ -0,0 +1,1231 @@
+// 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.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Windows.Forms;
+using System.Globalization;
+using System.Reflection;
+using System.Resources;
+using System.Threading;
+using System.Security.Permissions;
+using System.Data;
+[assembly: AssemblyDescription("Shows a hierarchical, relational, searchable " +
+        " view of all of the product, feature, component, file, and patch data managed " +
+        "by MSI, for all products installed on the system.")]
+[assembly: SecurityPermission(SecurityAction.RequestMinimum, UnmanagedCode=true)]
+namespace WixToolset.Dtf.Samples.Inventory
+{
+        public class Inventory : System.Windows.Forms.Form
+        {
+                [STAThread]
+        public static void Main()
+        {
+            if (WixToolset.Dtf.WindowsInstaller.Installer.Version < new Version(3, 0))
+            {
+                MessageBox.Show("This application requires Windows Installer version 3.0 or later.",
+                    "Inventory", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            Application.Run(new Inventory());
+        }
+                private IInventoryDataProvider[] dataProviders;
+                private Hashtable dataProviderMap;
+                private Hashtable data;
+                private ArrayList tablesLoading;
+                private bool searching;
+                private bool stopSearch;
+                private bool navigating;
+                private string continueSearchRoot;
+                private string continueSearchPath;
+                private DataGridCell continueSearchCell;
+                private DataGridCell continueSearchEndCell;
+                private bool mouseOverGridLink = false;
+                private Stack historyBack;
+                private Stack historyForward;
+                private Stack cellHistoryBack;
+                private Stack cellHistoryForward;
+                private static readonly DataGridCell anyCell = new DataGridCell(-1,-1);
+                private static readonly DataGridCell zeroCell = new DataGridCell(0,0);
+        private static object syncRoot = new object();
+                private System.Windows.Forms.DataGrid dataGrid;
+                private System.Windows.Forms.TreeView treeView;
+                private System.Windows.Forms.Panel toolPanel;
+                private System.Windows.Forms.Splitter splitter;
+                private System.Windows.Forms.Panel dataPanel;
+                private System.Windows.Forms.Button backButton;
+                private System.Windows.Forms.Button forwardButton;
+                private System.Windows.Forms.Button findButton;
+                private System.Windows.Forms.TextBox findTextBox;
+                private System.Windows.Forms.Button refreshButton;
+                private System.Windows.Forms.Button findStopButton;
+                private System.Windows.Forms.CheckBox searchTreeCheckBox;
+                private System.Windows.Forms.ToolTip gridLinkTip;
+                private System.ComponentModel.IContainer components;
+                public Inventory()
+                {
+                        InitializeComponent();
+                        this.gridLinkTip.InitialDelay = 0;
+                        this.gridLinkTip.ReshowDelay = 0;
+                        this.dataProviderMap = new Hashtable();
+                        this.data = new Hashtable();
+                        this.tablesLoading = new ArrayList();
+                        this.historyBack = new Stack();
+                        this.historyForward = new Stack();
+                        this.cellHistoryBack = new Stack();
+                        this.cellHistoryForward = new Stack();
+                }
+                protected override void Dispose(bool disposing)
+                {
+                        if(disposing)
+                        {
+                                if(components != null) 
+                                {
+                                        components.Dispose();
+                                }
+                        }
+                        base.Dispose(disposing);
+                }
+                #region Windows Form Designer generated code
+                /// <summary>
+                /// Required method for Designer support - do not modify
+                /// the contents of this method with the code editor.
+                /// </summary>
+                private void InitializeComponent()
+                {
+                        this.components = new System.ComponentModel.Container();
+                        this.dataGrid = new System.Windows.Forms.DataGrid();
+                        this.treeView = new System.Windows.Forms.TreeView();
+                        this.toolPanel = new System.Windows.Forms.Panel();
+                        this.findStopButton = new System.Windows.Forms.Button();
+                        this.findButton = new System.Windows.Forms.Button();
+                        this.searchTreeCheckBox = new System.Windows.Forms.CheckBox();
+                        this.findTextBox = new System.Windows.Forms.TextBox();
+                        this.refreshButton = new System.Windows.Forms.Button();
+                        this.forwardButton = new System.Windows.Forms.Button();
+                        this.backButton = new System.Windows.Forms.Button();
+                        this.dataPanel = new System.Windows.Forms.Panel();
+                        this.splitter = new System.Windows.Forms.Splitter();
+                        this.gridLinkTip = new System.Windows.Forms.ToolTip(this.components);
+                        ((System.ComponentModel.ISupportInitialize)(this.dataGrid)).BeginInit();
+                        this.toolPanel.SuspendLayout();
+                        this.dataPanel.SuspendLayout();
+                        this.SuspendLayout();
+                        // 
+                        // dataGrid
+                        // 
+                        this.dataGrid.DataMember = "";
+                        this.dataGrid.Dock = System.Windows.Forms.DockStyle.Fill;
+                        this.dataGrid.HeaderForeColor = System.Drawing.SystemColors.ControlText;
+                        this.dataGrid.Location = new System.Drawing.Point(230, 0);
+                        this.dataGrid.Name = "dataGrid";
+                        this.dataGrid.ReadOnly = true;
+                        this.dataGrid.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+                        this.dataGrid.Size = new System.Drawing.Size(562, 432);
+                        this.dataGrid.TabIndex = 1;
+                        this.dataGrid.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGrid_KeyDown);
+                        this.dataGrid.MouseDown += new System.Windows.Forms.MouseEventHandler(this.dataGrid_MouseDown);
+                        this.dataGrid.KeyUp += new System.Windows.Forms.KeyEventHandler(this.dataGrid_KeyUp);
+                        this.dataGrid.MouseMove += new System.Windows.Forms.MouseEventHandler(this.dataGrid_MouseMove);
+                        this.dataGrid.MouseLeave += new System.EventHandler(this.dataGrid_MouseLeave);
+                        // 
+                        // treeView
+                        // 
+                        this.treeView.Dock = System.Windows.Forms.DockStyle.Left;
+                        this.treeView.HideSelection = false;
+                        this.treeView.ImageIndex = -1;
+                        this.treeView.Location = new System.Drawing.Point(0, 0);
+                        this.treeView.Name = "treeView";
+                        this.treeView.SelectedImageIndex = -1;
+                        this.treeView.Size = new System.Drawing.Size(224, 432);
+                        this.treeView.TabIndex = 0;
+                        this.treeView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.treeView_KeyDown);
+                        this.treeView.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Inventory_MouseDown);
+                        this.treeView.KeyUp += new System.Windows.Forms.KeyEventHandler(this.treeView_KeyUp);
+                        this.treeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView_AfterSelect);
+                        // 
+                        // toolPanel
+                        // 
+                        this.toolPanel.Controls.Add(this.findStopButton);
+                        this.toolPanel.Controls.Add(this.findButton);
+                        this.toolPanel.Controls.Add(this.searchTreeCheckBox);
+                        this.toolPanel.Controls.Add(this.findTextBox);
+                        this.toolPanel.Controls.Add(this.refreshButton);
+                        this.toolPanel.Controls.Add(this.forwardButton);
+                        this.toolPanel.Controls.Add(this.backButton);
+                        this.toolPanel.Dock = System.Windows.Forms.DockStyle.Top;
+                        this.toolPanel.Location = new System.Drawing.Point(0, 0);
+                        this.toolPanel.Name = "toolPanel";
+                        this.toolPanel.Size = new System.Drawing.Size(792, 40);
+                        this.toolPanel.TabIndex = 2;
+                        // 
+                        // findStopButton
+                        // 
+                        this.findStopButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+                        this.findStopButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
+                        this.findStopButton.Location = new System.Drawing.Point(704, 8);
+                        this.findStopButton.Name = "findStopButton";
+                        this.findStopButton.Size = new System.Drawing.Size(72, 25);
+                        this.findStopButton.TabIndex = 6;
+                        this.findStopButton.Text = "Stop";
+                        this.findStopButton.Visible = false;
+                        this.findStopButton.Click += new System.EventHandler(this.findStopButton_Click);
+                        // 
+                        // findButton
+                        // 
+                        this.findButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+                        this.findButton.Enabled = false;
+                        this.findButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
+                        this.findButton.Location = new System.Drawing.Point(624, 8);
+                        this.findButton.Name = "findButton";
+                        this.findButton.Size = new System.Drawing.Size(72, 25);
+                        this.findButton.TabIndex = 4;
+                        this.findButton.Text = "Find";
+                        this.findButton.Click += new System.EventHandler(this.findButton_Click);
+                        // 
+                        // searchTreeCheckBox
+                        // 
+                        this.searchTreeCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+                        this.searchTreeCheckBox.FlatStyle = System.Windows.Forms.FlatStyle.System;
+                        this.searchTreeCheckBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
+                        this.searchTreeCheckBox.Location = new System.Drawing.Point(704, 10);
+                        this.searchTreeCheckBox.Name = "searchTreeCheckBox";
+                        this.searchTreeCheckBox.Size = new System.Drawing.Size(80, 22);
+                        this.searchTreeCheckBox.TabIndex = 5;
+                        this.searchTreeCheckBox.Text = "In Subtree";
+                        this.searchTreeCheckBox.CheckedChanged += new System.EventHandler(this.searchTreeCheckBox_CheckedChanged);
+                        // 
+                        // findTextBox
+                        // 
+                        this.findTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+                        this.findTextBox.Location = new System.Drawing.Point(344, 10);
+                        this.findTextBox.Name = "findTextBox";
+                        this.findTextBox.Size = new System.Drawing.Size(272, 20);
+                        this.findTextBox.TabIndex = 3;
+                        this.findTextBox.Text = "";
+                        this.findTextBox.TextChanged += new System.EventHandler(this.findTextBox_TextChanged);
+                        this.findTextBox.Enter += new System.EventHandler(this.findTextBox_Enter);
+                        // 
+                        // refreshButton
+                        // 
+                        this.refreshButton.Enabled = false;
+                        this.refreshButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
+                        this.refreshButton.Location = new System.Drawing.Point(160, 8);
+                        this.refreshButton.Name = "refreshButton";
+                        this.refreshButton.Size = new System.Drawing.Size(72, 25);
+                        this.refreshButton.TabIndex = 2;
+                        this.refreshButton.Text = "Refresh";
+                        this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
+                        // 
+                        // forwardButton
+                        // 
+                        this.forwardButton.Enabled = false;
+                        this.forwardButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
+                        this.forwardButton.Location = new System.Drawing.Point(80, 8);
+                        this.forwardButton.Name = "forwardButton";
+                        this.forwardButton.Size = new System.Drawing.Size(72, 25);
+                        this.forwardButton.TabIndex = 1;
+                        this.forwardButton.Text = "Forward";
+                        this.forwardButton.Click += new System.EventHandler(this.forwardButton_Click);
+                        // 
+                        // backButton
+                        // 
+                        this.backButton.Enabled = false;
+                        this.backButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
+                        this.backButton.Location = new System.Drawing.Point(8, 8);
+                        this.backButton.Name = "backButton";
+                        this.backButton.Size = new System.Drawing.Size(72, 25);
+                        this.backButton.TabIndex = 0;
+                        this.backButton.Text = "Back";
+                        this.backButton.Click += new System.EventHandler(this.backButton_Click);
+                        // 
+                        // dataPanel
+                        // 
+                        this.dataPanel.Controls.Add(this.dataGrid);
+                        this.dataPanel.Controls.Add(this.splitter);
+                        this.dataPanel.Controls.Add(this.treeView);
+                        this.dataPanel.Dock = System.Windows.Forms.DockStyle.Fill;
+                        this.dataPanel.Location = new System.Drawing.Point(0, 40);
+                        this.dataPanel.Name = "dataPanel";
+                        this.dataPanel.Size = new System.Drawing.Size(792, 432);
+                        this.dataPanel.TabIndex = 1;
+                        // 
+                        // splitter
+                        // 
+                        this.splitter.Location = new System.Drawing.Point(224, 0);
+                        this.splitter.Name = "splitter";
+                        this.splitter.Size = new System.Drawing.Size(6, 432);
+                        this.splitter.TabIndex = 2;
+                        this.splitter.TabStop = false;
+                        // 
+                        // Inventory
+                        // 
+                        this.AcceptButton = this.findButton;
+                        this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
+                        this.ClientSize = new System.Drawing.Size(792, 472);
+                        this.Controls.Add(this.dataPanel);
+                        this.Controls.Add(this.toolPanel);
+                        this.MinimumSize = new System.Drawing.Size(700, 0);
+                        this.Name = "Inventory";
+                        this.Text = "MSI Inventory";
+                        this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Inventory_KeyDown);
+                        this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.Inventory_MouseDown);
+                        this.Load += new System.EventHandler(this.Inventory_Load);
+                        this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.Inventory_KeyUp);
+                        ((System.ComponentModel.ISupportInitialize)(this.dataGrid)).EndInit();
+                        this.toolPanel.ResumeLayout(false);
+                        this.dataPanel.ResumeLayout(false);
+                        this.ResumeLayout(false);
+                }
+                #endregion
+                #region DataProviders
+                private IInventoryDataProvider[] DataProviders
+                {
+                        get
+                        {
+                                if(this.dataProviders == null)
+                                {
+                                        ArrayList providerList = new ArrayList();
+                                        providerList.AddRange(FindDataProviders(Assembly.GetExecutingAssembly()));
+                                        Uri codebase = new Uri(Assembly.GetExecutingAssembly().CodeBase);
+                                        if(codebase.IsFile)
+                                        {
+                                                foreach(string module in Directory.GetFiles(Path.GetDirectoryName(codebase.LocalPath), "*Inventory.dll"))
+                                                {
+                                                        try
+                                                        {
+                                                                providerList.AddRange(FindDataProviders(Assembly.LoadFrom(module)));
+                                                        }
+                                                        catch(Exception) { }
+                                                }
+                                        }
+                                        this.dataProviders = (IInventoryDataProvider[]) providerList.ToArray(typeof(IInventoryDataProvider));
+                                }
+                                return this.dataProviders;
+                        }
+                }
+                private static IList FindDataProviders(Assembly assembly)
+                {
+                        ArrayList providerList = new ArrayList();
+                        foreach(Type type in assembly.GetTypes())
+                        {
+                                if(type.IsClass)
+                                {
+                                        foreach(Type implementedInterface in type.GetInterfaces())
+                                        {
+                                                if(implementedInterface.Equals(typeof(IInventoryDataProvider)))
+                                                {
+                                                        try
+                                                        {
+                                                                providerList.Add(assembly.CreateInstance(type.FullName));
+                                                        }
+                                                        catch(Exception)
+                                                        {
+                                                                // Data provider's constructor threw an exception for some reason.
+                                                                // Well, now we can't get any data from that one.
+                                                        }
+                                                }
+                                        }
+                                }
+                        }
+                        return providerList;
+                }
+                #endregion
+                private void GoTo(string nodePath, DataGridCell cell)
+                {
+                        lock(syncRoot)
+                        {
+                                if(this.tablesLoading == null) return;  // The tree is being loaded
+                                if(this.navigating) return;  // This method is already on the callstack
+                                DataView table = (DataView) this.data[nodePath];
+                                if(table != null && table == this.dataGrid.DataSource)
+                                {
+                                        // Grid is already in view
+                                        if(!cell.Equals(anyCell)) this.dataGrid.CurrentCell = cell;
+                                        return;
+                                }
+                                if(cell.Equals(anyCell)) cell = zeroCell;
+                                if(this.historyBack.Count == 0 || nodePath != (string) this.historyBack.Peek())
+                                {
+                                        this.historyBack.Push(nodePath);
+                                        if(this.cellHistoryBack.Count > 0 && this.historyForward != null)
+                                        {
+                                                this.cellHistoryBack.Pop();
+                                                this.cellHistoryBack.Push(this.dataGrid.CurrentCell);
+                                        }
+                                        this.cellHistoryBack.Push(cell);
+                                }
+                                if(this.historyForward != null)
+                                {
+                                        this.historyForward.Clear();
+                                        this.cellHistoryForward.Clear();
+                                }
+                                if(table != null || nodePath.Length == 0 || this.dataProviderMap[nodePath] == null)
+                                {
+                                        this.dataGrid.CaptionText = nodePath;
+                                        this.dataGrid.CaptionBackColor = SystemColors.ActiveCaption;
+                                        this.dataGrid.CaptionForeColor = SystemColors.ActiveCaptionText;
+                                        this.dataGrid.DataSource = table;
+                                        this.dataGrid.CurrentCell = cell;
+                                        this.dataGrid.Focus();
+                                }
+                                else
+                                {
+                                        this.dataGrid.CaptionText = nodePath + " (loading...)";
+                                        this.dataGrid.CaptionBackColor = SystemColors.InactiveCaption;
+                                        this.dataGrid.CaptionForeColor = SystemColors.InactiveCaptionText;
+                                        this.dataGrid.DataSource = table;
+                                        if(!this.tablesLoading.Contains(nodePath))
+                                        {
+                                                this.tablesLoading.Add(nodePath);
+                                                this.SetCursor();
+                                                #if SINGLETHREAD
+                                                this.LoadTable(nodePath);
+                                                #else
+                                                new WaitCallback(this.LoadTable).BeginInvoke(nodePath, null, null);
+                                                #endif
+                                        }
+                                }
+                                this.findButton.Enabled = this.findTextBox.Text.Length > 0 && !searching;
+                                TreeNode treeNode = this.FindNode(nodePath);
+                                if(treeNode != this.treeView.SelectedNode)
+                                {
+                                        this.navigating = true;
+                                        this.treeView.SelectedNode = treeNode;
+                                        this.navigating = false;
+                                }
+                        }
+                }
+                private void LoadTable(object nodePathObj)
+                {
+                        string nodePath = (string) nodePathObj;
+                        IInventoryDataProvider dataProvider = (IInventoryDataProvider) this.dataProviderMap[nodePath];
+                        DataView table = null;
+                        if(dataProvider != null)
+                        {
+                                try
+                                {
+                                        table = dataProvider.GetData(nodePath);
+                                }
+                                catch(Exception)
+                                {
+                                        // Data provider threw an exception for some reason.
+                                        // Treat it like it returned no data.
+                                }
+                        }
+                        lock(syncRoot)
+                        {
+                                if(this.tablesLoading == null || !tablesLoading.Contains(nodePath)) return;
+                                if(table == null)
+                                {
+                                        this.dataProviderMap.Remove(nodePath);
+                                }
+                                else
+                                {
+                                        this.data[nodePath] = table;
+                                }
+                                this.tablesLoading.Remove(nodePath);
+                        }
+                        #if SINGLETHREAD
+                        this.TableLoaded(nodePath);
+                        #else
+                        this.Invoke(new WaitCallback(this.TableLoaded), new object[] { nodePath });
+                        #endif
+                }
+                private void TableLoaded(object nodePathObj)
+                {
+                        string nodePath = (string) nodePathObj;
+                        lock(syncRoot)
+                        {
+                                this.LoadTableStyle(nodePath);
+                                if(nodePath == this.CurrentNodePath)
+                                {
+                                        this.dataGrid.CaptionBackColor = SystemColors.ActiveCaption;
+                                        this.dataGrid.CaptionForeColor = SystemColors.ActiveCaptionText;
+                                        this.dataGrid.CaptionText = nodePath;
+                                        this.dataGrid.DataSource = this.CurrentTable;
+                                        this.dataGrid.CurrentCell = (DataGridCell) this.cellHistoryBack.Peek();
+                                        this.dataGrid.Focus();
+                                }
+                                this.SetCursor();
+                        }
+                }
+                private void RefreshData()
+                {
+                        lock(syncRoot)
+                        {
+                                this.GoTo("", zeroCell);
+                                this.treeView.Nodes.Clear();
+                                this.dataGrid.TableStyles.Clear();
+                                this.dataGrid.CaptionBackColor = SystemColors.InactiveCaption;
+                                this.dataGrid.CaptionForeColor = SystemColors.InactiveCaptionText;
+                                this.SetControlsEnabled(false);
+                                this.treeView.BeginUpdate();
+                                #if SINGLETHREAD
+                                this.LoadTree();
+                                #else
+                                new ThreadStart(this.LoadTree).BeginInvoke(null, null);
+                                #endif
+                        }
+                }
+                private void SetControlsEnabled(bool enabled)
+                {
+                        this.backButton.Enabled = enabled && this.historyBack.Count > 1;
+                        this.forwardButton.Enabled = enabled && this.historyForward.Count > 0;
+                        this.refreshButton.Enabled = enabled;
+                        this.findButton.Enabled = enabled && this.findTextBox.Text.Length > 0 && !searching;
+                }
+                private WaitCallback treeStatusCallback;
+                private int treeNodesLoaded;
+                private int treeNodesLoadedBase;
+        private string treeNodesLoading;
+                private void TreeLoadDataProviderStatus(int status, string currentNode)
+                {
+            if (currentNode != null)
+            {
+                this.treeNodesLoading = currentNode;
+            }
+                        this.treeNodesLoaded = treeNodesLoadedBase + status;
+            string statusString = String.Format("Loading tree... " + this.treeNodesLoaded);
+            if (!String.IsNullOrEmpty(this.treeNodesLoading))
+            {
+                statusString += ": " + treeNodesLoading;
+            }
+                        #if SINGLETHREAD
+                        treeStatusCallback(statusString);
+                        #else
+                        this.Invoke(treeStatusCallback, new object[] { statusString });
+                        #endif
+                }
+                private void UpdateTreeLoadStatus(object status)
+                {
+                        if(status == null)
+                        {
+                                // Loading is complete.
+                                this.treeView.EndUpdate();
+                                this.SetCursor();
+                                this.GoTo("Products", new DataGridCell(0, 0));
+                                this.SetControlsEnabled(true);
+                        }
+                        else
+                        {
+                                this.dataGrid.CaptionText = (string) status;
+                        }
+                }
+                private void LoadTree()
+                {
+                        lock(syncRoot)
+                        {
+                                if(this.tablesLoading == null) return;
+                                this.tablesLoading = null;
+                                this.dataProviderMap.Clear();
+                                this.data.Clear();
+                                this.Invoke(new ThreadStart(this.SetCursor));
+                        }
+                        this.treeStatusCallback = new WaitCallback(UpdateTreeLoadStatus);
+                        this.LoadTreeNodes();
+                        this.RenderTreeNodes();
+                        lock(syncRoot)
+                        {
+                                this.tablesLoading = new ArrayList();
+                        }
+                        // Use a status of null to signal loading complete.
+                        #if SINGLETHREAD
+                        this.UpdateTreeLoadStatus(null);
+                        #else
+                        this.Invoke(new WaitCallback(this.UpdateTreeLoadStatus), new object[] { null });
+                        #endif
+                }
+                private void LoadTreeNodes()
+                {
+                        #if SINGLETHREAD
+                        this.treeStatusCallback("Loading tree... ");
+                        #else
+                        this.Invoke(this.treeStatusCallback, new object[] { "Loading tree... " });
+                        #endif
+                        this.treeNodesLoaded = 0;
+            this.treeNodesLoading = null;
+                        foreach(IInventoryDataProvider dataProvider in this.DataProviders)
+                        {
+                                this.treeNodesLoadedBase = this.treeNodesLoaded;
+                                string[] nodePaths = null;
+                                try
+                                {
+                                        nodePaths = dataProvider.GetNodes(new InventoryDataLoadStatusCallback(this.TreeLoadDataProviderStatus));
+                                }
+                                catch(Exception)
+                                {
+                                        // Data provider threw an exception for some reason.
+                                        // Treat it like it returned no data.
+                                }
+                                if(nodePaths != null)
+                                {
+                                        foreach(string nodePath in nodePaths)
+                                        {
+                                                if(!this.dataProviderMap.Contains(nodePath))
+                                                {
+                                                        this.dataProviderMap.Add(nodePath, dataProvider);
+                                                }
+                                        }
+                                }
+                        }
+                }
+                private void RenderTreeNodes()
+                {
+                        #if SINGLETHREAD
+                        this.treeStatusCallback("Rendering tree... ");
+                        #else
+                        this.Invoke(this.treeStatusCallback, new object[] { "Rendering tree... " });
+                        #endif
+                        this.treeNodesLoaded = 0;
+                        foreach(DictionaryEntry nodePathAndProvider in this.dataProviderMap)
+                        {
+                                string nodePath = (string) nodePathAndProvider.Key;
+                                #if SINGLETHREAD
+                                this.AddNode(nodePath);
+                                #else
+                                this.Invoke(new WaitCallback(this.AddNode), new object[] { nodePath });
+                                #endif
+                        }
+                }
+                private void LoadTableStyle(string nodePath)
+                {
+                        DataView table = (DataView) this.data[nodePath];
+                        if(table != null)
+                        {
+                                DataGridTableStyle tableStyle = this.dataGrid.TableStyles[table.Table.TableName];
+                                if(tableStyle == null)
+                                {
+                                        tableStyle = new DataGridTableStyle();
+                                        tableStyle.MappingName = table.Table.TableName;
+                                        tableStyle.RowHeadersVisible = true;
+                                        this.dataGrid.TableStyles.Add(tableStyle);
+                                }
+                                foreach(DataColumn column in table.Table.Columns)
+                                {
+                                        if(!tableStyle.GridColumnStyles.Contains(column.ColumnName))
+                                        {
+                                                string colStyle = (string) ColumnResources.GetObject(column.ColumnName, CultureInfo.InvariantCulture);
+                                                if(colStyle != null)
+                                                {
+                                                        string[] colStyleParts = colStyle.Split(',');
+                                                        DataGridColumnStyle columnStyle = (colStyleParts.Length > 2 && colStyleParts[2] == "bool"
+                                                                ? (DataGridColumnStyle) new DataGridBoolColumn() : (DataGridColumnStyle) new DataGridTextBoxColumn());
+                                                        try { if(colStyleParts.Length > 1) columnStyle.Width = Int32.Parse(colStyleParts[1]); }
+                                                        catch(FormatException) { }
+                                                        columnStyle.HeaderText = colStyleParts[0];
+                                                        columnStyle.MappingName = column.ColumnName;
+                                                        tableStyle.GridColumnStyles.Add(columnStyle);
+                                                }
+                                        }
+                                }
+                        }
+                }
+                private static ResourceManager ColumnResources
+                {
+                        get
+                        {
+                                if(columnResources == null)
+                                {
+                                        columnResources = new ResourceManager(typeof(Inventory).Name + ".Columns", typeof(Inventory).Assembly);
+                                }
+                                return columnResources;
+                        }
+                }
+                private static ResourceManager columnResources;
+                private void AddNode(object nodePathObj)
+                {
+                        string nodePath = (string) nodePathObj;
+                        string[] path = nodePath.Split('\\');
+                        TreeNodeCollection nodes = this.treeView.Nodes;
+                        TreeNode node = null;
+                        foreach(string pathPart in path)
+                        {
+                                node = null;
+                                for(int i = 0; i < nodes.Count; i++)
+                                {
+                                        int c = string.CompareOrdinal(nodes[i].Text, pathPart);
+                                        if(c == 0)
+                                        {
+                                                node = nodes[i];
+                                                break;
+                                        }
+                                        else if(c > 0)
+                                        {
+                                                node = new TreeNode(pathPart);
+                                                nodes.Insert(i, node);
+                                                break;
+                                        }
+                                }
+                                if(node == null)
+                                {
+                                        node = new TreeNode(pathPart);
+                                        nodes.Add(node);
+                                }
+                                nodes = node.Nodes;
+                        }
+                        if(++this.treeNodesLoaded % 1000 == 0)
+                        {
+                                this.UpdateTreeLoadStatus("Rendering tree... " +
+                                        (100 * this.treeNodesLoaded / this.dataProviderMap.Count) + "%");
+                        }
+                }
+                public string CurrentNodePath
+                {
+                        get
+                        {
+                                TreeNode currentNode = this.treeView.SelectedNode;
+                                return currentNode != null ? currentNode.FullPath : null;
+                        }
+                }
+                public DataView CurrentTable
+                {
+                        get
+                        {
+                                string currentNodePath = this.CurrentNodePath;
+                                return currentNodePath != null ? (DataView) this.data[this.CurrentNodePath] : null;
+                        }
+                }
+                private TreeNode FindNode(string nodePath)
+                {
+                        if(nodePath == null) return null;
+                        string[] path = nodePath.Split('\\');
+                        TreeNodeCollection nodes = this.treeView.Nodes;
+                        TreeNode node = null;
+                        foreach(string pathPart in path)
+                        {
+                                node = null;
+                                for(int i = 0; i < nodes.Count; i++)
+                                {
+                                        if(nodes[i].Text == pathPart)
+                                        {
+                                                node = nodes[i];
+                                                break;
+                                        }
+                                }
+                                if(node != null)
+                                {
+                                        nodes = node.Nodes;
+                                }
+                        }
+                        return node;
+                }
+                private void dataGrid_MouseDown(object sender, MouseEventArgs e)
+                {
+                        Keys modKeys = Control.ModifierKeys;
+                        if(e.Button == MouseButtons.Left && (modKeys & (Keys.Shift | Keys.Control)) == 0)
+                        {
+                                DataGrid.HitTestInfo hit = this.dataGrid.HitTest(e.X, e.Y);
+                                string link = this.GetLinkForGridHit(hit);
+                                if(link != null)
+                                {
+                                        TreeNode node = this.FindNode(link);
+                                        if(node != null)
+                                        {
+                                                this.treeView.SelectedNode = node;
+                                                node.Expand();
+                                        }
+                                }
+                        }
+                        this.Inventory_MouseDown(sender, e);
+                }
+                private void dataGrid_MouseMove(object sender, System.Windows.Forms.MouseEventArgs e)
+                {
+                        //this.gridLinkTip.SetToolTip(this.dataGrid, null);
+                        DataGrid.HitTestInfo hit = this.dataGrid.HitTest(e.X, e.Y);
+                        if(hit.Type == DataGrid.HitTestType.RowHeader)
+                        {
+                                string link = this.GetLinkForGridHit(hit);
+                                if(link != null)
+                                {
+                                        this.mouseOverGridLink = true;
+                                        this.SetCursor();
+                                        return;
+                                }
+                        }
+                        else if(this.mouseOverGridLink)
+                        {
+                                this.mouseOverGridLink = false;
+                                this.SetCursor();
+                        }
+                }
+                
+                private void dataGrid_MouseLeave(object sender, System.EventArgs e)
+                {
+                        this.mouseOverGridLink = false;
+                        this.SetCursor();
+                }
+                private string GetLinkForGridHit(DataGrid.HitTestInfo hit)
+                {
+                        if(hit.Type == DataGrid.HitTestType.RowHeader && this.tablesLoading != null)
+                        {
+                                string nodePath = this.CurrentNodePath;
+                                DataView table = (DataView) this.data[nodePath];
+                                if(table != null)
+                                {
+                                        DataRow row = table[hit.Row].Row;
+                                        IInventoryDataProvider dataProvider = (IInventoryDataProvider) this.dataProviderMap[nodePath];
+                                        return dataProvider.GetLink(nodePath, table[hit.Row].Row);
+                                }
+                        }
+                        return null;
+                }
+                private void HistoryBack()
+                {
+                        lock(syncRoot)
+                        {
+                                if(this.historyBack.Count > 1)
+                                {
+                                        string nodePath = (string) this.historyBack.Pop();
+                                        this.cellHistoryBack.Pop();
+                                        DataGridCell cell = this.dataGrid.CurrentCell;
+                                        Stack saveForward = this.historyForward;
+                                        this.historyForward = null;
+                                        this.GoTo((string) this.historyBack.Pop(), (DataGridCell) this.cellHistoryBack.Pop());
+                                        this.historyForward = saveForward;
+                                        this.historyForward.Push(nodePath);
+                                        this.cellHistoryForward.Push(cell);
+                                        this.backButton.Enabled = this.historyBack.Count > 1;
+                                        this.forwardButton.Enabled = this.historyForward.Count > 0;
+                                }
+                        }
+                }
+                private void HistoryForward()
+                {
+                        lock(syncRoot)
+                        {
+                                if(this.historyForward.Count > 0)
+                                {
+                                        string nodePath = (string) this.historyForward.Pop();
+                                        DataGridCell cell = (DataGridCell) this.cellHistoryForward.Pop();
+                                        Stack saveForward = this.historyForward;
+                                        this.historyForward = null;
+                                        this.GoTo(nodePath, cell);
+                                        this.historyForward = saveForward;
+                                        this.backButton.Enabled = this.historyBack.Count > 1;
+                                        this.forwardButton.Enabled = this.historyForward.Count > 0;
+                                }
+                        }
+                }
+                #region Find
+                private void Find()
+                {
+                        this.BeginFind();
+            object[] findNextArgs = new object[] { this.CurrentNodePath, this.dataGrid.CurrentCell, this.treeView.SelectedNode };
+                        #if SINGLETHREAD
+                        this.FindNext(findNextArgs);
+                        #else
+            new WaitCallback(this.FindNext).BeginInvoke(findNextArgs, null, null);
+                        #endif
+                }
+        [SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase")]
+                private void FindNext(object start)
+                {
+                        string nodePath = (string) ((object[]) start)[0];
+                        DataGridCell startCell = (DataGridCell) ((object[]) start)[1];
+            TreeNode searchNode = (TreeNode) ((object[]) start)[2];
+                        DataGridCell endCell = startCell;
+                        string searchString = this.findTextBox.Text;
+                        if(searchString.Length == 0) return;
+                        bool ignoreCase = true; // TODO: make this a configurable option?
+                        if(ignoreCase) searchString = searchString.ToLowerInvariant();
+                
+                        if(!this.searchTreeCheckBox.Checked)
+                        {
+                                DataGridCell foundCell;
+                                startCell.ColumnNumber++;
+                                if(FindInTable((DataView) this.data[nodePath], searchString, ignoreCase,
+                                        startCell, startCell, true, out foundCell))
+                                {
+                                        #if SINGLETHREAD
+                                        this.EndFind(new object[] { nodePath, foundCell });
+                                        #else
+                                        this.Invoke(new WaitCallback(this.EndFind), new object[] { new object[] { nodePath, foundCell } });
+                                        #endif
+                                        return;
+                                }
+                        }
+                        else
+                        {
+                                if(this.continueSearchRoot != null)
+                                {
+                                        searchNode = this.FindNode(this.continueSearchRoot);
+                                        startCell = this.continueSearchCell;
+                                        endCell = this.continueSearchEndCell;
+                                }
+                                else
+                                {
+                                        this.continueSearchRoot = searchNode.FullPath;
+                                        this.continueSearchPath = this.continueSearchRoot;
+                                        this.continueSearchEndCell = endCell;
+                                }
+                                //if(searchNode == null) return;
+                                ArrayList nodesList = new ArrayList();
+                                nodesList.Add(searchNode);
+                                this.GetFlatTreeNodes(searchNode.Nodes, nodesList, true, this.continueSearchRoot);
+                                TreeNode[] nodes = (TreeNode[]) nodesList.ToArray(typeof(TreeNode));
+                                int startNode = nodesList.IndexOf(this.FindNode(this.continueSearchPath));
+                                DataGridCell foundCell;
+                                startCell.ColumnNumber++;
+                                for(int i = startNode; i < nodes.Length; i++)
+                                {
+                                        if(this.stopSearch) break;
+                                        DataGridCell startCellOnThisNode = zeroCell;
+                                        if(i == startNode) startCellOnThisNode = startCell;
+                                        DataView table = this.GetTableForSearch(nodes[i].FullPath);
+                                        if(table != null)
+                                        {
+                                                if(FindInTable(table, searchString, ignoreCase, startCellOnThisNode, zeroCell, false, out foundCell))
+                                                {
+                                                        #if SINGLETHREAD
+                                                        this.EndFind(new object[] { nodes[i].FullPath, foundCell });
+                                                        #else
+                                                        this.Invoke(new WaitCallback(this.EndFind), new object[] { new object[] { nodes[i].FullPath, foundCell } });
+                                                        #endif
+                                                        return;
+                                                }
+                                        }
+                                }
+                                if(!this.stopSearch)
+                                {
+                                        DataView table = this.GetTableForSearch(searchNode.FullPath);
+                                        if(table != null)
+                                        {
+                                                if(FindInTable(table, searchString, ignoreCase, zeroCell, endCell, false, out foundCell))
+                                                {
+                                                        #if SINGLETHREAD
+                                                        this.EndFind(new object[] { searchNode.FullPath, foundCell });
+                                                        #else
+                                                        this.Invoke(new WaitCallback(this.EndFind), new object[] { new object[] { searchNode.FullPath, foundCell } });
+                                                        #endif
+                                                        return;
+                                                }
+                                        }
+                                }
+                        }
+                        #if SINGLETHREAD
+                        this.EndFind(null);
+                        #else
+                        this.Invoke(new WaitCallback(this.EndFind), new object[] { null });
+                        #endif
+                }
+                private DataView GetTableForSearch(string nodePath)
+                {
+                        DataView table = (DataView) this.data[nodePath];
+                        string status = nodePath;
+                        if(table == null) status = status + " (loading)";
+                        #if SINGLETHREAD
+                        this.FindStatus(nodePath);
+                        #else
+                        this.Invoke(new WaitCallback(this.FindStatus), new object[] { status });
+                        #endif
+                        if(table == null)
+                        {
+                                this.tablesLoading.Add(nodePath);
+                                this.Invoke(new ThreadStart(this.SetCursor));
+                                this.LoadTable(nodePath);
+                                table = (DataView) this.data[nodePath];
+                        }
+                        return table;
+                }
+                private void GetFlatTreeNodes(TreeNodeCollection nodes, IList resultsList, bool searchable, string searchRoot)
+                {
+                        foreach(TreeNode node in nodes)
+                        {
+                                string nodePath = node.FullPath;
+                                IInventoryDataProvider dataProvider = (IInventoryDataProvider) this.dataProviderMap[nodePath];
+                                if(!searchable || (dataProvider != null && dataProvider.IsNodeSearchable(searchRoot, nodePath)))
+                                {
+                                        resultsList.Add(node);
+                                }
+                                GetFlatTreeNodes(node.Nodes, resultsList, searchable, searchRoot);
+                        }
+                }
+        [SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase")]
+                private bool FindInTable(DataView table, string searchString, bool lowerCase,
+                        DataGridCell startCell, DataGridCell endCell, bool wrap, out DataGridCell foundCell)
+                {
+                        foundCell = new DataGridCell(-1, -1);
+                        if(table == null) return false;
+                        if(startCell.RowNumber < 0) startCell.RowNumber = 0;
+                        if(startCell.ColumnNumber < 0) startCell.ColumnNumber = 0;
+                        for(int searchRow = startCell.RowNumber; searchRow < table.Count; searchRow++)
+                        {
+                                if(this.stopSearch) break;
+                                if(endCell.RowNumber > startCell.RowNumber && searchRow > endCell.RowNumber) break;
+                                DataRowView tableRow = table[searchRow];
+                                for(int searchCol = (searchRow == startCell.RowNumber
+                                        ? startCell.ColumnNumber : 0); searchCol < table.Table.Columns.Count; searchCol++)
+                                {
+                                        if(this.stopSearch) break;
+                                        if(endCell.RowNumber > startCell.RowNumber && searchRow == endCell.RowNumber
+                                                && searchCol >= endCell.ColumnNumber) break;
+                                        string value = tableRow[searchCol].ToString();
+                                        if(lowerCase) value = value.ToLowerInvariant();
+                                        if(value.IndexOf(searchString, StringComparison.Ordinal) >= 0)
+                                        {
+                                                foundCell.RowNumber = searchRow;
+                                                foundCell.ColumnNumber = searchCol;
+                                                return true;
+                                        }
+                                }
+                        }
+                        if(wrap)
+                        {
+                                for(int searchRow = 0; searchRow <= endCell.RowNumber; searchRow++)
+                                {
+                                        if(this.stopSearch) break;
+                                        DataRowView tableRow = table[searchRow];
+                                        for(int searchCol = 0; searchCol < (searchRow == endCell.RowNumber
+                                                ? endCell.ColumnNumber : table.Table.Columns.Count); searchCol++)
+                                        {
+                                                if(this.stopSearch) break;
+                                                string value = tableRow[searchCol].ToString();
+                                                if(lowerCase) value = value.ToLowerInvariant();
+                                                if(value.IndexOf(searchString, StringComparison.Ordinal) >= 0)
+                                                {
+                                                        foundCell.RowNumber = searchRow;
+                                                        foundCell.ColumnNumber = searchCol;
+                                                        return true;
+                                                }
+                                        }
+                                }
+                        }
+                        return false;
+                }
+                private void BeginFind()
+                {
+                        lock(syncRoot)
+                        {
+                                this.findButton.Enabled = false;
+                                this.findButton.Text = "Searching...";
+                                this.findTextBox.Enabled = false;
+                                this.searchTreeCheckBox.Visible = false;
+                                this.findStopButton.Visible = true;
+                                this.refreshButton.Enabled = false;
+                                this.searching = true;
+                                this.stopSearch = false;
+                                this.SetCursor();
+                        }
+                }
+                private void FindStatus(object status)
+                {
+                        lock(syncRoot)
+                        {
+                                this.dataGrid.CaptionText = "Searching... " + (string) status;
+                                this.dataGrid.CaptionBackColor = SystemColors.InactiveCaption;
+                                this.dataGrid.CaptionForeColor = SystemColors.InactiveCaptionText;
+                        }
+                }
+                private void EndFind(object result)
+                {
+                        lock(syncRoot)
+                        {
+                                this.searching = false;
+                                this.refreshButton.Enabled = true;
+                                this.findStopButton.Visible = false;
+                                this.searchTreeCheckBox.Visible = true;
+                                this.findTextBox.Enabled = true;
+                                this.findButton.Text = "Find";
+                                this.findButton.Enabled = true;
+                                this.dataGrid.CaptionBackColor = SystemColors.ActiveCaption;
+                                this.dataGrid.CaptionForeColor = SystemColors.ActiveCaptionText;
+                                this.dataGrid.CaptionText = this.CurrentNodePath;
+                                if(result != null)
+                                {
+                                        string nodePath = (string) ((object[]) result)[0];
+                                        DataGridCell foundCell = (DataGridCell) ((object[]) result)[1];
+                                        this.GoTo(nodePath, foundCell);
+                                        this.dataGrid.Focus();
+                                        this.continueSearchPath = nodePath;
+                                        this.continueSearchCell = foundCell;
+                                        if(this.searchTreeCheckBox.Checked) this.searchTreeCheckBox.Text = "Continue";
+                                }
+                                else
+                                {
+                                        this.continueSearchRoot = null;
+                                        this.continueSearchPath = null;
+                                        this.searchTreeCheckBox.Text = "In Subtree";
+                                }
+                                this.SetCursor();
+                        }
+                }
+                private void SetCursor()
+                {
+                        if(this.mouseOverGridLink)
+                        {
+                                Keys modKeys = Control.ModifierKeys;
+                                if((modKeys & (Keys.Shift | Keys.Control)) == 0)
+                                {
+                                        this.Cursor = Cursors.Hand;
+                                        return;
+                                }
+                        }
+                        if(this.tablesLoading == null || this.tablesLoading.Count > 0 || this.searching)
+                        {
+                                this.Cursor = Cursors.AppStarting;
+                                return;
+                        }
+                        this.Cursor = Cursors.Arrow;
+                }
+                #endregion
+                #region EventHandlers
+                private void Inventory_Load(object sender, System.EventArgs e)
+                {
+                        this.RefreshData();
+                }
+                private void refreshButton_Click(object sender, System.EventArgs e)
+                {
+                        this.RefreshData();
+                }
+                private void Inventory_MouseDown(object sender, MouseEventArgs e)
+                {
+                        if(e.Button == MouseButtons.XButton1) this.HistoryBack();
+                        else if(e.Button == MouseButtons.XButton2) this.HistoryForward();
+                }
+                private void Inventory_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
+                {
+                        this.SetCursor();
+                        if(e.KeyCode == Keys.F3) this.Find();
+                        else if(e.KeyCode == Keys.F && (e.Modifiers | Keys.Control) != 0) this.findTextBox.Focus();
+                        else if(e.KeyCode == Keys.BrowserBack) this.HistoryBack();
+                        else if(e.KeyCode == Keys.BrowserForward) this.HistoryForward();
+                        else return;
+                        e.Handled = true;
+                }
+                private void treeView_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
+                {
+                        this.Inventory_KeyDown(sender, e);
+                }
+                private void dataGrid_KeyDown(object sender, System.Windows.Forms.KeyEventArgs e)
+                {
+                        this.Inventory_KeyDown(sender, e);
+                }
+                private void Inventory_KeyUp(object sender, System.Windows.Forms.KeyEventArgs e)
+                {
+                        this.SetCursor();
+                }
+                private void treeView_KeyUp(object sender, System.Windows.Forms.KeyEventArgs e)
+                {
+                        this.Inventory_KeyDown(sender, e);
+                }
+                private void dataGrid_KeyUp(object sender, System.Windows.Forms.KeyEventArgs e)
+                {
+                        this.Inventory_KeyDown(sender, e);
+                }
+                private void treeView_AfterSelect(object sender, System.Windows.Forms.TreeViewEventArgs e)
+                {
+                        this.GoTo(e.Node.FullPath, anyCell);
+                }
+                private void backButton_Click(object sender, System.EventArgs e)
+                {
+                        this.HistoryBack();
+                }
+                private void forwardButton_Click(object sender, System.EventArgs e)
+                {
+                        this.HistoryForward();          
+                }
+                private void findTextBox_TextChanged(object sender, System.EventArgs e)
+                {
+                        this.findButton.Enabled = this.findTextBox.Text.Length > 0 &&
+                                this.tablesLoading != null && this.treeView.SelectedNode != null && !searching;
+                        this.searchTreeCheckBox.Text = "In Subtree";
+                        this.continueSearchRoot = null;
+                }
+                private void findButton_Click(object sender, System.EventArgs e)
+                {
+                        this.Find();
+                }
+                private void findTextBox_Enter(object sender, System.EventArgs e)
+                {
+                        findTextBox.SelectAll();
+                }
+                private void findStopButton_Click(object sender, System.EventArgs e)
+                {
+                        this.stopSearch = true;
+                }
+                private void searchTreeCheckBox_CheckedChanged(object sender, System.EventArgs e)
+                {
+                        if(!searchTreeCheckBox.Checked && searchTreeCheckBox.Text == "Continue")
+                        {
+                                this.searchTreeCheckBox.Text = "In Subtree";
+                        }
+                }
+                #endregion
+        }
+}
diff --git a/src/samples/Dtf/Inventory/Inventory.csproj b/src/samples/Dtf/Inventory/Inventory.csproj
new file mode 100644
index 00000000..6dc1cfd3
--- /dev/null
+++ b/src/samples/Dtf/Inventory/Inventory.csproj
@@ -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. -->
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{51480F8E-B80F-42DC-91E7-3542C1F12F8C}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>WixToolset.Dtf.Samples.Inventory</RootNamespace>
+    <AssemblyName>Inventory</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <ApplicationIcon>Inventory.ico</ApplicationIcon>
+    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="components.cs" />
+    <Compile Include="Features.cs" />
+    <Compile Include="IInventoryDataProvider.cs" />
+    <Compile Include="Inventory.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="msiutils.cs" />
+    <Compile Include="patches.cs" />
+    <Compile Include="products.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Inventory.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <ProjectReference Include="..\..\Libraries\WindowsInstaller\WindowsInstaller.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
+</Project>
diff --git a/src/samples/Dtf/Inventory/Inventory.ico b/src/samples/Dtf/Inventory/Inventory.ico
new file mode 100644
index 00000000..d5757f7a
--- /dev/null
+++ b/src/samples/Dtf/Inventory/Inventory.ico
Binary files differ
diff --git a/src/samples/Dtf/Inventory/Inventory.resx b/src/samples/Dtf/Inventory/Inventory.resx
new file mode 100644
index 00000000..9aeb4d2c
--- /dev/null
+++ b/src/samples/Dtf/Inventory/Inventory.resx
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 1.3
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">1.3</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1">this is my long string</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        [base64 mime encoded serialized .NET Framework object]
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        [base64 mime encoded string representing a byte array form of the .NET Framework object]
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used forserialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="dataGrid.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="dataGrid.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="dataGrid.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="treeView.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="treeView.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="treeView.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="toolPanel.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="toolPanel.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="toolPanel.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="toolPanel.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="toolPanel.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="toolPanel.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="findStopButton.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="findStopButton.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="findStopButton.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="findButton.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="findButton.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="findButton.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="searchTreeCheckBox.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="searchTreeCheckBox.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="searchTreeCheckBox.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="findTextBox.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="findTextBox.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="findTextBox.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="refreshButton.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="refreshButton.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="refreshButton.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="forwardButton.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="forwardButton.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="forwardButton.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="backButton.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="backButton.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="backButton.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="dataPanel.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="dataPanel.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="dataPanel.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="dataPanel.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="dataPanel.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="dataPanel.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="splitter.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="splitter.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="splitter.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="gridLinkTip.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="gridLinkTip.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </data>
+  <data name="gridLinkTip.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+  <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>(Default)</value>
+  </data>
+  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </data>
+  <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>8, 8</value>
+  </data>
+  <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>80</value>
+  </data>
+  <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </data>
+  <data name="$this.Name">
+    <value>Inventory</value>
+  </data>
+  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>Private</value>
+  </data>
+</root>
+\ No newline at end of file
diff --git a/src/samples/Dtf/Inventory/components.cs b/src/samples/Dtf/Inventory/components.cs
new file mode 100644
index 00000000..c5147084
--- /dev/null
+++ b/src/samples/Dtf/Inventory/components.cs
@@ -0,0 +1,626 @@
+// 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.Data;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Windows.Forms;
+using Microsoft.Win32;
+using WixToolset.Dtf.WindowsInstaller;
+using View = WixToolset.Dtf.WindowsInstaller.View;
+namespace WixToolset.Dtf.Samples.Inventory
+{
+        /// <summary>
+        /// Provides inventory data about components of products installed on the system.
+        /// </summary>
+        public class ComponentsInventory : IInventoryDataProvider
+        {
+        private static object syncRoot = new object();
+                public ComponentsInventory()
+                {
+                }
+                public string Description
+                {
+                        get { return "Components of installed products"; }
+                }
+                private Hashtable componentProductsMap;
+                public string[] GetNodes(InventoryDataLoadStatusCallback statusCallback)
+                {
+                        ArrayList nodes = new ArrayList();
+                        componentProductsMap = new Hashtable();
+                        foreach(ProductInstallation product in ProductInstallation.AllProducts)
+                        {
+                string productName = MsiUtils.GetProductName(product.ProductCode);
+                statusCallback(nodes.Count, String.Format(@"Products\{0}", productName));
+                                try
+                                {
+                                        IntPtr hWnd = IntPtr.Zero;
+                                        Installer.SetInternalUI(InstallUIOptions.Silent, ref hWnd);
+                                        lock(syncRoot)  // Only one Installer session can be active at a time
+                                        {
+                        using (Session session = Installer.OpenProduct(product.ProductCode))
+                                                {
+                            statusCallback(nodes.Count, String.Format(@"Products\{0}\Features", productName));
+                            IList<string> features = session.Database.ExecuteStringQuery("SELECT `Feature` FROM `Feature`");
+                            string[] featuresArray = new string[features.Count];
+                            features.CopyTo(featuresArray, 0);
+                            Array.Sort(featuresArray, 0, featuresArray.Length, StringComparer.OrdinalIgnoreCase);
+                            foreach (string feature in featuresArray)
+                                                        {
+                                                                nodes.Add(String.Format(@"Products\{0}\Features\{1}", productName, feature));
+                                                        }
+                            statusCallback(nodes.Count, String.Format(@"Products\{0}\Components", productName));
+                                                        nodes.Add(String.Format(@"Products\{0}\Components", productName));
+                            IList<string> components = session.Database.ExecuteStringQuery("SELECT `ComponentId` FROM `Component`");
+                                                        for (int i = 0; i < components.Count; i++)
+                                                        {
+                                                                string component = components[i];
+                                                                if (component.Length > 0)
+                                                                {
+                                                                        nodes.Add(String.Format(@"Products\{0}\Components\{1}", productName, component));
+                                                                        ArrayList sharingProducts = (ArrayList) componentProductsMap[component];
+                                                                        if (sharingProducts == null)
+                                                                        {
+                                                                                sharingProducts = new ArrayList();
+                                                                                componentProductsMap[component] = sharingProducts;
+                                                                        }
+                                    sharingProducts.Add(product.ProductCode);
+                                                                }
+                                                                if (i % 100 == 0) statusCallback(nodes.Count, null);
+                                                        }
+                                                        nodes.Add(String.Format(@"Products\{0}\Files", productName));
+                                                        nodes.Add(String.Format(@"Products\{0}\Registry", productName));
+                                                        statusCallback(nodes.Count, String.Empty);
+                                                }
+                                        }
+                                }
+                                catch(InstallerException) { }
+                        }
+            statusCallback(nodes.Count, @"Products\...\Components\...\Sharing");
+            foreach (DictionaryEntry componentProducts in componentProductsMap)
+                        {
+                                string component = (string) componentProducts.Key;
+                                ArrayList products = (ArrayList) componentProducts.Value;
+                                if(products.Count > 1)
+                                {
+                                        foreach(string productCode in products)
+                                        {
+                                                nodes.Add(String.Format(@"Products\{0}\Components\{1}\Sharing", MsiUtils.GetProductName(productCode), component));
+                                        }
+                                }
+                        }
+                        statusCallback(nodes.Count, String.Empty);
+                        return (string[]) nodes.ToArray(typeof(string));
+                }
+                public bool IsNodeSearchable(string searchRoot, string searchNode)
+                {
+                        string[] rootPath = searchRoot.Split('\\');
+                        string[] nodePath = searchNode.Split('\\');
+                        if(rootPath.Length < 3 && nodePath.Length >= 3 && nodePath[0] == "Products" && nodePath[2] == "Components")
+                        {
+                                // When searching an entire product, don't search the "Components" subtree --
+                                // it just has duplicate data from the Files and Registry table.  And if you
+                                // really want to know about the component, it's only a click away from
+                                // those other tables.
+                                return false;
+                        }
+                        return true;
+                }
+                public DataView GetData(string nodePath)
+                {
+                        string[] path = nodePath.Split('\\');
+                        if(path.Length == 4 && path[0] == "Products" && path[2] == "Features")
+                        {
+                                return GetFeatureComponentsData(MsiUtils.GetProductCode(path[1]), path[3]);
+                        }
+                        else if(path.Length == 3 && path[0] == "Products" && path[2] == "Components")
+                        {
+                                return GetProductComponentsData(MsiUtils.GetProductCode(path[1]));
+                        }
+                        else if(path.Length == 4 && path[0] == "Products" && path[2] == "Components")
+                        {
+                                return GetComponentData(MsiUtils.GetProductCode(path[1]), path[3]);
+                        }
+                        else if(path.Length == 5 && path[0] == "Products" && path[2] == "Components" && path[4] == "Sharing")
+                        {
+                                return GetComponentProductsData(path[3]);
+                        }
+                        else if(path.Length == 3 && path[0] == "Products" && path[2] == "Files")
+                        {
+                                return GetProductFilesData(MsiUtils.GetProductCode(path[1]));
+                        }
+                        else if(path.Length == 3 && path[0] == "Products" && path[2] == "Registry")
+                        {
+                                return GetProductRegistryData(MsiUtils.GetProductCode(path[1]));
+                        }
+                        return null;
+                }
+                public DataView GetComponentData(string productCode, string componentCode)
+                {
+                        DataTable table = new DataTable("ProductComponentItems");
+                        table.Locale = CultureInfo.InvariantCulture;
+                        table.Columns.Add("ProductComponentItemsIsKey", typeof(bool));
+                        table.Columns.Add("ProductComponentItemsKey", typeof(string));
+                        table.Columns.Add("ProductComponentItemsPath", typeof(string));
+                        table.Columns.Add("ProductComponentItemsExists", typeof(bool));
+                        table.Columns.Add("ProductComponentItemsDbVersion", typeof(string));
+                        table.Columns.Add("ProductComponentItemsInstalledVersion", typeof(string));
+                        table.Columns.Add("ProductComponentItemsInstalledMatch", typeof(bool));
+                        try
+                        {
+                                IntPtr hWnd = IntPtr.Zero;
+                Installer.SetInternalUI(InstallUIOptions.Silent, ref hWnd);
+                                lock(syncRoot)  // Only one Installer session can be active at a time
+                                {
+                                        using(Session session = Installer.OpenProduct(productCode))
+                                        {
+                                                session.DoAction("CostInitialize");
+                                                session.DoAction("FileCost");
+                                                session.DoAction("CostFinalize");
+                                                foreach(object[] row in this.GetComponentFilesRows(productCode, componentCode, session, false))
+                                                {
+                                                        table.Rows.Add(row);
+                                                }
+                                                foreach(object[] row in this.GetComponentRegistryRows(productCode, componentCode, session, false))
+                                                {
+                                                        table.Rows.Add(row);
+                                                }
+                                        }
+                                }
+                                return new DataView(table, "", "ProductComponentItemsPath ASC", DataViewRowState.CurrentRows);
+                        }
+                        catch(InstallerException) { }
+                        return null;
+                }
+                private object[][] GetComponentFilesRows(string productCode, string componentCode, Session session, bool includeComponent)
+                {
+                        ArrayList rows = new ArrayList();
+                        string componentPath = new ComponentInstallation(componentCode, productCode).Path;
+                        string componentKey = (string) session.Database.ExecuteScalar(
+                                "SELECT `Component` FROM `Component` WHERE `ComponentId` = '{0}'", componentCode);
+                        if(componentKey == null) return null;
+                        int attributes = Convert.ToInt32(session.Database.ExecuteScalar(
+                                "SELECT `Attributes` FROM `Component` WHERE `Component` = '{0}'", componentKey));
+                        bool registryKeyPath = (attributes & (int) ComponentAttributes.RegistryKeyPath) != 0;
+                        if(!registryKeyPath && componentPath.Length > 0) componentPath = Path.GetDirectoryName(componentPath);
+                        string keyPath = (string) session.Database.ExecuteScalar(
+                                "SELECT `KeyPath` FROM `Component` WHERE `Component` = '{0}'", componentKey);
+                        using (View     view = session.Database.OpenView("SELECT `File`, `FileName`, `Version`, `Language`, " +
+                            "`Attributes` FROM `File` WHERE `Component_` = '{0}'", componentKey))
+            {
+                                view.Execute();
+                                
+                foreach (Record rec in view) using (rec)
+                                {
+                                        string fileKey = (string) rec["File"];
+                                        bool isKey = !registryKeyPath && keyPath == fileKey;
+                                                        
+                                        string dbVersion = (string) rec["Version"];
+                                        bool versionedFile = dbVersion.Length != 0;
+                                        if(versionedFile)
+                                        {
+                                                string language = (string) rec["Language"];
+                                                if(language.Length > 0)
+                                                {
+                                                        dbVersion = dbVersion + " (" + language + ")";
+                                                }
+                                        }
+                                        else if(session.Database.Tables.Contains("MsiFileHash"))
+                                        {
+                                                IList<int> hash = session.Database.ExecuteIntegerQuery("SELECT `HashPart1`, `HashPart2`, " + 
+                                                        "`HashPart3`, `HashPart4` FROM `MsiFileHash` WHERE `File_` = '{0}'", fileKey);
+                                                if(hash != null && hash.Count == 4)
+                                                {
+                                                        dbVersion = this.GetFileHashString(hash);
+                                                }
+                                        }
+                                        string filePath = GetLongFileName((string) rec["FileName"]);
+                                        bool exists = false;
+                                        bool installedMatch = false;
+                                        string installedVersion = "";
+                                        if(!registryKeyPath && componentPath.Length > 0)
+                                        {
+                                                filePath = Path.Combine(componentPath, filePath);
+                                                if(File.Exists(filePath))
+                                                {
+                                                        exists = true;
+                                                        if(versionedFile)
+                                                        {
+                                                                installedVersion = Installer.GetFileVersion(filePath);
+                                                                string language = Installer.GetFileLanguage(filePath);
+                                                                if(language.Length > 0)
+                                                                {
+                                                                        installedVersion = installedVersion + " (" + language + ")";
+                                                                }
+                                                        }
+                                                        else
+                                                        {
+                                int[] hash = new int[4];
+                                Installer.GetFileHash(filePath, hash);
+                                                        installedVersion = this.GetFileHashString(hash);
+                                                        }
+                                                        installedMatch = installedVersion == dbVersion;
+                                                }
+                                        }
+                                        object[] row;
+                                        if(includeComponent) row = new object[] { isKey, fileKey, filePath, exists, dbVersion, installedVersion, installedMatch, componentCode };
+                                        else row = new object[] { isKey, fileKey, filePath, exists, dbVersion, installedVersion, installedMatch };
+                                        rows.Add(row);
+                                }
+                        }
+            return (object[][]) rows.ToArray(typeof(object[]));
+                }
+                private string GetLongFileName(string fileName)
+                {
+                        string[] fileNames = fileName.Split('|');
+                        return fileNames.Length == 1? fileNames[0] : fileNames[1];
+                }
+                private string GetFileHashString(IList<int> hash)
+                {
+                        return String.Format("{0:X8}{1:X8}{2:X8}{3:X8}", (uint) hash[0], (uint) hash[1], (uint) hash[2], (uint) hash[3]);
+                }
+                private object[][] GetComponentRegistryRows(string productCode, string componentCode, Session session, bool includeComponent)
+                {
+                        ArrayList rows = new ArrayList();
+            string componentPath = new ComponentInstallation(componentCode, productCode).Path;
+                        string componentKey = (string) session.Database.ExecuteScalar(
+                                "SELECT `Component` FROM `Component` WHERE `ComponentId` = '{0}'", componentCode);
+                        if(componentKey == null) return null;
+                        int attributes = Convert.ToInt32(session.Database.ExecuteScalar(
+                                "SELECT `Attributes` FROM `Component` WHERE `Component` = '{0}'", componentKey));
+                        bool registryKeyPath = (attributes & (int) ComponentAttributes.RegistryKeyPath) != 0;
+                        if(!registryKeyPath && componentPath.Length > 0) componentPath = Path.GetDirectoryName(componentPath);
+                        string keyPath = (string) session.Database.ExecuteScalar(
+                                "SELECT `KeyPath` FROM `Component` WHERE `Component` = '{0}'", componentKey);
+                        using (View view = session.Database.OpenView("SELECT `Registry`, `Root`, `Key`, `Name`, " +
+                            "`Value` FROM `Registry` WHERE `Component_` = '{0}'", componentKey))
+            {
+                                view.Execute();
+                                foreach (Record rec in view) using (rec)
+                                {
+                                        string regName = (string) rec["Name"];
+                                        if(regName == "-") continue;  // Don't list deleted keys
+                                        string regTableKey = (string) rec["Registry"];
+                                        bool isKey = registryKeyPath && keyPath == regTableKey;
+                                        string regPath = this.GetRegistryPath(session, (RegistryRoot) Convert.ToInt32(rec["Root"]),
+                                                (string) rec["Key"], (string) rec["Name"]);
+                                        string dbValue;
+                                        using(Record formatRec = new Record(0))
+                                        {
+                                                formatRec[0] = rec["Value"];
+                                                dbValue = session.FormatRecord(formatRec);
+                                        }
+                                        string installedValue = this.GetRegistryValue(regPath);
+                                        bool exists = installedValue != null;
+                                        if(!exists) installedValue = "";
+                                        bool match = installedValue == dbValue;
+                                        object[] row;
+                                        if(includeComponent) row = new object[] { isKey, regTableKey, regPath, exists, dbValue, installedValue, match, componentCode };
+                                        else row = new object[] { isKey, regTableKey, regPath, exists, dbValue, installedValue, match };
+                                        rows.Add(row);
+                                }
+                        }
+            return (object[][]) rows.ToArray(typeof(object[]));
+                }
+                private string GetRegistryPath(Session session, RegistryRoot root, string key, string name)
+                {
+                        bool allUsers = session.EvaluateCondition("ALLUSERS = 1", true);
+                        string rootName = "????";
+                        switch(root)
+                        {
+                                case RegistryRoot.LocalMachine : rootName = "HKLM"; break;
+                                case RegistryRoot.CurrentUser  : rootName = "HKCU"; break;
+                                case RegistryRoot.Users        : rootName = "HKU"; break;
+                                case RegistryRoot.UserOrMachine: rootName = (allUsers ? "HKLM" : "HKCU"); break;
+                                case RegistryRoot.ClassesRoot  : rootName = (allUsers ? @"HKLM\Software\Classes" : @"HKCU\Software\Classes"); break;
+                                // TODO: Technically, RegistryRoot.ClassesRoot should be under HKLM on NT4.
+                        }
+                        if(name.Length == 0) name = "(Default)";
+                        if(name == "+" || name == "*") name = "";
+                        else name = " : " + name;
+                        using(Record formatRec = new Record(0))
+                        {
+                                formatRec[0] = String.Format(@"{0}\{1}{2}", rootName, key, name);
+                                return session.FormatRecord(formatRec);
+                        }
+                }
+                private string GetRegistryValue(string regPath)
+                {
+                        string valueName = null;
+                        int iColon = regPath.IndexOf(" : ", StringComparison.Ordinal) + 1;
+                        if(iColon > 0)
+                        {
+                                valueName = regPath.Substring(iColon + 2);
+                                regPath = regPath.Substring(0, iColon - 1);
+                        }
+                        if(valueName == "(Default)") valueName = "";
+                        RegistryKey root;
+                        if(regPath.StartsWith(@"HKLM\", StringComparison.Ordinal))
+                        {
+                                root = Registry.LocalMachine;
+                                regPath = regPath.Substring(5);
+                        }
+                        else if(regPath.StartsWith(@"HKCU\", StringComparison.Ordinal))
+                        {
+                                root = Registry.CurrentUser;
+                                regPath = regPath.Substring(5);
+                        }
+                        else if(regPath.StartsWith(@"HKU\", StringComparison.Ordinal))
+                        {
+                                root = Registry.Users;
+                                regPath = regPath.Substring(4);
+                        }
+                        else return null;
+                        using(RegistryKey regKey = root.OpenSubKey(regPath))
+                        {
+                                if(regKey != null)
+                                {
+                                        if(valueName == null)
+                                        {
+                                                // Just checking for the existence of the key.
+                                                return "";
+                                        }
+                                        object value = regKey.GetValue(valueName);
+                                        if(value is string[])
+                                        {
+                                                value = String.Join("[~]", (string[]) value);
+                                        }
+                                        else if(value is int)
+                                        {
+                                                value = "#" + value.ToString();
+                                        }
+                                        else if(value is byte[])
+                                        {
+                                                byte[] valueBytes = (byte[]) value;
+                                                StringBuilder byteString = new StringBuilder("#x");
+                                                for(int i = 0; i < valueBytes.Length; i++)
+                                                {
+                                                        byteString.Append(valueBytes[i].ToString("x2"));
+                                                }
+                                                value = byteString.ToString();
+                                        }
+                                        return (value != null ? value.ToString() : null);
+                                }
+                        }
+                        return null;
+                }
+                public DataView GetProductFilesData(string productCode)
+                {
+                        DataTable table = new DataTable("ProductFiles");
+                        table.Locale = CultureInfo.InvariantCulture;
+                        table.Columns.Add("ProductFilesIsKey", typeof(bool));
+                        table.Columns.Add("ProductFilesKey", typeof(string));
+                        table.Columns.Add("ProductFilesPath", typeof(string));
+                        table.Columns.Add("ProductFilesExists", typeof(bool));
+                        table.Columns.Add("ProductFilesDbVersion", typeof(string));
+                        table.Columns.Add("ProductFilesInstalledVersion", typeof(string));
+                        table.Columns.Add("ProductFilesInstalledMatch", typeof(bool));
+                        table.Columns.Add("ProductFilesComponentID", typeof(string));
+                        try
+                        {
+                                IntPtr hWnd = IntPtr.Zero;
+                Installer.SetInternalUI(InstallUIOptions.Silent, ref hWnd);
+                                lock(syncRoot)  // Only one Installer session can be active at a time
+                                {
+                                        using(Session session = Installer.OpenProduct(productCode))
+                                        {
+                                                session.DoAction("CostInitialize");
+                                                session.DoAction("FileCost");
+                                                session.DoAction("CostFinalize");
+                                                foreach(string componentCode in session.Database.ExecuteStringQuery("SELECT `ComponentId` FROM `Component`"))
+                                                {
+                                                        foreach(object[] row in this.GetComponentFilesRows(productCode, componentCode, session, true))
+                                                        {
+                                                                table.Rows.Add(row);
+                                                        }
+                                                }
+                                        }
+                                }
+                                return new DataView(table, "", "ProductFilesPath ASC", DataViewRowState.CurrentRows);
+                        }
+                        catch(InstallerException) { }
+                        return null;
+                }
+                public DataView GetProductRegistryData(string productCode)
+                {
+                        DataTable table = new DataTable("ProductRegistry");
+                        table.Locale = CultureInfo.InvariantCulture;
+                        table.Columns.Add("ProductRegistryIsKey", typeof(bool));
+                        table.Columns.Add("ProductRegistryKey", typeof(string));
+                        table.Columns.Add("ProductRegistryPath", typeof(string));
+                        table.Columns.Add("ProductRegistryExists", typeof(bool));
+                        table.Columns.Add("ProductRegistryDbVersion", typeof(string));
+                        table.Columns.Add("ProductRegistryInstalledVersion", typeof(string));
+                        table.Columns.Add("ProductRegistryInstalledMatch", typeof(bool));
+                        table.Columns.Add("ProductRegistryComponentID", typeof(string));
+                        try
+                        {
+                                IntPtr hWnd = IntPtr.Zero;
+                Installer.SetInternalUI(InstallUIOptions.Silent, ref hWnd);
+                                lock(syncRoot)  // Only one Installer session can be active at a time
+                                {
+                                        using(Session session = Installer.OpenProduct(productCode))
+                                        {
+                                                session.DoAction("CostInitialize");
+                                                session.DoAction("FileCost");
+                                                session.DoAction("CostFinalize");
+                                                foreach(string componentCode in session.Database.ExecuteStringQuery("SELECT `ComponentId` FROM `Component`"))
+                                                {
+                                                        foreach(object[] row in this.GetComponentRegistryRows(productCode, componentCode, session, true))
+                                                        {
+                                                                table.Rows.Add(row);
+                                                        }
+                                                }
+                                        }
+                                }
+                                return new DataView(table, "", "ProductRegistryPath ASC", DataViewRowState.CurrentRows);
+                        }
+                        catch(InstallerException) { }
+                        return null;
+                }
+                public DataView GetComponentProductsData(string componentCode)
+                {
+                        DataTable table = new DataTable("ComponentProducts");
+                        table.Locale = CultureInfo.InvariantCulture;
+                        table.Columns.Add("ComponentProductsProductName", typeof(string));
+                        table.Columns.Add("ComponentProductsProductCode", typeof(string));
+                        table.Columns.Add("ComponentProductsComponentPath", typeof(string));
+                        if(this.componentProductsMap != null)
+                        {
+                                ArrayList componentProducts = (ArrayList) this.componentProductsMap[componentCode];
+                                foreach(string productCode in componentProducts)
+                                {
+                                        string productName = MsiUtils.GetProductName(productCode);
+                    string componentPath = new ComponentInstallation(componentCode, productCode).Path;
+                                        table.Rows.Add(new object[] { productName, productCode, componentPath });
+                                }
+                                return new DataView(table, "", "ComponentProductsProductName ASC", DataViewRowState.CurrentRows);
+                        }
+                        return null;
+                }
+                public DataView GetProductComponentsData(string productCode)
+                {
+                        DataTable table = new DataTable("ProductComponents");
+                        table.Locale = CultureInfo.InvariantCulture;
+                        table.Columns.Add("ProductComponentsComponentName", typeof(string));
+                        table.Columns.Add("ProductComponentsComponentID", typeof(string));
+                        table.Columns.Add("ProductComponentsInstallState", typeof(string));
+                        try
+                        {
+                                IntPtr hWnd = IntPtr.Zero;
+                Installer.SetInternalUI(InstallUIOptions.Silent, ref hWnd);
+                                lock(syncRoot)  // Only one Installer session can be active at a time
+                                {
+                                        using(Session session = Installer.OpenProduct(productCode))
+                                        {
+                                                session.DoAction("CostInitialize");
+                                                session.DoAction("FileCost");
+                                                session.DoAction("CostFinalize");
+                                                IList<string> componentsAndIds = session.Database.ExecuteStringQuery(
+                                                        "SELECT `Component`, `ComponentId` FROM `Component`");
+                        for (int i = 0; i < componentsAndIds.Count; i += 2)
+                                                {
+                                                        if(componentsAndIds[i+1] == "Temporary Id") continue;
+                                                        InstallState compState = session.Components[componentsAndIds[i]].CurrentState;
+                                                        table.Rows.Add(new object[] { componentsAndIds[i], componentsAndIds[i+1],
+                                                                                                                        (compState == InstallState.Advertised ? "Advertised" : compState.ToString())});
+                                                }
+                                        }
+                                }
+                                return new DataView(table, "", "ProductComponentsComponentName ASC", DataViewRowState.CurrentRows);
+                        }
+                        catch(InstallerException) { }
+                        return null;
+                }
+                public DataView GetFeatureComponentsData(string productCode, string feature)
+                {
+                        DataTable table = new DataTable("ProductFeatureComponents");
+                        table.Locale = CultureInfo.InvariantCulture;
+                        table.Columns.Add("ProductFeatureComponentsComponentName", typeof(string));
+                        table.Columns.Add("ProductFeatureComponentsComponentID", typeof(string));
+                        try
+                        {
+                                IntPtr hWnd = IntPtr.Zero;
+                Installer.SetInternalUI(InstallUIOptions.Silent, ref hWnd);
+                                lock(syncRoot)  // Only one Installer session can be active at a time
+                                {
+                                        using(Session session = Installer.OpenProduct(productCode))
+                                        {
+                        IList<string> componentsAndIds = session.Database.ExecuteStringQuery(
+                            "SELECT `FeatureComponents`.`Component_`, " +
+                                                        "`Component`.`ComponentId` FROM `FeatureComponents`, `Component` " +
+                                                        "WHERE `FeatureComponents`.`Component_` = `Component`.`Component` " +
+                                                        "AND `FeatureComponents`.`Feature_` = '{0}'", feature);
+                                                for (int i = 0; i < componentsAndIds.Count; i += 2)
+                                                {
+                                                        table.Rows.Add(new object[] { componentsAndIds[i], componentsAndIds[i+1] });
+                                                }
+                                        }
+                                }
+                                return new DataView(table, "", "ProductFeatureComponentsComponentName ASC", DataViewRowState.CurrentRows);
+                        }
+                        catch(InstallerException) { }
+                        return null;
+                }
+                public string GetLink(string nodePath, DataRow row)
+                {
+                        string[] path = nodePath.Split('\\');
+                        if(path.Length == 3 && path[0] == "Products" && path[2] == "Components")
+                        {
+                                string component = (string) row["ProductComponentsComponentID"];
+                                return String.Format(@"Products\{0}\Components\{1}", path[1], component);
+                        }
+                        else if(path.Length == 4 && path[0] == "Products" && path[2] == "Features")
+                        {
+                                string component = (string) row["ProductFeatureComponentsComponentID"];
+                                return String.Format(@"Products\{0}\Components\{1}", path[1], component);
+                        }
+                        else if(path.Length == 3 && path[0] == "Products" && path[2] == "Files")
+                        {
+                                string component = (string) row["ProductFilesComponentID"];
+                                return String.Format(@"Products\{0}\Components\{1}", path[1], component);
+                        }
+                        else if(path.Length == 3 && path[0] == "Products" && path[2] == "Registry")
+                        {
+                                string component = (string) row["ProductRegistryComponentID"];
+                                return String.Format(@"Products\{0}\Components\{1}", path[1], component);
+                        }
+                        else if(path.Length == 5 && path[0] == "Products" && path[2] == "Components" && path[4] == "Sharing")
+                        {
+                                string product = (string) row["ComponentProductsProductCode"];
+                                return String.Format(@"Products\{0}\Components\{1}", MsiUtils.GetProductName(product), path[3]);
+                        }
+                        return null;
+                }
+        }
+}
diff --git a/src/samples/Dtf/Inventory/msiutils.cs b/src/samples/Dtf/Inventory/msiutils.cs
new file mode 100644
index 00000000..a345e194
--- /dev/null
+++ b/src/samples/Dtf/Inventory/msiutils.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.
+using System;
+using System.Collections;
+using WixToolset.Dtf.WindowsInstaller;
+namespace WixToolset.Dtf.Samples.Inventory
+{
+        public class MsiUtils
+        {
+                private static Hashtable productCodesToNames = new Hashtable();
+                private static Hashtable productNamesToCodes = new Hashtable();
+                public static string GetProductName(string productCode)
+                {
+                        string productName = (string) productCodesToNames[productCode];
+                        if(productName == null)
+                        {
+                productName = new ProductInstallation(productCode).ProductName;
+                                productName = productName.Replace('\\', ' ');
+                                if(productNamesToCodes.Contains(productName))
+                                {
+                                        string modifiedProductName = null;
+                                        for(int i = 2; i < Int32.MaxValue; i++)
+                                        {
+                                                modifiedProductName = productName + " [" + i + "]";
+                                                if(!productNamesToCodes.Contains(modifiedProductName)) break;
+                                        }
+                                        productName = modifiedProductName;
+                                }
+                                productCodesToNames[productCode] = productName;
+                                productNamesToCodes[productName] = productCode;
+                        }
+                        return productName;
+                }
+                // Assumes GetProductName() has already been called for this product.
+                public static string GetProductCode(string productName)
+                {
+                        return (string) productNamesToCodes[productName];
+                }
+                private MsiUtils() { }
+        }
+}
diff --git a/src/samples/Dtf/Inventory/patches.cs b/src/samples/Dtf/Inventory/patches.cs
new file mode 100644
index 00000000..f01a4798
--- /dev/null
+++ b/src/samples/Dtf/Inventory/patches.cs
@@ -0,0 +1,227 @@
+// 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.Security;
+using System.Data;
+using System.Collections;
+using System.Globalization;
+using System.Windows.Forms;
+using WixToolset.Dtf.WindowsInstaller;
+namespace WixToolset.Dtf.Samples.Inventory
+{
+        /// <summary>
+        /// Provides inventory data about patches installed on the system.
+        /// </summary>
+        public class PatchesInventory : IInventoryDataProvider
+        {
+                public PatchesInventory()
+                {
+                }
+                public string Description
+                {
+                        get { return "Installed patches"; }
+                }
+                public string[] GetNodes(InventoryDataLoadStatusCallback statusCallback)
+                {
+                        ArrayList nodes = new ArrayList();
+            statusCallback(nodes.Count, @"Products\...\Patches");
+            foreach (ProductInstallation product in ProductInstallation.AllProducts)
+                        {
+                                string productName = MsiUtils.GetProductName(product.ProductCode);
+                bool addedRoot = false;
+                                foreach (PatchInstallation productPatch in PatchInstallation.GetPatches(null, product.ProductCode, null, UserContexts.All, PatchStates.Applied))
+                                {
+                    if (!addedRoot) nodes.Add(String.Format(@"Products\{0}\Patches", productName));
+                                nodes.Add(String.Format(@"Products\{0}\Patches\{1}", productName, productPatch.PatchCode));
+                                }
+                        }
+                        
+            statusCallback(nodes.Count, "Patches");
+            string[] allPatches = GetAllPatchesList();
+                        if(allPatches.Length > 0)
+                        {
+                                nodes.Add("Patches");
+                                foreach(string patchCode in allPatches)
+                                {
+                                        nodes.Add(String.Format(@"Patches\{0}", patchCode));
+                                        nodes.Add(String.Format(@"Patches\{0}\Patched Products", patchCode));
+                                }
+                                statusCallback(nodes.Count, String.Empty);
+                        }
+                        return (string[]) nodes.ToArray(typeof(string));
+                }
+                public bool IsNodeSearchable(string searchRoot, string searchNode)
+                {
+                        return true;
+                }
+                public DataView GetData(string nodePath)
+                {
+                        string[] path = nodePath.Split('\\');
+                        if(path.Length == 3 && path[0] == "Products" && path[2] == "Patches")
+                        {
+                                return this.GetProductPatchData(path[1]);
+                        }
+                        else if(path.Length == 4 && path[0] == "Products" && path[2] == "Patches")
+                        {
+                                return this.GetPatchData(path[3]);
+                        }
+                        else if(path.Length == 1 && path[0] == "Patches")
+                        {
+                                return this.GetAllPatchesData();
+                        }
+                        else if(path.Length == 2 && path[0] == "Patches")
+                        {
+                                return this.GetPatchData(path[1]);
+                        }
+                        else if(path.Length == 3 && path[0] == "Patches" && path[2] == "Patched Products")
+                        {
+                                return this.GetPatchTargetData(path[1]);
+                        }
+                        return null;
+                }
+                private string[] GetAllPatchesList()
+                {
+                        ArrayList patchList = new ArrayList();
+                        foreach(PatchInstallation patch in PatchInstallation.AllPatches)
+                        {
+                                if(!patchList.Contains(patch.PatchCode))
+                                {
+                                        patchList.Add(patch.PatchCode);
+                                }
+                        }
+                        string[] patchArray = (string[]) patchList.ToArray(typeof(string));
+                        Array.Sort(patchArray, 0, patchArray.Length, StringComparer.Ordinal);
+                        return patchArray;
+                }
+                private DataView GetAllPatchesData()
+                {
+                        DataTable table = new DataTable("Patches");
+                        table.Locale = CultureInfo.InvariantCulture;
+                        table.Columns.Add("PatchesPatchCode", typeof(string));
+                        foreach(string patchCode in GetAllPatchesList())
+                        {
+                                table.Rows.Add(new object[] { patchCode });
+                        }
+                        return new DataView(table, "", "PatchesPatchCode ASC", DataViewRowState.CurrentRows);
+                }
+                private DataView GetProductPatchData(string productCode)
+                {
+                        DataTable table = new DataTable("ProductPatches");
+                        table.Locale = CultureInfo.InvariantCulture;
+                        table.Columns.Add("ProductPatchesPatchCode", typeof(string));
+                        foreach(PatchInstallation patch in PatchInstallation.GetPatches(null, productCode, null, UserContexts.All, PatchStates.Applied))
+                        {
+                                table.Rows.Add(new object[] { patch.PatchCode });
+                        }
+                        return new DataView(table, "", "ProductPatchesPatchCode ASC", DataViewRowState.CurrentRows);
+                }
+                private DataView GetPatchData(string patchCode)
+                {
+                        DataTable table = new DataTable("PatchProperties");
+                        table.Locale = CultureInfo.InvariantCulture;
+                        table.Columns.Add("PatchPropertiesProperty", typeof(string));
+                        table.Columns.Add("PatchPropertiesValue", typeof(string));
+                        table.Rows.Add(new object[] { "PatchCode", patchCode });
+            PatchInstallation patch = new PatchInstallation(patchCode, null);
+                        string localPackage = null;
+                        foreach(string property in new string[]
+                        {
+                                "InstallDate",
+                                "LocalPackage",
+                                "State",
+                                "Transforms",
+                                "Uninstallable",
+                        })
+                        {
+                                try
+                                {
+                                        string value = patch[property];
+                                        table.Rows.Add(new object[] { property,  (value != null ? value : "") });
+                                        if(property == "LocalPackage") localPackage = value;
+                                }
+                                catch(InstallerException iex)
+                                {
+                                        table.Rows.Add(new object[] { property, iex.Message });
+                                }
+                                catch(ArgumentException) { }
+                        }
+                        if(localPackage != null)
+                        {
+                                try
+                                {
+                                        using(SummaryInfo patchSummaryInfo = new SummaryInfo(localPackage, false))
+                                        {
+                                                table.Rows.Add(new object[] { "Title", patchSummaryInfo.Title });
+                                                table.Rows.Add(new object[] { "Subject", patchSummaryInfo.Subject });
+                                                table.Rows.Add(new object[] { "Author", patchSummaryInfo.Author });
+                                                table.Rows.Add(new object[] { "Comments", patchSummaryInfo.Comments });
+                                                table.Rows.Add(new object[] { "TargetProductCodes", patchSummaryInfo.Template });
+                                                string obsoletedPatchCodes = patchSummaryInfo.RevisionNumber.Substring(patchSummaryInfo.RevisionNumber.IndexOf('}') + 1);
+                                                table.Rows.Add(new object[] { "ObsoletedPatchCodes", obsoletedPatchCodes });
+                                                table.Rows.Add(new object[] { "TransformNames", patchSummaryInfo.LastSavedBy });
+                                        }
+                                }
+                                catch(InstallerException) { }
+                                catch(IOException) { }
+                                catch(SecurityException) { }
+                        }
+                        return new DataView(table, "", "PatchPropertiesProperty ASC", DataViewRowState.CurrentRows);
+                }
+                private DataView GetPatchTargetData(string patchCode)
+                {
+                        DataTable table = new DataTable("PatchTargets");
+                        table.Locale = CultureInfo.InvariantCulture;
+                        table.Columns.Add("PatchTargetsProductName", typeof(string));
+                        table.Columns.Add("PatchTargetsProductCode", typeof(string));
+            foreach (PatchInstallation patch in PatchInstallation.GetPatches(patchCode, null, null, UserContexts.All, PatchStates.Applied))
+                        {
+                                if(patch.PatchCode == patchCode)
+                                {
+                                        string productName = MsiUtils.GetProductName(patch.ProductCode);
+                                        table.Rows.Add(new object[] { productName, patch.ProductCode });
+                                }
+                        }
+                        return new DataView(table, "", "PatchTargetsProductName ASC", DataViewRowState.CurrentRows);
+                }
+                public string GetLink(string nodePath, DataRow row)
+                {
+                        string[] path = nodePath.Split('\\');
+                        if(path.Length == 3 && path[0] == "Products" && path[2] == "Patches")
+                        {
+                                return String.Format(@"Patches\{0}", row["ProductPatchesPatchCode"]);
+                        }
+                        else if(path.Length == 1 && path[0] == "Patches")
+                        {
+                                return String.Format(@"Patches\{0}", row["PatchesPatchCode"]);
+                        }
+                        else if(path.Length == 3 && path[0] == "Patches" && path[2] == "Patched Products")
+                        {
+                                return String.Format(@"Products\{0}", MsiUtils.GetProductCode((string) row["PatchTargetsProductCode"]));
+                        }
+                        return null;
+                }
+        }
+}
diff --git a/src/samples/Dtf/Inventory/products.cs b/src/samples/Dtf/Inventory/products.cs
new file mode 100644
index 00000000..872c56c3
--- /dev/null
+++ b/src/samples/Dtf/Inventory/products.cs
@@ -0,0 +1,145 @@
+// 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.Data;
+using System.Globalization;
+using System.Collections;
+using System.Windows.Forms;
+using WixToolset.Dtf.WindowsInstaller;
+namespace WixToolset.Dtf.Samples.Inventory
+{
+        /// <summary>
+        /// Provides inventory data about products installed or advertised on the system.
+        /// </summary>
+        public class ProductsInventory : IInventoryDataProvider
+        {
+                public ProductsInventory()
+                {
+                }
+                public string Description
+                {
+                        get { return "Installed products"; }
+                }
+                public string[] GetNodes(InventoryDataLoadStatusCallback statusCallback)
+                {
+            statusCallback(0, "Products");
+            ArrayList nodes = new ArrayList();
+                        nodes.Add("Products");
+                        foreach(ProductInstallation product in ProductInstallation.AllProducts)
+                        {
+                nodes.Add("Products\\" + MsiUtils.GetProductName(product.ProductCode));
+                        }
+                        statusCallback(nodes.Count, String.Empty);
+                        return (string[]) nodes.ToArray(typeof(string));
+                }
+                public bool IsNodeSearchable(string searchRoot, string searchNode)
+                {
+                        return true;
+                }
+                public DataView GetData(string nodePath)
+                {
+                        string[] path = nodePath.Split('\\');
+                        if(path.Length == 1 && path[0] == "Products")
+                        {
+                                return this.GetAllProductsData();
+                        }
+                        else if(path.Length == 2 && path[0] == "Products")
+                        {
+                                return this.GetProductData(MsiUtils.GetProductCode(path[1]));
+                        }
+                        return null;
+                }
+                private DataView GetAllProductsData()
+                {
+                        DataTable table = new DataTable("Products");
+                        table.Locale = CultureInfo.InvariantCulture;
+                        table.Columns.Add("ProductsProductName", typeof(string));
+                        table.Columns.Add("ProductsProductCode", typeof(string));
+            foreach (ProductInstallation product in ProductInstallation.AllProducts)
+            {
+                string productName = MsiUtils.GetProductName(product.ProductCode);
+                table.Rows.Add(new object[] { productName, product.ProductCode });
+                        }
+                        return new DataView(table, "", "ProductsProductName ASC", DataViewRowState.CurrentRows);
+                }
+                private DataView GetProductData(string productCode)
+                {
+                        DataTable table = new DataTable("ProductProperties");
+                        table.Locale = CultureInfo.InvariantCulture;
+                        table.Columns.Add("ProductPropertiesProperty", typeof(string));
+                        table.Columns.Add("ProductPropertiesValue", typeof(string));
+                        // Add a fake "ProductCode" install property, just for display convenience.
+                        table.Rows.Add(new object[] { "ProductCode", productCode });
+            ProductInstallation product = new ProductInstallation(productCode);
+                        foreach(string property in new string[]
+                        {
+                                "AssignmentType",
+                                "DiskPrompt",
+                                "HelpLink",
+                                "HelpTelephone",
+                                "InstalledProductName",
+                                "InstallDate",
+                                "InstallLocation",
+                                "InstallSource",
+                                "Language",
+                                "LastUsedSource",
+                                "LastUsedType",
+                                "LocalPackage",
+                                "MediaPackagePath",
+                                "PackageCode",
+                                "PackageName",
+                                "ProductIcon",
+                                "ProductID",
+                                "ProductName",
+                                "Publisher",
+                                "RegCompany",
+                                "RegOwner",
+                                "State",
+                                "transforms",
+                                "Uninstallable",
+                                "UrlInfoAbout",
+                                "UrlUpdateInfo",
+                                "Version",
+                                "VersionMinor",
+                                "VersionMajor",
+                                "VersionString"
+                        })
+                        {
+                                try
+                                {
+                    string value = product[property];
+                                        table.Rows.Add(new object[] { property,  (value != null ? value : "") });
+                                }
+                                catch(InstallerException iex)
+                                {
+                                        table.Rows.Add(new object[] { property, iex.Message });
+                                }
+                                catch(ArgumentException) { }
+                        }
+                        return new DataView(table, "", "ProductPropertiesProperty ASC", DataViewRowState.CurrentRows);
+                }
+                public string GetLink(string nodePath, DataRow row)
+                {
+                        string[] path = nodePath.Split('\\');
+                        if(path.Length == 1 && path[0] == "Products")
+                        {
+                                return String.Format(@"Products\{0}", MsiUtils.GetProductName((string) row["ProductsProductCode"]));
+                        }
+                        return null;
+                }
+        }
+}
diff --git a/src/samples/Dtf/Inventory/xp.manifest b/src/samples/Dtf/Inventory/xp.manifest
new file mode 100644
index 00000000..34d61fea
--- /dev/null
+++ b/src/samples/Dtf/Inventory/xp.manifest
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<!-- 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. -->
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32"
+        name="Microsoft.Windows.Common-Controls"
+        version="6.0.0.0" language="*"
+        processorArchitecture="X86"
+        publicKeyToken="6595b64144ccf1df" /> 
+    </dependentAssembly>
+  </dependency>
+</assembly>
diff --git a/src/samples/Dtf/ManagedCA/AssemblyInfo.cs b/src/samples/Dtf/ManagedCA/AssemblyInfo.cs
new file mode 100644
index 00000000..75be36b2
--- /dev/null
+++ b/src/samples/Dtf/ManagedCA/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.Reflection;
+[assembly: AssemblyDescription("Sample managed custom actions")]
diff --git a/src/samples/Dtf/ManagedCA/ManagedCA.csproj b/src/samples/Dtf/ManagedCA/ManagedCA.csproj
new file mode 100644
index 00000000..7fb32ad4
--- /dev/null
+++ b/src/samples/Dtf/ManagedCA/ManagedCA.csproj
@@ -0,0 +1,33 @@
+<!-- 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>{DB9E5F02-8241-440A-9B60-980EB5B42B13}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>WixToolset.Dtf.Samples.ManagedCA</RootNamespace>
+    <AssemblyName>WixToolset.Dtf.Samples.ManagedCA</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="SampleCAs.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj">
+      <Project>{24121677-0ed0-41b5-833f-1b9a18e87bf4}</Project>
+      <Name>WixToolset.Dtf.WindowsInstaller</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+<!--
+  <PropertyGroup>
+    <PostBuildEvent>"$(TargetDir)..\x86\MakeSfxCA.exe" "$(TargetPath)" "$(TargetDir)SfxCA.dll" "$(IntermediateOutputPath)$(TargetFileName)" WixToolset.Dtf.WindowsInstaller.dll="$(TargetDir)WixToolset.Dtf.WindowsInstaller.dll" testsub\SampleCAs.cs="$(ProjectDir)\SampleCAs.cs"</PostBuildEvent>
+  </PropertyGroup>
+-->
+  
+</Project>
diff --git a/src/samples/Dtf/ManagedCA/SampleCAs.cs b/src/samples/Dtf/ManagedCA/SampleCAs.cs
new file mode 100644
index 00000000..645131c8
--- /dev/null
+++ b/src/samples/Dtf/ManagedCA/SampleCAs.cs
@@ -0,0 +1,127 @@
+// 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.Samples.ManagedCA
+{
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using WixToolset.Dtf.WindowsInstaller;
+    public class SampleCAs
+    {
+        [CustomAction]
+        public static ActionResult SampleCA1(Session session)
+        {
+            using (Record msgRec = new Record(0))
+            {
+                msgRec[0] = "Hello from SampleCA1!" +
+                    "\r\nCLR version is v" + Environment.Version;
+                session.Message(InstallMessage.Info, msgRec);
+                session.Message(InstallMessage.User, msgRec);
+            }
+            session.Log("Testing summary info...");
+            SummaryInfo summInfo = session.Database.SummaryInfo;
+            session.Log("MSI PackageCode = {0}", summInfo.RevisionNumber);
+            session.Log("MSI ModifyDate = {0}", summInfo.LastSaveTime);
+            string testProp = session["SampleCATest"];
+            session.Log("Simple property test: [SampleCATest]={0}.", testProp);
+            session.Log("Testing subdirectory extraction...");
+            string testFilePath = "testsub\\SampleCAs.cs";
+            if (!File.Exists(testFilePath))
+            {
+                session.Log("Subdirectory extraction failed. File not found: " + testFilePath);
+                return ActionResult.Failure;
+            }
+            else
+            {
+                session.Log("Found file extracted in subdirectory.");
+            }
+            session.Log("Testing record stream extraction...");
+            string tempFile = null;
+            try
+            {
+                tempFile = Path.GetTempFileName();
+                using (View binView = session.Database.OpenView(
+                    "SELECT `Binary`.`Data` FROM `Binary`, `CustomAction` " +
+                    "WHERE `CustomAction`.`Target` = 'SampleCA1' AND " +
+                    "`CustomAction`.`Source` = `Binary`.`Name`"))
+                {
+                    binView.Execute();
+                    using (Record binRec = binView.Fetch())
+                    {
+                        binRec.GetStream(1, tempFile);
+                    }
+                }
+                session.Log("CA binary file size: {0}", new FileInfo(tempFile).Length);
+                string binFileVersion = Installer.GetFileVersion(tempFile);
+                session.Log("CA binary file version: {0}", binFileVersion);
+            }
+            finally
+            {
+                if (tempFile != null && File.Exists(tempFile))
+                {
+                    File.Delete(tempFile);
+                }
+            }
+            session.Log("Testing record stream reading...");
+            using (View binView2 = session.Database.OpenView("SELECT `Data` FROM `Binary` WHERE `Name` = 'TestData'"))
+            {
+                binView2.Execute();
+                using (Record binRec2 = binView2.Fetch())
+                {
+                    Stream stream = binRec2.GetStream("Data");
+                    string testData = new StreamReader(stream, System.Text.Encoding.UTF8).ReadToEnd();
+                    session.Log("Test data: " + testData);
+                }
+            }
+            session.Log("Listing components");
+            using (View compView = session.Database.OpenView(
+                "SELECT `Component` FROM `Component`"))
+            {
+                compView.Execute();
+                foreach (Record compRec in compView)
+                {
+                    using (compRec)
+                    {
+                        session.Log("\t{0}", compRec["Component"]);
+                    }
+                }
+            }
+            session.Log("Testing the ability to access an external MSI database...");
+            string tempDbFile = Path.GetTempFileName();
+            using (Database tempDb = new Database(tempDbFile, DatabaseOpenMode.CreateDirect))
+            {
+                // Just create an empty database.
+            }
+            using (Database tempDb2 = new Database(tempDbFile))
+            {
+                // See if we can open and query the database.
+                IList<string> tables = tempDb2.ExecuteStringQuery("SELECT `Name` FROM `_Tables`");
+                session.Log("Found " + tables.Count + " tables in the newly created database.");
+            }
+            File.Delete(tempDbFile);
+            return ActionResult.Success;
+        }
+        [CustomAction("SampleCA2")]
+        public static ActionResult SampleCustomAction2(Session session)
+        {
+            using (Record msgRec = new Record(0))
+            {
+                msgRec[0] = "Hello from SampleCA2!";
+                session.Message(InstallMessage.Info, msgRec);
+                session.Message(InstallMessage.User, msgRec);
+            }
+            return ActionResult.UserExit;
+        }
+    }
+}
diff --git a/src/samples/Dtf/Tools/MakeSfxCA/MakeSfxCA.cs b/src/samples/Dtf/Tools/MakeSfxCA/MakeSfxCA.cs
new file mode 100644
index 00000000..76ff79b3
--- /dev/null
+++ b/src/samples/Dtf/Tools/MakeSfxCA/MakeSfxCA.cs
@@ -0,0 +1,711 @@
+// 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.Tools.MakeSfxCA
+{
+    using System;
+    using System.IO;
+    using System.Collections.Generic;
+    using System.Security;
+    using System.Text;
+    using System.Reflection;
+    using Compression;
+    using Compression.Cab;
+    using Resources;
+    using ResourceCollection = Resources.ResourceCollection;
+    /// <summary>
+    /// Command-line tool for building self-extracting custom action packages.
+    /// Appends cabbed CA binaries to SfxCA.dll and fixes up the result's
+    /// entry-points and file version to look like the CA module.
+    /// </summary>
+    public static class MakeSfxCA
+    {
+        private const string REQUIRED_WI_ASSEMBLY = "WixToolset.Dtf.WindowsInstaller.dll";
+        private static TextWriter log;
+        /// <summary>
+        /// Prints usage text for the tool.
+        /// </summary>
+        /// <param name="w">Console text writer.</param>
+        public static void Usage(TextWriter w)
+        {
+            w.WriteLine("Deployment Tools Foundation custom action packager version {0}",
+                Assembly.GetExecutingAssembly().GetName().Version);
+            w.WriteLine("Copyright (C) .NET Foundation and contributors. All rights reserved.");
+            w.WriteLine();
+            w.WriteLine("Usage: MakeSfxCA <outputca.dll> SfxCA.dll <inputca.dll> [support files ...]");
+            w.WriteLine();
+            w.WriteLine("Makes a self-extracting managed MSI CA or UI DLL package.");
+            w.WriteLine("Support files must include " + MakeSfxCA.REQUIRED_WI_ASSEMBLY);
+            w.WriteLine("Support files optionally include CustomAction.config/EmbeddedUI.config");
+        }
+        /// <summary>
+        /// Runs the MakeSfxCA command-line tool.
+        /// </summary>
+        /// <param name="args">Command-line arguments.</param>
+        /// <returns>0 on success, nonzero on failure.</returns>
+        public static int Main(string[] args)
+        {
+            if (args.Length < 3)
+            {
+                Usage(Console.Out);
+                return 1;
+            }
+            var output = args[0];
+            var sfxDll = args[1];
+            var inputs = new string[args.Length - 2];
+            Array.Copy(args, 2, inputs, 0, inputs.Length);
+            try
+            {
+                Build(output, sfxDll, inputs, Console.Out);
+                return 0;
+            }
+            catch (ArgumentException ex)
+            {
+                Console.Error.WriteLine("Error: Invalid argument: " + ex.Message);
+                return 1;
+            }
+            catch (FileNotFoundException ex)
+            {
+                Console.Error.WriteLine("Error: Cannot find file: " + ex.Message);
+                return 1;
+            }
+            catch (Exception ex)
+            {
+                Console.Error.WriteLine("Error: Unexpected error: " + ex);
+                return 1;
+            }
+        }
+        /// <summary>
+        /// Packages up all the inputs to the output location.
+        /// </summary>
+        /// <exception cref="Exception">Various exceptions are thrown
+        /// if things go wrong.</exception>
+        public static void Build(string output, string sfxDll, IList<string> inputs, TextWriter log)
+        {
+            MakeSfxCA.log = log;
+            if (string.IsNullOrEmpty(output))
+            {
+                throw new ArgumentNullException("output");
+            }
+            if (string.IsNullOrEmpty(sfxDll))
+            {
+                throw new ArgumentNullException("sfxDll");
+            }
+            if (inputs == null || inputs.Count == 0)
+            {
+                throw new ArgumentNullException("inputs");
+            }
+            if (!File.Exists(sfxDll))
+            {
+                throw new FileNotFoundException(sfxDll);
+            }
+            var customActionAssembly = inputs[0];
+            if (!File.Exists(customActionAssembly))
+            {
+                throw new FileNotFoundException(customActionAssembly);
+            }
+            inputs = MakeSfxCA.SplitList(inputs);
+            var inputsMap = MakeSfxCA.GetPackFileMap(inputs);
+            var foundWIAssembly = false;
+            foreach (var input in inputsMap.Keys)
+            {
+                if (string.Compare(input, MakeSfxCA.REQUIRED_WI_ASSEMBLY,
+                    StringComparison.OrdinalIgnoreCase) == 0)
+                {
+                    foundWIAssembly = true;
+                }
+            }
+            if (!foundWIAssembly)
+            {
+                throw new ArgumentException(MakeSfxCA.REQUIRED_WI_ASSEMBLY +
+                    " must be included in the list of support files. " +
+                    "If using the MSBuild targets, make sure the assembly reference " +
+                    "has the Private (Copy Local) flag set.");
+            }
+            MakeSfxCA.ResolveDependentAssemblies(inputsMap, Path.GetDirectoryName(customActionAssembly));
+            var entryPoints = MakeSfxCA.FindEntryPoints(customActionAssembly);
+            var uiClass = MakeSfxCA.FindEmbeddedUIClass(customActionAssembly);
+            if (entryPoints.Count == 0 && uiClass == null)
+            {
+                throw new ArgumentException(
+                    "No CA or UI entry points found in module: " + customActionAssembly);
+            }
+            else if (entryPoints.Count > 0 && uiClass != null)
+            {
+                throw new NotSupportedException(
+                    "CA and UI entry points cannot be in the same assembly: " + customActionAssembly);
+            }
+            var dir = Path.GetDirectoryName(output);
+            if (dir.Length > 0 && !Directory.Exists(dir))
+            {
+                Directory.CreateDirectory(dir);
+            }
+            using (Stream outputStream = File.Create(output))
+            {
+                MakeSfxCA.WriteEntryModule(sfxDll, outputStream, entryPoints, uiClass);
+            }
+            MakeSfxCA.CopyVersionResource(customActionAssembly, output);
+            MakeSfxCA.PackInputFiles(output, inputsMap);
+            log.WriteLine("MakeSfxCA finished: " + new FileInfo(output).FullName);
+        }
+        /// <summary>
+        /// Splits any list items delimited by semicolons into separate items.
+        /// </summary>
+        /// <param name="list">Read-only input list.</param>
+        /// <returns>New list with resulting split items.</returns>
+        private static IList<string> SplitList(IList<string> list)
+        {
+            var newList = new List<string>(list.Count);
+            foreach (var item in list)
+            {
+                if (!string.IsNullOrEmpty(item))
+                {
+                    foreach (var splitItem in item.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
+                    {
+                        newList.Add(splitItem);
+                    }
+                }
+            }
+            return newList;
+        }
+        /// <summary>
+        /// Sets up a reflection-only assembly-resolve-handler to handle loading dependent assemblies during reflection.
+        /// </summary>
+        /// <param name="inputFiles">List of input files which include non-GAC dependent assemblies.</param>
+        /// <param name="inputDir">Directory to auto-locate additional dependent assemblies.</param>
+        /// <remarks>
+        /// Also searches the assembly's directory for unspecified dependent assemblies, and adds them
+        /// to the list of input files if found.
+        /// </remarks>
+        private static void ResolveDependentAssemblies(IDictionary<string, string> inputFiles, string inputDir)
+        {
+            AppDomain.CurrentDomain.ReflectionOnlyAssemblyResolve += delegate(object sender, ResolveEventArgs args)
+            {
+                AssemblyName resolveName = new AssemblyName(args.Name);
+                Assembly assembly = null;
+                // First, try to find the assembly in the list of input files.
+                foreach (var inputFile in inputFiles.Values)
+                {
+                    var inputName = Path.GetFileNameWithoutExtension(inputFile);
+                    var inputExtension = Path.GetExtension(inputFile);
+                    if (string.Equals(inputName, resolveName.Name, StringComparison.OrdinalIgnoreCase) &&
+                        (string.Equals(inputExtension, ".dll", StringComparison.OrdinalIgnoreCase) ||
+                         string.Equals(inputExtension, ".exe", StringComparison.OrdinalIgnoreCase)))
+                    {
+                        assembly = MakeSfxCA.TryLoadDependentAssembly(inputFile);
+                        if (assembly != null)
+                        {
+                            break;
+                        }
+                    }
+                }
+                // Second, try to find the assembly in the input directory.
+                if (assembly == null && inputDir != null)
+                {
+                    string assemblyPath = null;
+                    if (File.Exists(Path.Combine(inputDir, resolveName.Name) + ".dll"))
+                    {
+                        assemblyPath = Path.Combine(inputDir, resolveName.Name) + ".dll";
+                    }
+                    else if (File.Exists(Path.Combine(inputDir, resolveName.Name) + ".exe"))
+                    {
+                        assemblyPath = Path.Combine(inputDir, resolveName.Name) + ".exe";
+                    }
+                    if (assemblyPath != null)
+                    {
+                        assembly = MakeSfxCA.TryLoadDependentAssembly(assemblyPath);
+                        if (assembly != null)
+                        {
+                            // Add this detected dependency to the list of files to be packed.
+                            inputFiles.Add(Path.GetFileName(assemblyPath), assemblyPath);
+                        }
+                    }
+                }
+                // Third, try to load the assembly from the GAC.
+                if (assembly == null)
+                {
+                    try
+                    {
+                        assembly = Assembly.ReflectionOnlyLoad(args.Name);
+                    }
+                    catch (FileNotFoundException)
+                    {
+                    }
+                }
+                if (assembly != null)
+                {
+                    if (string.Equals(assembly.GetName().ToString(), resolveName.ToString()))
+                    {
+                        log.WriteLine("    Loaded dependent assembly: " + assembly.Location);
+                        return assembly;
+                    }
+                    log.WriteLine("    Warning: Loaded mismatched dependent assembly: " + assembly.Location);
+                    log.WriteLine("      Loaded assembly   : " + assembly.GetName());
+                    log.WriteLine("      Reference assembly: " + resolveName);
+                }
+                else
+                {
+                    log.WriteLine("    Error: Dependent assembly not supplied: " + resolveName);
+                }
+                return null;
+            };
+        }
+        /// <summary>
+        /// Attempts a reflection-only load of a dependent assembly, logging the error if the load fails.
+        /// </summary>
+        /// <param name="assemblyPath">Path of the assembly file to laod.</param>
+        /// <returns>Loaded assembly, or null if the load failed.</returns>
+        private static Assembly TryLoadDependentAssembly(string assemblyPath)
+        {
+            Assembly assembly = null;
+            try
+            {
+                assembly = Assembly.ReflectionOnlyLoadFrom(assemblyPath);
+            }
+            catch (IOException ex)
+            {
+                log.WriteLine("    Error: Failed to load dependent assembly: {0}. {1}", assemblyPath, ex.Message);
+            }
+            catch (BadImageFormatException ex)
+            {
+                log.WriteLine("    Error: Failed to load dependent assembly: {0}. {1}", assemblyPath, ex.Message);
+            }
+            catch (SecurityException ex)
+            {
+                log.WriteLine("    Error: Failed to load dependent assembly: {0}. {1}", assemblyPath, ex.Message);
+            }
+            return assembly;
+        }
+        /// <summary>
+        /// Searches the types in the input assembly for a type that implements IEmbeddedUI.
+        /// </summary>
+        /// <param name="module"></param>
+        /// <returns></returns>
+        private static string FindEmbeddedUIClass(string module)
+        {
+            log.WriteLine("Searching for an embedded UI class in {0}", Path.GetFileName(module));
+            string uiClass = null;
+            var assembly = Assembly.ReflectionOnlyLoadFrom(module);
+            foreach (var type in assembly.GetExportedTypes())
+            {
+                if (!type.IsAbstract)
+                {
+                    foreach (var interfaceType in type.GetInterfaces())
+                    {
+                        if (interfaceType.FullName == "WixToolset.Dtf.WindowsInstaller.IEmbeddedUI")
+                        {
+                            if (uiClass == null)
+                            {
+                                uiClass = assembly.GetName().Name + "!" + type.FullName;
+                            }
+                            else
+                            {
+                                throw new ArgumentException("Multiple IEmbeddedUI implementations found.");
+                            }
+                        }
+                    }
+                }
+            }
+            return uiClass;
+        }
+        /// <summary>
+        /// Reflects on an input CA module to locate custom action entry-points.
+        /// </summary>
+        /// <param name="module">Assembly module with CA entry-points.</param>
+        /// <returns>Mapping from entry-point names to assembly!class.method paths.</returns>
+        private static IDictionary<string, string> FindEntryPoints(string module)
+        {
+            log.WriteLine("Searching for custom action entry points " +
+                "in {0}", Path.GetFileName(module));
+            var entryPoints = new Dictionary<string, string>();
+            var assembly = Assembly.ReflectionOnlyLoadFrom(module);
+            foreach (var type in assembly.GetExportedTypes())
+            {
+                foreach (var method in type.GetMethods(BindingFlags.Public | BindingFlags.Static))
+                {
+                    var entryPointName = MakeSfxCA.GetEntryPoint(method);
+                    if (entryPointName != null)
+                    {
+                        var entryPointPath = string.Format(
+                            "{0}!{1}.{2}",
+                            Path.GetFileNameWithoutExtension(module),
+                            type.FullName,
+                            method.Name);
+                        entryPoints.Add(entryPointName, entryPointPath);
+                        log.WriteLine("    {0}={1}", entryPointName, entryPointPath);
+                    }
+                }
+            }
+            return entryPoints;
+        }
+        /// <summary>
+        /// Check for a CustomActionAttribute and return the entrypoint name for the method if it is a CA method.
+        /// </summary>
+        /// <param name="method">A public static method.</param>
+        /// <returns>Entrypoint name for the method as specified by the custom action attribute or just the method name,
+        /// or null if the method is not a custom action method.</returns>
+        private static string GetEntryPoint(MethodInfo method)
+        {
+            IList<CustomAttributeData> attributes;
+            try
+            {
+                attributes = CustomAttributeData.GetCustomAttributes(method);
+            }
+            catch (FileLoadException)
+            {
+                // Already logged load failures in the assembly-resolve-handler.
+                return null;
+            }
+            foreach (CustomAttributeData attribute in attributes)
+            {
+                if (attribute.ToString().StartsWith(
+                    "[WixToolset.Dtf.WindowsInstaller.CustomActionAttribute(",
+                    StringComparison.Ordinal))
+                {
+                    string entryPointName = null;
+                    foreach (var argument in attribute.ConstructorArguments)
+                    {
+                        // The entry point name is the first positional argument, if specified.
+                        entryPointName = (string) argument.Value;
+                        break;
+                    }
+                    if (string.IsNullOrEmpty(entryPointName))
+                    {
+                        entryPointName = method.Name;
+                    }
+                    return entryPointName;
+                }
+            }
+            return null;
+        }
+        /// <summary>
+        /// Counts the number of template entrypoints in SfxCA.dll.
+        /// </summary>
+        /// <remarks>
+        /// Depending on the requirements, SfxCA.dll might be built with
+        /// more entrypoints than the default.
+        /// </remarks>
+        private static int GetEntryPointSlotCount(byte[] fileBytes, string entryPointFormat)
+        {
+            for (var count = 0; ; count++)
+            {
+                var templateName = string.Format(entryPointFormat, count);
+                var templateAsciiBytes = Encoding.ASCII.GetBytes(templateName);
+                var nameOffset = FindBytes(fileBytes, templateAsciiBytes);
+                if (nameOffset < 0)
+                {
+                    return count;
+                }
+            }
+        }
+        /// <summary>
+        /// Writes a modified version of SfxCA.dll to the output stream,
+        /// with the template entry-points mapped to the CA entry-points.
+        /// </summary>
+        /// <remarks>
+        /// To avoid having to recompile SfxCA.dll for every different set of CAs,
+        /// this method looks for a preset number of template entry-points in the
+        /// binary file and overwrites their entrypoint name and string data with
+        /// CA-specific values.
+        /// </remarks>
+        private static void WriteEntryModule(
+            string sfxDll, Stream outputStream, IDictionary<string, string> entryPoints, string uiClass)
+        {
+            log.WriteLine("Modifying SfxCA.dll stub");
+            byte[] fileBytes;
+            using (var readStream = File.OpenRead(sfxDll))
+            {
+                fileBytes = new byte[(int) readStream.Length];
+                readStream.Read(fileBytes, 0, fileBytes.Length);
+            }
+            const string ENTRYPOINT_FORMAT = "CustomActionEntryPoint{0:d03}";
+            const int MAX_ENTRYPOINT_NAME = 72;
+            const int MAX_ENTRYPOINT_PATH = 160;
+            //var emptyBytes = new byte[0];
+            var slotCount = MakeSfxCA.GetEntryPointSlotCount(fileBytes, ENTRYPOINT_FORMAT);
+            if (slotCount == 0)
+            {
+                throw new ArgumentException("Invalid SfxCA.dll file.");
+            }
+            if (entryPoints.Count > slotCount)
+            {
+                throw new ArgumentException(string.Format(
+                    "The custom action assembly has {0} entrypoints, which is more than the maximum ({1}). " +
+                    "Refactor the custom actions or add more entrypoint slots in SfxCA\\EntryPoints.h.",
+                    entryPoints.Count, slotCount));
+            }
+            var slotSort = new string[slotCount];
+            for (var i = 0; i < slotCount - entryPoints.Count; i++)
+            {
+                slotSort[i] = string.Empty;
+            }
+            entryPoints.Keys.CopyTo(slotSort, slotCount - entryPoints.Count);
+            Array.Sort<string>(slotSort, slotCount - entryPoints.Count, entryPoints.Count, StringComparer.Ordinal);
+            for (var i = 0; ; i++)
+            {
+                var templateName = string.Format(ENTRYPOINT_FORMAT, i);
+                var templateAsciiBytes = Encoding.ASCII.GetBytes(templateName);
+                var templateUniBytes = Encoding.Unicode.GetBytes(templateName);
+                var nameOffset = MakeSfxCA.FindBytes(fileBytes, templateAsciiBytes);
+                if (nameOffset < 0)
+                {
+                    break;
+                }
+                var pathOffset = MakeSfxCA.FindBytes(fileBytes, templateUniBytes);
+                if (pathOffset < 0)
+                {
+                    break;
+                }
+                var entryPointName = slotSort[i];
+                var entryPointPath = entryPointName.Length > 0 ?
+                    entryPoints[entryPointName] : string.Empty;
+                if (entryPointName.Length > MAX_ENTRYPOINT_NAME)
+                {
+                    throw new ArgumentException(string.Format(
+                        "Entry point name exceeds limit of {0} characters: {1}",
+                        MAX_ENTRYPOINT_NAME,
+                        entryPointName));
+                }
+                if (entryPointPath.Length > MAX_ENTRYPOINT_PATH)
+                {
+                    throw new ArgumentException(string.Format(
+                        "Entry point path exceeds limit of {0} characters: {1}",
+                        MAX_ENTRYPOINT_PATH,
+                        entryPointPath));
+                }
+                var replaceNameBytes = Encoding.ASCII.GetBytes(entryPointName);
+                var replacePathBytes = Encoding.Unicode.GetBytes(entryPointPath);
+                MakeSfxCA.ReplaceBytes(fileBytes, nameOffset, MAX_ENTRYPOINT_NAME, replaceNameBytes);
+                MakeSfxCA.ReplaceBytes(fileBytes, pathOffset, MAX_ENTRYPOINT_PATH * 2, replacePathBytes);
+            }
+            if (entryPoints.Count == 0 && uiClass != null)
+            {
+                // Remove the zzz prefix from exported EmbeddedUI entry-points.
+                foreach (var export in new string[] { "InitializeEmbeddedUI", "EmbeddedUIHandler", "ShutdownEmbeddedUI" })
+                {
+                    var exportNameBytes = Encoding.ASCII.GetBytes("zzz" + export);
+                    var exportOffset = MakeSfxCA.FindBytes(fileBytes, exportNameBytes);
+                    if (exportOffset < 0)
+                    {
+                        throw new ArgumentException("Input SfxCA.dll does not contain exported entry-point: " + export);
+                    }
+                    var replaceNameBytes = Encoding.ASCII.GetBytes(export);
+                    MakeSfxCA.ReplaceBytes(fileBytes, exportOffset, exportNameBytes.Length, replaceNameBytes);
+                }
+                if (uiClass.Length > MAX_ENTRYPOINT_PATH)
+                {
+                    throw new ArgumentException(string.Format(
+                        "UI class full name exceeds limit of {0} characters: {1}",
+                        MAX_ENTRYPOINT_PATH,
+                        uiClass));
+                }
+                var templateBytes = Encoding.Unicode.GetBytes("InitializeEmbeddedUI_FullClassName");
+                var replaceBytes = Encoding.Unicode.GetBytes(uiClass);
+                // Fill in the embedded UI implementor class so the proxy knows which one to load.
+                var replaceOffset = MakeSfxCA.FindBytes(fileBytes, templateBytes);
+                if (replaceOffset >= 0)
+                {
+                    MakeSfxCA.ReplaceBytes(fileBytes, replaceOffset, MAX_ENTRYPOINT_PATH * 2, replaceBytes);
+                }
+            }
+            outputStream.Write(fileBytes, 0, fileBytes.Length);
+        }
+        /// <summary>
+        /// Searches for a sub-array of bytes within a larger array of bytes.
+        /// </summary>
+        private static int FindBytes(byte[] source, byte[] find)
+        {
+            for (var i = 0; i < source.Length; i++)
+            {
+                int j;
+                for (j = 0; j < find.Length; j++)
+                {
+                    if (source[i + j] != find[j])
+                    {
+                        break;
+                    }
+                }
+                if (j == find.Length)
+                {
+                    return i;
+                }
+            }
+            return -1;
+        }
+        /// <summary>
+        /// Replaces a range of bytes with new bytes, padding any extra part
+        /// of the range with zeroes.
+        /// </summary>
+        private static void ReplaceBytes(
+            byte[] source, int offset, int length, byte[] replace)
+        {
+            for (var i = 0; i < length; i++)
+            {
+                if (i < replace.Length)
+                {
+                    source[offset + i] = replace[i];
+                }
+                else
+                {
+                    source[offset + i] = 0;
+                }
+            }
+        }
+        /// <summary>
+        /// Print the name of one file as it is being packed into the cab.
+        /// </summary>
+        private static void PackProgress(object source, ArchiveProgressEventArgs e)
+        {
+            if (e.ProgressType == ArchiveProgressType.StartFile && log != null)
+            {
+                log.WriteLine("    {0}", e.CurrentFileName);
+            }
+        }
+        /// <summary>
+        /// Gets a mapping from filenames as they will be in the cab to filenames
+        /// as they are currently on disk.
+        /// </summary>
+        /// <remarks>
+        /// By default, all files will be placed in the root of the cab. But inputs may
+        /// optionally include an alternate inside-cab file path before an equals sign.
+        /// </remarks>
+        private static IDictionary<string, string> GetPackFileMap(IList<string> inputs)
+        {
+            var fileMap = new Dictionary<string, string>();
+            foreach (var inputFile in inputs)
+            {
+                if (inputFile.IndexOf('=') > 0)
+                {
+                    var parse = inputFile.Split('=');
+                    if (!fileMap.ContainsKey(parse[0]))
+                    {
+                        fileMap.Add(parse[0], parse[1]);
+                    }
+                }
+                else
+                {
+                    var fileName = Path.GetFileName(inputFile);
+                    if (!fileMap.ContainsKey(fileName))
+                    {
+                        fileMap.Add(fileName, inputFile);
+                    }
+                }
+            }
+            return fileMap;
+        }
+        /// <summary>
+        /// Packs the input files into a cab that is appended to the
+        /// output SfxCA.dll.
+        /// </summary>
+        private static void PackInputFiles(string outputFile, IDictionary<string, string> fileMap)
+        {
+            log.WriteLine("Packaging files");
+            var cabInfo = new CabInfo(outputFile);
+            cabInfo.PackFileSet(null, fileMap, CompressionLevel.Max, PackProgress);
+        }
+        /// <summary>
+        /// Copies the version resource information from the CA module to
+        /// the CA package. This gives the package the file version and
+        /// description of the CA module, instead of the version and
+        /// description of SfxCA.dll.
+        /// </summary>
+        private static void CopyVersionResource(string sourceFile, string destFile)
+        {
+            log.WriteLine("Copying file version info from {0} to {1}",
+                sourceFile, destFile);
+            var rc = new ResourceCollection();
+            rc.Find(sourceFile, ResourceType.Version);
+            rc.Load(sourceFile);
+            rc.Save(destFile);
+        }
+    }
+}
diff --git a/src/samples/Dtf/Tools/MakeSfxCA/MakeSfxCA.csproj b/src/samples/Dtf/Tools/MakeSfxCA/MakeSfxCA.csproj
new file mode 100644
index 00000000..c6982532
--- /dev/null
+++ b/src/samples/Dtf/Tools/MakeSfxCA/MakeSfxCA.csproj
@@ -0,0 +1,33 @@
+<?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>
+    <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>WixToolset.Dtf.Tools.MakeSfxCA</RootNamespace>
+    <AssemblyName>MakeSfxCA</AssemblyName>    
+    <DebugType>embedded</DebugType>
+    <AppConfig>app.config</AppConfig>
+    <ApplicationManifest>MakeSfxCA.exe.manifest</ApplicationManifest>
+    <RollForward>Major</RollForward>
+    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj" />
+    <ProjectReference Include="..\..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" />
+    <ProjectReference Include="..\..\WixToolset.Dtf.Resources\WixToolset.Dtf.Resources.csproj" />
+  </ItemGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
+  </Target>
+</Project>
diff --git a/src/samples/Dtf/Tools/MakeSfxCA/MakeSfxCA.exe.manifest b/src/samples/Dtf/Tools/MakeSfxCA/MakeSfxCA.exe.manifest
new file mode 100644
index 00000000..49b074e0
--- /dev/null
+++ b/src/samples/Dtf/Tools/MakeSfxCA/MakeSfxCA.exe.manifest
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- 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. -->
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <assemblyIdentity name="WixToolset.Dtf.Tools.MakeSfxCA" version="4.0.0.0" processorArchitecture="x86" type="win32"/>
+ <description>WiX Toolset Compiler</description> 
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+  <security>
+   <requestedPrivileges>
+    <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+   </requestedPrivileges>
+  </security>
+ </trustInfo>
+ <application xmlns="urn:schemas-microsoft-com:asm.v3">
+  <windowsSettings xmlns:ws2="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
+   <ws2:longPathAware>true</ws2:longPathAware>
+  </windowsSettings>
+ </application>
+</assembly>
diff --git a/src/samples/Dtf/Tools/MakeSfxCA/app.config b/src/samples/Dtf/Tools/MakeSfxCA/app.config
new file mode 100644
index 00000000..65d3d6c3
--- /dev/null
+++ b/src/samples/Dtf/Tools/MakeSfxCA/app.config
@@ -0,0 +1,10 @@
+<?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. -->
+<configuration>
+    <runtime>
+        <loadFromRemoteSources enabled="true"/>
+        <AppContextSwitchOverrides value="Switch.System.IO.UseLegacyPathHandling=false;Switch.System.IO.BlockLongPaths=false" />
+    </runtime>
+</configuration>
diff --git a/src/samples/Dtf/Tools/SfxCA/ClrHost.cpp b/src/samples/Dtf/Tools/SfxCA/ClrHost.cpp
new file mode 100644
index 00000000..1988fb2a
--- /dev/null
+++ b/src/samples/Dtf/Tools/SfxCA/ClrHost.cpp
@@ -0,0 +1,262 @@
+// 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.
+#include "precomp.h"
+void Log(MSIHANDLE hSession, const wchar_t* szMessage, ...);
+//---------------------------------------------------------------------
+// CLR HOSTING
+//---------------------------------------------------------------------
+/// <summary>
+/// Binds to the CLR after determining the appropriate version.
+/// </summary>
+/// <param name="hSession">Handle to the installer session,
+/// used just for logging.</param>
+/// <param name="version">Specific version of the CLR to load.
+/// If null, then the config file and/or primary assembly are
+/// used to determine the version.</param>
+/// <param name="szConfigFile">XML .config file which may contain
+/// a startup section to direct which version of the CLR to use.
+/// May be NULL.</param>
+/// <param name="szPrimaryAssembly">Assembly to be used to determine
+/// the version of the CLR in the absence of other configuration.
+/// May be NULL.</param>
+/// <param name="ppHost">Returned runtime host interface.</param>
+/// <returns>True if the CLR was loaded successfully, false if
+/// there was some error.</returns>
+/// <remarks>
+/// If szPrimaryAssembly is NULL and szConfigFile is also NULL or
+/// does not contain any version configuration, the CLR will not be loaded.
+/// </remarks>
+bool LoadCLR(MSIHANDLE hSession, const wchar_t* szVersion, const wchar_t* szConfigFile,
+        const wchar_t* szPrimaryAssembly, ICorRuntimeHost** ppHost)
+{
+        typedef HRESULT (__stdcall *PGetRequestedRuntimeInfo)(LPCWSTR pExe, LPCWSTR pwszVersion,
+                LPCWSTR pConfigurationFile, DWORD startupFlags, DWORD runtimeInfoFlags,
+                LPWSTR pDirectory, DWORD dwDirectory, DWORD *dwDirectoryLength,
+                LPWSTR pVersion, DWORD cchBuffer, DWORD* dwlength);
+        typedef HRESULT (__stdcall *PCorBindToRuntimeEx)(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor,
+                DWORD startupFlags, REFCLSID rclsid, REFIID riid, LPVOID FAR *ppv);
+        HMODULE hmodMscoree = LoadLibrary(L"mscoree.dll");
+        if (hmodMscoree == NULL)
+        {
+                Log(hSession, L"Failed to load mscoree.dll (Error code %d). This custom action "
+                        L"requires the .NET Framework to be installed.", GetLastError());
+                return false;
+        }
+        PGetRequestedRuntimeInfo pGetRequestedRuntimeInfo = (PGetRequestedRuntimeInfo)
+                GetProcAddress(hmodMscoree, "GetRequestedRuntimeInfo");
+        PCorBindToRuntimeEx pCorBindToRuntimeEx = (PCorBindToRuntimeEx)
+                GetProcAddress(hmodMscoree, "CorBindToRuntimeEx");
+        if (pGetRequestedRuntimeInfo == NULL || pCorBindToRuntimeEx == NULL)
+        {
+                Log(hSession, L"Failed to locate functions in mscoree.dll (Error code %d). This custom action "
+                        L"requires the .NET Framework to be installed.", GetLastError());
+                FreeLibrary(hmodMscoree);
+                return false;
+        }
+        wchar_t szClrVersion[20];
+        HRESULT hr;
+        if (szVersion != NULL && szVersion[0] != L'\0')
+        {
+                wcsncpy_s(szClrVersion, 20, szVersion, 20);
+        }
+        else
+        {
+                wchar_t szVersionDir[MAX_PATH];
+                hr = pGetRequestedRuntimeInfo(szPrimaryAssembly, NULL,
+                        szConfigFile, 0, 0, szVersionDir, MAX_PATH, NULL, szClrVersion, 20, NULL);
+                if (FAILED(hr))
+                {
+                        Log(hSession, L"Failed to get requested CLR info. Error code 0x%x", hr);
+                        Log(hSession, L"Ensure that the proper version of the .NET Framework is installed, or "
+                                L"that there is a matching supportedRuntime element in CustomAction.config. "
+                                L"If you are binding to .NET 4 or greater add "
+                                L"useLegacyV2RuntimeActivationPolicy=true to the <startup> element.");
+                        FreeLibrary(hmodMscoree);
+                        return false;
+                }
+        }
+        Log(hSession, L"Binding to CLR version %s", szClrVersion);
+        ICorRuntimeHost* pHost;
+        hr = pCorBindToRuntimeEx(szClrVersion, NULL,
+                STARTUP_LOADER_OPTIMIZATION_SINGLE_DOMAIN,
+                CLSID_CorRuntimeHost, IID_ICorRuntimeHost, (void**) &pHost);
+        if (FAILED(hr))
+        {
+                Log(hSession, L"Failed to bind to the CLR. Error code 0x%X", hr);
+                FreeLibrary(hmodMscoree);
+                return false;
+        }
+        hr = pHost->Start();
+        if (FAILED(hr))
+        {
+                Log(hSession, L"Failed to start the CLR. Error code 0x%X", hr);
+                pHost->Release();
+                FreeLibrary(hmodMscoree);
+                return false;
+        }
+        *ppHost = pHost;
+        FreeLibrary(hmodMscoree);
+        return true;
+}
+/// <summary>
+/// Creates a new CLR application domain.
+/// </summary>
+/// <param name="hSession">Handle to the installer session,
+/// used just for logging</param>
+/// <param name="pHost">Interface to the runtime host where the
+/// app domain will be created.</param>
+/// <param name="szName">Name of the app domain to create.</param>
+/// <param name="szAppBase">Application base directory path, where
+/// the app domain will look first to load its assemblies.</param>
+/// <param name="szConfigFile">Optional XML .config file containing any
+/// configuration for thae app domain.</param>
+/// <param name="ppAppDomain">Returned app domain interface.</param>
+/// <returns>True if the app domain was created successfully, false if
+/// there was some error.</returns>
+bool CreateAppDomain(MSIHANDLE hSession, ICorRuntimeHost* pHost,
+        const wchar_t* szName, const wchar_t* szAppBase,
+        const wchar_t* szConfigFile, _AppDomain** ppAppDomain)
+{
+        IUnknown* punkAppDomainSetup = NULL;
+        IAppDomainSetup* pAppDomainSetup = NULL;
+        HRESULT hr = pHost->CreateDomainSetup(&punkAppDomainSetup);
+        if (SUCCEEDED(hr))
+        {
+                hr = punkAppDomainSetup->QueryInterface(__uuidof(IAppDomainSetup), (void**) &pAppDomainSetup);
+                punkAppDomainSetup->Release();
+        }
+        if (FAILED(hr))
+        {
+                Log(hSession, L"Failed to create app domain setup. Error code 0x%X", hr);
+                return false;
+        }
+        const wchar_t* szUrlPrefix = L"file:///";
+        size_t cchApplicationBase = wcslen(szUrlPrefix) + wcslen(szAppBase);
+        wchar_t* szApplicationBase = (wchar_t*) _alloca((cchApplicationBase + 1) * sizeof(wchar_t));
+        if (szApplicationBase == NULL) hr = E_OUTOFMEMORY;
+        else
+        {
+                StringCchCopy(szApplicationBase, cchApplicationBase + 1, szUrlPrefix);
+                StringCchCat(szApplicationBase, cchApplicationBase + 1, szAppBase);
+                BSTR bstrApplicationBase = SysAllocString(szApplicationBase);
+                if (bstrApplicationBase == NULL) hr = E_OUTOFMEMORY;
+                else
+                {
+                        hr = pAppDomainSetup->put_ApplicationBase(bstrApplicationBase);
+                        SysFreeString(bstrApplicationBase);
+                }
+        }
+        if (SUCCEEDED(hr) && szConfigFile != NULL)
+        {
+                BSTR bstrConfigFile = SysAllocString(szConfigFile);
+                if (bstrConfigFile == NULL) hr = E_OUTOFMEMORY;
+                else
+                {
+                        hr = pAppDomainSetup->put_ConfigurationFile(bstrConfigFile);
+                        SysFreeString(bstrConfigFile);
+                }
+        }
+        if (FAILED(hr))
+        {
+                Log(hSession, L"Failed to configure app domain setup. Error code 0x%X", hr);
+                pAppDomainSetup->Release();
+                return false;
+        }
+        IUnknown* punkAppDomain;
+        hr = pHost->CreateDomainEx(szName, pAppDomainSetup, NULL, &punkAppDomain);
+        pAppDomainSetup->Release();
+        if (SUCCEEDED(hr))
+        {
+                hr = punkAppDomain->QueryInterface(__uuidof(_AppDomain), (void**) ppAppDomain);
+                punkAppDomain->Release();
+        }
+        if (FAILED(hr))
+        {
+                Log(hSession, L"Failed to create app domain. Error code 0x%X", hr);
+                return false;
+        }
+        return true;
+}
+/// <summary>
+/// Locates a specific method in a specific class and assembly.
+/// </summary>
+/// <param name="hSession">Handle to the installer session,
+/// used just for logging</param>
+/// <param name="pAppDomain">Application domain in which to
+/// load assemblies.</param>
+/// <param name="szAssembly">Display name of the assembly
+/// containing the method.</param>
+/// <param name="szClass">Fully-qualified name of the class
+/// containing the method.</param>
+/// <param name="szMethod">Name of the method.</param>
+/// <param name="ppMethod">Returned method interface.</param>
+/// <returns>True if the method was located, otherwise false.</returns>
+/// <remarks>Only public static methods are searched. Method
+/// parameter types are not considered; if there are multiple
+/// matching methods with different parameters, an error results.</remarks>
+bool GetMethod(MSIHANDLE hSession, _AppDomain* pAppDomain,
+        const wchar_t* szAssembly, const wchar_t* szClass,
+        const wchar_t* szMethod, _MethodInfo** ppMethod)
+{
+        HRESULT hr;
+        _Assembly* pAssembly = NULL;
+        BSTR bstrAssemblyName = SysAllocString(szAssembly);
+        if (bstrAssemblyName == NULL) hr = E_OUTOFMEMORY;
+        else
+        {
+                hr = pAppDomain->Load_2(bstrAssemblyName, &pAssembly);
+                SysFreeString(bstrAssemblyName);
+        }
+        if (FAILED(hr))
+        {
+                Log(hSession, L"Failed to load assembly %s. Error code 0x%X", szAssembly, hr);
+                return false;
+        }
+        _Type* pType = NULL;
+        BSTR bstrClass = SysAllocString(szClass);
+        if (bstrClass == NULL) hr = E_OUTOFMEMORY;
+        else
+        {
+                hr = pAssembly->GetType_2(bstrClass, &pType);
+                SysFreeString(bstrClass);
+        }
+        pAssembly->Release();
+        if (FAILED(hr) || pType == NULL)
+        {
+                Log(hSession, L"Failed to load class %s. Error code 0x%X", szClass, hr);
+                return false;
+        }
+        BSTR bstrMethod = SysAllocString(szMethod);
+        if (bstrMethod == NULL) hr = E_OUTOFMEMORY;
+        else
+        {
+                hr = pType->GetMethod_2(bstrMethod,
+                        (BindingFlags) (BindingFlags_Public | BindingFlags_Static), ppMethod);
+                SysFreeString(bstrMethod);
+        }
+        pType->Release();
+        if (FAILED(hr) || *ppMethod == NULL)
+        {
+                Log(hSession, L"Failed to get method %s. Error code 0x%X", szMethod, hr);
+                return false;
+        }
+        return true;
+}
diff --git a/src/samples/Dtf/Tools/SfxCA/EmbeddedUI.cpp b/src/samples/Dtf/Tools/SfxCA/EmbeddedUI.cpp
new file mode 100644
index 00000000..a49cdeec
--- /dev/null
+++ b/src/samples/Dtf/Tools/SfxCA/EmbeddedUI.cpp
@@ -0,0 +1,281 @@
+// 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.
+#include "precomp.h"
+#include "SfxUtil.h"
+// Globals for keeping track of things across UI messages.
+static const wchar_t* g_szWorkingDir;
+static ICorRuntimeHost* g_pClrHost;
+static _AppDomain* g_pAppDomain;
+static _MethodInfo* g_pProcessMessageMethod;
+static _MethodInfo* g_pShutdownMethod;
+// Reserve extra space for strings to be replaced at build time.
+#define NULLSPACE \
+L"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" \
+L"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" \
+L"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" \
+L"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+// Prototypes for local functions.
+// See the function definitions for comments.
+bool InvokeInitializeMethod(_MethodInfo* pInitMethod, MSIHANDLE hSession,
+        const wchar_t* szClassName, LPDWORD pdwInternalUILevel, UINT* puiResult);
+/// <summary>
+/// First entry-point for the UI DLL when loaded and called by MSI.
+/// Extracts the payload, hosts the CLR, and invokes the managed
+/// initialize method.
+/// </summary>
+/// <param name="hSession">Handle to the installer session,
+/// used for logging errors and to be passed on to the managed initialize method.</param>
+/// <param name="szResourcePath">Path the directory where resources from the MsiEmbeddedUI table
+/// have been extracted, and where additional payload from this package will be extracted.</param>
+/// <param name="pdwInternalUILevel">MSI install UI level passed to and returned from
+/// the managed initialize method.</param>
+extern "C"
+UINT __stdcall InitializeEmbeddedUI(MSIHANDLE hSession, LPCWSTR szResourcePath, LPDWORD pdwInternalUILevel)
+{
+        // If the managed initialize method cannot be called, continue the installation in BASIC UI mode.
+        UINT uiResult = INSTALLUILEVEL_BASIC;
+        const wchar_t* szClassName = L"InitializeEmbeddedUI_FullClassName" NULLSPACE;
+        g_szWorkingDir = szResourcePath;
+        wchar_t szModule[MAX_PATH];
+        DWORD cchCopied = GetModuleFileName(g_hModule, szModule, MAX_PATH - 1);
+        if (cchCopied == 0)
+        {
+                Log(hSession, L"Failed to get module path. Error code %d.", GetLastError());
+                return uiResult;
+        }
+        else if (cchCopied == MAX_PATH - 1)
+        {
+                Log(hSession, L"Failed to get module path -- path is too long.");
+                return uiResult;
+        }
+        Log(hSession, L"Extracting embedded UI to temporary directory: %s", g_szWorkingDir);
+        int err = ExtractCabinet(szModule, g_szWorkingDir);
+        if (err != 0)
+        {
+                Log(hSession, L"Failed to extract to temporary directory. Cabinet error code %d.", err);
+                Log(hSession, L"Ensure that no MsiEmbeddedUI.FileName values are the same as "
+                                          L"any file contained in the embedded UI package.");
+                return uiResult;
+        }
+        wchar_t szConfigFilePath[MAX_PATH + 20];
+        StringCchCopy(szConfigFilePath, MAX_PATH + 20, g_szWorkingDir);
+        StringCchCat(szConfigFilePath, MAX_PATH + 20, L"\\EmbeddedUI.config");
+        const wchar_t* szConfigFile = szConfigFilePath;
+        if (!PathFileExists(szConfigFilePath))
+        {
+                szConfigFile = NULL;
+        }
+        wchar_t szWIAssembly[MAX_PATH + 50];
+        StringCchCopy(szWIAssembly, MAX_PATH + 50, g_szWorkingDir);
+        StringCchCat(szWIAssembly, MAX_PATH + 50, L"\\WixToolset.Dtf.WindowsInstaller.dll");
+        if (LoadCLR(hSession, NULL, szConfigFile, szWIAssembly, &g_pClrHost))
+        {
+                if (CreateAppDomain(hSession, g_pClrHost, L"EmbeddedUI", g_szWorkingDir,
+                        szConfigFile, &g_pAppDomain))
+                {
+                        const wchar_t* szMsiAssemblyName  = L"WixToolset.Dtf.WindowsInstaller";
+                        const wchar_t* szProxyClass = L"WixToolset.Dtf.WindowsInstaller.EmbeddedUIProxy";
+                        const wchar_t* szInitMethod = L"Initialize";
+                        const wchar_t* szProcessMessageMethod = L"ProcessMessage";
+                        const wchar_t* szShutdownMethod = L"Shutdown";
+        
+                        if (GetMethod(hSession, g_pAppDomain, szMsiAssemblyName,
+                                          szProxyClass, szProcessMessageMethod, &g_pProcessMessageMethod) &&
+                                GetMethod(hSession, g_pAppDomain, szMsiAssemblyName,
+                                          szProxyClass, szShutdownMethod, &g_pShutdownMethod))
+                        {
+                                _MethodInfo* pInitMethod;
+                                if (GetMethod(hSession, g_pAppDomain, szMsiAssemblyName,
+                                                          szProxyClass, szInitMethod, &pInitMethod))
+                                {
+                                        bool invokeSuccess = InvokeInitializeMethod(pInitMethod, hSession, szClassName, pdwInternalUILevel, &uiResult);
+                                        pInitMethod->Release();
+                                        if (invokeSuccess)
+                                        {
+                                                if (uiResult == 0)
+                                                {
+                                                        return ERROR_SUCCESS;
+                                                }
+                                                else if (uiResult == ERROR_INSTALL_USEREXIT)
+                                                {
+                                                        // InitializeEmbeddedUI is not allowed to return ERROR_INSTALL_USEREXIT.
+                                                        // So return success here and then IDCANCEL on the next progress message.
+                                                        uiResult = 0;
+                                                        *pdwInternalUILevel = INSTALLUILEVEL_NONE;
+                                                        Log(hSession, L"Initialization canceled by user.");
+                                                }
+                                        }
+                                }
+                        }
+                        g_pProcessMessageMethod->Release();
+                        g_pProcessMessageMethod = NULL;
+                        g_pShutdownMethod->Release();
+                        g_pShutdownMethod = NULL;
+                        g_pClrHost->UnloadDomain(g_pAppDomain);
+                        g_pAppDomain->Release();
+                        g_pAppDomain = NULL;
+                }
+                g_pClrHost->Stop();
+                g_pClrHost->Release();
+                g_pClrHost = NULL;
+        }
+        return uiResult;
+}
+/// <summary>
+/// Entry-point for UI progress messages received from the MSI engine during an active installation.
+/// Forwards the progress messages to the managed handler method and returns its result.
+/// </summary>
+extern "C"
+INT __stdcall EmbeddedUIHandler(UINT uiMessageType, MSIHANDLE hRecord)
+{
+        if (g_pProcessMessageMethod == NULL)
+        {
+                // Initialization was canceled. 
+                return IDCANCEL;
+        }
+        VARIANT vResult;
+        VariantInit(&vResult);
+        VARIANT vNull;
+        vNull.vt = VT_EMPTY;
+        SAFEARRAY* saArgs = SafeArrayCreateVector(VT_VARIANT, 0, 2);
+        VARIANT vMessageType;
+        vMessageType.vt = VT_I4;
+        vMessageType.lVal = (LONG) uiMessageType;
+        LONG index = 0;
+        HRESULT hr = SafeArrayPutElement(saArgs, &index, &vMessageType);
+        if (FAILED(hr)) goto LExit;
+        VARIANT vRecord;
+        vRecord.vt = VT_I4;
+        vRecord.lVal = (LONG) hRecord;
+        index = 1;
+        hr = SafeArrayPutElement(saArgs, &index, &vRecord);
+        if (FAILED(hr)) goto LExit;
+        
+        hr = g_pProcessMessageMethod->Invoke_3(vNull, saArgs, &vResult);
+LExit:
+        SafeArrayDestroy(saArgs);
+        if (SUCCEEDED(hr))
+        {
+                return vResult.intVal;
+        }
+        else
+        {
+                return -1;
+        }
+}
+/// <summary>
+/// Entry-point for the UI shutdown message received from the MSI engine after installation has completed.
+/// Forwards the shutdown message to the managed shutdown method, then shuts down the CLR.
+/// </summary>
+extern "C"
+DWORD __stdcall ShutdownEmbeddedUI()
+{
+        if (g_pShutdownMethod != NULL)
+        {
+                VARIANT vNull;
+                vNull.vt = VT_EMPTY;
+                SAFEARRAY* saArgs = SafeArrayCreateVector(VT_VARIANT, 0, 0);
+                g_pShutdownMethod->Invoke_3(vNull, saArgs, NULL);
+                SafeArrayDestroy(saArgs);
+                g_pClrHost->UnloadDomain(g_pAppDomain);
+                g_pAppDomain->Release();
+                g_pClrHost->Stop();
+                g_pClrHost->Release();
+        }
+        return 0;
+}
+/// <summary>
+/// Loads and invokes the managed portion of the proxy.
+/// </summary>
+/// <param name="pInitMethod">Managed initialize method to be invoked.</param>
+/// <param name="hSession">Handle to the installer session,
+/// used for logging errors and to be passed on to the managed initialize method.</param>
+/// <param name="szClassName">Name of the UI class to be loaded.
+/// This must be of the form: AssemblyName!Namespace.Class</param>
+/// <param name="pdwInternalUILevel">MSI install UI level passed to and returned from
+/// the managed initialize method.</param>
+/// <param name="puiResult">Return value of the invoked initialize method.</param>
+/// <returns>True if the managed proxy was invoked successfully, or an
+/// error code if there was some error. Note the initialize method itself may
+/// return an error via puiResult while this method still returns true
+/// since the invocation was successful.</returns>
+bool InvokeInitializeMethod(_MethodInfo* pInitMethod, MSIHANDLE hSession, const wchar_t* szClassName, LPDWORD pdwInternalUILevel, UINT* puiResult)
+{
+        VARIANT vResult;
+        VariantInit(&vResult);
+        VARIANT vNull;
+        vNull.vt = VT_EMPTY;
+        SAFEARRAY* saArgs = SafeArrayCreateVector(VT_VARIANT, 0, 3);
+        VARIANT vSessionHandle;
+        vSessionHandle.vt = VT_I4;
+        vSessionHandle.lVal = (LONG) hSession;
+        LONG index = 0;
+        HRESULT hr = SafeArrayPutElement(saArgs, &index, &vSessionHandle);
+        if (FAILED(hr)) goto LExit;
+        VARIANT vEntryPoint;
+        vEntryPoint.vt = VT_BSTR;
+        vEntryPoint.bstrVal = SysAllocString(szClassName);
+        if (vEntryPoint.bstrVal == NULL)
+        {
+                hr = E_OUTOFMEMORY;
+                goto LExit;
+        }
+        index = 1;
+        hr = SafeArrayPutElement(saArgs, &index, &vEntryPoint);
+        if (FAILED(hr)) goto LExit;
+        VARIANT vUILevel;
+        vUILevel.vt = VT_I4;
+        vUILevel.ulVal = *pdwInternalUILevel;
+        index = 2;
+        hr = SafeArrayPutElement(saArgs, &index, &vUILevel);
+        if (FAILED(hr)) goto LExit;
+        
+        hr = pInitMethod->Invoke_3(vNull, saArgs, &vResult);
+        
+LExit:
+        SafeArrayDestroy(saArgs);
+        if (SUCCEEDED(hr))
+        {
+                *puiResult = (UINT) vResult.lVal;
+                if ((*puiResult & 0xFFFF) == 0)
+                {
+                        // Due to interop limitations, the successful resulting UILevel is returned
+                        // as the high-word of the return value instead of via a ref parameter.
+                        *pdwInternalUILevel = *puiResult >> 16;
+                        *puiResult = 0;
+                }
+                return true;
+        }
+        else
+        {
+                Log(hSession, L"Failed to invoke EmbeddedUI Initialize method. Error code 0x%X", hr);
+                return false;
+        }
+}
diff --git a/src/samples/Dtf/Tools/SfxCA/EntryPoints.def b/src/samples/Dtf/Tools/SfxCA/EntryPoints.def
new file mode 100644
index 00000000..dd28b920
--- /dev/null
+++ b/src/samples/Dtf/Tools/SfxCA/EntryPoints.def
@@ -0,0 +1,140 @@
+; 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.
+LIBRARY "SfxCA"
+EXPORTS
+CustomActionEntryPoint000________________________________________________=CustomActionEntryPoint000
+CustomActionEntryPoint001________________________________________________=CustomActionEntryPoint001
+CustomActionEntryPoint002________________________________________________=CustomActionEntryPoint002
+CustomActionEntryPoint003________________________________________________=CustomActionEntryPoint003
+CustomActionEntryPoint004________________________________________________=CustomActionEntryPoint004
+CustomActionEntryPoint005________________________________________________=CustomActionEntryPoint005
+CustomActionEntryPoint006________________________________________________=CustomActionEntryPoint006
+CustomActionEntryPoint007________________________________________________=CustomActionEntryPoint007
+CustomActionEntryPoint008________________________________________________=CustomActionEntryPoint008
+CustomActionEntryPoint009________________________________________________=CustomActionEntryPoint009
+CustomActionEntryPoint010________________________________________________=CustomActionEntryPoint010
+CustomActionEntryPoint011________________________________________________=CustomActionEntryPoint011
+CustomActionEntryPoint012________________________________________________=CustomActionEntryPoint012
+CustomActionEntryPoint013________________________________________________=CustomActionEntryPoint013
+CustomActionEntryPoint014________________________________________________=CustomActionEntryPoint014
+CustomActionEntryPoint015________________________________________________=CustomActionEntryPoint015
+CustomActionEntryPoint016________________________________________________=CustomActionEntryPoint016
+CustomActionEntryPoint017________________________________________________=CustomActionEntryPoint017
+CustomActionEntryPoint018________________________________________________=CustomActionEntryPoint018
+CustomActionEntryPoint019________________________________________________=CustomActionEntryPoint019
+CustomActionEntryPoint020________________________________________________=CustomActionEntryPoint020
+CustomActionEntryPoint021________________________________________________=CustomActionEntryPoint021
+CustomActionEntryPoint022________________________________________________=CustomActionEntryPoint022
+CustomActionEntryPoint023________________________________________________=CustomActionEntryPoint023
+CustomActionEntryPoint024________________________________________________=CustomActionEntryPoint024
+CustomActionEntryPoint025________________________________________________=CustomActionEntryPoint025
+CustomActionEntryPoint026________________________________________________=CustomActionEntryPoint026
+CustomActionEntryPoint027________________________________________________=CustomActionEntryPoint027
+CustomActionEntryPoint028________________________________________________=CustomActionEntryPoint028
+CustomActionEntryPoint029________________________________________________=CustomActionEntryPoint029
+CustomActionEntryPoint030________________________________________________=CustomActionEntryPoint030
+CustomActionEntryPoint031________________________________________________=CustomActionEntryPoint031
+CustomActionEntryPoint032________________________________________________=CustomActionEntryPoint032
+CustomActionEntryPoint033________________________________________________=CustomActionEntryPoint033
+CustomActionEntryPoint034________________________________________________=CustomActionEntryPoint034
+CustomActionEntryPoint035________________________________________________=CustomActionEntryPoint035
+CustomActionEntryPoint036________________________________________________=CustomActionEntryPoint036
+CustomActionEntryPoint037________________________________________________=CustomActionEntryPoint037
+CustomActionEntryPoint038________________________________________________=CustomActionEntryPoint038
+CustomActionEntryPoint039________________________________________________=CustomActionEntryPoint039
+CustomActionEntryPoint040________________________________________________=CustomActionEntryPoint040
+CustomActionEntryPoint041________________________________________________=CustomActionEntryPoint041
+CustomActionEntryPoint042________________________________________________=CustomActionEntryPoint042
+CustomActionEntryPoint043________________________________________________=CustomActionEntryPoint043
+CustomActionEntryPoint044________________________________________________=CustomActionEntryPoint044
+CustomActionEntryPoint045________________________________________________=CustomActionEntryPoint045
+CustomActionEntryPoint046________________________________________________=CustomActionEntryPoint046
+CustomActionEntryPoint047________________________________________________=CustomActionEntryPoint047
+CustomActionEntryPoint048________________________________________________=CustomActionEntryPoint048
+CustomActionEntryPoint049________________________________________________=CustomActionEntryPoint049
+CustomActionEntryPoint050________________________________________________=CustomActionEntryPoint050
+CustomActionEntryPoint051________________________________________________=CustomActionEntryPoint051
+CustomActionEntryPoint052________________________________________________=CustomActionEntryPoint052
+CustomActionEntryPoint053________________________________________________=CustomActionEntryPoint053
+CustomActionEntryPoint054________________________________________________=CustomActionEntryPoint054
+CustomActionEntryPoint055________________________________________________=CustomActionEntryPoint055
+CustomActionEntryPoint056________________________________________________=CustomActionEntryPoint056
+CustomActionEntryPoint057________________________________________________=CustomActionEntryPoint057
+CustomActionEntryPoint058________________________________________________=CustomActionEntryPoint058
+CustomActionEntryPoint059________________________________________________=CustomActionEntryPoint059
+CustomActionEntryPoint060________________________________________________=CustomActionEntryPoint060
+CustomActionEntryPoint061________________________________________________=CustomActionEntryPoint061
+CustomActionEntryPoint062________________________________________________=CustomActionEntryPoint062
+CustomActionEntryPoint063________________________________________________=CustomActionEntryPoint063
+CustomActionEntryPoint064________________________________________________=CustomActionEntryPoint064
+CustomActionEntryPoint065________________________________________________=CustomActionEntryPoint065
+CustomActionEntryPoint066________________________________________________=CustomActionEntryPoint066
+CustomActionEntryPoint067________________________________________________=CustomActionEntryPoint067
+CustomActionEntryPoint068________________________________________________=CustomActionEntryPoint068
+CustomActionEntryPoint069________________________________________________=CustomActionEntryPoint069
+CustomActionEntryPoint070________________________________________________=CustomActionEntryPoint070
+CustomActionEntryPoint071________________________________________________=CustomActionEntryPoint071
+CustomActionEntryPoint072________________________________________________=CustomActionEntryPoint072
+CustomActionEntryPoint073________________________________________________=CustomActionEntryPoint073
+CustomActionEntryPoint074________________________________________________=CustomActionEntryPoint074
+CustomActionEntryPoint075________________________________________________=CustomActionEntryPoint075
+CustomActionEntryPoint076________________________________________________=CustomActionEntryPoint076
+CustomActionEntryPoint077________________________________________________=CustomActionEntryPoint077
+CustomActionEntryPoint078________________________________________________=CustomActionEntryPoint078
+CustomActionEntryPoint079________________________________________________=CustomActionEntryPoint079
+CustomActionEntryPoint080________________________________________________=CustomActionEntryPoint080
+CustomActionEntryPoint081________________________________________________=CustomActionEntryPoint081
+CustomActionEntryPoint082________________________________________________=CustomActionEntryPoint082
+CustomActionEntryPoint083________________________________________________=CustomActionEntryPoint083
+CustomActionEntryPoint084________________________________________________=CustomActionEntryPoint084
+CustomActionEntryPoint085________________________________________________=CustomActionEntryPoint085
+CustomActionEntryPoint086________________________________________________=CustomActionEntryPoint086
+CustomActionEntryPoint087________________________________________________=CustomActionEntryPoint087
+CustomActionEntryPoint088________________________________________________=CustomActionEntryPoint088
+CustomActionEntryPoint089________________________________________________=CustomActionEntryPoint089
+CustomActionEntryPoint090________________________________________________=CustomActionEntryPoint090
+CustomActionEntryPoint091________________________________________________=CustomActionEntryPoint091
+CustomActionEntryPoint092________________________________________________=CustomActionEntryPoint092
+CustomActionEntryPoint093________________________________________________=CustomActionEntryPoint093
+CustomActionEntryPoint094________________________________________________=CustomActionEntryPoint094
+CustomActionEntryPoint095________________________________________________=CustomActionEntryPoint095
+CustomActionEntryPoint096________________________________________________=CustomActionEntryPoint096
+CustomActionEntryPoint097________________________________________________=CustomActionEntryPoint097
+CustomActionEntryPoint098________________________________________________=CustomActionEntryPoint098
+CustomActionEntryPoint099________________________________________________=CustomActionEntryPoint099
+CustomActionEntryPoint100________________________________________________=CustomActionEntryPoint100
+CustomActionEntryPoint101________________________________________________=CustomActionEntryPoint101
+CustomActionEntryPoint102________________________________________________=CustomActionEntryPoint102
+CustomActionEntryPoint103________________________________________________=CustomActionEntryPoint103
+CustomActionEntryPoint104________________________________________________=CustomActionEntryPoint104
+CustomActionEntryPoint105________________________________________________=CustomActionEntryPoint105
+CustomActionEntryPoint106________________________________________________=CustomActionEntryPoint106
+CustomActionEntryPoint107________________________________________________=CustomActionEntryPoint107
+CustomActionEntryPoint108________________________________________________=CustomActionEntryPoint108
+CustomActionEntryPoint109________________________________________________=CustomActionEntryPoint109
+CustomActionEntryPoint110________________________________________________=CustomActionEntryPoint110
+CustomActionEntryPoint111________________________________________________=CustomActionEntryPoint111
+CustomActionEntryPoint112________________________________________________=CustomActionEntryPoint112
+CustomActionEntryPoint113________________________________________________=CustomActionEntryPoint113
+CustomActionEntryPoint114________________________________________________=CustomActionEntryPoint114
+CustomActionEntryPoint115________________________________________________=CustomActionEntryPoint115
+CustomActionEntryPoint116________________________________________________=CustomActionEntryPoint116
+CustomActionEntryPoint117________________________________________________=CustomActionEntryPoint117
+CustomActionEntryPoint118________________________________________________=CustomActionEntryPoint118
+CustomActionEntryPoint119________________________________________________=CustomActionEntryPoint119
+CustomActionEntryPoint120________________________________________________=CustomActionEntryPoint120
+CustomActionEntryPoint121________________________________________________=CustomActionEntryPoint121
+CustomActionEntryPoint122________________________________________________=CustomActionEntryPoint122
+CustomActionEntryPoint123________________________________________________=CustomActionEntryPoint123
+CustomActionEntryPoint124________________________________________________=CustomActionEntryPoint124
+CustomActionEntryPoint125________________________________________________=CustomActionEntryPoint125
+CustomActionEntryPoint126________________________________________________=CustomActionEntryPoint126
+CustomActionEntryPoint127________________________________________________=CustomActionEntryPoint127
+zzzzInvokeManagedCustomActionOutOfProcW=InvokeManagedCustomActionOutOfProc
+zzzInitializeEmbeddedUI=InitializeEmbeddedUI
+zzzEmbeddedUIHandler=EmbeddedUIHandler
+zzzShutdownEmbeddedUI=ShutdownEmbeddedUI
diff --git a/src/samples/Dtf/Tools/SfxCA/EntryPoints.h b/src/samples/Dtf/Tools/SfxCA/EntryPoints.h
new file mode 100644
index 00000000..bd2fa970
--- /dev/null
+++ b/src/samples/Dtf/Tools/SfxCA/EntryPoints.h
@@ -0,0 +1,162 @@
+// 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.
+int InvokeCustomAction(MSIHANDLE hSession,
+        const wchar_t* szWorkingDir, const wchar_t* szEntryPoint);
+/// <summary>
+/// Macro for defining and exporting a custom action entrypoint.
+/// </summary>
+/// <param name="name">Name of the entrypoint as exported from
+/// the DLL.</param>
+/// <param name="method">Path to the managed custom action method,
+/// in the form: "AssemblyName!Namespace.Class.Method"</param>
+/// <remarks>
+/// To prevent the exported name from being decorated, add
+/// /EXPORT:name to the linker options for every entrypoint.
+/// </remarks>
+#define CUSTOMACTION_ENTRYPOINT(name,method) extern "C" int __stdcall \
+        name(MSIHANDLE hSession) { return InvokeCustomAction(hSession, NULL, method); }
+// TEMPLATE ENTRYPOINTS
+// To be edited by the MakeSfxCA tool.
+#define NULLSPACE \
+L"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" \
+L"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" \
+L"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" \
+L"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+#define TEMPLATE_CA_ENTRYPOINT(id,sid) CUSTOMACTION_ENTRYPOINT( \
+        CustomActionEntryPoint##id##, \
+        L"CustomActionEntryPoint" sid NULLSPACE)
+TEMPLATE_CA_ENTRYPOINT(000,L"000");
+TEMPLATE_CA_ENTRYPOINT(001,L"001");
+TEMPLATE_CA_ENTRYPOINT(002,L"002");
+TEMPLATE_CA_ENTRYPOINT(003,L"003");
+TEMPLATE_CA_ENTRYPOINT(004,L"004");
+TEMPLATE_CA_ENTRYPOINT(005,L"005");
+TEMPLATE_CA_ENTRYPOINT(006,L"006");
+TEMPLATE_CA_ENTRYPOINT(007,L"007");
+TEMPLATE_CA_ENTRYPOINT(008,L"008");
+TEMPLATE_CA_ENTRYPOINT(009,L"009");
+TEMPLATE_CA_ENTRYPOINT(010,L"010");
+TEMPLATE_CA_ENTRYPOINT(011,L"011");
+TEMPLATE_CA_ENTRYPOINT(012,L"012");
+TEMPLATE_CA_ENTRYPOINT(013,L"013");
+TEMPLATE_CA_ENTRYPOINT(014,L"014");
+TEMPLATE_CA_ENTRYPOINT(015,L"015");
+TEMPLATE_CA_ENTRYPOINT(016,L"016");
+TEMPLATE_CA_ENTRYPOINT(017,L"017");
+TEMPLATE_CA_ENTRYPOINT(018,L"018");
+TEMPLATE_CA_ENTRYPOINT(019,L"019");
+TEMPLATE_CA_ENTRYPOINT(020,L"020");
+TEMPLATE_CA_ENTRYPOINT(021,L"021");
+TEMPLATE_CA_ENTRYPOINT(022,L"022");
+TEMPLATE_CA_ENTRYPOINT(023,L"023");
+TEMPLATE_CA_ENTRYPOINT(024,L"024");
+TEMPLATE_CA_ENTRYPOINT(025,L"025");
+TEMPLATE_CA_ENTRYPOINT(026,L"026");
+TEMPLATE_CA_ENTRYPOINT(027,L"027");
+TEMPLATE_CA_ENTRYPOINT(028,L"028");
+TEMPLATE_CA_ENTRYPOINT(029,L"029");
+TEMPLATE_CA_ENTRYPOINT(030,L"030");
+TEMPLATE_CA_ENTRYPOINT(031,L"031");
+TEMPLATE_CA_ENTRYPOINT(032,L"032");
+TEMPLATE_CA_ENTRYPOINT(033,L"033");
+TEMPLATE_CA_ENTRYPOINT(034,L"034");
+TEMPLATE_CA_ENTRYPOINT(035,L"035");
+TEMPLATE_CA_ENTRYPOINT(036,L"036");
+TEMPLATE_CA_ENTRYPOINT(037,L"037");
+TEMPLATE_CA_ENTRYPOINT(038,L"038");
+TEMPLATE_CA_ENTRYPOINT(039,L"039");
+TEMPLATE_CA_ENTRYPOINT(040,L"040");
+TEMPLATE_CA_ENTRYPOINT(041,L"041");
+TEMPLATE_CA_ENTRYPOINT(042,L"042");
+TEMPLATE_CA_ENTRYPOINT(043,L"043");
+TEMPLATE_CA_ENTRYPOINT(044,L"044");
+TEMPLATE_CA_ENTRYPOINT(045,L"045");
+TEMPLATE_CA_ENTRYPOINT(046,L"046");
+TEMPLATE_CA_ENTRYPOINT(047,L"047");
+TEMPLATE_CA_ENTRYPOINT(048,L"048");
+TEMPLATE_CA_ENTRYPOINT(049,L"049");
+TEMPLATE_CA_ENTRYPOINT(050,L"050");
+TEMPLATE_CA_ENTRYPOINT(051,L"051");
+TEMPLATE_CA_ENTRYPOINT(052,L"052");
+TEMPLATE_CA_ENTRYPOINT(053,L"053");
+TEMPLATE_CA_ENTRYPOINT(054,L"054");
+TEMPLATE_CA_ENTRYPOINT(055,L"055");
+TEMPLATE_CA_ENTRYPOINT(056,L"056");
+TEMPLATE_CA_ENTRYPOINT(057,L"057");
+TEMPLATE_CA_ENTRYPOINT(058,L"058");
+TEMPLATE_CA_ENTRYPOINT(059,L"059");
+TEMPLATE_CA_ENTRYPOINT(060,L"060");
+TEMPLATE_CA_ENTRYPOINT(061,L"061");
+TEMPLATE_CA_ENTRYPOINT(062,L"062");
+TEMPLATE_CA_ENTRYPOINT(063,L"063");
+TEMPLATE_CA_ENTRYPOINT(064,L"064");
+TEMPLATE_CA_ENTRYPOINT(065,L"065");
+TEMPLATE_CA_ENTRYPOINT(066,L"066");
+TEMPLATE_CA_ENTRYPOINT(067,L"067");
+TEMPLATE_CA_ENTRYPOINT(068,L"068");
+TEMPLATE_CA_ENTRYPOINT(069,L"069");
+TEMPLATE_CA_ENTRYPOINT(070,L"070");
+TEMPLATE_CA_ENTRYPOINT(071,L"071");
+TEMPLATE_CA_ENTRYPOINT(072,L"072");
+TEMPLATE_CA_ENTRYPOINT(073,L"073");
+TEMPLATE_CA_ENTRYPOINT(074,L"074");
+TEMPLATE_CA_ENTRYPOINT(075,L"075");
+TEMPLATE_CA_ENTRYPOINT(076,L"076");
+TEMPLATE_CA_ENTRYPOINT(077,L"077");
+TEMPLATE_CA_ENTRYPOINT(078,L"078");
+TEMPLATE_CA_ENTRYPOINT(079,L"079");
+TEMPLATE_CA_ENTRYPOINT(080,L"080");
+TEMPLATE_CA_ENTRYPOINT(081,L"081");
+TEMPLATE_CA_ENTRYPOINT(082,L"082");
+TEMPLATE_CA_ENTRYPOINT(083,L"083");
+TEMPLATE_CA_ENTRYPOINT(084,L"084");
+TEMPLATE_CA_ENTRYPOINT(085,L"085");
+TEMPLATE_CA_ENTRYPOINT(086,L"086");
+TEMPLATE_CA_ENTRYPOINT(087,L"087");
+TEMPLATE_CA_ENTRYPOINT(088,L"088");
+TEMPLATE_CA_ENTRYPOINT(089,L"089");
+TEMPLATE_CA_ENTRYPOINT(090,L"090");
+TEMPLATE_CA_ENTRYPOINT(091,L"091");
+TEMPLATE_CA_ENTRYPOINT(092,L"092");
+TEMPLATE_CA_ENTRYPOINT(093,L"093");
+TEMPLATE_CA_ENTRYPOINT(094,L"094");
+TEMPLATE_CA_ENTRYPOINT(095,L"095");
+TEMPLATE_CA_ENTRYPOINT(096,L"096");
+TEMPLATE_CA_ENTRYPOINT(097,L"097");
+TEMPLATE_CA_ENTRYPOINT(098,L"098");
+TEMPLATE_CA_ENTRYPOINT(099,L"099");
+TEMPLATE_CA_ENTRYPOINT(100,L"100");
+TEMPLATE_CA_ENTRYPOINT(101,L"101");
+TEMPLATE_CA_ENTRYPOINT(102,L"102");
+TEMPLATE_CA_ENTRYPOINT(103,L"103");
+TEMPLATE_CA_ENTRYPOINT(104,L"104");
+TEMPLATE_CA_ENTRYPOINT(105,L"105");
+TEMPLATE_CA_ENTRYPOINT(106,L"106");
+TEMPLATE_CA_ENTRYPOINT(107,L"107");
+TEMPLATE_CA_ENTRYPOINT(108,L"108");
+TEMPLATE_CA_ENTRYPOINT(109,L"109");
+TEMPLATE_CA_ENTRYPOINT(110,L"110");
+TEMPLATE_CA_ENTRYPOINT(111,L"111");
+TEMPLATE_CA_ENTRYPOINT(112,L"112");
+TEMPLATE_CA_ENTRYPOINT(113,L"113");
+TEMPLATE_CA_ENTRYPOINT(114,L"114");
+TEMPLATE_CA_ENTRYPOINT(115,L"115");
+TEMPLATE_CA_ENTRYPOINT(116,L"116");
+TEMPLATE_CA_ENTRYPOINT(117,L"117");
+TEMPLATE_CA_ENTRYPOINT(118,L"118");
+TEMPLATE_CA_ENTRYPOINT(119,L"119");
+TEMPLATE_CA_ENTRYPOINT(120,L"120");
+TEMPLATE_CA_ENTRYPOINT(121,L"121");
+TEMPLATE_CA_ENTRYPOINT(122,L"122");
+TEMPLATE_CA_ENTRYPOINT(123,L"123");
+TEMPLATE_CA_ENTRYPOINT(124,L"124");
+TEMPLATE_CA_ENTRYPOINT(125,L"125");
+TEMPLATE_CA_ENTRYPOINT(126,L"126");
+TEMPLATE_CA_ENTRYPOINT(127,L"127");
+// Note: Keep in sync with EntryPoints.def
diff --git a/src/samples/Dtf/Tools/SfxCA/Extract.cpp b/src/samples/Dtf/Tools/SfxCA/Extract.cpp
new file mode 100644
index 00000000..171cf52f
--- /dev/null
+++ b/src/samples/Dtf/Tools/SfxCA/Extract.cpp
@@ -0,0 +1,282 @@
+// 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.
+#include "precomp.h"
+//---------------------------------------------------------------------
+// CABINET EXTRACTION
+//---------------------------------------------------------------------
+// Globals make this code unsuited for multhreaded use,
+// but FDI doesn't provide any other way to pass context.
+// Handle to the FDI (cab extraction) engine. Need access to this in a callback.
+static HFDI g_hfdi;
+// FDI is not unicode-aware, so avoid passing these paths through the callbacks.
+static const wchar_t* g_szExtractDir;
+static const wchar_t* g_szCabFile;
+// Offset into the source file where the cabinet really starts.
+// Used to trick FDI into extracting from a concatenated cabinet.
+static int g_lCabOffset;
+// Use the secure CRT version of _wsopen if available.
+#ifdef __GOT_SECURE_LIB__
+#define _wsopen__s(hf,file,oflag,shflag,pmode) _wsopen_s(&hf,file,oflag,shflag,pmode)
+#else
+#define _wsopen__s(hf,file,oflag,shflag,pmode) hf = _wsopen(file,oflag,shflag,pmode)
+#endif
+/// <summary>
+/// FDI callback to open a cabinet file.
+/// </summary>
+/// <param name="pszFile">Name of the file to be opened. This parameter
+/// is ignored since with our limited use this method is only ever called
+/// to open the main cabinet file.</param>
+/// <param name="oflag">Type of operations allowed.</param>
+/// <param name="pmode">Permission setting.</param>
+/// <returns>Integer file handle, or -1 if the file could not be opened.</returns>
+/// <remarks>
+/// To support reading from a cabinet that is concatenated onto
+/// another file, this function first searches for the offset of the cabinet,
+/// then saves that offset for use in recalculating later seeks.
+/// </remarks>
+static FNOPEN(CabOpen)
+{
+        UNREFERENCED_PARAMETER(pszFile);
+        int hf;
+        _wsopen__s(hf, g_szCabFile, oflag, _SH_DENYWR, pmode);
+        if (hf != -1)
+        {
+                FDICABINETINFO cabInfo;
+                int length = _lseek(hf, 0, SEEK_END);
+                for(int offset = 0; offset < length; offset += 256)
+                {
+                        if (_lseek(hf, offset, SEEK_SET) != offset) break;
+                        if (FDIIsCabinet(g_hfdi, hf, &cabInfo))
+                        {
+                                g_lCabOffset = offset;
+                                _lseek(hf, offset, SEEK_SET);
+                                return hf;
+                        }
+                }
+                _close(hf);
+        }
+        return -1;
+}
+/// <summary>
+/// FDI callback to seek within a file.
+/// </summary>
+/// <param name="hf">File handle.</param>
+/// <param name="dist">Seek distance</param>
+/// <param name="seektype">Whether to seek relative to the
+/// beginning, current position, or end of the file.</param>
+/// <returns>Resultant position within the cabinet.</returns>
+/// <remarks>
+/// To support reading from a cabinet that is concatenated onto
+/// another file, this function recalculates seeks based on the
+/// offset that was determined when the cabinet was opened.
+/// </remarks>
+static FNSEEK(CabSeek)
+{
+        if (seektype == SEEK_SET) dist += g_lCabOffset;
+        int pos = _lseek((int) hf, dist, seektype);
+        pos -= g_lCabOffset;
+        return pos;
+}
+/// <summary>
+/// Ensures a directory and its parent directory path exists.
+/// </summary>
+/// <param name="szDirPath">Directory path, not including file name.</param>
+/// <returns>0 if the directory exists or was successfully created, else nonzero.</returns>
+/// <remarks>
+/// This function modifies characters in szDirPath, but always restores them
+/// regardless of error condition.
+/// </remarks>
+static int EnsureDirectoryExists(__inout_z wchar_t* szDirPath)
+{
+        int ret = 0;
+        if (!::CreateDirectoryW(szDirPath, NULL))
+        {
+                UINT err = ::GetLastError();
+                if (err != ERROR_ALREADY_EXISTS)
+                {
+                        // Directory creation failed for some reason other than already existing.
+                        // Try to create the parent directory first.
+                        wchar_t* szLastSlash = NULL;
+                        for (wchar_t* sz = szDirPath; *sz; sz++)
+                        {
+                                if (*sz == L'\\')
+                                {
+                                        szLastSlash = sz;
+                                }
+                        }
+                        if (szLastSlash)
+                        {
+                                // Temporarily take one directory off the path and recurse.
+                                *szLastSlash = L'\0';
+                                ret = EnsureDirectoryExists(szDirPath);
+                                *szLastSlash = L'\\';
+                                // Try to create the directory if all parents are created.
+                                if (ret == 0 && !::CreateDirectoryW(szDirPath, NULL))
+                                {
+                                        err = ::GetLastError();
+                                        if (err != ERROR_ALREADY_EXISTS)
+                                        {
+                                                ret = -1;
+                                        }
+                                }
+                        }
+                        else
+                        {
+                                ret = -1;
+                        }
+                }
+        }
+        return ret;
+}
+/// <summary>
+/// Ensures a file's directory and its parent directory path exists.
+/// </summary>
+/// <param name="szDirPath">Path including file name.</param>
+/// <returns>0 if the file's directory exists or was successfully created, else nonzero.</returns>
+/// <remarks>
+/// This function modifies characters in szFilePath, but always restores them
+/// regardless of error condition.
+/// </remarks>
+static int EnsureFileDirectoryExists(__inout_z wchar_t* szFilePath)
+{
+        int ret = 0;
+        wchar_t* szLastSlash = NULL;
+        for (wchar_t* sz = szFilePath; *sz; sz++)
+        {
+                if (*sz == L'\\')
+                {
+                        szLastSlash = sz;
+                }
+        }
+        if (szLastSlash)
+        {
+                *szLastSlash = L'\0';
+                ret = EnsureDirectoryExists(szFilePath);
+                *szLastSlash = L'\\';
+        }
+        return ret;
+}
+/// <summary>
+/// FDI callback for handling files in the cabinet.
+/// </summary>
+/// <param name="fdint">Type of notification.</param>
+/// <param name="pfdin">Structure containing data about the notification.</param>
+/// <remarks>
+/// Refer to fdi.h for more comments on this notification callback.
+/// </remarks>
+static FNFDINOTIFY(CabNotification)
+{
+        // fdintCOPY_FILE:
+        //     Called for each file that *starts* in the current cabinet, giving
+        //     the client the opportunity to request that the file be copied or
+        //     skipped.
+        //   Entry:
+        //     pfdin->psz1    = file name in cabinet
+        //     pfdin->cb      = uncompressed size of file
+        //     pfdin->date    = file date
+        //     pfdin->time    = file time
+        //     pfdin->attribs = file attributes
+        //     pfdin->iFolder = file's folder index
+        //   Exit-Success:
+        //     Return non-zero file handle for destination file; FDI writes
+        //     data to this file use the PFNWRITE function supplied to FDICreate,
+        //     and then calls fdintCLOSE_FILE_INFO to close the file and set
+        //     the date, time, and attributes.
+        //   Exit-Failure:
+        //     Returns 0  => Skip file, do not copy
+        //     Returns -1 => Abort FDICopy() call
+        if (fdint == fdintCOPY_FILE)
+        {
+                size_t cchFile = MultiByteToWideChar(CP_UTF8, 0, pfdin->psz1, -1, NULL, 0);
+                size_t cchFilePath = wcslen(g_szExtractDir) + 1 + cchFile;
+                wchar_t* szFilePath = (wchar_t*) _alloca((cchFilePath + 1) * sizeof(wchar_t));
+                if (szFilePath == NULL) return -1;
+                StringCchCopyW(szFilePath, cchFilePath + 1, g_szExtractDir);
+                StringCchCatW(szFilePath, cchFilePath + 1, L"\\");
+                MultiByteToWideChar(CP_UTF8, 0, pfdin->psz1, -1,
+                        szFilePath + cchFilePath - cchFile, (int) cchFile + 1);
+                int hf = -1;
+                if (EnsureFileDirectoryExists(szFilePath) == 0)
+                {
+                        _wsopen__s(hf, szFilePath,
+                                _O_BINARY | _O_CREAT | _O_WRONLY | _O_SEQUENTIAL,
+                                _SH_DENYWR, _S_IREAD | _S_IWRITE);
+                }
+                return hf;
+        }
+        // fdintCLOSE_FILE_INFO:
+        //     Called after all of the data has been written to a target file.
+        //     This function must close the file and set the file date, time,
+        //     and attributes.
+        //   Entry:
+        //     pfdin->psz1    = file name in cabinet
+        //     pfdin->hf      = file handle
+        //     pfdin->date    = file date
+        //     pfdin->time    = file time
+        //     pfdin->attribs = file attributes
+        //     pfdin->iFolder = file's folder index
+        //     pfdin->cb      = Run After Extract (0 - don't run, 1 Run)
+        //   Exit-Success:
+        //     Returns TRUE
+        //   Exit-Failure:
+        //     Returns FALSE, or -1 to abort
+        else if (fdint == fdintCLOSE_FILE_INFO)
+        {
+                _close((int) pfdin->hf);
+                return TRUE;
+        }
+        return 0;
+}
+/// <summary>
+/// Extracts all contents of a cabinet file to a directory.
+/// </summary>
+/// <param name="szCabFile">Path to the cabinet file to be extracted.
+/// The cabinet may actually start at some offset within the file,
+/// as long as that offset is a multiple of 256.</param>
+/// <param name="szExtractDir">Directory where files are to be extracted.
+/// This directory must already exist, but should be empty.</param>
+/// <returns>0 if the cabinet was extracted successfully,
+/// or an error code if any error occurred.</returns>
+/// <remarks>
+/// The extraction will not overwrite any files in the destination
+/// directory; extraction will be interrupted and fail if any files
+/// with the same name already exist.
+/// </remarks>
+int ExtractCabinet(const wchar_t* szCabFile, const wchar_t* szExtractDir)
+{
+        ERF erf;
+        // Most of the FDI callbacks can be handled by existing CRT I/O functions.
+        // For our functionality we only need to handle the open and seek callbacks.
+        HFDI hfdi = FDICreate((PFNALLOC) malloc, (PFNFREE) free, CabOpen,
+                (PFNREAD) _read, (PFNWRITE) _write, (PFNCLOSE) _close,
+                CabSeek, cpu80386, &erf);
+        if (hfdi != NULL)
+        {
+                g_hfdi = hfdi;
+                g_szCabFile = szCabFile;
+                g_szExtractDir = szExtractDir;
+                char szEmpty[1] = {0};
+                if (FDICopy(hfdi, szEmpty, szEmpty, 0, CabNotification, NULL, NULL))
+                {
+                        FDIDestroy(hfdi);
+                        return 0;
+                }
+                FDIDestroy(hfdi);
+        }
+        return erf.erfOper;
+}
diff --git a/src/samples/Dtf/Tools/SfxCA/RemoteMsi.cpp b/src/samples/Dtf/Tools/SfxCA/RemoteMsi.cpp
new file mode 100644
index 00000000..ba59fdf7
--- /dev/null
+++ b/src/samples/Dtf/Tools/SfxCA/RemoteMsi.cpp
@@ -0,0 +1,629 @@
+// 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.
+#include "precomp.h"
+#include "RemoteMsiSession.h"
+//
+// Ensures that the request buffer is large enough to hold a request,
+// reallocating the buffer if necessary.
+// It will also reduce the buffer size if the previous allocation was very large.
+//
+static __success(return == 0) UINT EnsureBufSize(__deref_out_ecount(*pcchBuf) wchar_t** pszBuf, __deref_inout DWORD* pcchBuf, DWORD cchRequired)
+{
+    // It will also reduce the buffer size if the previous allocation was very large.
+    if (*pcchBuf < cchRequired || (LARGE_BUFFER_THRESHOLD/2 < *pcchBuf && cchRequired < *pcchBuf))
+    {
+        if (*pszBuf != NULL)
+        {
+            SecureZeroMemory(*pszBuf, *pcchBuf);
+            delete[] *pszBuf;
+        }
+        *pcchBuf = max(MIN_BUFFER_STRING_SIZE, cchRequired);
+        *pszBuf = new wchar_t[*pcchBuf];
+        if (*pszBuf == NULL)
+        {
+            return ERROR_OUTOFMEMORY;
+        }
+    }
+    return ERROR_SUCCESS;
+}
+typedef int (WINAPI *PMsiFunc_I_I)(int in1, __out int* out1);
+typedef int (WINAPI *PMsiFunc_II_I)(int in1, int in2, __out int* out1);
+typedef int (WINAPI *PMsiFunc_IS_I)(int in1, __in_z wchar_t* in2, __out int* out1);
+typedef int (WINAPI *PMsiFunc_ISI_I)(int in1, __in_z wchar_t* in2, int in3, __out int* out1);
+typedef int (WINAPI *PMsiFunc_ISII_I)(int in1, __in_z wchar_t* in2, int in3, int in4, __out int* out1);
+typedef int (WINAPI *PMsiFunc_IS_II)(int in1, __in_z wchar_t* in2, __out int* out1, __out int* out2);
+typedef MSIDBERROR (WINAPI *PMsiEFunc_I_S)(int in1, __out_ecount_full(*cchOut1) wchar_t* out1, __inout DWORD* cchOut1);
+typedef int (WINAPI *PMsiFunc_I_S)(int in1, __out_ecount_full(*cchOut1) wchar_t* out1, __inout DWORD* cchOut1);
+typedef int (WINAPI *PMsiFunc_II_S)(int in1, int in2, __out_ecount_full(*cchOut1) wchar_t* out1, __inout DWORD* cchOut1);
+typedef int (WINAPI *PMsiFunc_IS_S)(int in1, __in_z wchar_t* in2, __out_ecount_full(*cchOut1) wchar_t* out1, __inout DWORD* cchOut1);
+typedef int (WINAPI *PMsiFunc_ISII_SII)(int in1, __in_z wchar_t* in2, int in3, int in4, __out_ecount_full(*cchOut1) wchar_t* out1, __inout DWORD* cchOut1, __out int* out2, __out int* out3);
+UINT MsiFunc_I_I(PMsiFunc_I_I func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp)
+{
+    int in1 = pReq->fields[0].iValue;
+    int out1;
+    UINT ret = (UINT) func(in1, &out1);
+    if (ret == 0)
+    {
+        pResp->fields[1].vt = VT_I4;
+        pResp->fields[1].iValue = out1;
+    }
+    return ret;
+}
+UINT MsiFunc_II_I(PMsiFunc_II_I func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp)
+{
+    int in1 = pReq->fields[0].iValue;
+    int in2 = pReq->fields[1].iValue;
+    int out1;
+    UINT ret = (UINT) func(in1, in2, &out1);
+    if (ret == 0)
+    {
+        pResp->fields[1].vt = VT_I4;
+        pResp->fields[1].iValue = out1;
+    }
+    return ret;
+}
+UINT MsiFunc_IS_I(PMsiFunc_IS_I func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp)
+{
+    int in1 = pReq->fields[0].iValue;
+    wchar_t* in2 = pReq->fields[1].szValue;
+    int out1;
+    UINT ret = (UINT) func(in1, in2, &out1);
+    if (ret == 0)
+    {
+        pResp->fields[1].vt = VT_I4;
+        pResp->fields[1].iValue = out1;
+    }
+    return ret;
+}
+UINT MsiFunc_ISI_I(PMsiFunc_ISI_I func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp)
+{
+    int in1 = pReq->fields[0].iValue;
+    wchar_t* in2 = pReq->fields[1].szValue;
+    int in3 = pReq->fields[2].iValue;
+    int out1;
+    UINT ret = (UINT) func(in1, in2, in3, &out1);
+    if (ret == 0)
+    {
+        pResp->fields[1].vt = VT_I4;
+        pResp->fields[1].iValue = out1;
+    }
+    return ret;
+}
+UINT MsiFunc_ISII_I(PMsiFunc_ISII_I func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp)
+{
+    int in1 = pReq->fields[0].iValue;
+    wchar_t* in2 = pReq->fields[1].szValue;
+    int in3 = pReq->fields[2].iValue;
+    int in4 = pReq->fields[3].iValue;
+    int out1;
+    UINT ret = (UINT) func(in1, in2, in3, in4, &out1);
+    if (ret == 0)
+    {
+        pResp->fields[1].vt = VT_I4;
+        pResp->fields[1].iValue = out1;
+    }
+    return ret;
+}
+UINT MsiFunc_IS_II(PMsiFunc_IS_II func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp)
+{
+    int in1 = pReq->fields[0].iValue;
+    wchar_t* in2 = pReq->fields[1].szValue;
+    int out1, out2;
+    UINT ret = (UINT) func(in1, in2, &out1, &out2);
+    if (ret == 0)
+    {
+        pResp->fields[1].vt = VT_I4;
+        pResp->fields[1].iValue = out1;
+        pResp->fields[2].vt = VT_I4;
+        pResp->fields[2].iValue = out2;
+    }
+    return ret;
+}
+UINT MsiFunc_I_S(PMsiFunc_I_S func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp, __deref_inout_ecount(cchBuf) wchar_t*& szBuf, __inout DWORD& cchBuf)
+{
+    int in1 = pReq->fields[0].iValue;
+    szBuf[0] = L'\0';
+    DWORD cchValue = cchBuf;
+    UINT ret = (UINT) func(in1, szBuf, &cchValue);
+    if (ret == ERROR_MORE_DATA)
+    {
+        ret = EnsureBufSize(&szBuf, &cchBuf, ++cchValue);
+        if (ret == 0)
+        {
+            ret = (UINT) func(in1, szBuf, &cchValue);
+        }
+    }
+    if (ret == 0)
+    {
+        pResp->fields[1].vt = VT_LPWSTR;
+        pResp->fields[1].szValue = szBuf;
+    }
+    return ret;
+}
+MSIDBERROR MsiEFunc_I_S(PMsiEFunc_I_S func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp, __deref_inout_ecount(cchBuf) wchar_t*& szBuf, __inout DWORD& cchBuf)
+{
+    int in1 = pReq->fields[0].iValue;
+    szBuf[0] = L'\0';
+    DWORD cchValue = cchBuf;
+    MSIDBERROR ret = func(in1, szBuf, &cchValue);
+    if (ret == MSIDBERROR_MOREDATA)
+    {
+        if (0 == EnsureBufSize(&szBuf, &cchBuf, ++cchValue))
+        {
+            ret = func(in1, szBuf, &cchValue);
+        }
+    }
+    if (ret != MSIDBERROR_MOREDATA)
+    {
+        pResp->fields[1].vt = VT_LPWSTR;
+        pResp->fields[1].szValue = szBuf;
+    }
+    return ret;
+}
+UINT MsiFunc_II_S(PMsiFunc_II_S func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp, __deref_inout_ecount(cchBuf) wchar_t*& szBuf, __inout DWORD& cchBuf)
+{
+    int in1 = pReq->fields[0].iValue;
+    int in2 = pReq->fields[1].iValue;
+    szBuf[0] = L'\0';
+    DWORD cchValue = cchBuf;
+    UINT ret = (UINT) func(in1, in2, szBuf, &cchValue);
+    if (ret == ERROR_MORE_DATA)
+    {
+        ret = EnsureBufSize(&szBuf, &cchBuf, ++cchValue);
+        if (ret == 0)
+        {
+            ret = (UINT) func(in1, in2, szBuf, &cchValue);
+        }
+    }
+    if (ret == 0)
+    {
+        pResp->fields[1].vt = VT_LPWSTR;
+        pResp->fields[1].szValue = szBuf;
+    }
+    return ret;
+}
+UINT MsiFunc_IS_S(PMsiFunc_IS_S func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp, __deref_inout_ecount(cchBuf) wchar_t*& szBuf, __inout DWORD& cchBuf)
+{
+    int in1 = pReq->fields[0].iValue;
+    wchar_t* in2 = pReq->fields[1].szValue;
+    szBuf[0] = L'\0';
+    DWORD cchValue = cchBuf;
+    UINT ret = (UINT) func(in1, in2, szBuf, &cchValue);
+    if (ret == ERROR_MORE_DATA)
+    {
+        ret = EnsureBufSize(&szBuf, &cchBuf, ++cchValue);
+        if (ret == 0)
+        {
+            ret = (UINT) func(in1, in2, szBuf, &cchValue);
+        }
+    }
+    if (ret == 0)
+    {
+        pResp->fields[1].vt = VT_LPWSTR;
+        pResp->fields[1].szValue = szBuf;
+    }
+    return ret;
+}
+UINT MsiFunc_ISII_SII(PMsiFunc_ISII_SII func, const RemoteMsiSession::RequestData* pReq, RemoteMsiSession::RequestData* pResp, __deref_inout_ecount(cchBuf) wchar_t*& szBuf, __inout DWORD& cchBuf)
+{
+    int in1 = pReq->fields[0].iValue;
+    wchar_t* in2 = pReq->fields[1].szValue;
+    int in3 = pReq->fields[2].iValue;
+    int in4 = pReq->fields[3].iValue;
+    szBuf[0] = L'\0';
+    DWORD cchValue = cchBuf;
+    int out2, out3;
+    UINT ret = (UINT) func(in1, in2, in3, in4, szBuf, &cchValue, &out2, &out3);
+    if (ret == ERROR_MORE_DATA)
+    {
+        ret = EnsureBufSize(&szBuf, &cchBuf, ++cchValue);
+        if (ret == 0)
+        {
+            ret = (UINT) func(in1, in2, in3, in4, szBuf, &cchValue, &out2, &out3);
+        }
+    }
+    if (ret == 0)
+    {
+        pResp->fields[1].vt = VT_LPWSTR;
+        pResp->fields[1].szValue = szBuf;
+        pResp->fields[2].vt = VT_I4;
+        pResp->fields[2].iValue = out2;
+        pResp->fields[3].vt = VT_I4;
+        pResp->fields[3].iValue = out3;
+    }
+    return ret;
+}
+void RemoteMsiSession::ProcessRequest(RequestId id, const RequestData* pReq, RequestData* pResp)
+{
+    SecureZeroMemory(pResp, sizeof(RequestData));
+    UINT ret = EnsureBufSize(&m_pBufSend, &m_cbBufSend, 1024);
+    if (0 == ret)
+    {
+        switch (id)
+        {
+            case RemoteMsiSession::EndSession:
+            {
+                this->ExitCode = pReq->fields[0].iValue;
+            }
+            break;
+            case RemoteMsiSession::MsiCloseHandle:
+            {
+                MSIHANDLE h = (MSIHANDLE) pReq->fields[0].iValue;
+                ret = ::MsiCloseHandle(h);
+            }
+            break;
+            case RemoteMsiSession::MsiProcessMessage:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                INSTALLMESSAGE eMessageType = (INSTALLMESSAGE) pReq->fields[1].iValue;
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[2].iValue;
+                ret = ::MsiProcessMessage(hInstall, eMessageType, hRecord);
+            }
+            break;
+            case RemoteMsiSession::MsiGetProperty:
+            {
+                ret = MsiFunc_IS_S((PMsiFunc_IS_S) ::MsiGetProperty, pReq, pResp, m_pBufSend, m_cbBufSend);
+            }
+            break;
+            case RemoteMsiSession::MsiSetProperty:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                const wchar_t* szName = pReq->fields[1].szValue;
+                const wchar_t* szValue = pReq->fields[2].szValue;
+                ret = ::MsiSetProperty(hInstall, szName, szValue);
+            }
+            break;
+            case RemoteMsiSession::MsiCreateRecord:
+            {
+                UINT cParams = pReq->fields[0].uiValue;
+                ret = ::MsiCreateRecord(cParams);
+            }
+            break;
+            case RemoteMsiSession::MsiRecordGetFieldCount:
+            {
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[0].iValue;
+                ret = ::MsiRecordGetFieldCount(hRecord);
+            }
+            break;
+            case RemoteMsiSession::MsiRecordGetInteger:
+            {
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[0].iValue;
+                UINT iField = pReq->fields[1].uiValue;
+                ret = ::MsiRecordGetInteger(hRecord, iField);
+            }
+            break;
+            case RemoteMsiSession::MsiRecordSetInteger:
+            {
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[0].iValue;
+                UINT iField = pReq->fields[1].uiValue;
+                int iValue = pReq->fields[2].iValue;
+                ret = ::MsiRecordSetInteger(hRecord, iField, iValue);
+            }
+            break;
+            case RemoteMsiSession::MsiRecordGetString:
+            {
+                ret = MsiFunc_II_S((PMsiFunc_II_S) ::MsiRecordGetString, pReq, pResp, m_pBufSend, m_cbBufSend);
+            }
+            break;
+            case RemoteMsiSession::MsiRecordSetString:
+            {
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[0].iValue;
+                UINT iField = pReq->fields[1].uiValue;
+                const wchar_t* szValue = pReq->fields[2].szValue;
+                ret = ::MsiRecordSetString(hRecord, iField, szValue);
+            }
+            break;
+            case RemoteMsiSession::MsiRecordClearData:
+            {
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[0].iValue;
+                ret = ::MsiRecordClearData(hRecord);
+            }
+            break;
+            case RemoteMsiSession::MsiRecordIsNull:
+            {
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[0].iValue;
+                UINT iField = pReq->fields[1].uiValue;
+                ret = ::MsiRecordIsNull(hRecord, iField);
+            }
+            break;
+            case RemoteMsiSession::MsiFormatRecord:
+            {
+                ret = MsiFunc_II_S((PMsiFunc_II_S) ::MsiFormatRecord, pReq, pResp, m_pBufSend, m_cbBufSend);
+            }
+            break;
+            case RemoteMsiSession::MsiGetActiveDatabase:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                ret = (UINT) ::MsiGetActiveDatabase(hInstall);
+            }
+            break;
+            case RemoteMsiSession::MsiDatabaseOpenView:
+            {
+                ret = MsiFunc_IS_I((PMsiFunc_IS_I) ::MsiDatabaseOpenView, pReq, pResp);
+            }
+            break;
+            case RemoteMsiSession::MsiViewExecute:
+            {
+                MSIHANDLE hView = (MSIHANDLE) pReq->fields[0].iValue;
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[1].iValue;
+                ret = ::MsiViewExecute(hView, hRecord);
+            }
+            break;
+            case RemoteMsiSession::MsiViewFetch:
+            {
+                ret = MsiFunc_I_I((PMsiFunc_I_I) ::MsiViewFetch, pReq, pResp);
+            }
+            break;
+            case RemoteMsiSession::MsiViewModify:
+            {
+                MSIHANDLE hView = (MSIHANDLE) pReq->fields[0].iValue;
+                MSIMODIFY eModifyMode = (MSIMODIFY) pReq->fields[1].iValue;
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[2].iValue;
+                ret = ::MsiViewModify(hView, eModifyMode, hRecord);
+            }
+            break;
+            case RemoteMsiSession::MsiViewGetError:
+            {
+                ret = MsiEFunc_I_S((PMsiEFunc_I_S) ::MsiViewGetError, pReq, pResp, m_pBufSend, m_cbBufSend);
+            }
+            break;
+            case RemoteMsiSession::MsiViewGetColumnInfo:
+            {
+                ret = MsiFunc_II_I((PMsiFunc_II_I) ::MsiViewGetColumnInfo, pReq, pResp);
+            }
+            break;
+            case RemoteMsiSession::MsiDatabaseGetPrimaryKeys:
+            {
+                ret = MsiFunc_IS_I((PMsiFunc_IS_I) ::MsiDatabaseGetPrimaryKeys, pReq, pResp);
+            }
+            break;
+            case RemoteMsiSession::MsiDatabaseIsTablePersistent:
+            {
+                MSIHANDLE hDb = (MSIHANDLE) pReq->fields[0].iValue;
+                const wchar_t* szTable = pReq->fields[1].szValue;
+                ret = ::MsiDatabaseIsTablePersistent(hDb, szTable);
+            }
+            break;
+            case RemoteMsiSession::MsiDoAction:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                const wchar_t* szAction = pReq->fields[1].szValue;
+                ret = ::MsiDoAction(hInstall, szAction);
+            }
+            break;
+            case RemoteMsiSession::MsiEnumComponentCosts:
+            {
+                ret = MsiFunc_ISII_SII((PMsiFunc_ISII_SII) ::MsiEnumComponentCosts, pReq, pResp, m_pBufSend, m_cbBufSend);
+            }
+            break;
+            case RemoteMsiSession::MsiEvaluateCondition:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                const wchar_t* szCondition = pReq->fields[1].szValue;
+                ret = ::MsiEvaluateCondition(hInstall, szCondition);
+            }
+            break;
+            case RemoteMsiSession::MsiGetComponentState:
+            {
+                ret = MsiFunc_IS_II((PMsiFunc_IS_II) ::MsiGetComponentState, pReq, pResp);
+            }
+            break;
+            case RemoteMsiSession::MsiGetFeatureCost:
+            {
+                ret = MsiFunc_ISII_I((PMsiFunc_ISII_I) ::MsiGetFeatureCost, pReq, pResp);
+            }
+            break;
+            case RemoteMsiSession::MsiGetFeatureState:
+            {
+                ret = MsiFunc_IS_II((PMsiFunc_IS_II) ::MsiGetFeatureState, pReq, pResp);
+            }
+            break;
+            case RemoteMsiSession::MsiGetFeatureValidStates:
+            {
+                ret = MsiFunc_IS_I((PMsiFunc_IS_I) ::MsiGetFeatureValidStates, pReq, pResp);
+            }
+            break;
+            case RemoteMsiSession::MsiGetLanguage:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                ret = ::MsiGetLanguage(hInstall);
+            }
+            break;
+            case RemoteMsiSession::MsiGetLastErrorRecord:
+            {
+                ret = ::MsiGetLastErrorRecord();
+            }
+            break;
+            case RemoteMsiSession::MsiGetMode:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                MSIRUNMODE iRunMode = (MSIRUNMODE) pReq->fields[1].iValue;
+                ret = ::MsiGetMode(hInstall, iRunMode);
+            }
+            break;
+            case RemoteMsiSession::MsiGetSourcePath:
+            {
+                ret = MsiFunc_IS_S((PMsiFunc_IS_S) ::MsiGetSourcePath, pReq, pResp, m_pBufSend, m_cbBufSend);
+            }
+            break;
+            case RemoteMsiSession::MsiGetSummaryInformation:
+            {
+                ret = MsiFunc_ISI_I((PMsiFunc_ISI_I) ::MsiGetSummaryInformation, pReq, pResp);
+            }
+            break;
+            case RemoteMsiSession::MsiGetTargetPath:
+            {
+                ret = MsiFunc_IS_S((PMsiFunc_IS_S) ::MsiGetTargetPath, pReq, pResp, m_pBufSend, m_cbBufSend);
+            }
+            break;
+            case RemoteMsiSession::MsiRecordDataSize:
+            {
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[0].iValue;
+                UINT iField = pReq->fields[1].uiValue;
+                ret = ::MsiRecordDataSize(hRecord, iField);
+            }
+            break;
+            case RemoteMsiSession::MsiRecordReadStream:
+            {
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[0].iValue;
+                UINT iField = pReq->fields[1].uiValue;
+                DWORD cbRead = (DWORD) pReq->fields[2].uiValue;
+                ret = EnsureBufSize(&m_pBufSend, &m_cbBufSend, (cbRead + 1) / 2);
+                if (ret == 0)
+                {
+                    ret = ::MsiRecordReadStream(hRecord, iField, (char*) m_pBufSend, &cbRead);
+                    if (ret == 0)
+                    {
+                        pResp->fields[1].vt = VT_STREAM;
+                        pResp->fields[1].szValue = m_pBufSend;
+                        pResp->fields[2].vt = VT_I4;
+                        pResp->fields[2].uiValue = (UINT) cbRead;
+                    }
+                }
+            }
+            break;
+            case RemoteMsiSession::MsiRecordSetStream:
+            {
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[0].iValue;
+                UINT iField = pReq->fields[1].uiValue;
+                const wchar_t* szFilePath = pReq->fields[2].szValue;
+                ret = ::MsiRecordSetStream(hRecord, iField, szFilePath);
+            }
+            break;
+            case RemoteMsiSession::MsiSequence:
+            {
+                MSIHANDLE hRecord = (MSIHANDLE) pReq->fields[0].iValue;
+                const wchar_t* szTable = pReq->fields[1].szValue;
+                UINT iSequenceMode = pReq->fields[2].uiValue;
+                ret = ::MsiSequence(hRecord, szTable, iSequenceMode);
+            }
+            break;
+            case RemoteMsiSession::MsiSetComponentState:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                const wchar_t* szComponent = pReq->fields[1].szValue;
+                INSTALLSTATE iState = (INSTALLSTATE) pReq->fields[2].iValue;
+                ret = ::MsiSetComponentState(hInstall, szComponent, iState);
+            }
+            break;
+            case RemoteMsiSession::MsiSetFeatureAttributes:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                const wchar_t* szFeature = pReq->fields[1].szValue;
+                DWORD dwAttrs = (DWORD) pReq->fields[2].uiValue;
+                ret = ::MsiSetFeatureAttributes(hInstall, szFeature, dwAttrs);
+            }
+            break;
+            case RemoteMsiSession::MsiSetFeatureState:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                const wchar_t* szFeature = pReq->fields[1].szValue;
+                INSTALLSTATE iState = (INSTALLSTATE) pReq->fields[2].iValue;
+                ret = ::MsiSetFeatureState(hInstall, szFeature, iState);
+            }
+            break;
+            case RemoteMsiSession::MsiSetInstallLevel:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                int iInstallLevel = pReq->fields[1].iValue;
+                ret = ::MsiSetInstallLevel(hInstall, iInstallLevel);
+            }
+            break;
+            case RemoteMsiSession::MsiSetMode:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                MSIRUNMODE iRunMode = (MSIRUNMODE) pReq->fields[1].uiValue;
+                BOOL fState = (BOOL) pReq->fields[2].iValue;
+                ret = ::MsiSetMode(hInstall, iRunMode, fState);
+            }
+            break;
+            case RemoteMsiSession::MsiSetTargetPath:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                const wchar_t* szFolder = pReq->fields[1].szValue;
+                const wchar_t* szFolderPath = pReq->fields[2].szValue;
+                ret = ::MsiSetTargetPath(hInstall, szFolder, szFolderPath);
+            }
+            break;
+            case RemoteMsiSession::MsiSummaryInfoGetProperty:
+            {
+                MSIHANDLE hSummaryInfo = (MSIHANDLE) pReq->fields[0].iValue;
+                UINT uiProperty = pReq->fields[1].uiValue;
+                UINT uiDataType;
+                int iValue;
+                FILETIME ftValue;
+                m_pBufSend[0] = L'\0';
+                DWORD cchValue = m_cbBufSend;
+                ret = ::MsiSummaryInfoGetProperty(hSummaryInfo, uiProperty, &uiDataType, &iValue, &ftValue, m_pBufSend, &cchValue);
+                if (ret == ERROR_MORE_DATA)
+                {
+                    ret = EnsureBufSize(&m_pBufSend, &m_cbBufSend, ++cchValue);
+                    if (ret == 0)
+                    {
+                        ret = ::MsiSummaryInfoGetProperty(hSummaryInfo, uiProperty, &uiDataType, &iValue, &ftValue, m_pBufSend, &cchValue);
+                    }
+                }
+                if (ret == 0)
+                {
+                    pResp->fields[1].vt = VT_UI4;
+                    pResp->fields[1].uiValue = uiDataType;
+                    switch (uiDataType)
+                    {
+                    case VT_I2:
+                    case VT_I4:
+                        pResp->fields[2].vt = VT_I4;
+                        pResp->fields[2].iValue = iValue;
+                        break;
+                    case VT_FILETIME:
+                        pResp->fields[2].vt = VT_UI4;
+                        pResp->fields[2].iValue = ftValue.dwHighDateTime;
+                        pResp->fields[3].vt = VT_UI4;
+                        pResp->fields[3].iValue = ftValue.dwLowDateTime;
+                        break;
+                    case VT_LPSTR:
+                        pResp->fields[2].vt = VT_LPWSTR;
+                        pResp->fields[2].szValue = m_pBufSend;
+                        break;
+                    }
+                }
+            }
+            break;
+            case RemoteMsiSession::MsiVerifyDiskSpace:
+            {
+                MSIHANDLE hInstall = (MSIHANDLE) pReq->fields[0].iValue;
+                ret = ::MsiVerifyDiskSpace(hInstall);
+            }
+            break;
+            
+            default:
+            {
+                ret = ERROR_INVALID_FUNCTION;
+            }
+            break;
+        }
+    }
+    pResp->fields[0].vt = VT_UI4;
+    pResp->fields[0].uiValue = ret;
+}
diff --git a/src/samples/Dtf/Tools/SfxCA/RemoteMsiSession.h b/src/samples/Dtf/Tools/SfxCA/RemoteMsiSession.h
new file mode 100644
index 00000000..90c7c01f
--- /dev/null
+++ b/src/samples/Dtf/Tools/SfxCA/RemoteMsiSession.h
@@ -0,0 +1,898 @@
+// 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.
+#define LARGE_BUFFER_THRESHOLD 65536 // bytes
+#define MIN_BUFFER_STRING_SIZE 1024 // wchar_ts
+///////////////////////////////////////////////////////////////////////////////////////
+// RemoteMsiSession //
+//////////////////////
+//
+// Allows accessing MSI APIs from another process using named pipes.
+//
+class RemoteMsiSession
+{
+public:
+    // This enumeration MUST stay in sync with the
+    // managed equivalent in RemotableNativeMethods.cs!
+    enum RequestId
+    {
+        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,
+    };
+    static const int MAX_REQUEST_FIELDS = 4;
+    // Used to pass data back and forth for remote API calls,
+    // including in & out params & return values.
+    // Only strings and ints are supported.
+    struct RequestData
+    {
+        struct
+        {
+            VARENUM  vt;
+            union {
+              int    iValue;
+              UINT   uiValue;
+              DWORD  cchValue;
+              LPWSTR szValue;
+              BYTE*  sValue;
+              DWORD  cbValue;
+            };
+        } fields[MAX_REQUEST_FIELDS];
+    };
+public:
+    // This value is set from the single data parameter in the EndSession request.
+    // It saves the exit code of the out-of-proc custom action.
+    int ExitCode;
+    /////////////////////////////////////////////////////////////////////////////////////
+    // RemoteMsiSession constructor
+    //
+    // Creates a new remote session instance, for use either by the server
+    // or client process.
+    //
+    // szName  - Identifies the session instance being remoted. The server and
+    //         the client must use the same name. The name should be unique
+    //         enough to avoid conflicting with other instances on the system.
+    //
+    // fServer - True if the calling process is the server process, false if the
+    //         calling process is the client process.
+    //
+    RemoteMsiSession(const wchar_t* szName, bool fServer=true)
+        : m_fServer(fServer),
+          m_szName(szName != NULL && szName[0] != L'\0' ? szName : L"RemoteMsiSession"),
+          m_szPipeName(NULL),
+          m_hPipe(NULL),
+          m_fConnecting(false),
+          m_fConnected(false),
+          m_hReceiveThread(NULL),
+          m_hReceiveStopEvent(NULL),
+          m_pBufReceive(NULL),
+          m_cbBufReceive(0),
+          m_pBufSend(NULL),
+          m_cbBufSend(0),
+          ExitCode(ERROR_INSTALL_FAILURE)
+    {   
+        SecureZeroMemory(&m_overlapped, sizeof(OVERLAPPED));
+        m_overlapped.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+    }
+    /////////////////////////////////////////////////////////////////////////////////////
+    // RemoteMsiSession destructor
+    //
+    // Closes any open handles and frees any allocated memory.
+    //
+    ~RemoteMsiSession()
+    {
+        WaitExitCode();
+        if (m_hPipe != NULL)
+        {
+            CloseHandle(m_hPipe);
+            m_hPipe = NULL;
+        }
+        if (m_overlapped.hEvent != NULL)
+        {
+            CloseHandle(m_overlapped.hEvent);
+            m_overlapped.hEvent = NULL;
+        }
+        if (m_szPipeName != NULL)
+        {
+            delete[] m_szPipeName;
+            m_szPipeName = NULL;
+        }
+        if (m_pBufReceive != NULL)
+        {
+            SecureZeroMemory(m_pBufReceive, m_cbBufReceive);
+            delete[] m_pBufReceive;
+            m_pBufReceive = NULL;
+        }
+        if (m_pBufSend != NULL)
+        {
+            SecureZeroMemory(m_pBufSend, m_cbBufSend);
+            delete[] m_pBufSend;
+            m_pBufSend = NULL;
+        }
+        m_fConnecting = false;
+        m_fConnected = false;
+    }
+    /////////////////////////////////////////////////////////////////////////////////////
+    // RemoteMsiSession::WaitExitCode()
+    //
+    // Waits for the server processing thread to complete.
+    //
+    void WaitExitCode()
+    {
+        if (m_hReceiveThread != NULL)
+        {
+            SetEvent(m_hReceiveStopEvent);
+            WaitForSingleObject(m_hReceiveThread, INFINITE);
+            CloseHandle(m_hReceiveThread);
+            m_hReceiveThread = NULL;
+        }
+    }
+    /////////////////////////////////////////////////////////////////////////////////////
+    // RemoteMsiSession::Connect()
+    //
+    // Connects the inter-process communication channel.
+    // (Currently implemented as a named pipe.)
+    //
+    // This method must be called first by the server process, then by the client
+    // process. The method does not block; the server will asynchronously wait
+    // for the client process to make the connection.
+    //
+    // Returns: 0 on success, Win32 error code on failure.
+    //
+    virtual DWORD Connect()
+    {
+        const wchar_t* szPipePrefix = L"\\\\.\\pipe\\";
+        size_t cchPipeNameBuf = wcslen(szPipePrefix) + wcslen(m_szName) + 1;
+        m_szPipeName = new wchar_t[cchPipeNameBuf];
+        if (m_szPipeName == NULL)
+        {
+            return ERROR_OUTOFMEMORY;
+        }
+        else
+        {
+            wcscpy_s(m_szPipeName, cchPipeNameBuf, szPipePrefix);
+            wcscat_s(m_szPipeName, cchPipeNameBuf, m_szName);
+            if (m_fServer)
+            {
+                return this->ConnectPipeServer();
+            }
+            else
+            {
+                return this->ConnectPipeClient();
+            }
+        }
+    }
+    /////////////////////////////////////////////////////////////////////////////////////
+    // RemoteMsiSession::IsConnected()
+    //
+    // Checks if the server process and client process are currently connected.
+    //
+    virtual bool IsConnected() const
+    {
+        return m_fConnected;
+    }
+    /////////////////////////////////////////////////////////////////////////////////////
+    // RemoteMsiSession::ProcessRequests()
+    //
+    // For use by the service process. Watches for requests in the input buffer and calls
+    // the callback for each one.
+    //
+    // This method does not block; it spawns a separate thread to do the work.
+    //
+    // Returns: 0 on success, Win32 error code on failure.
+    //
+    virtual DWORD ProcessRequests()
+    {
+        return this->StartProcessingReqests();
+    }
+    /////////////////////////////////////////////////////////////////////////////////////
+    // RemoteMsiSession::SendRequest()
+    //
+    // For use by the client process. Sends a request to the server and
+    // synchronously waits on a response, up to the timeout value.
+    //
+    // id         - ID code of the MSI API call being requested.
+    //
+    // pRequest   - Pointer to a data structure containing request parameters.
+    //
+    // ppResponse - [OUT] Pointer to a location that receives the response parameters.
+    //
+    // Returns: 0 on success, Win32 error code on failure.
+    // Returns WAIT_TIMEOUT if no response was received in time.
+    //
+    virtual DWORD SendRequest(RequestId id, const RequestData* pRequest, RequestData** ppResponse)
+    {
+        if (m_fServer)
+        {
+            return ERROR_INVALID_OPERATION;
+        }
+        if (!m_fConnected)
+        {
+            *ppResponse = NULL;
+            return 0;
+        }
+        DWORD dwRet = this->SendRequest(id, pRequest);
+        if (dwRet != 0)
+        {
+            return dwRet;
+        }
+        if (id != EndSession)
+        {
+            static RequestData response;
+            if (ppResponse != NULL)
+            {
+                *ppResponse = &response;
+            }
+            return this->ReceiveResponse(id, &response);
+        }
+        else
+        {
+            CloseHandle(m_hPipe);
+            m_hPipe = NULL;
+            m_fConnected = false;
+            return 0;
+        }
+    }
+private:
+    //
+    // Do not allow assignment.
+    //
+    RemoteMsiSession& operator=(const RemoteMsiSession&);
+    //
+    // Called only by the server process.
+    // Create a new thread to handle receiving requests.
+    //
+    DWORD StartProcessingReqests()
+    {
+        if (!m_fServer || m_hReceiveStopEvent != NULL)
+        {
+            return ERROR_INVALID_OPERATION;
+        }
+        DWORD dwRet = 0;
+        m_hReceiveStopEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+        if (m_hReceiveStopEvent == NULL)
+        {
+            dwRet = GetLastError();
+        }
+        else
+        {
+            if (m_hReceiveThread != NULL)
+            {
+                CloseHandle(m_hReceiveThread);
+            }
+            m_hReceiveThread = CreateThread(NULL, 0,
+                RemoteMsiSession::ProcessRequestsThreadStatic, this, 0, NULL);
+            
+            if (m_hReceiveThread == NULL)
+            {
+                dwRet = GetLastError();
+                CloseHandle(m_hReceiveStopEvent);
+                m_hReceiveStopEvent = NULL;
+            }
+        }
+        return dwRet;
+    }
+    //
+    // Called only by the watcher process.
+    // First verify the connection is complete. Then continually read and parse messages,
+    // invoke the callback, and send the replies.
+    //
+    static DWORD WINAPI ProcessRequestsThreadStatic(void* pv)
+    {
+        return reinterpret_cast<RemoteMsiSession*>(pv)->ProcessRequestsThread();
+    }
+    DWORD ProcessRequestsThread()
+    {
+        DWORD dwRet;
+        dwRet = CompleteConnection();
+        if (dwRet != 0)
+        {
+            if (dwRet == ERROR_OPERATION_ABORTED) dwRet = 0;
+        }
+        while (m_fConnected)
+        {
+            RequestId id;
+            RequestData req;
+            dwRet = ReceiveRequest(&id, &req);
+            if (dwRet != 0)
+            {
+                if (dwRet == ERROR_OPERATION_ABORTED ||
+                    dwRet == ERROR_BROKEN_PIPE || dwRet == ERROR_NO_DATA)
+                {
+                    dwRet = 0;
+                }
+            }
+            else
+            {
+                RequestData resp;
+                ProcessRequest(id, &req, &resp);
+                if (id == EndSession)
+                {
+                    break;
+                }
+                dwRet = SendResponse(id, &resp);
+                if (dwRet != 0 && dwRet != ERROR_BROKEN_PIPE && dwRet != ERROR_NO_DATA)
+                {
+                    dwRet = 0;
+                }
+            }
+        }
+        CloseHandle(m_hReceiveStopEvent);
+        m_hReceiveStopEvent = NULL;
+        return dwRet;
+    }
+    //
+    // Called only by the server process's receive thread.
+    // Read one request into a RequestData object.
+    //
+    DWORD ReceiveRequest(RequestId* pId, RequestData* pReq)
+    {
+        DWORD dwRet = this->ReadPipe((BYTE*) pId, sizeof(RequestId));
+        if (dwRet == 0)
+        {
+            dwRet = this->ReadRequestData(pReq);
+        }
+        return dwRet;
+    }
+    //
+    // Called by the server process's receive thread or the client's request call
+    // to read the response. Read data from the pipe, allowing interruption by the
+    // stop event if on the server.
+    //
+    DWORD ReadPipe(__out_bcount(cbRead) BYTE* pBuf, DWORD cbRead)
+    {
+        DWORD dwRet = 0;
+        DWORD dwTotalBytesRead = 0;
+        while (dwRet == 0 && dwTotalBytesRead < cbRead)
+        {
+            DWORD dwBytesReadThisTime;
+            ResetEvent(m_overlapped.hEvent);
+            if (!ReadFile(m_hPipe, pBuf + dwTotalBytesRead, cbRead - dwTotalBytesRead, &dwBytesReadThisTime, &m_overlapped))
+            {
+                dwRet = GetLastError();
+                if (dwRet == ERROR_IO_PENDING)
+                {
+                    if (m_fServer)
+                    {
+                        HANDLE hWaitHandles[] = { m_overlapped.hEvent, m_hReceiveStopEvent };
+                        dwRet = WaitForMultipleObjects(2, hWaitHandles, FALSE, INFINITE);
+                    }
+                    else
+                    {
+                        dwRet = WaitForSingleObject(m_overlapped.hEvent, INFINITE);
+                    }
+                    if (dwRet == WAIT_OBJECT_0)
+                    {
+                        if (!GetOverlappedResult(m_hPipe, &m_overlapped, &dwBytesReadThisTime, FALSE))
+                        {
+                            dwRet = GetLastError();
+                        }
+                    }
+                    else if (dwRet == WAIT_FAILED)
+                    {
+                        dwRet = GetLastError();
+                    }
+                    else
+                    {
+                        dwRet = ERROR_OPERATION_ABORTED;
+                    }
+                }
+            }
+            dwTotalBytesRead += dwBytesReadThisTime;
+        }
+        if (dwRet != 0)
+        {
+            if (m_fServer)
+            {
+                CancelIo(m_hPipe);
+                DisconnectNamedPipe(m_hPipe);
+            }
+            else
+            {
+                CloseHandle(m_hPipe);
+                m_hPipe = NULL;
+            }
+            m_fConnected = false;
+        }
+        return dwRet;
+    }
+    //
+    // Called only by the server process.
+    // Given a request, invoke the MSI API and return the response.
+    // This is implemented in RemoteMsi.cpp.
+    //
+    void ProcessRequest(RequestId id, const RequestData* pReq, RequestData* pResp);
+    //
+    // Called only by the client process.
+    // Send request data over the pipe.
+    //
+    DWORD SendRequest(RequestId id, const RequestData* pRequest)
+    {
+        DWORD dwRet = WriteRequestData(id, pRequest);
+        
+        if (dwRet != 0)
+        {
+            m_fConnected = false;
+            CloseHandle(m_hPipe);
+            m_hPipe = NULL;
+        }
+        return dwRet;
+    }
+    //
+    // Called only by the server process.
+    // Just send a response over the pipe.
+    //
+    DWORD SendResponse(RequestId id, const RequestData* pResp)
+    {
+        DWORD dwRet = WriteRequestData(id, pResp);
+        if (dwRet != 0)
+        {
+            DisconnectNamedPipe(m_hPipe);
+            m_fConnected = false;
+        }
+        return dwRet;
+    }
+    //
+    // Called either by the client or server process.
+    // Writes data to the pipe for a request or response.
+    //
+    DWORD WriteRequestData(RequestId id, const RequestData* pReq)
+    {
+        DWORD dwRet = 0;
+        RequestData req = *pReq; // Make a copy because the const data can't be changed.
+        dwRet = this->WritePipe((const BYTE *)&id, sizeof(RequestId));
+        if (dwRet != 0)
+        {
+            return dwRet;
+        }
+        BYTE* sValues[MAX_REQUEST_FIELDS] = {0};
+        for (int i = 0; i < MAX_REQUEST_FIELDS; i++)
+        {
+            if (req.fields[i].vt == VT_LPWSTR)
+            {
+                sValues[i] = (BYTE*) req.fields[i].szValue;
+                req.fields[i].cchValue = (DWORD) wcslen(req.fields[i].szValue);
+            }
+            else if (req.fields[i].vt == VT_STREAM)
+            {
+                sValues[i] = req.fields[i].sValue;
+                req.fields[i].cbValue = (DWORD) req.fields[i + 1].uiValue;
+            }
+        }
+        dwRet = this->WritePipe((const BYTE *)&req, sizeof(RequestData));
+        if (dwRet != 0)
+        {
+            return dwRet;
+        }
+        for (int i = 0; i < MAX_REQUEST_FIELDS; i++)
+        {
+            if (sValues[i] != NULL)
+            {
+                DWORD cbValue;
+                if (req.fields[i].vt == VT_LPWSTR)
+                {
+                    cbValue = (req.fields[i].cchValue + 1) * sizeof(WCHAR);
+                }
+                else
+                {
+                    cbValue = req.fields[i].cbValue;
+                }
+                dwRet = this->WritePipe(const_cast<BYTE*> (sValues[i]), cbValue);
+                if (dwRet != 0)
+                {
+                    break;
+                }
+            }
+        }
+        return dwRet;
+    }
+    //
+    // Called when writing a request or response. Writes data to
+    // the pipe, allowing interruption by the stop event if on the server.
+    //
+    DWORD WritePipe(const BYTE* pBuf, DWORD cbWrite)
+    {
+        DWORD dwRet = 0;
+        DWORD dwTotalBytesWritten = 0;
+        while (dwRet == 0 && dwTotalBytesWritten < cbWrite)
+        {
+            DWORD dwBytesWrittenThisTime;
+            ResetEvent(m_overlapped.hEvent);
+            if (!WriteFile(m_hPipe, pBuf + dwTotalBytesWritten, cbWrite - dwTotalBytesWritten, &dwBytesWrittenThisTime, &m_overlapped))
+            {
+                dwRet = GetLastError();
+                if (dwRet == ERROR_IO_PENDING)
+                {
+                    if (m_fServer)
+                    {
+                        HANDLE hWaitHandles[] = { m_overlapped.hEvent, m_hReceiveStopEvent };
+                        dwRet = WaitForMultipleObjects(2, hWaitHandles, FALSE, INFINITE);
+                    }
+                    else
+                    {
+                        dwRet = WaitForSingleObject(m_overlapped.hEvent, INFINITE);
+                    }
+                    if (dwRet == WAIT_OBJECT_0)
+                    {
+                        if (!GetOverlappedResult(m_hPipe, &m_overlapped, &dwBytesWrittenThisTime, FALSE))
+                        {
+                            dwRet = GetLastError();
+                        }
+                    }
+                    else if (dwRet == WAIT_FAILED)
+                    {
+                        dwRet = GetLastError();
+                    }
+                    else
+                    {
+                        dwRet = ERROR_OPERATION_ABORTED;
+                    }
+                }
+            }
+            dwTotalBytesWritten += dwBytesWrittenThisTime;
+        }
+        return dwRet;
+    }
+    //
+    // Called either by the client or server process.
+    // Reads data from the pipe for a request or response.
+    //
+    DWORD ReadRequestData(RequestData* pReq)
+    {
+        DWORD dwRet = ReadPipe((BYTE*) pReq, sizeof(RequestData));
+        if (dwRet == 0)
+        {
+            DWORD cbData = 0;
+            for (int i = 0; i < MAX_REQUEST_FIELDS; i++)
+            {
+                if (pReq->fields[i].vt == VT_LPWSTR)
+                {
+                    cbData += (pReq->fields[i].cchValue + 1) * sizeof(WCHAR);
+                }
+                else if (pReq->fields[i].vt == VT_STREAM)
+                {
+                    cbData += pReq->fields[i].cbValue;
+                }
+            }
+            
+            if (cbData > 0)
+            {
+                if (!CheckRequestDataBuf(cbData))
+                {
+                    return ERROR_OUTOFMEMORY;
+                }
+                dwRet = this->ReadPipe((BYTE*) m_pBufReceive, cbData);
+                if (dwRet == 0)
+                {
+                    DWORD dwOffset = 0;
+                    for (int i = 0; i < MAX_REQUEST_FIELDS; i++)
+                    {
+                        if (pReq->fields[i].vt == VT_LPWSTR)
+                        {
+                            LPWSTR szTemp = (LPWSTR) (m_pBufReceive + dwOffset);
+                            dwOffset += (pReq->fields[i].cchValue + 1) * sizeof(WCHAR);
+                            pReq->fields[i].szValue = szTemp;
+                        }
+                        else if (pReq->fields[i].vt == VT_STREAM)
+                        {
+                            BYTE* sTemp = m_pBufReceive + dwOffset;
+                            dwOffset += pReq->fields[i].cbValue;
+                            pReq->fields[i].sValue = sTemp;
+                        }
+                    }
+                }
+            }
+        }
+        return dwRet;
+    }
+    //
+    // Called only by the client process.
+    // Wait for a response on the pipe. If no response is received before the timeout,
+    // then give up and close the connection.
+    //
+    DWORD ReceiveResponse(RequestId id, RequestData* pResp)
+    {
+        RequestId responseId;
+        DWORD dwRet = ReadPipe((BYTE*) &responseId, sizeof(RequestId));
+        if (dwRet == 0 && responseId != id)
+        {
+            dwRet = ERROR_OPERATION_ABORTED;
+        }
+        if (dwRet == 0)
+        {
+            dwRet = this->ReadRequestData(pResp);
+        }
+        return dwRet;
+    }
+    //
+    // Called only by the server process's receive thread.
+    // Try to complete and verify an asynchronous connection operation.
+    //
+    DWORD CompleteConnection()
+    {
+        DWORD dwRet = 0;
+        if (m_fConnecting)
+        {
+            HANDLE hWaitHandles[] = { m_overlapped.hEvent, m_hReceiveStopEvent };
+            DWORD dwWaitRes = WaitForMultipleObjects(2, hWaitHandles, FALSE, INFINITE);
+            if (dwWaitRes == WAIT_OBJECT_0)
+            {
+                m_fConnecting = false;
+                DWORD dwUnused;
+                if (GetOverlappedResult(m_hPipe, &m_overlapped, &dwUnused, FALSE))
+                {
+                    m_fConnected = true;
+                }
+                else
+                {
+                    dwRet = GetLastError();
+                }
+            }
+            else if (dwWaitRes == WAIT_FAILED)
+            {
+                CancelIo(m_hPipe);
+                dwRet = GetLastError();
+            }
+            else
+            {
+                CancelIo(m_hPipe);
+                dwRet = ERROR_OPERATION_ABORTED;
+            }
+        }
+        return dwRet;
+    }
+    //
+    // Called only by the server process.
+    // Creates a named pipe instance and begins asynchronously waiting
+    // for a connection from the client process.
+    //
+    DWORD ConnectPipeServer()
+    {
+        DWORD dwRet = 0;
+        const int BUFSIZE = 1024; // Suggested pipe I/O buffer sizes
+        m_hPipe = CreateNamedPipe(
+            m_szPipeName,
+            PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED | FILE_FLAG_FIRST_PIPE_INSTANCE,
+            PIPE_TYPE_BYTE | PIPE_READMODE_BYTE,
+            1, BUFSIZE, BUFSIZE, 0, NULL);
+        if (m_hPipe == INVALID_HANDLE_VALUE)
+        {
+            m_hPipe = NULL;
+            dwRet = GetLastError();
+        }
+        else if (ConnectNamedPipe(m_hPipe, &m_overlapped))
+        {
+            m_fConnected = true;
+        }
+        else
+        {
+            dwRet = GetLastError();
+            if (dwRet == ERROR_PIPE_BUSY)
+            {
+                // All pipe instances are busy, so wait for a maximum of 20 seconds 
+                dwRet = 0;
+                if (WaitNamedPipe(m_szPipeName, 20000))
+                {
+                    m_fConnected = true;
+                }
+                else
+                {
+                    dwRet = GetLastError();
+                }
+            }
+            
+            if (dwRet == ERROR_IO_PENDING)
+            {
+                dwRet = 0;
+                m_fConnecting = true;
+            }
+        }
+        return dwRet;
+    }
+    //
+    // Called only by the client process.
+    // Attemps to open a connection to an existing named pipe instance
+    // which should have already been created by the server process.
+    //
+    DWORD ConnectPipeClient()
+    {
+        DWORD dwRet = 0;
+        m_hPipe = CreateFile(
+            m_szPipeName, GENERIC_READ | GENERIC_WRITE, 
+            0, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL);
+        if (m_hPipe != INVALID_HANDLE_VALUE)
+        {
+            m_fConnected = true;
+        }
+        else
+        {
+            m_hPipe = NULL;
+            dwRet = GetLastError();
+        }
+        return dwRet;
+    }
+    //
+    // Ensures that the request buffer is large enough to hold a request,
+    // reallocating the buffer if necessary.
+    // It will also reduce the buffer size if the previous allocation was very large.
+    //
+    BOOL CheckRequestDataBuf(DWORD cbBuf)
+    {
+        if (m_cbBufReceive < cbBuf || (LARGE_BUFFER_THRESHOLD < m_cbBufReceive && cbBuf < m_cbBufReceive))
+        {
+            if (m_pBufReceive != NULL)
+            {
+                SecureZeroMemory(m_pBufReceive, m_cbBufReceive);
+                delete[] m_pBufReceive;
+            }
+            m_cbBufReceive = max(MIN_BUFFER_STRING_SIZE*2, cbBuf);
+            m_pBufReceive = new BYTE[m_cbBufReceive];
+            if (m_pBufReceive == NULL)
+            {
+                m_cbBufReceive = 0;
+            }
+        }
+        return m_pBufReceive != NULL;
+    }
+private:
+    // Name of this instance. 
+    const wchar_t* m_szName;
+    // "\\.\pipe\name"
+    wchar_t* m_szPipeName;
+    
+    // Handle to the pipe instance.
+    HANDLE m_hPipe;
+    // Handle to the thread that receives requests.
+    HANDLE m_hReceiveThread;
+    // Handle to the event used to signal the receive thread to exit.
+    HANDLE m_hReceiveStopEvent;
+    // All pipe I/O is done in overlapped mode to avoid unintentional blocking.
+    OVERLAPPED m_overlapped;
+    
+    // Dynamically-resized buffer for receiving requests.
+    BYTE* m_pBufReceive;
+    // Current size of the receive request buffer.
+    DWORD m_cbBufReceive;
+    // Dynamically-resized buffer for sending requests.
+    wchar_t* m_pBufSend;
+    // Current size of the send request buffer.
+    DWORD m_cbBufSend;
+    // True if this is the server process, false if this is the client process.
+    const bool m_fServer;
+    // True if an asynchronous connection operation is currently in progress.
+    bool m_fConnecting;
+    // True if the pipe is currently connected.
+    bool m_fConnected;
+};
diff --git a/src/samples/Dtf/Tools/SfxCA/SfxCA.cpp b/src/samples/Dtf/Tools/SfxCA/SfxCA.cpp
new file mode 100644
index 00000000..06319f1e
--- /dev/null
+++ b/src/samples/Dtf/Tools/SfxCA/SfxCA.cpp
@@ -0,0 +1,363 @@
+// 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.
+#include "precomp.h"
+#include "EntryPoints.h"
+#include "SfxUtil.h"
+#define MANAGED_CAs_OUT_OF_PROC 1
+HMODULE g_hModule;
+bool g_fRunningOutOfProc = false;
+RemoteMsiSession* g_pRemote = NULL;
+// Prototypes for local functions.
+// See the function definitions for comments.
+bool InvokeManagedCustomAction(MSIHANDLE hSession,
+        _AppDomain* pAppDomain, const wchar_t* szEntryPoint, int* piResult);
+/// <summary>
+/// Entry-point for the CA DLL when re-launched as a separate process;
+/// connects the comm channel for remote MSI APIs, then invokes the
+/// managed custom action entry-point.
+/// </summary>
+/// <remarks>
+/// Do not change the parameters or calling-convention: RUNDLL32
+/// requires this exact signature.
+/// </remarks>
+extern "C"
+void __stdcall InvokeManagedCustomActionOutOfProc(
+        __in HWND hwnd, __in HINSTANCE hinst, __in_z wchar_t* szCmdLine, int nCmdShow)
+{
+        UNREFERENCED_PARAMETER(hwnd);
+        UNREFERENCED_PARAMETER(hinst);
+        UNREFERENCED_PARAMETER(nCmdShow);
+        g_fRunningOutOfProc = true;
+        const wchar_t* szSessionName = szCmdLine;
+        MSIHANDLE hSession;
+        const wchar_t* szEntryPoint;
+        int i;
+        for (i = 0; szCmdLine[i] && szCmdLine[i] != L' '; i++);
+        if (szCmdLine[i] != L'\0') szCmdLine[i++] = L'\0';
+        hSession = _wtoi(szCmdLine + i);
+        for (; szCmdLine[i] && szCmdLine[i] != L' '; i++);
+        if (szCmdLine[i] != L'\0') szCmdLine[i++] = L'\0';
+        szEntryPoint = szCmdLine + i;
+        g_pRemote = new RemoteMsiSession(szSessionName, false);
+        g_pRemote->Connect();
+        int ret = InvokeCustomAction(hSession, NULL, szEntryPoint);
+        RemoteMsiSession::RequestData requestData;
+        SecureZeroMemory(&requestData, sizeof(RemoteMsiSession::RequestData));
+        requestData.fields[0].vt = VT_I4;
+        requestData.fields[0].iValue = ret;
+        g_pRemote->SendRequest(RemoteMsiSession::EndSession, &requestData, NULL);
+        delete g_pRemote;
+}
+/// <summary>
+/// Re-launch this CA DLL as a separate process, and setup a comm channel
+/// for remote MSI API calls back to this process.
+/// </summary>
+int InvokeOutOfProcManagedCustomAction(MSIHANDLE hSession, const wchar_t* szEntryPoint)
+{
+        wchar_t szSessionName[100] = {0};
+        swprintf_s(szSessionName, 100, L"SfxCA_%d", ::GetTickCount());
+        
+        RemoteMsiSession remote(szSessionName, true);
+        DWORD ret = remote.Connect();
+        if (ret != 0)
+        {
+                Log(hSession, L"Failed to create communication pipe for new CA process. Error code: %d", ret);
+                return ERROR_INSTALL_FAILURE;
+        }
+        ret = remote.ProcessRequests();
+        if (ret != 0)
+        {
+                Log(hSession, L"Failed to open communication pipe for new CA process. Error code: %d", ret);
+                return ERROR_INSTALL_FAILURE;
+        }
+        wchar_t szModule[MAX_PATH] = {0};
+        GetModuleFileName(g_hModule, szModule, MAX_PATH);
+        const wchar_t* rundll32 = L"rundll32.exe";
+        wchar_t szRunDll32Path[MAX_PATH] = {0};
+        GetSystemDirectory(szRunDll32Path, MAX_PATH);
+        wcscat_s(szRunDll32Path, MAX_PATH, L"\\");
+        wcscat_s(szRunDll32Path, MAX_PATH, rundll32);
+        const wchar_t* entry = L"zzzzInvokeManagedCustomActionOutOfProc";
+        wchar_t szCommandLine[1024] = {0};
+        swprintf_s(szCommandLine, 1024, L"%s \"%s\",%s %s %d %s",
+                rundll32, szModule, entry, szSessionName, hSession, szEntryPoint);
+        STARTUPINFO si;
+        SecureZeroMemory(&si, sizeof(STARTUPINFO));
+        si.cb = sizeof(STARTUPINFO);
+        
+        PROCESS_INFORMATION pi;
+        SecureZeroMemory(&pi, sizeof(PROCESS_INFORMATION));
+        if (!CreateProcess(szRunDll32Path, szCommandLine, NULL, NULL, FALSE,
+                0, NULL, NULL, &si, &pi))
+        {
+                DWORD err = GetLastError();
+                Log(hSession, L"Failed to create new CA process via RUNDLL32. Error code: %d", err);
+                return ERROR_INSTALL_FAILURE;
+        }
+        DWORD dwWait = WaitForSingleObject(pi.hProcess, INFINITE);
+        if (dwWait != WAIT_OBJECT_0)
+        {
+                DWORD err = GetLastError();
+                Log(hSession, L"Failed to wait for CA process. Error code: %d", err);
+                return ERROR_INSTALL_FAILURE;
+        }
+        DWORD dwExitCode;
+        BOOL bRet = GetExitCodeProcess(pi.hProcess, &dwExitCode);
+        if (!bRet)
+        {
+                DWORD err = GetLastError();
+                Log(hSession, L"Failed to get exit code of CA process. Error code: %d", err);
+                return ERROR_INSTALL_FAILURE;
+        }
+        else if (dwExitCode != 0)
+        {
+                Log(hSession, L"RUNDLL32 returned error code: %d", dwExitCode);
+                return ERROR_INSTALL_FAILURE;
+        }
+        CloseHandle(pi.hThread);
+        CloseHandle(pi.hProcess);
+        remote.WaitExitCode();
+        return remote.ExitCode;
+}
+/// <summary>
+/// Entrypoint for the managed CA proxy (RemotableNativeMethods) to
+/// call MSI APIs remotely.
+/// </summary>
+void __stdcall MsiRemoteInvoke(RemoteMsiSession::RequestId id, RemoteMsiSession::RequestData* pRequest, RemoteMsiSession::RequestData** ppResponse)
+{
+        if (g_fRunningOutOfProc)
+        {
+                g_pRemote->SendRequest(id, pRequest, ppResponse);
+        }
+        else
+        {
+                *ppResponse = NULL;
+        }
+}
+/// <summary>
+/// Invokes a managed custom action from native code by
+/// extracting the package to a temporary working directory
+/// then hosting the CLR and locating and calling the entrypoint.
+/// </summary>
+/// <param name="hSession">Handle to the installation session.
+/// Passed to custom action entrypoints by the installer engine.</param>
+/// <param name="szWorkingDir">Directory containing the CA binaries
+/// and the CustomAction.config file defining the entrypoints.
+/// This may be NULL, in which case the current module must have
+/// a concatenated cabinet containing those files, which will be
+/// extracted to a temporary directory.</param>
+/// <param name="szEntryPoint">Name of the CA entrypoint to be invoked.
+/// This must be either an explicit &quot;AssemblyName!Namespace.Class.Method&quot;
+/// string, or a simple name that maps to a full entrypoint definition
+/// in CustomAction.config.</param>
+/// <returns>The value returned by the managed custom action method,
+/// or ERROR_INSTALL_FAILURE if the CA could not be invoked.</returns>
+int InvokeCustomAction(MSIHANDLE hSession,
+        const wchar_t* szWorkingDir, const wchar_t* szEntryPoint)
+{
+#ifdef MANAGED_CAs_OUT_OF_PROC
+        if (!g_fRunningOutOfProc && szWorkingDir == NULL)
+        {
+                return InvokeOutOfProcManagedCustomAction(hSession, szEntryPoint);
+        }
+#endif
+        wchar_t szTempDir[MAX_PATH];
+        bool fDeleteTemp = false;
+        if (szWorkingDir == NULL)
+        {
+                if (!ExtractToTempDirectory(hSession, g_hModule, szTempDir, MAX_PATH))
+                {
+                        return ERROR_INSTALL_FAILURE;
+                }
+                szWorkingDir = szTempDir;
+                fDeleteTemp = true;
+        }
+        wchar_t szConfigFilePath[MAX_PATH + 20];
+        StringCchCopy(szConfigFilePath, MAX_PATH + 20, szWorkingDir);
+        StringCchCat(szConfigFilePath, MAX_PATH + 20, L"\\CustomAction.config");
+        const wchar_t* szConfigFile = szConfigFilePath;
+        if (!::PathFileExists(szConfigFilePath))
+        {
+                szConfigFile = NULL;
+        }
+        wchar_t szWIAssembly[MAX_PATH + 50];
+        StringCchCopy(szWIAssembly, MAX_PATH + 50, szWorkingDir);
+        StringCchCat(szWIAssembly, MAX_PATH + 50, L"\\WixToolset.Dtf.WindowsInstaller.dll");
+        int iResult = ERROR_INSTALL_FAILURE;
+        ICorRuntimeHost* pHost;
+        if (LoadCLR(hSession, NULL, szConfigFile, szWIAssembly, &pHost))
+        {
+                _AppDomain* pAppDomain;
+                if (CreateAppDomain(hSession, pHost, L"CustomAction", szWorkingDir,
+                        szConfigFile, &pAppDomain))
+                {
+                        if (!InvokeManagedCustomAction(hSession, pAppDomain, szEntryPoint, &iResult))
+                        {
+                                iResult = ERROR_INSTALL_FAILURE;
+                        }
+                        HRESULT hr = pHost->UnloadDomain(pAppDomain);
+                        if (FAILED(hr))
+                        {
+                                Log(hSession, L"Failed to unload app domain. Error code 0x%X", hr);
+                        }
+                        pAppDomain->Release();
+                }
+                pHost->Stop();
+                pHost->Release();
+        }
+        if (fDeleteTemp)
+        {
+                DeleteDirectory(szTempDir);
+        }
+        return iResult;
+}
+/// <summary>
+/// Called by the system when the DLL is loaded.
+/// Saves the module handle for later use.
+/// </summary>
+BOOL WINAPI DllMain(HMODULE hModule, DWORD  dwReason, void* pReserved)
+{
+        UNREFERENCED_PARAMETER(pReserved);
+        switch (dwReason)
+        {
+                case DLL_PROCESS_ATTACH:
+                        g_hModule = hModule;
+                        break;
+                case DLL_THREAD_ATTACH:
+                case DLL_THREAD_DETACH:
+                case DLL_PROCESS_DETACH:
+                        break;
+        }
+        return TRUE;
+}
+/// <summary>
+/// Loads and invokes the managed portion of the proxy.
+/// </summary>
+/// <param name="hSession">Handle to the installer session,
+/// used for logging errors and to be passed on to the custom action.</param>
+/// <param name="pAppDomain">AppDomain which has its application
+/// base set to the CA working directory.</param>
+/// <param name="szEntryPoint">Name of the CA entrypoint to be invoked.
+/// This must be either an explicit &quot;AssemblyName!Namespace.Class.Method&quot;
+/// string, or a simple name that maps to a full entrypoint definition
+/// in CustomAction.config.</param>
+/// <param name="piResult">Return value of the invoked custom
+/// action method.</param>
+/// <returns>True if the managed proxy was invoked successfully,
+/// false if there was some error. Note the custom action itself may
+/// return an error via piResult while this method still returns true
+/// since the invocation was successful.</returns>
+bool InvokeManagedCustomAction(MSIHANDLE hSession, _AppDomain* pAppDomain,
+        const wchar_t* szEntryPoint, int* piResult)
+{
+        VARIANT vResult;
+        ::VariantInit(&vResult);
+        const bool f64bit = (sizeof(void*) == sizeof(LONGLONG));
+        const wchar_t* szMsiAssemblyName   = L"WixToolset.Dtf.WindowsInstaller";
+        const wchar_t* szMsiCAProxyClass   = L"WixToolset.Dtf.WindowsInstaller.CustomActionProxy";
+        const wchar_t* szMsiCAInvokeMethod = (f64bit ? L"InvokeCustomAction64" : L"InvokeCustomAction32");
+        
+        _MethodInfo* pCAInvokeMethod;
+        if (!GetMethod(hSession, pAppDomain, szMsiAssemblyName,
+                szMsiCAProxyClass, szMsiCAInvokeMethod, &pCAInvokeMethod))
+        {
+                return false;
+        }
+        HRESULT hr;
+        VARIANT vNull;
+        vNull.vt = VT_EMPTY;
+        SAFEARRAY* saArgs = SafeArrayCreateVector(VT_VARIANT, 0, 3);
+        VARIANT vSessionHandle;
+        vSessionHandle.vt = VT_I4;
+        vSessionHandle.intVal = hSession;
+        LONG index = 0;
+        hr = SafeArrayPutElement(saArgs, &index, &vSessionHandle);
+        if (FAILED(hr)) goto LExit;
+        VARIANT vEntryPoint;
+        vEntryPoint.vt = VT_BSTR;
+        vEntryPoint.bstrVal = SysAllocString(szEntryPoint);
+        if (vEntryPoint.bstrVal == NULL)
+        {
+                hr = E_OUTOFMEMORY;
+                goto LExit;
+        }
+        index = 1;
+        hr = SafeArrayPutElement(saArgs, &index, &vEntryPoint);
+        if (FAILED(hr)) goto LExit;
+        VARIANT vRemotingFunctionPtr;
+#pragma warning(push)
+#pragma warning(disable:4127) // conditional expression is constant
+        if (f64bit)
+#pragma warning(pop)
+        {
+                vRemotingFunctionPtr.vt =  VT_I8;
+                vRemotingFunctionPtr.llVal = (LONGLONG) (g_fRunningOutOfProc ? MsiRemoteInvoke : NULL);
+        }
+        else
+        {
+                vRemotingFunctionPtr.vt =  VT_I4;
+#pragma warning(push)
+#pragma warning(disable:4302) // truncation
+#pragma warning(disable:4311) // pointer truncation
+                vRemotingFunctionPtr.lVal = (LONG) (g_fRunningOutOfProc ? MsiRemoteInvoke : NULL);
+#pragma warning(pop)
+        }
+        index = 2;
+        hr = SafeArrayPutElement(saArgs, &index, &vRemotingFunctionPtr);
+        if (FAILED(hr)) goto LExit;
+        
+        hr = pCAInvokeMethod->Invoke_3(vNull, saArgs, &vResult);
+LExit:
+        SafeArrayDestroy(saArgs);
+        pCAInvokeMethod->Release();
+        
+        if (FAILED(hr))
+        {
+                Log(hSession, L"Failed to invoke custom action method. Error code 0x%X", hr);
+                return false;
+        }
+        *piResult = vResult.intVal;
+        return true;
+}
diff --git a/src/samples/Dtf/Tools/SfxCA/SfxCA.rc b/src/samples/Dtf/Tools/SfxCA/SfxCA.rc
new file mode 100644
index 00000000..4d78194b
--- /dev/null
+++ b/src/samples/Dtf/Tools/SfxCA/SfxCA.rc
@@ -0,0 +1,10 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+#define VER_DLL
+#define VER_LANG_NEUTRAL
+#define VER_ORIGINAL_FILENAME "SfxCA.dll"
+#define VER_INTERNAL_NAME "SfxCA"
+#define VER_FILE_DESCRIPTION "DTF Self-Extracting Custom Action"
+// Additional resources here
diff --git a/src/samples/Dtf/Tools/SfxCA/SfxCA.vcxproj b/src/samples/Dtf/Tools/SfxCA/SfxCA.vcxproj
new file mode 100644
index 00000000..aeaaa776
--- /dev/null
+++ b/src/samples/Dtf/Tools/SfxCA/SfxCA.vcxproj
@@ -0,0 +1,68 @@
+<?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" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{55D5BA28-D427-4F53-80C2-FE9EF23C1553}</ProjectGuid>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <TargetName>SfxCA</TargetName>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <ProjectModuleDefinitionFile>EntryPoints.def</ProjectModuleDefinitionFile>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <PropertyGroup>
+    <ProjectAdditionalLinkLibraries>msi.lib;cabinet.lib;shlwapi.lib</ProjectAdditionalLinkLibraries>
+  </PropertyGroup>
+  <ItemGroup>
+    <ClCompile Include="ClrHost.cpp" />
+    <ClCompile Include="Extract.cpp" />
+    <ClCompile Include="precomp.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="RemoteMsi.cpp" />
+    <ClCompile Include="SfxCA.cpp" />
+    <ClCompile Include="SfxUtil.cpp" />
+    <ClCompile Include="EmbeddedUI.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="precomp.h" />
+    <ClInclude Include="EntryPoints.h" />
+    <ClInclude Include="RemoteMsiSession.h" />
+    <ClInclude Include="SfxUtil.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="EntryPoints.def" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="SfxCA.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
+  </Target>
+</Project>
+\ No newline at end of file
diff --git a/src/samples/Dtf/Tools/SfxCA/SfxCA.vcxproj.filters b/src/samples/Dtf/Tools/SfxCA/SfxCA.vcxproj.filters
new file mode 100644
index 00000000..a5ebf693
--- /dev/null
+++ b/src/samples/Dtf/Tools/SfxCA/SfxCA.vcxproj.filters
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="ClrHost.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="EmbeddedUI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Extract.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RemoteMsi.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SfxCA.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SfxUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="precomp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="EntryPoints.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="precomp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RemoteMsiSession.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SfxUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{81c92f68-18c2-4cd4-a588-5c3616860dd9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{6cdc30ee-e14d-4679-b92e-3e080535e53b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{1666a44e-4f2e-4f13-980e-d0c3dfa7cb6d}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="SfxCA.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="EntryPoints.def">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/samples/Dtf/Tools/SfxCA/SfxUtil.cpp b/src/samples/Dtf/Tools/SfxCA/SfxUtil.cpp
new file mode 100644
index 00000000..1bf2c5b2
--- /dev/null
+++ b/src/samples/Dtf/Tools/SfxCA/SfxUtil.cpp
@@ -0,0 +1,209 @@
+// 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.
+#include "precomp.h"
+#include "SfxUtil.h"
+/// <summary>
+/// Writes a formatted message to the MSI log.
+/// Does out-of-proc MSI calls if necessary.
+/// </summary>
+void Log(MSIHANDLE hSession, const wchar_t* szMessage, ...)
+{
+        const int LOG_BUFSIZE = 4096;
+        wchar_t szBuf[LOG_BUFSIZE];
+        va_list args;
+        va_start(args, szMessage);
+        StringCchVPrintf(szBuf, LOG_BUFSIZE, szMessage, args);
+        if (!g_fRunningOutOfProc || NULL == g_pRemote)
+        {
+                MSIHANDLE hRec = MsiCreateRecord(1);
+                MsiRecordSetString(hRec, 0, L"SFXCA: [1]");
+                MsiRecordSetString(hRec, 1, szBuf);
+                MsiProcessMessage(hSession, INSTALLMESSAGE_INFO, hRec);
+                MsiCloseHandle(hRec);
+        }
+        else
+        {
+                // Logging is the only remote-MSI operation done from unmanaged code.
+                // It's not very convenient here because part of the infrastructure
+                // for remote MSI APIs is on the managed side.
+                RemoteMsiSession::RequestData req;
+                RemoteMsiSession::RequestData* pResp = NULL;
+                SecureZeroMemory(&req, sizeof(RemoteMsiSession::RequestData));
+                req.fields[0].vt = VT_UI4;
+                req.fields[0].uiValue = 1;
+                g_pRemote->SendRequest(RemoteMsiSession::MsiCreateRecord, &req, &pResp);
+                MSIHANDLE hRec = (MSIHANDLE) pResp->fields[0].iValue;
+                req.fields[0].vt = VT_I4;
+                req.fields[0].iValue = (int) hRec;
+                req.fields[1].vt = VT_UI4;
+                req.fields[1].uiValue = 0;
+                req.fields[2].vt = VT_LPWSTR;
+                req.fields[2].szValue = L"SFXCA: [1]";
+                g_pRemote->SendRequest(RemoteMsiSession::MsiRecordSetString, &req, &pResp);
+                req.fields[0].vt = VT_I4;
+                req.fields[0].iValue = (int) hRec;
+                req.fields[1].vt = VT_UI4;
+                req.fields[1].uiValue = 1;
+                req.fields[2].vt = VT_LPWSTR;
+                req.fields[2].szValue = szBuf;
+                g_pRemote->SendRequest(RemoteMsiSession::MsiRecordSetString, &req, &pResp);
+                req.fields[0].vt = VT_I4;
+                req.fields[0].iValue = (int) hSession;
+                req.fields[1].vt = VT_I4;
+                req.fields[1].iValue = (int) INSTALLMESSAGE_INFO;
+                req.fields[2].vt = VT_I4;
+                req.fields[2].iValue = (int) hRec;
+                g_pRemote->SendRequest(RemoteMsiSession::MsiProcessMessage, &req, &pResp);
+                req.fields[0].vt = VT_I4;
+                req.fields[0].iValue = (int) hRec;
+                req.fields[1].vt = VT_EMPTY;
+                req.fields[2].vt = VT_EMPTY;
+                g_pRemote->SendRequest(RemoteMsiSession::MsiCloseHandle, &req, &pResp);
+        }
+}
+/// <summary>
+/// Deletes a directory, including all files and subdirectories.
+/// </summary>
+/// <param name="szDir">Path to the directory to delete,
+/// not including a trailing backslash.</param>
+/// <returns>True if the directory was successfully deleted, or false
+/// if the deletion failed (most likely because some files were locked).
+/// </returns>
+bool DeleteDirectory(const wchar_t* szDir)
+{
+        size_t cchDir = wcslen(szDir);
+        size_t cchPathBuf = cchDir + 3 + MAX_PATH;
+        wchar_t* szPath = (wchar_t*) _alloca(cchPathBuf * sizeof(wchar_t));
+        if (szPath == NULL) return false;
+        StringCchCopy(szPath, cchPathBuf, szDir);
+        StringCchCat(szPath, cchPathBuf, L"\\*");
+        WIN32_FIND_DATA fd;
+        HANDLE hSearch = FindFirstFile(szPath, &fd);
+        while (hSearch != INVALID_HANDLE_VALUE)
+        {
+                StringCchCopy(szPath + cchDir + 1, cchPathBuf - (cchDir + 1), fd.cFileName);
+                if ((fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0)
+                {
+                        if (wcscmp(fd.cFileName, L".") != 0 && wcscmp(fd.cFileName, L"..") != 0)
+                        {
+                                DeleteDirectory(szPath);
+                        }
+                }
+                else
+                {
+                        DeleteFile(szPath);
+                }
+                if (!FindNextFile(hSearch, &fd))
+                {
+                        FindClose(hSearch);
+                        hSearch = INVALID_HANDLE_VALUE;
+                }
+        }
+        return RemoveDirectory(szDir) != 0;
+}
+bool DirectoryExists(const wchar_t* szDir)
+{
+        if (szDir != NULL)
+        {
+                DWORD dwAttrs = GetFileAttributes(szDir);
+                if (dwAttrs != -1 && (dwAttrs & FILE_ATTRIBUTE_DIRECTORY) != 0)
+                {
+                        return true;
+                }
+        }
+        return false;
+}
+/// <summary>
+/// Extracts a cabinet that is concatenated to a module
+/// to a new temporary directory.
+/// </summary>
+/// <param name="hSession">Handle to the installer session,
+/// used just for logging.</param>
+/// <param name="hModule">Module that has the concatenated cabinet.</param>
+/// <param name="szTempDir">Buffer for returning the path of the
+/// created temp directory.</param>
+/// <param name="cchTempDirBuf">Size in characters of the buffer.
+/// <returns>True if the files were extracted, or false if the
+/// buffer was too small or the directory could not be created
+/// or the extraction failed for some other reason.</returns>
+__success(return != false)
+bool ExtractToTempDirectory(__in MSIHANDLE hSession, __in HMODULE hModule,
+        __out_ecount_z(cchTempDirBuf) wchar_t* szTempDir, DWORD cchTempDirBuf)
+{
+        wchar_t szModule[MAX_PATH];
+        DWORD cchCopied = GetModuleFileName(hModule, szModule, MAX_PATH - 1);
+        if (cchCopied == 0)
+        {
+                Log(hSession, L"Failed to get module path. Error code %d.", GetLastError());
+                return false;
+        }
+        else if (cchCopied == MAX_PATH - 1)
+        {
+                Log(hSession, L"Failed to get module path -- path is too long.");
+                return false;
+        }
+        if (szTempDir == NULL || cchTempDirBuf < wcslen(szModule) + 1)
+        {
+                Log(hSession, L"Temp directory buffer is NULL or too small.");
+                return false;
+        }
+        StringCchCopy(szTempDir, cchTempDirBuf, szModule);
+        StringCchCat(szTempDir, cchTempDirBuf, L"-");
+        DWORD cchTempDir = (DWORD) wcslen(szTempDir);
+        for (int i = 0; DirectoryExists(szTempDir); i++)
+        {
+                swprintf_s(szTempDir + cchTempDir, cchTempDirBuf - cchTempDir, L"%d", i);
+        }
+        if (!CreateDirectory(szTempDir, NULL))
+        {
+                cchCopied = GetTempPath(cchTempDirBuf, szTempDir);
+                if (cchCopied == 0 || cchCopied >= cchTempDirBuf)
+                {
+                        Log(hSession, L"Failed to get temp directory. Error code %d", GetLastError());
+                        return false;
+                }
+                wchar_t* szModuleName = wcsrchr(szModule, L'\\');
+                if (szModuleName == NULL) szModuleName = szModule;
+                else szModuleName = szModuleName + 1;
+                StringCchCat(szTempDir, cchTempDirBuf, szModuleName);
+                StringCchCat(szTempDir, cchTempDirBuf, L"-");
+                cchTempDir = (DWORD) wcslen(szTempDir);
+                for (int i = 0; DirectoryExists(szTempDir); i++)
+                {
+                        swprintf_s(szTempDir + cchTempDir, cchTempDirBuf - cchTempDir, L"%d", i);
+                }
+                if (!CreateDirectory(szTempDir, NULL))
+                {
+                        Log(hSession, L"Failed to create temp directory. Error code %d", GetLastError());
+                        return false;
+                }
+        }
+        Log(hSession, L"Extracting custom action to temporary directory: %s\\", szTempDir);
+        int err = ExtractCabinet(szModule, szTempDir);
+        if (err != 0)
+        {
+                Log(hSession, L"Failed to extract to temporary directory. Cabinet error code %d.", err);
+                DeleteDirectory(szTempDir);
+                return false;
+        }
+        return true;
+}
diff --git a/src/samples/Dtf/Tools/SfxCA/SfxUtil.h b/src/samples/Dtf/Tools/SfxCA/SfxUtil.h
new file mode 100644
index 00000000..af12d8dd
--- /dev/null
+++ b/src/samples/Dtf/Tools/SfxCA/SfxUtil.h
@@ -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.
+#include "RemoteMsiSession.h"
+void Log(MSIHANDLE hSession, const wchar_t* szMessage, ...);
+int ExtractCabinet(const wchar_t* szCabFile, const wchar_t* szExtractDir);
+bool DeleteDirectory(const wchar_t* szDir);
+__success(return != false)
+bool ExtractToTempDirectory(__in MSIHANDLE hSession, __in HMODULE hModule,
+        __out_ecount_z(cchTempDirBuf) wchar_t* szTempDir, DWORD cchTempDirBuf);
+bool LoadCLR(MSIHANDLE hSession, const wchar_t* szVersion, const wchar_t* szConfigFile,
+        const wchar_t* szPrimaryAssembly, ICorRuntimeHost** ppHost);
+bool CreateAppDomain(MSIHANDLE hSession, ICorRuntimeHost* pHost,
+        const wchar_t* szName, const wchar_t* szAppBase,
+        const wchar_t* szConfigFile, _AppDomain** ppAppDomain);
+bool GetMethod(MSIHANDLE hSession, _AppDomain* pAppDomain,
+        const wchar_t* szAssembly, const wchar_t* szClass,
+        const wchar_t* szMethod, _MethodInfo** ppCAMethod);
+extern HMODULE g_hModule;
+extern bool g_fRunningOutOfProc;
+extern RemoteMsiSession* g_pRemote;
diff --git a/src/samples/Dtf/Tools/SfxCA/packages.config b/src/samples/Dtf/Tools/SfxCA/packages.config
new file mode 100644
index 00000000..1ffaa8df
--- /dev/null
+++ b/src/samples/Dtf/Tools/SfxCA/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
+</packages>
+\ No newline at end of file
diff --git a/src/samples/Dtf/Tools/SfxCA/precomp.cpp b/src/samples/Dtf/Tools/SfxCA/precomp.cpp
new file mode 100644
index 00000000..ce82c1d7
--- /dev/null
+++ b/src/samples/Dtf/Tools/SfxCA/precomp.cpp
@@ -0,0 +1,3 @@
+// 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.
+#include "precomp.h"
+\ No newline at end of file
diff --git a/src/samples/Dtf/Tools/SfxCA/precomp.h b/src/samples/Dtf/Tools/SfxCA/precomp.h
new file mode 100644
index 00000000..48d4f011
--- /dev/null
+++ b/src/samples/Dtf/Tools/SfxCA/precomp.h
@@ -0,0 +1,18 @@
+#pragma once
+// 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.
+#include <windows.h>
+#include <msiquery.h>
+#include <strsafe.h>
+#include <mscoree.h>
+#include <io.h>
+#include <fcntl.h>
+#include <share.h>
+#include <shlwapi.h>
+#include <sys/stat.h>
+#include <malloc.h>
+#include <fdi.h>
+#include <msiquery.h>
+#import <mscorlib.tlb> raw_interfaces_only rename("ReportEvent", "CorReportEvent")
+using namespace mscorlib;
diff --git a/src/samples/Dtf/Tools/Tools.proj b/src/samples/Dtf/Tools/Tools.proj
new file mode 100644
index 00000000..751247dc
--- /dev/null
+++ b/src/samples/Dtf/Tools/Tools.proj
@@ -0,0 +1,15 @@
+<?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">
+  <ItemGroup>
+    <ProjectReference Include="MakeSfxCA\MakeSfxCA.csproj" />
+    <ProjectReference Include="SfxCA\SfxCA.vcxproj" />
+    <ProjectReference Include="SfxCA\SfxCA.vcxproj">
+      <Properties>Platform=x64</Properties>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\Traversal.targets" />
+</Project>
diff --git a/src/samples/Dtf/WiFile/WiFile.cs b/src/samples/Dtf/WiFile/WiFile.cs
new file mode 100644
index 00000000..1e5c80df
--- /dev/null
+++ b/src/samples/Dtf/WiFile/WiFile.cs
@@ -0,0 +1,147 @@
+// 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.Reflection;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text.RegularExpressions;
+using WixToolset.Dtf.WindowsInstaller;
+using WixToolset.Dtf.WindowsInstaller.Package;
+[assembly: AssemblyDescription("Windows Installer package file extraction and update tool")]
+/// <summary>
+/// Shows sample use of the InstallPackage class.
+/// </summary>
+public class WiFile
+{
+        public static void Usage(TextWriter w)
+        {
+                w.WriteLine("Usage: WiFile.exe package.msi /l [filename,filename2,...]");
+                w.WriteLine("Usage: WiFile.exe package.msi /x [filename,filename2,...]");
+                w.WriteLine("Usage: WiFile.exe package.msi /u [filename,filename2,...]");
+                w.WriteLine();
+                w.WriteLine("Lists (/l), extracts (/x) or updates (/u) files in an MSI or MSM.");
+                w.WriteLine("Files are extracted using their source path relative to the package.");
+                w.WriteLine("Specified filenames do not include paths.");
+                w.WriteLine("Filenames may be a pattern such as *.exe or file?.dll");
+        }
+    [SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase")]
+        public static int Main(string[] args)
+        {
+                if(!(args.Length == 2 || args.Length == 3))
+                {
+                        Usage(Console.Out);
+                        return -1;
+                }
+                string msiFile = args[0];
+                string option = args[1].ToLowerInvariant();
+                if(option.StartsWith("-", StringComparison.Ordinal)) option = "/" + option.Substring(1);
+                string[] fileNames = null;
+                if(args.Length == 3)
+                {
+                        fileNames = args[2].Split(',');
+                }
+                try
+                {
+                        switch(option)
+                        {
+                                case "/l":
+                                        using(InstallPackage pkg = new InstallPackage(msiFile, DatabaseOpenMode.ReadOnly))
+                                        {
+                                                pkg.Message += new InstallPackageMessageHandler(Console.WriteLine);
+                                                IEnumerable<string> fileKeys = (fileNames != null ? FindFileKeys(pkg, fileNames) : pkg.Files.Keys);
+                                                foreach(string fileKey in fileKeys)
+                                                {
+                                                        Console.WriteLine(pkg.Files[fileKey]);
+                                                }
+                                        }
+                                        break;
+                                case "/x":
+                                        using(InstallPackage pkg = new InstallPackage(msiFile, DatabaseOpenMode.ReadOnly))
+                                        {
+                                                pkg.Message += new InstallPackageMessageHandler(Console.WriteLine);
+                                                ICollection<string> fileKeys = FindFileKeys(pkg, fileNames);
+                                                pkg.ExtractFiles(fileKeys);
+                                        }
+                                        break;
+                                case "/u":
+                                        using(InstallPackage pkg = new InstallPackage(msiFile, DatabaseOpenMode.Transact))
+                                        {
+                                                pkg.Message += new InstallPackageMessageHandler(Console.WriteLine);
+                        ICollection<string> fileKeys = FindFileKeys(pkg, fileNames);
+                                                pkg.UpdateFiles(fileKeys);
+                                                pkg.Commit();
+                                        }
+                                        break;
+                                default:
+                    Usage(Console.Out);
+                                        return -1;
+                        }
+                }
+                catch(InstallerException iex)
+                {
+                        Console.WriteLine("Error: " + iex.Message);
+                        return iex.ErrorCode != 0 ? iex.ErrorCode : 1;
+                }
+                catch(FileNotFoundException fnfex)
+                {
+                        Console.WriteLine(fnfex.Message);
+                        return 2;
+                }
+                catch(Exception ex)
+                {
+                        Console.WriteLine("Error: " + ex.Message);
+                        return 1;
+                }
+                return 0;
+        }
+        static ICollection<string> FindFileKeys(InstallPackage pkg, ICollection<string> fileNames)
+        {
+                List<string> fileKeys = null;
+                if(fileNames != null)
+                {
+                        fileKeys = new List<string>();
+                        foreach(string fileName in fileNames)
+                        {
+                                string[] foundFileKeys = null;
+                                if(fileName.IndexOfAny(new char[] { '*', '?' }) >= 0)
+                                {
+                                        foundFileKeys = pkg.FindFiles(FilePatternToRegex(fileName));
+                                }
+                                else
+                                {
+                                        foundFileKeys = pkg.FindFiles(fileName);
+                                }
+                                fileKeys.AddRange(foundFileKeys);
+                        }
+                        if(fileKeys.Count == 0)
+                        {
+                                throw new FileNotFoundException("Files not found in package.");
+                        }
+                }
+                return fileKeys;
+        }
+        static Regex FilePatternToRegex(string pattern)
+        {
+                return new Regex("^" + Regex.Escape(pattern).Replace("\\*", ".*").Replace("\\?", ".") + "$",
+                        RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
+        }
+}
diff --git a/src/samples/Dtf/WiFile/WiFile.csproj b/src/samples/Dtf/WiFile/WiFile.csproj
new file mode 100644
index 00000000..b5a95481
--- /dev/null
+++ b/src/samples/Dtf/WiFile/WiFile.csproj
@@ -0,0 +1,27 @@
+<!-- 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>{AE562F7F-EE33-41D6-A962-DA488FEFBD08}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>WixToolset.Dtf.Samples.WiFile</RootNamespace>
+    <AssemblyName>WiFile</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="WiFile.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <ProjectReference Include="..\..\Libraries\WindowsInstaller.Package\WindowsInstaller.Package.csproj" />
+    <ProjectReference Include="..\..\Libraries\WindowsInstaller\WindowsInstaller.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
+</Project>
diff --git a/src/samples/Dtf/XPack/AssemblyInfo.cs b/src/samples/Dtf/XPack/AssemblyInfo.cs
new file mode 100644
index 00000000..6dfb9437
--- /dev/null
+++ b/src/samples/Dtf/XPack/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.Reflection;
+[assembly: AssemblyDescription("Simple command-line CAB/ZIP packing and unpacking tool.")]
diff --git a/src/samples/Dtf/XPack/XPack.cs b/src/samples/Dtf/XPack/XPack.cs
new file mode 100644
index 00000000..36543a73
--- /dev/null
+++ b/src/samples/Dtf/XPack/XPack.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.Samples.XPack
+{
+    using System;
+    using System.IO;
+    using System.Collections.Generic;
+    using System.Text;
+    using WixToolset.Dtf.Compression;
+    public class XPack
+    {
+        public static void Usage(TextWriter writer)
+        {
+            writer.WriteLine("Usage: XPack /P <archive.cab> <directory>");
+            writer.WriteLine("Usage: XPack /P <archive.zip> <directory>");
+            writer.WriteLine();
+            writer.WriteLine("Packs all files in a directory tree into an archive,");
+            writer.WriteLine("using either the cab or zip format. Any existing archive");
+            writer.WriteLine("with the same name will be overwritten.");
+            writer.WriteLine();
+            writer.WriteLine("Usage: XPack /U <archive.cab> <directory>");
+            writer.WriteLine("Usage: XPack /U <archive.zip> <directory>");
+            writer.WriteLine();
+            writer.WriteLine("Unpacks all files from a cab or zip archive to the");
+            writer.WriteLine("specified directory. Any existing files with the same");
+            writer.WriteLine("names will be overwritten.");
+        }
+        public static void Main(string[] args)
+        {
+            try
+            {
+                if (args.Length == 3 && args[0].ToUpperInvariant() == "/P")
+                {
+                    ArchiveInfo a = GetArchive(args[1]);
+                    a.Pack(args[2], true, CompressionLevel.Max, ProgressHandler);
+                }
+                else if (args.Length == 3 && args[0].ToUpperInvariant() == "/U")
+                {
+                    ArchiveInfo a = GetArchive(args[1]);
+                    a.Unpack(args[2], ProgressHandler);
+                }
+                else
+                {
+                    Usage(Console.Out);
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex);
+            }
+        }
+        private static void ProgressHandler(object source, ArchiveProgressEventArgs e)
+        {
+            if (e.ProgressType == ArchiveProgressType.StartFile)
+            {
+                Console.WriteLine(e.CurrentFileName);
+            }
+        }
+        private static ArchiveInfo GetArchive(string name)
+        {
+            string extension = Path.GetExtension(name).ToUpperInvariant();
+            if (extension == ".CAB")
+            {
+                return new WixToolset.Dtf.Compression.Cab.CabInfo(name);
+            }
+            else if (extension == ".ZIP")
+            {
+                return new WixToolset.Dtf.Compression.Zip.ZipInfo(name);
+            }
+            else
+            {
+                throw new ArgumentException("Unknown archive file extension: " + extension);
+            }
+        }
+    }
+}
diff --git a/src/samples/Dtf/XPack/XPack.csproj b/src/samples/Dtf/XPack/XPack.csproj
new file mode 100644
index 00000000..778c2d94
--- /dev/null
+++ b/src/samples/Dtf/XPack/XPack.csproj
@@ -0,0 +1,27 @@
+<!-- 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>{03E55D95-DABE-4571-9CDA-92A44F92A465}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>WixToolset.Dtf.Samples.XPack</RootNamespace>
+    <AssemblyName>XPack</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="XPack.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <ProjectReference Include="..\..\Libraries\Compression.Cab\Compression.Cab.csproj" />
+    <ProjectReference Include="..\..\Libraries\Compression.Zip\Compression.Zip.csproj" />
+    <ProjectReference Include="..\..\Libraries\Compression\Compression.csproj" />
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
+</Project>
diff --git a/src/signing.json b/src/signing.json
new file mode 100644
index 00000000..fe1c8c9b
--- /dev/null
+++ b/src/signing.json
@@ -0,0 +1,13 @@
+{
+  "SignClient": {
+    "AzureAd": {
+      "AADInstance": "https://login.microsoftonline.com/",
+      "ClientId": "c248d68a-ba6f-4aa9-8a68-71fe872063f8",
+      "TenantId": "16076fdc-fcc1-4a15-b1ca-32c9a255900e"
+    },
+    "Service": {
+      "Url": "https://codesign.dotnetfoundation.org/",
+      "ResourceId": "https://SignService/3c30251f-36f3-490b-a955-520addb85001"
+    }
+  }
+}
diff --git a/src/version.json b/src/version.json
index 5f857771..2d200f90 100644
--- a/src/version.json
+++ b/src/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "4.0",
+  "version": "4.0.0-preview.0-build.{height}",
  "publicReleaseRefSpec": [
    "^refs/heads/master$"
  ],
diff --git a/src/wix.snk b/src/wix.snk
new file mode 100644
index 00000000..3908a66a
--- /dev/null
+++ b/src/wix.snk
Binary files differ