103 files changed, 9940 insertions, 0 deletions

diff --git a/src/tools/Directory.Build.props b/src/tools/Directory.Build.props
new file mode 100644
index 00000000..3fdc6553
--- /dev/null
+++ b/src/tools/Directory.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>
+  <PropertyGroup>
+    <SegmentName>tools</SegmentName>
+  </PropertyGroup>
+
+  <Import Project="..\Directory.Build.props" />
+</Project>
diff --git a/src/tools/Dtf/DDiff/CabDiffEngine.cs b/src/tools/Dtf/DDiff/CabDiffEngine.cs
new file mode 100644
index 00000000..b3bafaa3
--- /dev/null
+++ b/src/tools/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.Tools.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/tools/Dtf/DDiff/DDiff.cs b/src/tools/Dtf/DDiff/DDiff.cs
new file mode 100644
index 00000000..4e9121b6
--- /dev/null
+++ b/src/tools/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.Tools.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/tools/Dtf/DDiff/DDiff.csproj b/src/tools/Dtf/DDiff/DDiff.csproj
new file mode 100644
index 00000000..bf4d6521
--- /dev/null
+++ b/src/tools/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.Tools.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/tools/Dtf/DDiff/DirectoryDiffEngine.cs b/src/tools/Dtf/DDiff/DirectoryDiffEngine.cs
new file mode 100644
index 00000000..a5216f22
--- /dev/null
+++ b/src/tools/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.Tools.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/tools/Dtf/DDiff/FileDiffEngine.cs b/src/tools/Dtf/DDiff/FileDiffEngine.cs
new file mode 100644
index 00000000..9eb197ea
--- /dev/null
+++ b/src/tools/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.Tools.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/tools/Dtf/DDiff/IDiffEngine.cs b/src/tools/Dtf/DDiff/IDiffEngine.cs
new file mode 100644
index 00000000..918e42e6
--- /dev/null
+++ b/src/tools/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.Tools.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/tools/Dtf/DDiff/MsiDiffEngine.cs b/src/tools/Dtf/DDiff/MsiDiffEngine.cs
new file mode 100644
index 00000000..4e3b2c7b
--- /dev/null
+++ b/src/tools/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.Tools.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/tools/Dtf/DDiff/MspDiffEngine.cs b/src/tools/Dtf/DDiff/MspDiffEngine.cs
new file mode 100644
index 00000000..a32ab24a
--- /dev/null
+++ b/src/tools/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.Tools.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/tools/Dtf/DDiff/TextFileDiffEngine.cs b/src/tools/Dtf/DDiff/TextFileDiffEngine.cs
new file mode 100644
index 00000000..beb5ea84
--- /dev/null
+++ b/src/tools/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.Tools.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/tools/Dtf/DDiff/VersionedFileDiffEngine.cs b/src/tools/Dtf/DDiff/VersionedFileDiffEngine.cs
new file mode 100644
index 00000000..9a3e399f
--- /dev/null
+++ b/src/tools/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.Tools.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/tools/Dtf/Documents/Guide/Content/about.htm b/src/tools/Dtf/Documents/Guide/Content/about.htm
new file mode 100644
index 00000000..393b5a81
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/buildingcas.htm b/src/tools/Dtf/Documents/Guide/Content/buildingcas.htm
new file mode 100644
index 00000000..e88ad552
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/cabpack.htm b/src/tools/Dtf/Documents/Guide/Content/cabpack.htm
new file mode 100644
index 00000000..2d9f725e
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/cabs.htm b/src/tools/Dtf/Documents/Guide/Content/cabs.htm
new file mode 100644
index 00000000..e88d1e15
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/cabwrapper.htm b/src/tools/Dtf/Documents/Guide/Content/cabwrapper.htm
new file mode 100644
index 00000000..fd88437c
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/caconfig.htm b/src/tools/Dtf/Documents/Guide/Content/caconfig.htm
new file mode 100644
index 00000000..a6c97d2b
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/caproxy.htm b/src/tools/Dtf/Documents/Guide/Content/caproxy.htm
new file mode 100644
index 00000000..2ee962d5
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/databases.htm b/src/tools/Dtf/Documents/Guide/Content/databases.htm
new file mode 100644
index 00000000..4fe1fba9
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/debuggingcas.htm b/src/tools/Dtf/Documents/Guide/Content/debuggingcas.htm
new file mode 100644
index 00000000..ca1be161
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/dependencies.htm b/src/tools/Dtf/Documents/Guide/Content/dependencies.htm
new file mode 100644
index 00000000..cfec5880
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/filepatchwrapper.htm b/src/tools/Dtf/Documents/Guide/Content/filepatchwrapper.htm
new file mode 100644
index 00000000..6bab69b5
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/history.htm b/src/tools/Dtf/Documents/Guide/Content/history.htm
new file mode 100644
index 00000000..704ce875
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/installutil.htm b/src/tools/Dtf/Documents/Guide/Content/installutil.htm
new file mode 100644
index 00000000..e235a7b6
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/inventory.htm b/src/tools/Dtf/Documents/Guide/Content/inventory.htm
new file mode 100644
index 00000000..40a6ef74
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/managedcas.htm b/src/tools/Dtf/Documents/Guide/Content/managedcas.htm
new file mode 100644
index 00000000..9cce0432
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/msihelper.htm b/src/tools/Dtf/Documents/Guide/Content/msihelper.htm
new file mode 100644
index 00000000..c1493117
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/msiwrapper.htm b/src/tools/Dtf/Documents/Guide/Content/msiwrapper.htm
new file mode 100644
index 00000000..70190ac4
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/packages.htm b/src/tools/Dtf/Documents/Guide/Content/packages.htm
new file mode 100644
index 00000000..aa521685
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/powerdiff.htm b/src/tools/Dtf/Documents/Guide/Content/powerdiff.htm
new file mode 100644
index 00000000..f420b47e
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/samplecas.htm b/src/tools/Dtf/Documents/Guide/Content/samplecas.htm
new file mode 100644
index 00000000..4dfed6f0
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/samples.htm b/src/tools/Dtf/Documents/Guide/Content/samples.htm
new file mode 100644
index 00000000..3bcd379a
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/support.htm b/src/tools/Dtf/Documents/Guide/Content/support.htm
new file mode 100644
index 00000000..89acbadf
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/using.htm b/src/tools/Dtf/Documents/Guide/Content/using.htm
new file mode 100644
index 00000000..6fe960e8
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/whatsnew.htm b/src/tools/Dtf/Documents/Guide/Content/whatsnew.htm
new file mode 100644
index 00000000..3efe67bd
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/wifile.htm b/src/tools/Dtf/Documents/Guide/Content/wifile.htm
new file mode 100644
index 00000000..20998b73
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/Content/writingcas.htm b/src/tools/Dtf/Documents/Guide/Content/writingcas.htm
new file mode 100644
index 00000000..6beccf5f
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/DTF.hhc b/src/tools/Dtf/Documents/Guide/DTF.hhc
new file mode 100644
index 00000000..bf43e447
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/DTF.hhk b/src/tools/Dtf/Documents/Guide/DTF.hhk
new file mode 100644
index 00000000..bc6e49b3
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/DTF.hhp b/src/tools/Dtf/Documents/Guide/DTF.hhp
new file mode 100644
index 00000000..e9b8ad90
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/dtfguide.helpproj b/src/tools/Dtf/Documents/Guide/dtfguide.helpproj
new file mode 100644
index 00000000..4df2765d
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Guide/styles/presentation.css b/src/tools/Dtf/Documents/Guide/styles/presentation.css
new file mode 100644
index 00000000..b71c8582
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Reference/Compression.htm b/src/tools/Dtf/Documents/Reference/Compression.htm
new file mode 100644
index 00000000..7782bea1
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Reference/Compression1.png b/src/tools/Dtf/Documents/Reference/Compression1.png
new file mode 100644
index 00000000..5b2e177f
--- /dev/null
+++ b/src/tools/Dtf/Documents/Reference/Compression1.png
diff --git a/src/tools/Dtf/Documents/Reference/Compression2.png b/src/tools/Dtf/Documents/Reference/Compression2.png
new file mode 100644
index 00000000..394a5f18
--- /dev/null
+++ b/src/tools/Dtf/Documents/Reference/Compression2.png
diff --git a/src/tools/Dtf/Documents/Reference/WindowsInstaller.htm b/src/tools/Dtf/Documents/Reference/WindowsInstaller.htm
new file mode 100644
index 00000000..28990ce4
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Reference/WindowsInstaller1.png b/src/tools/Dtf/Documents/Reference/WindowsInstaller1.png
new file mode 100644
index 00000000..cc769cc7
--- /dev/null
+++ b/src/tools/Dtf/Documents/Reference/WindowsInstaller1.png
diff --git a/src/tools/Dtf/Documents/Reference/WindowsInstaller2.png b/src/tools/Dtf/Documents/Reference/WindowsInstaller2.png
new file mode 100644
index 00000000..0c11e501
--- /dev/null
+++ b/src/tools/Dtf/Documents/Reference/WindowsInstaller2.png
diff --git a/src/tools/Dtf/Documents/Reference/WindowsInstaller3.png b/src/tools/Dtf/Documents/Reference/WindowsInstaller3.png
new file mode 100644
index 00000000..68acd7d8
--- /dev/null
+++ b/src/tools/Dtf/Documents/Reference/WindowsInstaller3.png
diff --git a/src/tools/Dtf/Documents/Reference/dtfref.shfbproj b/src/tools/Dtf/Documents/Reference/dtfref.shfbproj
new file mode 100644
index 00000000..e45d2a07
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Documents/Reference/helplink.js b/src/tools/Dtf/Documents/Reference/helplink.js
new file mode 100644
index 00000000..a4989824
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Inventory/Columns.resx b/src/tools/Dtf/Inventory/Columns.resx
new file mode 100644
index 00000000..cfeb11e3
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Inventory/Features.cs b/src/tools/Dtf/Inventory/Features.cs
new file mode 100644
index 00000000..9d2747ba
--- /dev/null
+++ b/src/tools/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.Tools.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/tools/Dtf/Inventory/IInventoryDataProvider.cs b/src/tools/Dtf/Inventory/IInventoryDataProvider.cs
new file mode 100644
index 00000000..affcb358
--- /dev/null
+++ b/src/tools/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.Tools.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/tools/Dtf/Inventory/Inventory.cs b/src/tools/Dtf/Inventory/Inventory.cs
new file mode 100644
index 00000000..07735086
--- /dev/null
+++ b/src/tools/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.Tools.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/tools/Dtf/Inventory/Inventory.csproj b/src/tools/Dtf/Inventory/Inventory.csproj
new file mode 100644
index 00000000..57bae907
--- /dev/null
+++ b/src/tools/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.Tools.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/tools/Dtf/Inventory/Inventory.ico b/src/tools/Dtf/Inventory/Inventory.ico
new file mode 100644
index 00000000..d5757f7a
--- /dev/null
+++ b/src/tools/Dtf/Inventory/Inventory.ico
diff --git a/src/tools/Dtf/Inventory/Inventory.resx b/src/tools/Dtf/Inventory/Inventory.resx
new file mode 100644
index 00000000..9aeb4d2c
--- /dev/null
+++ b/src/tools/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/tools/Dtf/Inventory/components.cs b/src/tools/Dtf/Inventory/components.cs
new file mode 100644
index 00000000..b516af46
--- /dev/null
+++ b/src/tools/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.Tools.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/tools/Dtf/Inventory/msiutils.cs b/src/tools/Dtf/Inventory/msiutils.cs
new file mode 100644
index 00000000..189d28a9
--- /dev/null
+++ b/src/tools/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.Tools.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/tools/Dtf/Inventory/patches.cs b/src/tools/Dtf/Inventory/patches.cs
new file mode 100644
index 00000000..ca96a97d
--- /dev/null
+++ b/src/tools/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.Tools.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/tools/Dtf/Inventory/products.cs b/src/tools/Dtf/Inventory/products.cs
new file mode 100644
index 00000000..635e5439
--- /dev/null
+++ b/src/tools/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.Tools.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/tools/Dtf/Inventory/xp.manifest b/src/tools/Dtf/Inventory/xp.manifest
new file mode 100644
index 00000000..34d61fea
--- /dev/null
+++ b/src/tools/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/tools/Dtf/WiFile/WiFile.cs b/src/tools/Dtf/WiFile/WiFile.cs
new file mode 100644
index 00000000..1e5c80df
--- /dev/null
+++ b/src/tools/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/tools/Dtf/WiFile/WiFile.csproj b/src/tools/Dtf/WiFile/WiFile.csproj
new file mode 100644
index 00000000..c8d39235
--- /dev/null
+++ b/src/tools/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.Tools.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/tools/Dtf/XPack/AssemblyInfo.cs b/src/tools/Dtf/XPack/AssemblyInfo.cs
new file mode 100644
index 00000000..6dfb9437
--- /dev/null
+++ b/src/tools/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/tools/Dtf/XPack/XPack.cs b/src/tools/Dtf/XPack/XPack.cs
new file mode 100644
index 00000000..cc52bb7d
--- /dev/null
+++ b/src/tools/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.Tools.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/tools/Dtf/XPack/XPack.csproj b/src/tools/Dtf/XPack/XPack.csproj
new file mode 100644
index 00000000..3e76de2e
--- /dev/null
+++ b/src/tools/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.Tools.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/tools/ThmViewerPackage/Package.wxs b/src/tools/ThmViewerPackage/Package.wxs
new file mode 100644
index 00000000..dae6a9d0
--- /dev/null
+++ b/src/tools/ThmViewerPackage/Package.wxs
@@ -0,0 +1,30 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Name="WiX Toolset Theme Viewer" Manufacturer="WiX Toolset" Language="1033" Version="!(bind.fileVersion.ThmViewerFile)" UpgradeCode="59c4b122-5167-445b-8fc4-09dcd4eced89">
+    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+    <MediaTemplate EmbedCab="yes" />
+
+    <Feature Id="Main">
+      <ComponentGroupRef Id="Components" />
+    </Feature>
+  </Package>
+
+  <Fragment>
+    <ComponentGroup Id="Components" Directory="INSTALLFOLDER" Subdirectory="bin">
+      <Component>
+        <File Id="ThmViewerFile" Source="thmviewer.exe" />
+        <Shortcut Name="!(bind.property.ProductName)" Directory="ShortcutFolder" Advertise="yes" />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+
+  <Fragment>
+    <StandardDirectory Id="ProgramFilesFolder">
+      <Directory Id="INSTALLFOLDER" Name="WiX Toolset v4.0" />
+    </StandardDirectory>
+    <StandardDirectory Id="ProgramMenuFolder">
+      <Directory Id="ShortcutFolder" Name="WiX Toolset" />
+    </StandardDirectory>
+  </Fragment>
+
+</Wix>
diff --git a/src/tools/ThmViewerPackage/ThmViewerPackage.wixproj b/src/tools/ThmViewerPackage/ThmViewerPackage.wixproj
new file mode 100644
index 00000000..9b2a2b02
--- /dev/null
+++ b/src/tools/ThmViewerPackage/ThmViewerPackage.wixproj
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputPath>$(PackageOutputPath)</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\thmviewer\thmviewer.vcxproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/tools/WixToolset.Templates/WixToolset.Templates.csproj b/src/tools/WixToolset.Templates/WixToolset.Templates.csproj
new file mode 100644
index 00000000..00b6c6d3
--- /dev/null
+++ b/src/tools/WixToolset.Templates/WixToolset.Templates.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <PackageType>Template</PackageType>
+    <Title>WixToolset Templates</Title>
+    <Description>Project and item template for the WiX Toolset.</Description>
+
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <NoWarn>$(NoWarn);NU5128</NoWarn>
+
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <IncludeContentInPack>true</IncludeContentInPack>
+    <ContentTargetFolders>content</ContentTargetFolders>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="**" />
+    <Content Include="templates\**" />
+  </ItemGroup>
+</Project>
diff --git a/src/tools/WixToolset.Templates/templates/FragmentItem/.template.config/template.json b/src/tools/WixToolset.Templates/templates/FragmentItem/.template.config/template.json
new file mode 100644
index 00000000..2bd67b11
--- /dev/null
+++ b/src/tools/WixToolset.Templates/templates/FragmentItem/.template.config/template.json
@@ -0,0 +1,14 @@
+{
+    "$schema": "http://json.schemastore.org/template",
+    "identity": "WixToolset.Templates.FragmentItem",
+    "name": "WiX Toolset Fragment",
+    "shortName": "fragment",
+    "author": "WiX Toolset Team",
+    "classifications": ["WixToolset", "Code"],
+    "tags": {
+        "language": "WiX",
+        "type": "item"
+    },
+    "sourceName": "$safeprojectname$",
+    "defaultName": "Fragment"
+}
diff --git a/src/tools/WixToolset.Templates/templates/FragmentItem/Fragment.wxs b/src/tools/WixToolset.Templates/templates/FragmentItem/Fragment.wxs
new file mode 100644
index 00000000..12e1bfc3
--- /dev/null
+++ b/src/tools/WixToolset.Templates/templates/FragmentItem/Fragment.wxs
@@ -0,0 +1,4 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+  </Fragment>
+</Wix>
diff --git a/src/tools/WixToolset.Templates/templates/LibraryProject/$safeprojectname$.wixproj b/src/tools/WixToolset.Templates/templates/LibraryProject/$safeprojectname$.wixproj
new file mode 100644
index 00000000..c3536151
--- /dev/null
+++ b/src/tools/WixToolset.Templates/templates/LibraryProject/$safeprojectname$.wixproj
@@ -0,0 +1,5 @@
+<Project Sdk="WixToolset.Sdk/4.0.0">
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+</Project>
diff --git a/src/tools/WixToolset.Templates/templates/LibraryProject/.template.config/template.json b/src/tools/WixToolset.Templates/templates/LibraryProject/.template.config/template.json
new file mode 100644
index 00000000..ddfa82e9
--- /dev/null
+++ b/src/tools/WixToolset.Templates/templates/LibraryProject/.template.config/template.json
@@ -0,0 +1,14 @@
+{
+    "$schema": "http://json.schemastore.org/template",
+    "identity": "WixToolset.Templates.LibraryProject",
+    "name": "WiX Toolset Library",
+    "shortName": "wixlib",
+    "author": "WiX Toolset Team",
+    "classifications": ["WixToolset", "Library"],
+    "tags": {
+        "language": "WiX",
+        "type": "project"
+    },
+    "sourceName": "$safeprojectname$",
+    "defaultName": "Library"
+}
diff --git a/src/tools/WixToolset.Templates/templates/LibraryProject/Fragment.wxs b/src/tools/WixToolset.Templates/templates/LibraryProject/Fragment.wxs
new file mode 100644
index 00000000..12e1bfc3
--- /dev/null
+++ b/src/tools/WixToolset.Templates/templates/LibraryProject/Fragment.wxs
@@ -0,0 +1,4 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+  </Fragment>
+</Wix>
diff --git a/src/tools/WixToolset.Templates/templates/ModuleProject/$safeprojectname$.wixproj b/src/tools/WixToolset.Templates/templates/ModuleProject/$safeprojectname$.wixproj
new file mode 100644
index 00000000..cc813aab
--- /dev/null
+++ b/src/tools/WixToolset.Templates/templates/ModuleProject/$safeprojectname$.wixproj
@@ -0,0 +1,5 @@
+<Project Sdk="WixToolset.Sdk/4.0.0">
+  <PropertyGroup>
+    <OutputType>Module</OutputType>
+  </PropertyGroup>
+</Project>
diff --git a/src/tools/WixToolset.Templates/templates/ModuleProject/.template.config/template.json b/src/tools/WixToolset.Templates/templates/ModuleProject/.template.config/template.json
new file mode 100644
index 00000000..2be72f83
--- /dev/null
+++ b/src/tools/WixToolset.Templates/templates/ModuleProject/.template.config/template.json
@@ -0,0 +1,26 @@
+{
+    "$schema": "http://json.schemastore.org/template",
+    "identity": "WixToolset.Templates.ModuleProject",
+    "name": "WiX Toolset Module",
+    "shortName": "msm",
+    "author": "WiX Toolset Team",
+    "classifications": ["WixToolset", "Module"],
+    "tags": {
+        "language": "WiX",
+        "type": "project"
+    },
+    "symbols": {
+      "company": {
+        "type": "parameter",
+        "defaultValue": "Your Company Name",
+        "replaces": "$company$"
+      },
+      "version": {
+        "type": "parameter",
+        "defaultValue": "0.0.1",
+        "replaces": "$version$"
+      }
+    },
+    "sourceName": "$safeprojectname$",
+    "defaultName": "Module"
+}
diff --git a/src/tools/WixToolset.Templates/templates/ModuleProject/Module.wxs b/src/tools/WixToolset.Templates/templates/ModuleProject/Module.wxs
new file mode 100644
index 00000000..592c844d
--- /dev/null
+++ b/src/tools/WixToolset.Templates/templates/ModuleProject/Module.wxs
@@ -0,0 +1,8 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Module Id="$safeprojectname$" Guid="PUT-GUID-HERE" Manufacturer="$company$" Language="0" Version="$version$">
+    <Component Guid='PUT-GUID-HERE' Directory='TARGETDIR'>
+        <!-- TODO: Install something more useful than this source code file itself -->
+        <File Source="Module.wxs" />
+    </Component>
+  </Module>
+</Wix>
diff --git a/src/tools/WixToolset.Templates/templates/PackageProject/$safeprojectname$.wixproj b/src/tools/WixToolset.Templates/templates/PackageProject/$safeprojectname$.wixproj
new file mode 100644
index 00000000..17640703
--- /dev/null
+++ b/src/tools/WixToolset.Templates/templates/PackageProject/$safeprojectname$.wixproj
@@ -0,0 +1,2 @@
+<Project Sdk="WixToolset.Sdk/4.0.0">
+</Project>
diff --git a/src/tools/WixToolset.Templates/templates/PackageProject/.template.config/template.json b/src/tools/WixToolset.Templates/templates/PackageProject/.template.config/template.json
new file mode 100644
index 00000000..d12f3109
--- /dev/null
+++ b/src/tools/WixToolset.Templates/templates/PackageProject/.template.config/template.json
@@ -0,0 +1,26 @@
+{
+    "$schema": "http://json.schemastore.org/template",
+    "identity": "WixToolset.Templates.PackageProject",
+    "name": "WiX Toolset Package",
+    "shortName": "msi",
+    "author": "WiX Toolset Team",
+    "classifications": ["WixToolset", "Package"],
+    "tags": {
+        "language": "WiX",
+        "type": "project"
+    },
+    "symbols": {
+      "company": {
+        "type": "parameter",
+        "defaultValue": "Your Company Name",
+        "replaces": "$company$"
+      },
+      "version": {
+        "type": "parameter",
+        "defaultValue": "0.0.1",
+        "replaces": "$version$"
+      }
+    },
+    "sourceName": "$safeprojectname$",
+    "defaultName": "Package"
+}
diff --git a/src/tools/WixToolset.Templates/templates/PackageProject/Package.wxs b/src/tools/WixToolset.Templates/templates/PackageProject/Package.wxs
new file mode 100644
index 00000000..ac69e549
--- /dev/null
+++ b/src/tools/WixToolset.Templates/templates/PackageProject/Package.wxs
@@ -0,0 +1,24 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Name="$safeprojectname$" Manufacturer="$company$" Version="$version$" UpgradeCode="PUT-GUID-HERE">
+    <MajorUpgrade DowngradeError="A newer version of [ProductName] is already installed" />
+
+    <Feature Id="Main">
+      <ComponentGroupRef Id="Components" />
+    </Feature>
+  </Package>
+
+  <Fragment>
+    <ComponentGroup Id="Components" Directory="INSTALLFOLDER">
+      <Component>
+        <!-- TODO: Install something more useful than this source code file itself -->
+        <File Source="Package.wxs" />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+
+  <Fragment>
+    <StandardDirectory Id="ProgramFiles6432Folder">
+      <Directory Id="INSTALLFOLDER" Name="!(Property.Manufacturer) !(Property.ProductName)" />
+    </StandardDirectory>
+  </Fragment>
+</Wix>
diff --git a/src/tools/burn/ManagedBundleRunner/BundleErrorEventArgs.cs b/src/tools/burn/ManagedBundleRunner/BundleErrorEventArgs.cs
new file mode 100644
index 00000000..964b976e
--- /dev/null
+++ b/src/tools/burn/ManagedBundleRunner/BundleErrorEventArgs.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 WixToolset.Tools
+{
+    using System;
+
+    /// <summary>
+    /// Arguments provided when bundle encounters an error.
+    /// </summary>
+    [Serializable]
+    public class BundleErrorEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the error code.
+        /// </summary>
+        public int Code { get; set; }
+
+        /// <summary>
+        /// Gets the error message.
+        /// </summary>
+        public string Message { get; set; }
+
+        /// <summary>
+        /// Gets the recommended display flags for an error dialog.
+        /// </summary>
+        public int UIHint { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Result"/> of the operation. This is passed back to the bundle.
+        /// </summary>
+        public BundleResult Result { get; set; }
+    }
+}
diff --git a/src/tools/burn/ManagedBundleRunner/BundleProgressEventArgs.cs b/src/tools/burn/ManagedBundleRunner/BundleProgressEventArgs.cs
new file mode 100644
index 00000000..2add7cca
--- /dev/null
+++ b/src/tools/burn/ManagedBundleRunner/BundleProgressEventArgs.cs
@@ -0,0 +1,23 @@
+// Copyright (c) .NET Foundation 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;
+
+    /// <summary>
+    /// Arguments provided when bundle progress is updated.
+    /// </summary>
+    [Serializable]
+    public class BundleProgressEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets the percentage from 0 to 100 completed for a bundle.
+        /// </summary>
+        public int Progress { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="Result"/> of the operation. This is passed back to the bundle.
+        /// </summary>
+        public BundleResult Result { get; set; }
+    }
+}
diff --git a/src/tools/burn/ManagedBundleRunner/BundleResult.cs b/src/tools/burn/ManagedBundleRunner/BundleResult.cs
new file mode 100644
index 00000000..5df0d699
--- /dev/null
+++ b/src/tools/burn/ManagedBundleRunner/BundleResult.cs
@@ -0,0 +1,24 @@
+// Copyright (c) .NET Foundation 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
+{
+    /// <summary>
+    /// Result codes.
+    /// </summary>
+    public enum BundleResult
+    {
+        Error = -1,
+        None,
+        Ok,
+        Cancel,
+        Abort,
+        Retry,
+        Ignore,
+        Yes,
+        No,
+        Close,
+        Help,
+        TryAgain,
+        Continue,
+    }
+}
diff --git a/src/tools/burn/ManagedBundleRunner/BundleRunner.cs b/src/tools/burn/ManagedBundleRunner/BundleRunner.cs
new file mode 100644
index 00000000..98d92c66
--- /dev/null
+++ b/src/tools/burn/ManagedBundleRunner/BundleRunner.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.Tools
+{
+    using System;
+    using System.Diagnostics;
+    using System.IO.Pipes;
+    using System.Text;
+    using System.Threading;
+
+    /// <summary>
+    /// Runs a bundle with provided command-line.
+    /// </summary>
+    public class BundleRunner
+    {
+        /// <summary>
+        /// Creates a runner for the provided bundle.
+        /// </summary>
+        /// <param name="bundle">Path to the bundle to run.</param>
+        public BundleRunner(string bundle)
+        {
+            this.Path = bundle;
+        }
+
+        /// <summary>
+        /// Fired when the bundle encounters an error.
+        /// </summary>
+        public event EventHandler<BundleErrorEventArgs> Error;
+
+        /// <summary>
+        /// Fired when the bundle progress is udpated.
+        /// </summary>
+        public event EventHandler<BundleProgressEventArgs> Progress;
+
+        /// <summary>
+        /// Gets the path to the bundle to run.
+        /// </summary>
+        public string Path { get; private set; }
+
+        /// <summary>
+        /// Runs the bundle with the provided command-line.
+        /// </summary>
+        /// <param name="commandLine">Optional command-line to pass to the bundle.</param>
+        /// <returns>Exit code from the bundle.</returns>
+        public int Run(string commandLine = null)
+        {
+            WaitHandle[] waits = new WaitHandle[] { new ManualResetEvent(false), new ManualResetEvent(false) };
+            int returnCode = 0;
+            int pid = Process.GetCurrentProcess().Id;
+            string pipeName = String.Concat("bpe_", pid);
+            string pipeSecret = Guid.NewGuid().ToString("N");
+
+            using (NamedPipeServerStream pipe = new NamedPipeServerStream(pipeName, PipeDirection.InOut, 1))
+            {
+                using (Process bundleProcess = new Process())
+                {
+                    bundleProcess.StartInfo.FileName = this.Path;
+                    bundleProcess.StartInfo.Arguments = String.Format("{0} -burn.embedded {1} {2} {3}", commandLine ?? String.Empty, pipeName, pipeSecret, pid);
+                    bundleProcess.StartInfo.UseShellExecute = false;
+                    bundleProcess.StartInfo.CreateNoWindow = true;
+                    bundleProcess.Start();
+
+                    Connect(pipe, pipeSecret, pid, bundleProcess.Id);
+
+                    PumpMessages(pipe);
+
+                    bundleProcess.WaitForExit();
+                    returnCode = bundleProcess.ExitCode;
+                }
+            }
+
+            return returnCode;
+        }
+
+        /// <summary>
+        /// Called when bundle encounters an error.
+        /// </summary>
+        /// <param name="e">Additional arguments for this event.</param>
+        protected virtual void OnError(BundleErrorEventArgs e)
+        {
+            EventHandler<BundleErrorEventArgs> handler = this.Error;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        /// <summary>
+        /// Called when bundle progress is updated.
+        /// </summary>
+        /// <param name="e">Additional arguments for this event.</param>
+        protected virtual void OnProgress(BundleProgressEventArgs e)
+        {
+            EventHandler<BundleProgressEventArgs> handler = this.Progress;
+            if (handler != null)
+            {
+                handler(this, e);
+            }
+        }
+
+        private void Connect(NamedPipeServerStream pipe, string pipeSecret, int pid, int childPid)
+        {
+            pipe.WaitForConnection();
+
+            WriteSecretToPipe(pipe, pipeSecret);
+
+            WriteNumberToPipe(pipe, (uint)pid);
+
+            uint ack = ReadNumberFromPipe(pipe);
+            // This is not true when bundle is run under a debugger
+            //if (ack != childPid)
+            //{
+            //    throw new ApplicationException("Incorrect child process.");
+            //}
+        }
+
+        private void PumpMessages(NamedPipeServerStream pipe)
+        {
+            uint messageId;
+            while (TryReadNumberFromPipe(pipe, out messageId))
+            {
+                uint messageSize = ReadNumberFromPipe(pipe);
+
+                BundleResult result = BundleResult.None;
+                switch (messageId)
+                {
+                    case 1: //error
+                        result = ProcessErrorMessage(pipe);
+                        break;
+
+                    case 2: // progress
+                        result = ProcessProgressMessage(pipe);
+                        break;
+
+                    default: // unknown message, do nothing.
+                        break;
+                }
+
+                CompleteMessage(pipe, result);
+            }
+        }
+
+        private BundleResult ProcessErrorMessage(NamedPipeServerStream pipe)
+        {
+            BundleErrorEventArgs e = new BundleErrorEventArgs();
+            e.Code = (int)ReadNumberFromPipe(pipe);
+            e.Message = ReadStringFromPipe(pipe);
+            e.UIHint = (int)ReadNumberFromPipe(pipe);
+
+            this.OnError(e);
+
+            return e.Result;
+        }
+
+        private BundleResult ProcessProgressMessage(NamedPipeServerStream pipe)
+        {
+            ReadNumberFromPipe(pipe); // eat the first progress number because it is always zero.
+
+            BundleProgressEventArgs e = new BundleProgressEventArgs();
+            e.Progress = (int)ReadNumberFromPipe(pipe);
+
+            this.OnProgress(e);
+
+            return e.Result;
+        }
+
+        private void CompleteMessage(NamedPipeServerStream pipe, BundleResult result)
+        {
+            uint complete = 0xF0000002;
+            WriteNumberToPipe(pipe, complete);
+            WriteNumberToPipe(pipe, 4); // size of message data
+            WriteNumberToPipe(pipe, (uint)result);
+        }
+
+        private uint ReadNumberFromPipe(NamedPipeServerStream pipe)
+        {
+            byte[] buffer = new byte[4];
+            pipe.Read(buffer, 0, buffer.Length);
+            return BitConverter.ToUInt32(buffer, 0);
+        }
+
+        private string ReadStringFromPipe(NamedPipeServerStream pipe)
+        {
+            uint length = ReadNumberFromPipe(pipe);
+
+            byte[] buffer = new byte[length * 2];
+            pipe.Read(buffer, 0, buffer.Length);
+
+            return Encoding.Unicode.GetString(buffer);
+        }
+
+        private bool TryReadNumberFromPipe(NamedPipeServerStream pipe, out uint value)
+        {
+            value = ReadNumberFromPipe(pipe); // reading will not block and return zero if pipe is not connected.
+            return pipe.IsConnected;
+        }
+
+        private void WriteNumberToPipe(NamedPipeServerStream pipe, uint value)
+        {
+            byte[] buffer = BitConverter.GetBytes(value);
+            pipe.Write(buffer, 0, buffer.Length);
+        }
+
+        private void WriteSecretToPipe(NamedPipeServerStream pipe, string secret)
+        {
+            byte[] buffer = Encoding.Unicode.GetBytes(secret);
+
+            WriteNumberToPipe(pipe, (uint)buffer.Length);
+            pipe.Write(buffer, 0, buffer.Length);
+        }
+    }
+}
diff --git a/src/tools/burn/runbundle/AssemblyInfo.cs b/src/tools/burn/runbundle/AssemblyInfo.cs
new file mode 100644
index 00000000..3a66d5e3
--- /dev/null
+++ b/src/tools/burn/runbundle/AssemblyInfo.cs
@@ -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.
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Executable to demonstrate Bundle Runner Sample")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyCulture("")]
+[assembly: CLSCompliant(true)]
+[assembly: ComVisible(false)]
diff --git a/src/tools/burn/runbundle/Program.cs b/src/tools/burn/runbundle/Program.cs
new file mode 100644
index 00000000..fd36c2ca
--- /dev/null
+++ b/src/tools/burn/runbundle/Program.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 WixToolset.Tools
+{
+    using System;
+    using System.Linq;
+    using WixToolset.Tools;
+
+    /// <summary>
+    /// Example executable that installs then immediately uninstalls a bundle showing progress.
+    /// </summary>
+    class Program
+    {
+        static int Main(string[] args)
+        {
+            if (args.Length == 0)
+            {
+                Console.WriteLine("Must provide the path to the bundle to install then uninstall.");
+                return -1;
+            }
+
+            BundleRunner runner = new BundleRunner(args[0]);
+            runner.Error += Program.OnError;
+            runner.Progress += Program.OnProgress;
+
+            Console.WriteLine("Installing: {0}", runner.Path);
+            int exitCode = runner.Run(String.Join(" ", args.Skip(1).ToArray()));
+            if (0 == exitCode)
+            {
+                Console.WriteLine("\r\nUninstalling: {0}", runner.Path);
+                exitCode = runner.Run("-uninstall");
+            }
+
+            return exitCode;
+        }
+
+        static void OnError(object sender, BundleErrorEventArgs e)
+        {
+            Console.WriteLine("error: {0}, uiHint: {1}, message: {2}", e.Code, e.UIHint, e.Message);
+        }
+
+        static void OnProgress(object sender, BundleProgressEventArgs e)
+        {
+            Console.WriteLine("progresss: {0}%", e.Progress);
+        }
+    }
+}
diff --git a/src/tools/thmviewer/Resources/LoremIpsum.rtf b/src/tools/thmviewer/Resources/LoremIpsum.rtf
new file mode 100644
index 00000000..1ab0e65b
--- /dev/null
+++ b/src/tools/thmviewer/Resources/LoremIpsum.rtf
diff --git a/src/tools/thmviewer/Resources/thm.xml b/src/tools/thmviewer/Resources/thm.xml
new file mode 100644
index 00000000..6394f0f1
--- /dev/null
+++ b/src/tools/thmviewer/Resources/thm.xml
@@ -0,0 +1,11 @@
+<?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. -->
+
+
+<Theme>
+    <Font Id="0" Height="-48" Weight="700" Foreground="$windowtext">Consolas</Font>
+    <Font Id="1" Height="-12" Weight="700" Foreground="$windowtext" Background="$window">Consolas</Font>
+    <Window Width="220" Height="200" FontId="0" Caption="Theme Viewer">
+        <TreeView Name="Tree" X="0" Y="0" Width="0" Height="0" FontId="1" Visible="yes" FullRowSelect="yes" HasButtons="yes" AlwaysShowSelect="yes" HasLines="yes" LinesAtRoot="yes"/>
+    </Window>
+</Theme>
diff --git a/src/tools/thmviewer/display.cpp b/src/tools/thmviewer/display.cpp
new file mode 100644
index 00000000..444c6cfb
--- /dev/null
+++ b/src/tools/thmviewer/display.cpp
@@ -0,0 +1,339 @@
+// Copyright (c) .NET 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"
+
+static const LPCWSTR THMVWR_WINDOW_CLASS_DISPLAY = L"ThmViewerDisplay";
+
+struct DISPLAY_THREAD_CONTEXT
+{
+    HWND hWnd;
+    HINSTANCE hInstance;
+
+    HANDLE hInit;
+};
+
+static DWORD WINAPI DisplayThreadProc(
+    __in LPVOID pvContext
+    );
+static LRESULT CALLBACK DisplayWndProc(
+    __in HWND hWnd,
+    __in UINT uMsg,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    );
+static BOOL DisplayOnThmLoadedControl(
+    __in THEME* pTheme,
+    __in const THEME_LOADEDCONTROL_ARGS* args,
+    __in THEME_LOADEDCONTROL_RESULTS* results
+    );
+
+
+extern "C" HRESULT DisplayStart(
+    __in HINSTANCE hInstance,
+    __in HWND hWnd,
+    __out HANDLE *phThread,
+    __out DWORD* pdwThreadId
+    )
+{
+    HRESULT hr = S_OK;
+    HANDLE rgHandles[2] = { };
+    DISPLAY_THREAD_CONTEXT context = { };
+
+    rgHandles[0] = ::CreateEventW(NULL, TRUE, FALSE, NULL);
+    ExitOnNullWithLastError(rgHandles[0], hr, "Failed to create load init event.");
+
+    context.hWnd = hWnd;
+    context.hInstance = hInstance;
+    context.hInit = rgHandles[0];
+
+    rgHandles[1] = ::CreateThread(NULL, 0, DisplayThreadProc, reinterpret_cast<LPVOID>(&context), 0, pdwThreadId);
+    ExitOnNullWithLastError(rgHandles[1], hr, "Failed to create display thread.");
+
+    ::WaitForMultipleObjects(countof(rgHandles), rgHandles, FALSE, INFINITE);
+
+    *phThread = rgHandles[1];
+    rgHandles[1] = NULL;
+
+LExit:
+    ReleaseHandle(rgHandles[1]);
+    ReleaseHandle(rgHandles[0]);
+    return hr;
+}
+
+static DWORD WINAPI DisplayThreadProc(
+    __in LPVOID pvContext
+    )
+{
+    HRESULT hr = S_OK;
+
+    DISPLAY_THREAD_CONTEXT* pContext = static_cast<DISPLAY_THREAD_CONTEXT*>(pvContext);
+    HINSTANCE hInstance = pContext->hInstance;
+    HWND hwndParent = pContext->hWnd;
+
+    // We can signal the initialization event as soon as we have copied the context
+    // values into local variables.
+    ::SetEvent(pContext->hInit);
+
+    BOOL fComInitialized = FALSE;
+
+    HANDLE_THEME* pCurrentHandle = NULL;
+    ATOM atomWc = 0;
+    WNDCLASSW wc = { };
+    HWND hWnd = NULL;
+    RECT rc = { };
+    int x = CW_USEDEFAULT;
+    int y = CW_USEDEFAULT;
+
+    BOOL fRedoMsg = FALSE;
+    BOOL fRet = FALSE;
+    MSG msg = { };
+
+    BOOL fCreateIfNecessary = FALSE;
+
+    hr = ::CoInitialize(NULL);
+    ExitOnFailure(hr, "Failed to initialize COM on display thread.");
+    fComInitialized = TRUE;
+
+    // As long as the parent window is alive and kicking, keep this thread going (with or without a theme to display ).
+    while (::IsWindow(hwndParent))
+    {
+        if (pCurrentHandle && fCreateIfNecessary)
+        {
+            THEME* pTheme = pCurrentHandle->pTheme;
+
+            if (CW_USEDEFAULT == x && CW_USEDEFAULT == y && ::GetWindowRect(hwndParent, &rc))
+            {
+                x = rc.left;
+                y = rc.bottom + 20;
+            }
+
+            hr = ThemeCreateParentWindow(pTheme, 0, wc.lpszClassName, pTheme->sczCaption, pTheme->dwStyle, x, y, hwndParent, hInstance, pCurrentHandle, THEME_WINDOW_INITIAL_POSITION_DEFAULT, &hWnd);
+            ExitOnFailure(hr, "Failed to create display window.");
+
+            fCreateIfNecessary = FALSE;
+        }
+
+        // message pump
+        while (fRedoMsg || 0 != (fRet = ::GetMessageW(&msg, NULL, 0, 0)))
+        {
+            if (fRedoMsg)
+            {
+                fRedoMsg = FALSE;
+            }
+
+            if (-1 == fRet)
+            {
+                hr = E_UNEXPECTED;
+                ExitOnFailure(hr, "Unexpected return value from display message pump.");
+            }
+            else if (NULL == msg.hwnd) // Thread message.
+            {
+                if (WM_THMVWR_NEW_THEME == msg.message)
+                {
+                    // If there is already a handle, release it.
+                    if (pCurrentHandle)
+                    {
+                        DecrementHandleTheme(pCurrentHandle);
+                        pCurrentHandle = NULL;
+                    }
+
+                    // If the window was created, remember its window location before we destroy
+                    // it so so we can open the new window in the same place.
+                    if (::IsWindow(hWnd))
+                    {
+                        ::GetWindowRect(hWnd, &rc);
+                        x = rc.left;
+                        y = rc.top;
+
+                        ::DestroyWindow(hWnd); 
+                    }
+
+                    // If the display window class was registered, unregister it so we can
+                    // reuse the same window class name for the new theme.
+                    if (atomWc)
+                    {
+                        if (!::UnregisterClassW(reinterpret_cast<LPCWSTR>(atomWc), hInstance))
+                        {
+                            DWORD er = ::GetLastError();
+                            er = er;
+                        }
+
+                        atomWc = 0;
+                    }
+
+                    // If we were provided a new theme handle, create a new window class to
+                    // support it.
+                    pCurrentHandle = reinterpret_cast<HANDLE_THEME*>(msg.lParam);
+                    if (pCurrentHandle)
+                    {
+                        ThemeInitializeWindowClass(pCurrentHandle->pTheme, &wc, DisplayWndProc, hInstance, THMVWR_WINDOW_CLASS_DISPLAY);
+
+                        atomWc = ::RegisterClassW(&wc);
+                        if (!atomWc)
+                        {
+                            ExitWithLastError(hr, "Failed to register display window class.");
+                        }
+                    }
+                }
+                else if (WM_THMVWR_SHOWPAGE == msg.message)
+                {
+                    if (pCurrentHandle && ::IsWindow(hWnd) && pCurrentHandle->pTheme->hwndParent == hWnd)
+                    {
+                        DWORD dwPageId = static_cast<DWORD>(msg.lParam);
+                        int nCmdShow = static_cast<int>(msg.wParam);
+
+                        // First show/hide the controls not associated with a page.
+                        for (DWORD i = 0; i < pCurrentHandle->pTheme->cControls; ++i)
+                        {
+                            THEME_CONTROL* pControl = pCurrentHandle->pTheme->rgControls + i;
+                            if (!pControl->wPageId)
+                            {
+                                ThemeShowControl(pControl, nCmdShow);
+                            }
+                        }
+
+                        // If a page id was provided also, show/hide those controls
+                        if (dwPageId)
+                        {
+                            // Ignore error since we aren't using variables and it can only fail when using variables.
+                            ThemeShowPage(pCurrentHandle->pTheme, dwPageId, nCmdShow);
+                        }
+                    }
+                    else // display window isn't visible or it doesn't match the current handle.
+                    {
+                        // Keep the current message around to try again after we break out of this loop
+                        // and create the window.
+                        fRedoMsg = TRUE;
+                        fCreateIfNecessary = TRUE;
+                        break;
+                    }
+                }
+            }
+            else if (!ThemeHandleKeyboardMessage(pCurrentHandle->pTheme, hwndParent, &msg)) // Window message.
+            {
+                ::TranslateMessage(&msg);
+                ::DispatchMessageW(&msg);
+            }
+        }
+    }
+
+LExit:
+    if (::IsWindow(hWnd))
+    {
+        ::DestroyWindow(hWnd);
+    }
+
+    if (atomWc)
+    {
+        if (!::UnregisterClassW(THMVWR_WINDOW_CLASS_DISPLAY, hInstance))
+        {
+            DWORD er = ::GetLastError();
+            er = er;
+        }
+    }
+
+    DecrementHandleTheme(pCurrentHandle);
+
+    if (fComInitialized)
+    {
+        ::CoUninitialize();
+    }
+
+    return hr;
+}
+
+static LRESULT CALLBACK DisplayWndProc(
+    __in HWND hWnd,
+    __in UINT uMsg,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    )
+{
+    static DWORD dwProgress = 0;
+    HANDLE_THEME* pHandleTheme = reinterpret_cast<HANDLE_THEME*>(::GetWindowLongPtrW(hWnd, GWLP_USERDATA));
+
+    switch (uMsg)
+    {
+    case WM_NCCREATE:
+        {
+            LPCREATESTRUCT lpcs = reinterpret_cast<LPCREATESTRUCT>(lParam);
+            pHandleTheme = reinterpret_cast<HANDLE_THEME*>(lpcs->lpCreateParams);
+            IncrementHandleTheme(pHandleTheme);
+            ::SetWindowLongPtrW(hWnd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(pHandleTheme));
+        }
+        break;
+
+    case WM_TIMER:
+        if (!lParam && SUCCEEDED(ThemeSetProgressControl(reinterpret_cast<THEME_CONTROL*>(wParam), dwProgress)))
+        {
+            dwProgress += rand() % 10 + 1;
+            if (dwProgress > 100)
+            {
+                dwProgress = 0;
+            }
+
+            return 0;
+        }
+        break;
+
+    case WM_COMMAND:
+        {
+            WCHAR wzText[1024];
+            ::StringCchPrintfW(wzText, countof(wzText), L"Command %u\r\n", LOWORD(wParam));
+            OutputDebugStringW(wzText);
+            //::MessageBoxW(hWnd, wzText, L"Command fired", MB_OK);
+        }
+        break;
+
+    case WM_SYSCOMMAND:
+        {
+            WCHAR wzText[1024];
+            ::StringCchPrintfW(wzText, countof(wzText), L"SysCommand %u\r\n", LOWORD(wParam));
+            OutputDebugStringW(wzText);
+            //::MessageBoxW(hWnd, wzText, L"Command fired", MB_OK);
+        }
+        break;
+
+    case WM_NCDESTROY:
+        DecrementHandleTheme(pHandleTheme);
+        ::SetWindowLongPtrW(hWnd, GWLP_USERDATA, 0);
+        ::PostQuitMessage(0);
+        break;
+
+    case WM_THMUTIL_LOADED_CONTROL:
+        if (pHandleTheme)
+        {
+            return DisplayOnThmLoadedControl(pHandleTheme->pTheme, reinterpret_cast<THEME_LOADEDCONTROL_ARGS*>(wParam), reinterpret_cast<THEME_LOADEDCONTROL_RESULTS*>(lParam));
+        }
+    }
+
+    return ThemeDefWindowProc(pHandleTheme ? pHandleTheme->pTheme : NULL, hWnd, uMsg, wParam, lParam);
+}
+
+static BOOL DisplayOnThmLoadedControl(
+    __in THEME* pTheme,
+    __in const THEME_LOADEDCONTROL_ARGS* args,
+    __in THEME_LOADEDCONTROL_RESULTS* results
+    )
+{
+    HRESULT hr = S_OK;
+    const THEME_CONTROL* pControl = args->pThemeControl;
+
+    // Pre-populate some control types with data.
+    if (THEME_CONTROL_TYPE_RICHEDIT == pControl->type)
+    {
+        hr = WnduLoadRichEditFromResource(pControl->hWnd, MAKEINTRESOURCEA(THMVWR_RES_RICHEDIT_FILE), ::GetModuleHandleW(NULL));
+        ExitOnFailure(hr, "Failed to load richedit text.");
+    }
+    else if (THEME_CONTROL_TYPE_PROGRESSBAR == pControl->type)
+    {
+        UINT_PTR timerId = reinterpret_cast<UINT_PTR>(pControl);
+        UINT_PTR id = ::SetTimer(pTheme->hwndParent, timerId, 500, NULL);
+        id = id; // prevents warning in "ship" build.
+        Assert(id == timerId);
+    }
+
+LExit:
+    results->hr = hr;
+    return TRUE;
+}
diff --git a/src/tools/thmviewer/load.cpp b/src/tools/thmviewer/load.cpp
new file mode 100644
index 00000000..0267402a
--- /dev/null
+++ b/src/tools/thmviewer/load.cpp
@@ -0,0 +1,221 @@
+// Copyright (c) .NET 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"
+
+struct LOAD_THREAD_CONTEXT
+{
+    HWND hWnd;
+    LPCWSTR wzThemePath;
+    LPCWSTR wzWxlPath;
+
+    HANDLE hInit;
+};
+
+static DWORD WINAPI LoadThreadProc(
+    __in LPVOID pvContext
+    );
+
+
+extern "C" HRESULT LoadStart(
+    __in_z LPCWSTR wzThemePath,
+    __in_z_opt LPCWSTR wzWxlPath,
+    __in HWND hWnd,
+    __out HANDLE* phThread
+    )
+{
+    HRESULT hr = S_OK;
+    HANDLE rgHandles[2] = { };
+    LOAD_THREAD_CONTEXT context = { };
+
+    rgHandles[0] = ::CreateEventW(NULL, TRUE, FALSE, NULL);
+    ExitOnNullWithLastError(rgHandles[0], hr, "Failed to create load init event.");
+
+    context.hWnd = hWnd;
+    context.wzThemePath = wzThemePath;
+    context.wzWxlPath = wzWxlPath;
+    context.hInit = rgHandles[0];
+
+    rgHandles[1] = ::CreateThread(NULL, 0, LoadThreadProc, &context, 0, NULL);
+    ExitOnNullWithLastError(rgHandles[1], hr, "Failed to create load thread.");
+
+    ::WaitForMultipleObjects(countof(rgHandles), rgHandles, FALSE, INFINITE);
+
+    *phThread = rgHandles[1];
+    rgHandles[1] = NULL;
+
+LExit:
+    ReleaseHandle(rgHandles[1]);
+    ReleaseHandle(rgHandles[0]);
+    return hr;
+}
+
+
+static DWORD WINAPI LoadThreadProc(
+    __in LPVOID pvContext
+    )
+{
+    HRESULT hr = S_OK;
+    WIX_LOCALIZATION* pWixLoc = NULL;
+    LPWSTR sczThemePath = NULL;
+    LPWSTR sczWxlPath = NULL;
+    BOOL fComInitialized = FALSE;
+    HANDLE hDirectory = INVALID_HANDLE_VALUE;
+    LPWSTR sczDirectory = NULL;
+    LPWSTR wzFileName = NULL;
+
+    THEME* pTheme = NULL;
+    HANDLE_THEME* pHandle = NULL;
+
+    LOAD_THREAD_CONTEXT* pContext = static_cast<LOAD_THREAD_CONTEXT*>(pvContext);
+    HWND hWnd = pContext->hWnd;
+
+    hr = StrAllocString(&sczThemePath, pContext->wzThemePath, 0);
+    ExitOnFailure(hr, "Failed to copy path to initial theme file.");
+
+    if (pContext->wzWxlPath)
+    {
+        hr = StrAllocString(&sczWxlPath, pContext->wzWxlPath, 0);
+        ExitOnFailure(hr, "Failed to copy .wxl path to initial file.");
+    }
+
+    // We can signal the initialization event as soon as we have copied the context
+    // values into local variables.
+    ::SetEvent(pContext->hInit);
+
+    hr = ::CoInitialize(NULL);
+    ExitOnFailure(hr, "Failed to initialize COM on load thread.");
+    fComInitialized = TRUE;
+
+    // Open a handle to the directory so we can put a notification on it.
+    hr = PathGetDirectory(sczThemePath, &sczDirectory);
+    ExitOnFailure(hr, "Failed to get path directory.");
+
+    wzFileName = PathFile(sczThemePath);
+
+    hDirectory = ::CreateFileW(sczDirectory, FILE_LIST_DIRECTORY, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+    if (INVALID_HANDLE_VALUE == hDirectory)
+    {
+        ExitWithLastError(hr, "Failed to open directory: %ls", sczDirectory);
+    }
+
+    BOOL fUpdated = FALSE;
+    do
+    {
+        // Get the last modified time on the file we're loading for verification that the
+        // file actually gets changed down below.
+        FILETIME ftModified = { };
+        FileGetTime(sczThemePath, NULL, NULL, &ftModified);
+
+        ::SendMessageW(hWnd, WM_THMVWR_THEME_LOAD_BEGIN, 0, 0);
+
+        // Try to load the theme file.
+        hr = ThemeLoadFromFile(sczThemePath, &pTheme);
+        if (FAILED(hr))
+        {
+            ::SendMessageW(hWnd, WM_THMVWR_THEME_LOAD_ERROR, 0, hr);
+        }
+        else
+        {
+            if (sczWxlPath)
+            {
+                hr = LocLoadFromFile(sczWxlPath, &pWixLoc);
+                ExitOnFailure(hr, "Failed to load loc file from path: %ls", sczWxlPath);
+
+                hr = ThemeLocalize(pTheme, pWixLoc);
+                ExitOnFailure(hr, "Failed to localize theme: %ls", sczWxlPath);
+            }
+
+            hr = AllocHandleTheme(pTheme, &pHandle);
+            ExitOnFailure(hr, "Failed to allocate handle to theme");
+
+            ::SendMessageW(hWnd, WM_THMVWR_NEW_THEME, 0, reinterpret_cast<LPARAM>(pHandle));
+            pHandle = NULL;
+        }
+
+        fUpdated = FALSE;
+        do
+        {
+            DWORD rgbNotifications[1024];
+            DWORD cbRead = 0;
+            if (!::ReadDirectoryChangesW(hDirectory, rgbNotifications, sizeof(rgbNotifications), FALSE, FILE_NOTIFY_CHANGE_LAST_WRITE, &cbRead, NULL, NULL))
+            {
+                ExitWithLastError(hr, "Failed while watching directory: %ls", sczDirectory);
+            }
+
+            // Wait for half a second to let all the file handles get closed to minimize access
+            // denied errors.
+            ::Sleep(500);
+
+            FILE_NOTIFY_INFORMATION* pNotification = reinterpret_cast<FILE_NOTIFY_INFORMATION*>(rgbNotifications);
+            while (pNotification)
+            {
+                // If our file was updated, check to see if the modified time really changed. The notifications
+                // are often trigger happy thinking the file changed two or three times in a row. Maybe it's AV
+                // software creating the problems but actually checking the modified date works well.
+                if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, pNotification->FileName, pNotification->FileNameLength / sizeof(WCHAR), wzFileName, -1))
+                {
+                    FILETIME ft = { };
+                    FileGetTime(sczThemePath, NULL, NULL, &ft);
+
+                    fUpdated = (ftModified.dwHighDateTime < ft.dwHighDateTime) || (ftModified.dwHighDateTime == ft.dwHighDateTime && ftModified.dwLowDateTime < ft.dwLowDateTime);
+                    break;
+                }
+
+                pNotification = pNotification->NextEntryOffset ? reinterpret_cast<FILE_NOTIFY_INFORMATION*>(reinterpret_cast<BYTE*>(pNotification) + pNotification->NextEntryOffset) : NULL;
+            }
+        } while (!fUpdated);
+    } while(fUpdated);
+
+LExit:
+    if (fComInitialized)
+    {
+        ::CoUninitialize();
+    }
+
+    LocFree(pWixLoc);
+    ReleaseFileHandle(hDirectory);
+    ReleaseStr(sczDirectory);
+    ReleaseStr(sczThemePath);
+    ReleaseStr(sczWxlPath);
+    return hr;
+}
+
+extern "C" HRESULT AllocHandleTheme(
+    __in THEME* pTheme,
+    __out HANDLE_THEME** ppHandle
+    )
+{
+    HRESULT hr = S_OK;
+    HANDLE_THEME* pHandle = NULL;
+
+    pHandle = static_cast<HANDLE_THEME*>(MemAlloc(sizeof(HANDLE_THEME), TRUE));
+    ExitOnNull(pHandle, hr, E_OUTOFMEMORY, "Failed to allocate theme handle.");
+
+    pHandle->cReferences = 1;
+    pHandle->pTheme = pTheme;
+
+    *ppHandle = pHandle;
+    pHandle = NULL;
+
+LExit:
+    ReleaseMem(pHandle);
+    return hr;
+}
+
+extern "C" void IncrementHandleTheme(
+    __in HANDLE_THEME* pHandle
+    )
+{
+    ::InterlockedIncrement(reinterpret_cast<LONG*>(&pHandle->cReferences));
+}
+
+extern "C"  void DecrementHandleTheme(
+    __in HANDLE_THEME* pHandle
+    )
+{
+    if (pHandle && 0 == ::InterlockedDecrement(reinterpret_cast<LONG*>(&pHandle->cReferences)))
+    {
+        ThemeFree(pHandle->pTheme);
+        MemFree(pHandle);
+    }
+}
diff --git a/src/tools/thmviewer/precomp.cpp b/src/tools/thmviewer/precomp.cpp
new file mode 100644
index 00000000..37664a1c
--- /dev/null
+++ b/src/tools/thmviewer/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/tools/thmviewer/precomp.h b/src/tools/thmviewer/precomp.h
new file mode 100644
index 00000000..762a0623
--- /dev/null
+++ b/src/tools/thmviewer/precomp.h
@@ -0,0 +1,72 @@
+#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 <objbase.h>
+#include <shlobj.h>
+#include <shlwapi.h>
+#include <stdlib.h>
+#include <strsafe.h>
+
+#pragma warning(push)
+#pragma warning(disable:4458)
+#include <gdiplus.h>
+#pragma warning(pop)
+
+#include "dutil.h"
+#include "apputil.h"
+#include "memutil.h"
+#include "dictutil.h"
+#include "dirutil.h"
+#include "fileutil.h"
+#include "locutil.h"
+#include "logutil.h"
+#include "pathutil.h"
+#include "resrutil.h"
+#include "shelutil.h"
+#include "strutil.h"
+#include "thmutil.h"
+#include "wndutil.h"
+
+#include "resource.h"
+
+struct HANDLE_THEME
+{
+    DWORD cReferences;
+    THEME* pTheme;
+};
+
+enum WM_THMVWR
+{
+    WM_THMVWR_SHOWPAGE = WM_APP,
+    WM_THMVWR_PARSE_FILE,
+    WM_THMVWR_NEW_THEME,
+    WM_THMVWR_THEME_LOAD_ERROR,
+    WM_THMVWR_THEME_LOAD_BEGIN,
+};
+
+extern "C" HRESULT DisplayStart(
+    __in HINSTANCE hInstance,
+    __in HWND hWnd,
+    __out HANDLE *phThread,
+    __out DWORD* pdwThreadId
+    );
+extern "C" HRESULT LoadStart(
+    __in_z LPCWSTR wzThemePath,
+    __in_z LPCWSTR wzWxlPath,
+    __in HWND hWnd,
+    __out HANDLE* phThread
+    );
+
+extern "C" HRESULT AllocHandleTheme(
+    __in THEME* pTheme,
+    __out HANDLE_THEME** ppHandle
+    );
+extern "C" void IncrementHandleTheme(
+    __in HANDLE_THEME* pHandle
+    );
+extern "C" void DecrementHandleTheme(
+    __in HANDLE_THEME* pHandle
+    );
diff --git a/src/tools/thmviewer/resource.h b/src/tools/thmviewer/resource.h
new file mode 100644
index 00000000..4acc32cc
--- /dev/null
+++ b/src/tools/thmviewer/resource.h
@@ -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.
+
+#define IDC_STATIC                      -1
+#define THMVWR_RES_THEME_FILE            1
+#define THMVWR_RES_RICHEDIT_FILE         2
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        102
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1003
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/src/tools/thmviewer/thmviewer.cpp b/src/tools/thmviewer/thmviewer.cpp
new file mode 100644
index 00000000..38f3c4dc
--- /dev/null
+++ b/src/tools/thmviewer/thmviewer.cpp
@@ -0,0 +1,564 @@
+// Copyright (c) .NET 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"
+
+static const LPCWSTR THMVWR_WINDOW_CLASS_MAIN = L"ThmViewerMain";
+
+static THEME* vpTheme = NULL;
+static DWORD vdwDisplayThreadId = 0;
+static LPWSTR vsczThemeLoadErrors = NULL;
+
+enum THMVWR_CONTROL
+{
+    // Non-paged controls
+    THMVWR_CONTROL_TREE = THEME_FIRST_ASSIGN_CONTROL_ID,
+};
+
+// Internal functions
+
+static HRESULT ProcessCommandLine(
+    __in_z_opt LPCWSTR wzCommandLine,
+    __out_z LPWSTR* psczThemeFile,
+    __out_z LPWSTR* psczWxlFile
+    );
+static HRESULT CreateTheme(
+    __in HINSTANCE hInstance,
+    __out THEME** ppTheme
+    );
+static HRESULT CreateMainWindowClass(
+    __in HINSTANCE hInstance,
+    __in THEME* pTheme,
+    __out ATOM* pAtom
+    );
+static LRESULT CALLBACK MainWndProc(
+    __in HWND hWnd,
+    __in UINT uMsg,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    );
+static void OnThemeLoadBegin(
+    __in_z_opt LPWSTR sczThemeLoadErrors
+    );
+static void OnThemeLoadError(
+    __in THEME* pTheme,
+    __in HRESULT hrFailure
+    );
+static void OnNewTheme(
+    __in THEME* pTheme,
+    __in HWND hWnd,
+    __in HANDLE_THEME* pHandle
+    );
+static BOOL OnThemeLoadingControl(
+    __in const THEME_LOADINGCONTROL_ARGS* pArgs,
+    __in THEME_LOADINGCONTROL_RESULTS* pResults
+    );
+static BOOL OnThemeControlWmNotify(
+    __in const THEME_CONTROLWMNOTIFY_ARGS* pArgs,
+    __in THEME_CONTROLWMNOTIFY_RESULTS* pResults
+    );
+static void CALLBACK ThmviewerTraceError(
+    __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
+    );
+
+
+int WINAPI wWinMain(
+    __in HINSTANCE hInstance,
+    __in_opt HINSTANCE /* hPrevInstance */,
+    __in_z LPWSTR lpCmdLine,
+    __in int /*nCmdShow*/
+    )
+{
+    ::HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0);
+
+    HRESULT hr = S_OK;
+    BOOL fComInitialized = FALSE;
+    LPWSTR sczThemeFile = NULL;
+    LPWSTR sczWxlFile = NULL;
+    ATOM atom = 0;
+    HWND hWnd = NULL;
+
+    HANDLE hDisplayThread = NULL;
+    HANDLE hLoadThread = NULL;
+
+    BOOL fRet = FALSE;
+    MSG msg = { };
+
+    hr = ::CoInitialize(NULL);
+    ExitOnFailure(hr, "Failed to initialize COM.");
+    fComInitialized = TRUE;
+
+    DutilInitialize(&ThmviewerTraceError);
+
+    hr = ProcessCommandLine(lpCmdLine, &sczThemeFile, &sczWxlFile);
+    ExitOnFailure(hr, "Failed to process command line.");
+
+    hr = CreateTheme(hInstance, &vpTheme);
+    ExitOnFailure(hr, "Failed to create theme.");
+
+    hr = CreateMainWindowClass(hInstance, vpTheme, &atom);
+    ExitOnFailure(hr, "Failed to create main window.");
+
+    hr = ThemeCreateParentWindow(vpTheme, 0, reinterpret_cast<LPCWSTR>(atom), vpTheme->sczCaption, vpTheme->dwStyle, CW_USEDEFAULT, CW_USEDEFAULT, HWND_DESKTOP, hInstance, NULL, THEME_WINDOW_INITIAL_POSITION_DEFAULT, &hWnd);
+    ExitOnFailure(hr, "Failed to create window.");
+
+    if (!sczThemeFile)
+    {
+        // Prompt for a path to the theme file.
+        OPENFILENAMEW ofn = { };
+        WCHAR wzFile[MAX_PATH] = { };
+
+        ofn.lStructSize = sizeof(ofn);
+        ofn.hwndOwner = hWnd;
+        ofn.lpstrFile = wzFile;
+        ofn.nMaxFile = countof(wzFile);
+        ofn.lpstrFilter = L"Theme Files (*.thm)\0*.thm\0XML Files (*.xml)\0*.xml\0All Files (*.*)\0*.*\0";
+        ofn.nFilterIndex = 1;
+        ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
+        ofn.lpstrTitle = vpTheme->sczCaption;
+
+        if (::GetOpenFileNameW(&ofn))
+        {
+            hr = StrAllocString(&sczThemeFile, wzFile, 0);
+            ExitOnFailure(hr, "Failed to copy opened file to theme file.");
+        }
+        else
+        {
+            ::MessageBoxW(hWnd, L"Must specify a path to theme file.", vpTheme->sczCaption, MB_OK | MB_ICONERROR);
+            ExitFunction1(hr = E_INVALIDARG);
+        }
+    }
+
+    hr = DisplayStart(hInstance, hWnd, &hDisplayThread, &vdwDisplayThreadId);
+    ExitOnFailure(hr, "Failed to start display.");
+
+    hr = LoadStart(sczThemeFile, sczWxlFile, hWnd, &hLoadThread);
+    ExitOnFailure(hr, "Failed to start load.");
+
+    // message pump
+    while (0 != (fRet = ::GetMessageW(&msg, NULL, 0, 0)))
+    {
+        if (-1 == fRet)
+        {
+            hr = E_UNEXPECTED;
+            ExitOnFailure(hr, "Unexpected return value from message pump.");
+        }
+        else if (!ThemeHandleKeyboardMessage(vpTheme, msg.hwnd, &msg))
+        {
+            ::TranslateMessage(&msg);
+            ::DispatchMessageW(&msg);
+        }
+    }
+
+LExit:
+    if (::IsWindow(hWnd))
+    {
+        ::DestroyWindow(hWnd);
+    }
+
+    if (hDisplayThread)
+    {
+        ::PostThreadMessageW(vdwDisplayThreadId, WM_QUIT, 0, 0);
+        ::WaitForSingleObject(hDisplayThread, 10000);
+        ::CloseHandle(hDisplayThread);
+    }
+
+    // TODO: come up with a good way to kill the load thread, probably need to switch
+    // the ReadDirectoryW() to overlapped mode.
+    ReleaseHandle(hLoadThread);
+
+    if (atom && !::UnregisterClassW(reinterpret_cast<LPCWSTR>(atom), hInstance))
+    {
+        DWORD er = ::GetLastError();
+        er = er;
+    }
+
+    ThemeFree(vpTheme);
+    ThemeUninitialize();
+    DutilUninitialize();
+
+    // uninitialize COM
+    if (fComInitialized)
+    {
+        ::CoUninitialize();
+    }
+
+    ReleaseNullStr(vsczThemeLoadErrors);
+    ReleaseStr(sczThemeFile);
+    ReleaseStr(sczWxlFile);
+    return hr;
+}
+
+static void CALLBACK ThmviewerTraceError(
+    __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
+    )
+{
+    HRESULT hr = S_OK;
+    LPSTR sczFormattedAnsi = NULL;
+    LPWSTR sczMessage = NULL;
+
+    if (DUTIL_SOURCE_THMUTIL != source)
+    {
+        ExitFunction();
+    }
+
+    hr = StrAnsiAllocFormattedArgs(&sczFormattedAnsi, szFormat, args);
+    ExitOnFailure(hr, "Failed to format error log string.");
+
+    hr = StrAllocFormatted(&sczMessage, L"Error 0x%08x: %S\r\n", hrError, sczFormattedAnsi);
+    ExitOnFailure(hr, "Failed to prepend error number to error log string.");
+
+    hr = StrAllocConcat(&vsczThemeLoadErrors, sczMessage, 0);
+    ExitOnFailure(hr, "Failed to append theme load error.");
+
+LExit:
+    ReleaseStr(sczFormattedAnsi);
+    ReleaseStr(sczMessage);
+}
+
+
+//
+// ProcessCommandLine - process the provided command line arguments.
+//
+static HRESULT ProcessCommandLine(
+    __in_z_opt LPCWSTR wzCommandLine,
+    __out_z LPWSTR* psczThemeFile,
+    __out_z LPWSTR* psczWxlFile
+    )
+{
+    HRESULT hr = S_OK;
+    int argc = 0;
+    LPWSTR* argv = NULL;
+
+    if (wzCommandLine && *wzCommandLine)
+    {
+        hr = AppParseCommandLine(wzCommandLine, &argc, &argv);
+        ExitOnFailure(hr, "Failed to parse command line.");
+
+        for (int i = 0; i < argc; ++i)
+        {
+            if (argv[i][0] == L'-' || argv[i][0] == L'/')
+            {
+                if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &argv[i][1], -1, L"lang", -1))
+                {
+                    if (i + 1 >= argc)
+                    {
+                        ExitOnRootFailure(hr = E_INVALIDARG, "Must specify a language.");
+                    }
+
+                    ++i;
+                }
+            }
+            else
+            {
+                LPCWSTR wzExtension = PathExtension(argv[i]);
+                if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, wzExtension, -1, L".wxl", -1))
+                {
+                    hr = StrAllocString(psczWxlFile, argv[i], 0);
+                }
+                else
+                {
+                    hr = StrAllocString(psczThemeFile, argv[i], 0);
+                }
+                ExitOnFailure(hr, "Failed to copy path to file.");
+            }
+        }
+    }
+
+LExit:
+    if (argv)
+    {
+        AppFreeCommandLineArgs(argv);
+    }
+
+    return hr;
+}
+
+static HRESULT CreateTheme(
+    __in HINSTANCE hInstance,
+    __out THEME** ppTheme
+    )
+{
+    HRESULT hr = S_OK;
+
+    hr = ThemeInitialize(hInstance);
+    ExitOnFailure(hr, "Failed to initialize theme manager.");
+
+    hr = ThemeLoadFromResource(hInstance, MAKEINTRESOURCEA(THMVWR_RES_THEME_FILE), ppTheme);
+    ExitOnFailure(hr, "Failed to load theme from thmviewer.thm.");
+
+LExit:
+    return hr;
+}
+
+static HRESULT CreateMainWindowClass(
+    __in HINSTANCE hInstance,
+    __in THEME* pTheme,
+    __out ATOM* pAtom
+    )
+{
+    HRESULT hr = S_OK;
+    ATOM atom = 0;
+    WNDCLASSW wc = { };
+
+    ThemeInitializeWindowClass(pTheme, &wc, MainWndProc, hInstance, THMVWR_WINDOW_CLASS_MAIN);
+
+    atom = ::RegisterClassW(&wc);
+    if (!atom)
+    {
+        ExitWithLastError(hr, "Failed to register main windowclass .");
+    }
+
+    *pAtom = atom;
+
+LExit:
+    return hr;
+}
+
+static LRESULT CALLBACK MainWndProc(
+    __in HWND hWnd,
+    __in UINT uMsg,
+    __in WPARAM wParam,
+    __in LPARAM lParam
+    )
+{
+    HANDLE_THEME* pHandleTheme = reinterpret_cast<HANDLE_THEME*>(::GetWindowLongPtrW(hWnd, GWLP_USERDATA));
+
+    switch (uMsg)
+    {
+    case WM_NCCREATE:
+        {
+        //LPCREATESTRUCT lpcs = reinterpret_cast<LPCREATESTRUCT>(lParam);
+        //pBA = reinterpret_cast<CWixStandardBootstrapperApplication*>(lpcs->lpCreateParams);
+        //::SetWindowLongPtrW(hWnd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(pBA));
+        }
+        break;
+
+    case WM_NCDESTROY:
+        DecrementHandleTheme(pHandleTheme);
+        ::SetWindowLongPtrW(hWnd, GWLP_USERDATA, 0);
+        ::PostQuitMessage(0);
+        break;
+
+    case WM_THMVWR_THEME_LOAD_BEGIN:
+        OnThemeLoadBegin(vsczThemeLoadErrors);
+        return 0;
+
+    case WM_THMVWR_THEME_LOAD_ERROR:
+        OnThemeLoadError(vpTheme, lParam);
+        return 0;
+
+    case WM_THMVWR_NEW_THEME:
+        OnNewTheme(vpTheme, hWnd, reinterpret_cast<HANDLE_THEME*>(lParam));
+        return 0;
+
+    case WM_THMUTIL_LOADING_CONTROL:
+        return OnThemeLoadingControl(reinterpret_cast<THEME_LOADINGCONTROL_ARGS*>(wParam), reinterpret_cast<THEME_LOADINGCONTROL_RESULTS*>(lParam));
+
+    case WM_THMUTIL_CONTROL_WM_NOTIFY:
+        return OnThemeControlWmNotify(reinterpret_cast<THEME_CONTROLWMNOTIFY_ARGS*>(wParam), reinterpret_cast<THEME_CONTROLWMNOTIFY_RESULTS*>(lParam));
+    }
+
+    return ThemeDefWindowProc(vpTheme, hWnd, uMsg, wParam, lParam);
+}
+
+static void OnThemeLoadBegin(
+    __in_z_opt LPWSTR sczThemeLoadErrors
+    )
+{
+    ReleaseNullStr(sczThemeLoadErrors);
+}
+
+static void OnThemeLoadError(
+    __in THEME* pTheme,
+    __in HRESULT hrFailure
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczMessage = NULL;
+    LPWSTR* psczErrors = NULL;
+    UINT cErrors = 0;
+    TVINSERTSTRUCTW tvi = { };
+    const THEME_CONTROL* pTreeControl = NULL;
+
+    if (!ThemeControlExistsById(pTheme, THMVWR_CONTROL_TREE, &pTreeControl))
+    {
+        ExitWithRootFailure(hr, E_INVALIDSTATE, "THMVWR_CONTROL_TREE control doesn't exist.");
+    }
+
+    // Add the application node.
+    tvi.hParent = NULL;
+    tvi.hInsertAfter = TVI_ROOT;
+    tvi.item.mask = TVIF_TEXT | TVIF_PARAM;
+    tvi.item.lParam = 0;
+    tvi.item.pszText = L"Failed to load theme.";
+    tvi.hParent = reinterpret_cast<HTREEITEM>(::SendMessage(pTreeControl->hWnd, TVM_INSERTITEMW, 0, reinterpret_cast<LPARAM>(&tvi)));
+
+    if (!vsczThemeLoadErrors)
+    {
+        hr = StrAllocFormatted(&sczMessage, L"Error 0x%08x.", hrFailure);
+        ExitOnFailure(hr, "Failed to format error message.");
+
+        tvi.item.pszText = sczMessage;
+        ::SendMessage(pTreeControl->hWnd, TVM_INSERTITEMW, 0, reinterpret_cast<LPARAM>(&tvi));
+
+        hr = StrAllocFromError(&sczMessage, hrFailure, NULL);
+        ExitOnFailure(hr, "Failed to format error message text.");
+
+        tvi.item.pszText = sczMessage;
+        ::SendMessage(pTreeControl->hWnd, TVM_INSERTITEMW, 0, reinterpret_cast<LPARAM>(&tvi));
+    }
+    else
+    {
+        hr = StrSplitAllocArray(&psczErrors, &cErrors, vsczThemeLoadErrors, L"\r\n");
+        ExitOnFailure(hr, "Failed to split theme load errors.");
+
+        for (DWORD i = 0; i < cErrors; ++i)
+        {
+            tvi.item.pszText = psczErrors[i];
+            ::SendMessage(pTreeControl->hWnd, TVM_INSERTITEMW, 0, reinterpret_cast<LPARAM>(&tvi));
+        }
+    }
+
+    ::SendMessage(pTreeControl->hWnd, TVM_EXPAND, TVE_EXPAND, reinterpret_cast<LPARAM>(tvi.hParent));
+
+LExit:
+    ReleaseStr(sczMessage);
+    ReleaseMem(psczErrors);
+}
+
+
+static void OnNewTheme(
+    __in THEME* pTheme,
+    __in HWND hWnd,
+    __in HANDLE_THEME* pHandle
+    )
+{
+    const THEME_CONTROL* pTreeControl = NULL;
+    HANDLE_THEME* pOldHandle = reinterpret_cast<HANDLE_THEME*>(::GetWindowLongPtrW(hWnd, GWLP_USERDATA));
+    THEME* pNewTheme = pHandle->pTheme;
+
+    WCHAR wzSelectedPage[MAX_PATH] = { };
+    HTREEITEM htiSelected = NULL;
+    TVINSERTSTRUCTW tvi = { };
+    TVITEMW item = { };
+
+    if (pOldHandle)
+    {
+        DecrementHandleTheme(pOldHandle);
+        pOldHandle = NULL;
+    }
+
+    // Pass the new theme handle to the display thread so it can get the display window prepared
+    // to show the new theme.
+    IncrementHandleTheme(pHandle);
+    ::PostThreadMessageW(vdwDisplayThreadId, WM_THMVWR_NEW_THEME, 0, reinterpret_cast<LPARAM>(pHandle));
+
+    ::SetWindowLongPtrW(hWnd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(pHandle));
+
+    if (!ThemeControlExistsById(pTheme, THMVWR_CONTROL_TREE, &pTreeControl))
+    {
+        TraceError(E_INVALIDSTATE, "Tree control doesn't exist.");
+        return;
+    }
+
+    // Remember the currently selected item by name so we can try to automatically select it later.
+    // Otherwise, the user would see their window destroyed after every save of their theme file and
+    // have to click to get the window back.
+    item.mask = TVIF_TEXT;
+    item.pszText = wzSelectedPage;
+    item.cchTextMax = countof(wzSelectedPage);
+    item.hItem = reinterpret_cast<HTREEITEM>(::SendMessage(pTreeControl->hWnd, TVM_GETNEXTITEM, TVGN_CARET, NULL));
+    ::SendMessage(pTreeControl->hWnd, TVM_GETITEM, 0, reinterpret_cast<LPARAM>(&item));
+
+    // Remove the previous items in the tree.
+    ::SendMessage(pTreeControl->hWnd, TVM_DELETEITEM, 0, reinterpret_cast<LPARAM>(TVI_ROOT));
+
+    // Add the application node.
+    tvi.hParent = NULL;
+    tvi.hInsertAfter = TVI_ROOT;
+    tvi.item.mask = TVIF_TEXT | TVIF_PARAM;
+    tvi.item.lParam = 0;
+    tvi.item.pszText = pHandle && pHandle->pTheme && pHandle->pTheme->sczCaption ? pHandle->pTheme->sczCaption : L"Window";
+
+    // Add the pages.
+    tvi.hParent = reinterpret_cast<HTREEITEM>(::SendMessage(pTreeControl->hWnd, TVM_INSERTITEMW, 0, reinterpret_cast<LPARAM>(&tvi)));
+    tvi.hInsertAfter = TVI_SORT;
+    for (DWORD i = 0; i < pNewTheme->cPages; ++i)
+    {
+        THEME_PAGE* pPage = pNewTheme->rgPages + i;
+        if (pPage->sczName && *pPage->sczName)
+        {
+            tvi.item.pszText = pPage->sczName;
+            tvi.item.lParam = i + 1; //prgdwPageIds[i]; - TODO: do the right thing here by calling ThemeGetPageIds(), should not assume we know how the page ids will be calculated.
+
+            HTREEITEM hti = reinterpret_cast<HTREEITEM>(::SendMessage(pTreeControl->hWnd, TVM_INSERTITEMW, 0, reinterpret_cast<LPARAM>(&tvi)));
+            if (*wzSelectedPage && CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, pPage->sczName, -1, wzSelectedPage, -1))
+            {
+                htiSelected = hti;
+            }
+        }
+    }
+
+    if (*wzSelectedPage && CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, L"Application", -1, wzSelectedPage, -1))
+    {
+        htiSelected = tvi.hParent;
+    }
+
+    ::SendMessage(pTreeControl->hWnd, TVM_EXPAND, TVE_EXPAND, reinterpret_cast<LPARAM>(tvi.hParent));
+    if (htiSelected)
+    {
+        ::SendMessage(pTreeControl->hWnd, TVM_SELECTITEM, TVGN_CARET, reinterpret_cast<LPARAM>(htiSelected));
+    }
+}
+
+static BOOL OnThemeLoadingControl(
+    __in const THEME_LOADINGCONTROL_ARGS* pArgs,
+    __in THEME_LOADINGCONTROL_RESULTS* pResults
+    )
+{
+    if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, pArgs->pThemeControl->sczName, -1, L"Tree", -1))
+    {
+        pResults->wId = THMVWR_CONTROL_TREE;
+    }
+
+    pResults->hr = S_OK;
+    return TRUE;
+}
+
+static BOOL OnThemeControlWmNotify(
+    __in const THEME_CONTROLWMNOTIFY_ARGS* pArgs,
+    __in THEME_CONTROLWMNOTIFY_RESULTS* /*pResults*/
+    )
+{
+    BOOL fProcessed = FALSE;
+
+    switch (pArgs->lParam->code)
+    {
+    case TVN_SELCHANGEDW:
+        switch (pArgs->pThemeControl->wId)
+        {
+        case THMVWR_CONTROL_TREE:
+            NMTREEVIEWW* ptv = reinterpret_cast<NMTREEVIEWW*>(pArgs->lParam);
+            ::PostThreadMessageW(vdwDisplayThreadId, WM_THMVWR_SHOWPAGE, SW_HIDE, ptv->itemOld.lParam);
+            ::PostThreadMessageW(vdwDisplayThreadId, WM_THMVWR_SHOWPAGE, SW_SHOW, ptv->itemNew.lParam);
+
+            fProcessed = TRUE;
+            break;
+        }
+        break;
+    }
+
+    return fProcessed;
+}
diff --git a/src/tools/thmviewer/thmviewer.manifest b/src/tools/thmviewer/thmviewer.manifest
new file mode 100644
index 00000000..4663b61c
--- /dev/null
+++ b/src/tools/thmviewer/thmviewer.manifest
@@ -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. -->
+
+
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <assemblyIdentity name="thmviewer.exe" version="1.0.0.0" processorArchitecture="x86" type="win32"/>
+ <description>WiX Toolset Theme Viewer</description>
+ <dependency><dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*" /></dependentAssembly></dependency>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"><application><supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/></application></compatibility>
+ <application xmlns="urn:schemas-microsoft-com:asm.v3">
+   <windowsSettings xmlns="urn:schemas-microsoft-com:asm.v3">
+     <!-- pre-Win10 1607 -->
+     <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/pm</dpiAware>
+     <!-- Win10 picks the first one it recognizes -->
+     <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor, System</dpiAwareness>
+   </windowsSettings>
+ </application>
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"><security><requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false"/></requestedPrivileges></security></trustInfo>
+</assembly>
diff --git a/src/tools/thmviewer/thmviewer.rc b/src/tools/thmviewer/thmviewer.rc
new file mode 100644
index 00000000..dc6d7242
--- /dev/null
+++ b/src/tools/thmviewer/thmviewer.rc
@@ -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 <winver.h>
+#include <windows.h>
+#include "resource.h"
+
+//#define MANIFEST_RESOURCE_ID 1
+//MANIFEST_RESOURCE_ID RT_MANIFEST "thmviewer.manifest"
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+THMVWR_RES_THEME_FILE RCDATA "Resources\\thm.xml"
+THMVWR_RES_RICHEDIT_FILE RCDATA "Resources\\LoremIpsum.rtf"
diff --git a/src/tools/thmviewer/thmviewer.v3.ncrunchproject b/src/tools/thmviewer/thmviewer.v3.ncrunchproject
new file mode 100644
index 00000000..3cffd6ce
--- /dev/null
+++ b/src/tools/thmviewer/thmviewer.v3.ncrunchproject
@@ -0,0 +1,7 @@
+<ProjectConfiguration>
+  <Settings>
+    <AdditionalFilesToIncludeForProject>
+      <Value>thmviewer.manifest</Value>
+    </AdditionalFilesToIncludeForProject>
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/src/tools/thmviewer/thmviewer.vcxproj b/src/tools/thmviewer/thmviewer.vcxproj
new file mode 100644
index 00000000..3fd87878
--- /dev/null
+++ b/src/tools/thmviewer/thmviewer.vcxproj
@@ -0,0 +1,69 @@
+<?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>
+  </ItemGroup>
+
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{95228C13-97F5-484A-B4A2-ECF4618B0881}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <Description>WiX Toolset Theme Viewer</Description>
+  </PropertyGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+
+  <PropertyGroup>
+    <ProjectAdditionalLinkLibraries>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib</ProjectAdditionalLinkLibraries>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ClCompile Include="display.cpp" />
+    <ClCompile Include="load.cpp" />
+    <ClCompile Include="precomp.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="thmviewer.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="precomp.h" />
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="Resources\LoremIpsum.rtf" />
+    <None Include="Resources\thm.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="thmviewer.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="thmviewer.manifest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.DUtil" />
+
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
diff --git a/src/tools/thmviewer/thmviewer.vcxproj.filters b/src/tools/thmviewer/thmviewer.vcxproj.filters
new file mode 100644
index 00000000..488d5510
--- /dev/null
+++ b/src/tools/thmviewer/thmviewer.vcxproj.filters
@@ -0,0 +1,56 @@
+<?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</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="thmviewer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="display.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="load.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="precomp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\thm.xml">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="Resources\LoremIpsum.rtf">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="precomp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="thmviewer.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="thmviewer.manifest" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/tools/tools.cmd b/src/tools/tools.cmd
new file mode 100644
index 00000000..4764a8fe
--- /dev/null
+++ b/src/tools/tools.cmd
@@ -0,0 +1,18 @@
+@setlocal
+@pushd %~dp0
+
+@set _C=Debug
+:parse_args
+@if /i "%1"=="release" set _C=Release
+@if not "%1"=="" shift & goto parse_args
+
+@echo Building tools %_C%
+
+:: tools
+
+nuget restore || exit /b
+
+msbuild -t:Build -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\tools_build.binlog || exit /b
+
+@popd
+@endlocal
diff --git a/src/tools/tools.sln b/src/tools/tools.sln
new file mode 100644
index 00000000..4da1e8fd
--- /dev/null
+++ b/src/tools/tools.sln
@@ -0,0 +1,40 @@
+
+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}") = "thmviewer", "thmviewer\thmviewer.vcxproj", "{95228C13-97F5-484A-B4A2-ECF4618B0881}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Templates", "WixToolset.Templates\WixToolset.Templates.csproj", "{D1385232-CA10-4092-BAB5-4E5499FE144C}"
+EndProject
+Global
+        GlobalSection(SolutionConfigurationPlatforms) = preSolution
+                Debug|Any CPU = Debug|Any CPU
+                Debug|x86 = Debug|x86
+                Release|Any CPU = Release|Any CPU
+                Release|x86 = Release|x86
+        EndGlobalSection
+        GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                {95228C13-97F5-484A-B4A2-ECF4618B0881}.Debug|Any CPU.ActiveCfg = Debug|Win32
+                {95228C13-97F5-484A-B4A2-ECF4618B0881}.Debug|Any CPU.Build.0 = Debug|Win32
+                {95228C13-97F5-484A-B4A2-ECF4618B0881}.Debug|x86.ActiveCfg = Debug|Win32
+                {95228C13-97F5-484A-B4A2-ECF4618B0881}.Debug|x86.Build.0 = Debug|Win32
+                {95228C13-97F5-484A-B4A2-ECF4618B0881}.Release|Any CPU.ActiveCfg = Release|Win32
+                {95228C13-97F5-484A-B4A2-ECF4618B0881}.Release|x86.ActiveCfg = Release|Win32
+                {95228C13-97F5-484A-B4A2-ECF4618B0881}.Release|x86.Build.0 = Release|Win32
+                {D1385232-CA10-4092-BAB5-4E5499FE144C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {D1385232-CA10-4092-BAB5-4E5499FE144C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {D1385232-CA10-4092-BAB5-4E5499FE144C}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {D1385232-CA10-4092-BAB5-4E5499FE144C}.Debug|x86.Build.0 = Debug|Any CPU
+                {D1385232-CA10-4092-BAB5-4E5499FE144C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {D1385232-CA10-4092-BAB5-4E5499FE144C}.Release|Any CPU.Build.0 = Release|Any CPU
+                {D1385232-CA10-4092-BAB5-4E5499FE144C}.Release|x86.ActiveCfg = Release|Any CPU
+                {D1385232-CA10-4092-BAB5-4E5499FE144C}.Release|x86.Build.0 = Release|Any CPU
+        EndGlobalSection
+        GlobalSection(SolutionProperties) = preSolution
+                HideSolutionNode = FALSE
+        EndGlobalSection
+        GlobalSection(ExtensibilityGlobals) = postSolution
+                SolutionGuid = {537F1116-39FE-4AED-A9A2-35030E5750D5}
+        EndGlobalSection
+EndGlobal