Fix source path and cabinet processing

33 files changed, 352 insertions, 932 deletions

diff --git a/src/WixToolset.Core.Burn/Bundles/BurnReader.cs b/src/WixToolset.Core.Burn/Bundles/BurnReader.cs
index 261ef7b4..3b3076c4 100644
--- a/src/WixToolset.Core.Burn/Bundles/BurnReader.cs
+++ b/src/WixToolset.Core.Burn/Bundles/BurnReader.cs
@@ -7,7 +7,7 @@ namespace WixToolset.Core.Burn.Bundles
     using System.Collections.Generic;
     using System.IO;
     using System.Xml;
-    using WixToolset.Core.Cab;
+    using WixToolset.Core.Native;
 
     /// <summary>
     /// Burn PE reader for the WiX toolset.
@@ -101,10 +101,8 @@ namespace WixToolset.Core.Burn.Bundles
                 BurnCommon.CopyStream(this.binaryReader.BaseStream, tempCab, (int)this.UXSize);
             }
 
-            using (var extract = new WixExtractCab())
-            {
-                extract.Extract(tempCabPath, outputDirectory);
-            }
+            var cabinet = new Cabinet(tempCabPath);
+            cabinet.Extract(outputDirectory);
 
             Directory.CreateDirectory(Path.GetDirectoryName(manifestPath));
             File.Delete(manifestPath);
@@ -181,10 +179,8 @@ namespace WixToolset.Core.Burn.Bundles
                 BurnCommon.CopyStream(this.binaryReader.BaseStream, tempCab, (int)this.AttachedContainerSize);
             }
 
-            using (WixExtractCab extract = new WixExtractCab())
-            {
-                extract.Extract(tempCabPath, outputDirectory);
-            }
+            var cabinet = new Cabinet(tempCabPath);
+            cabinet.Extract(outputDirectory);
 
             foreach (DictionaryEntry entry in this.attachedContainerPayloadNames)
             {
diff --git a/src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs
index cde6d8f3..cbc4839a 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateContainerCommand.cs
@@ -7,7 +7,6 @@ namespace WixToolset.Core.Burn.Bundles
     using System.Diagnostics;
     using System.IO;
     using System.Linq;
-    using WixToolset.Core.Cab;
     using WixToolset.Data;
     using WixToolset.Data.Rows;
 
diff --git a/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj b/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj
index 878ac200..c607dd20 100644
--- a/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj
+++ b/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj
@@ -20,9 +20,9 @@
     <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj') " />
 
     <ProjectReference Include="$(WixToolsetRootFolder)\Core.Native\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core.Native\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj') " />
+    <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core.Native\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj') " />
 
     <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" />
-    <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core.Native\src\WixToolset.Core.Native\WixToolset.Core.Native.csproj') " />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index 30a19a4b..012998e6 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -123,7 +123,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     {
                         propertyRow.Value = Common.GenerateGuid();
 
-#if TODO_FIX_INSTANCE_TRANSFORM
+#if TODO_FIX_INSTANCE_TRANSFORM // Is this still necessary?
+
                         // Update the target ProductCode in any instance transforms.
                         foreach (SubStorage subStorage in this.Output.SubStorages)
                         {
@@ -391,7 +392,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 command.ResolveMedia = this.ResolveMedia;
                 command.TableDefinitions = this.TableDefinitions;
                 command.TempFilesLocation = this.IntermediateFolder;
-                command.WixMediaTable = output.Tables["WixMedia"];
+                command.WixMediaTuples = section.Tuples.OfType<WixMediaTuple>();
                 command.Execute();
 
                 fileTransfers.AddRange(command.FileTransfers);
@@ -526,7 +527,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
 
             this.FileTransfers = fileTransfers;
-            this.ContentFilePaths = fileFacades.Select(r => r.WixFile.Source).ToList();
+            this.ContentFilePaths = fileFacades.Select(r => r.WixFile.Source.Path).ToList();
 
             // TODO: Eventually this gets removed
             var intermediate = new Intermediate(this.Intermediate.Id, new[] { section }, this.Intermediate.Localizations.ToDictionary(l => l.Culture, StringComparer.OrdinalIgnoreCase), this.Intermediate.EmbedFilePaths);
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CabinetBuilder.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CabinetBuilder.cs
index c25a497e..2cbcc8e1 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CabinetBuilder.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CabinetBuilder.cs
@@ -4,11 +4,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 {
     using System;
     using System.Collections;
+    using System.Collections.Generic;
     using System.IO;
     using System.Linq;
     using System.Threading;
     using WixToolset.Core.Bind;
-    using WixToolset.Core.Cab;
+    using WixToolset.Core.Native;
     using WixToolset.Data;
 
     /// <summary>
@@ -137,7 +138,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             int maxCabinetSize = 0; // The value of 0 corresponds to default of 2GB which means no cabinet splitting
             ulong maxPreCompressedSizeInBytes = 0;
 
-            if (MaximumCabinetSizeForLargeFileSplitting != 0)
+            if (this.MaximumCabinetSizeForLargeFileSplitting != 0)
             {
                 // User Specified Max Cab Size for File Splitting, So Check if this cabinet has a single file larger than MaximumUncompressedFileSize
                 // If a file is larger than MaximumUncompressedFileSize, then the cabinet containing it will have only this file
@@ -152,26 +153,33 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         if ((ulong)facade.File.FileSize >= maxPreCompressedSizeInBytes)
                         {
                             // If file is larger than MaximumUncompressedFileSize set Maximum Cabinet Size for Cabinet Splitting
-                            maxCabinetSize = MaximumCabinetSizeForLargeFileSplitting;
+                            maxCabinetSize = this.MaximumCabinetSizeForLargeFileSplitting;
                         }
                     }
                 }
             }
 
             // create the cabinet file
+            var cabinetPath = Path.GetFullPath(cabinetWorkItem.CabinetFile);
             string cabinetFileName = Path.GetFileName(cabinetWorkItem.CabinetFile);
             string cabinetDirectory = Path.GetDirectoryName(cabinetWorkItem.CabinetFile);
 
-            using (WixCreateCab cab = new WixCreateCab(cabinetFileName, cabinetDirectory, cabinetWorkItem.FileFacades.Count(), maxCabinetSize, cabinetWorkItem.MaxThreshold, cabinetWorkItem.CompressionLevel))
-            {
-                foreach (FileFacade facade in cabinetWorkItem.FileFacades)
-                {
-                    cab.AddFile(facade);
-                }
+            //using (WixCreateCab cab = new WixCreateCab(cabinetFileName, cabinetDirectory, cabinetWorkItem.FileFacades.Count(), maxCabinetSize, cabinetWorkItem.MaxThreshold, cabinetWorkItem.CompressionLevel))
+            //{
+            //    foreach (FileFacade facade in cabinetWorkItem.FileFacades)
+            //    {
+            //        cab.AddFile(facade);
+            //    }
 
-                cab.Complete(newCabNamesCallBackAddress);
-            }
+            //    cab.Complete(newCabNamesCallBackAddress);
+            //}
+
+            var files = cabinetWorkItem.FileFacades.Select(facade => new CabinetCompressFile(facade.WixFile.Source.Path, facade.File.File, facade.Hash.HashPart1, facade.Hash.HashPart2, facade.Hash.HashPart3, facade.Hash.HashPart4)).ToList();
+
+            var cabinetCompressionLevel = (CabinetCompressionLevel)cabinetWorkItem.CompressionLevel;
+
+            var cab = new Cabinet(cabinetPath);
+            cab.Compress(files, cabinetCompressionLevel, maxCabinetSize, cabinetWorkItem.MaxThreshold);
         }
     }
 }
-
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs
index df1ccecf..370d4b9c 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs
@@ -6,8 +6,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
-    using WixToolset.Core.Cab;
     using WixToolset.Core.Bind;
+    using WixToolset.Core.Native;
     using WixToolset.Data;
     using WixToolset.Extensibility;
 
@@ -26,7 +26,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         public ResolvedCabinet ResolveCabinet(string cabinetPath, IEnumerable<FileFacade> fileFacades)
         {
-            var filesWithPath = fileFacades.Select(f => new BindFileWithPath() { Id = f.File.File, Path = f.WixFile.Source }).ToList();
+            var filesWithPath = fileFacades.Select(f => new BindFileWithPath() { Id = f.File.File, Path = f.WixFile.Source.Path }).ToList();
 
             ResolvedCabinet resolved = null;
 
@@ -58,45 +58,39 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     // 3. modified time changed
                     bool cabinetValid = true;
 
-                    // Need to force garbage collection of WixEnumerateCab to ensure the handle
-                    // associated with it is closed before it is reused.
-                    using (var wixEnumerateCab = new WixEnumerateCab())
-                    {
-                        List<CabinetFileInfo> fileList = wixEnumerateCab.Enumerate(resolved.Path);
+                    var cabinet = new Cabinet(resolved.Path);
+                    List<CabinetFileInfo> fileList = cabinet.Enumerate();
 
-                        if (filesWithPath.Count() != fileList.Count)
-                        {
-                            cabinetValid = false;
-                        }
-                        else
+                    if (filesWithPath.Count() != fileList.Count)
+                    {
+                        cabinetValid = false;
+                    }
+                    else
+                    {
+                        int i = 0;
+                        foreach (BindFileWithPath file in filesWithPath)
                         {
-                            int i = 0;
-                            foreach (BindFileWithPath file in filesWithPath)
+                            // First check that the file identifiers match because that is quick and easy.
+                            CabinetFileInfo cabFileInfo = fileList[i];
+                            cabinetValid = (cabFileInfo.FileId == file.Id);
+                            if (cabinetValid)
                             {
-                                // First check that the file identifiers match because that is quick and easy.
-                                CabinetFileInfo cabFileInfo = fileList[i];
-                                cabinetValid = (cabFileInfo.FileId == file.Id);
+                                // Still valid so ensure the file sizes are the same.
+                                FileInfo fileInfo = new FileInfo(file.Path);
+                                cabinetValid = (cabFileInfo.Size == fileInfo.Length);
                                 if (cabinetValid)
                                 {
-                                    // Still valid so ensure the file sizes are the same.
-                                    FileInfo fileInfo = new FileInfo(file.Path);
-                                    cabinetValid = (cabFileInfo.Size == fileInfo.Length);
-                                    if (cabinetValid)
-                                    {
-                                        // Still valid so ensure the source time stamp hasn't changed. Thus we need
-                                        // to convert the source file time stamp into a cabinet compatible data/time.
-                                        Native.CabInterop.DateTimeToCabDateAndTime(fileInfo.LastWriteTime, out var sourceCabDate, out var sourceCabTime);
-                                        cabinetValid = (cabFileInfo.Date == sourceCabDate && cabFileInfo.Time == sourceCabTime);
-                                    }
-                                }
-
-                                if (!cabinetValid)
-                                {
-                                    break;
+                                    // Still valid so ensure the source time stamp hasn't changed.
+                                    cabinetValid = cabFileInfo.SameAsDateTime(fileInfo.LastWriteTime);
                                 }
+                            }
 
-                                i++;
+                            if (!cabinetValid)
+                            {
+                                break;
                             }
+
+                            i++;
                         }
                     }
 
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
index b5a436c5..a449397d 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
@@ -66,7 +66,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         public TableDefinitionCollection TableDefinitions { private get; set; }
 
-        public Table WixMediaTable { private get; set; }
+        public IEnumerable<WixMediaTuple> WixMediaTuples { private get; set; }
 
         public IEnumerable<FileTransfer> FileTransfers => this.fileTransfers;
 
@@ -77,7 +77,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
         /// <returns>The uncompressed file rows.</returns>
         public void Execute()
         {
-            var wixMediaRows = new RowDictionary<WixMediaRow>(this.WixMediaTable);
+            var wixMediaTuples = this.WixMediaTuples.ToDictionary(t => t.DiskId_);
 
             this.lastCabinetAddedToMediaTable = new Dictionary<string, string>();
 
@@ -93,13 +93,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             foreach (var entry in this.FileRowsByCabinet)
             {
-                var mediaRow = entry.Key;
+                var mediaTuple = entry.Key;
                 IEnumerable<FileFacade> files = entry.Value;
                 CompressionLevel compressionLevel = this.DefaultCompressionLevel;
 
                 string mediaLayoutFolder = null;
 
-                if (wixMediaRows.TryGetValue(mediaRow.Id.Id, out var wixMediaRow))
+                if (wixMediaTuples.TryGetValue(mediaTuple.DiskId, out var wixMediaRow))
                 {
                     mediaLayoutFolder = wixMediaRow.Layout;
 
@@ -109,9 +109,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     }
                 }
 
-                string cabinetDir = this.ResolveMedia(mediaRow, mediaLayoutFolder, this.LayoutDirectory);
+                string cabinetDir = this.ResolveMedia(mediaTuple, mediaLayoutFolder, this.LayoutDirectory);
 
-                CabinetWorkItem cabinetWorkItem = this.CreateCabinetWorkItem(this.Output, cabinetDir, mediaRow, compressionLevel, files, this.fileTransfers);
+                CabinetWorkItem cabinetWorkItem = this.CreateCabinetWorkItem(this.Output, cabinetDir, mediaTuple, compressionLevel, files, this.fileTransfers);
                 if (null != cabinetWorkItem)
                 {
                     cabinetBuilder.Enqueue(cabinetWorkItem);
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
index 85b3b25a..a19a53f1 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
@@ -44,9 +44,21 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         this.AddFileTuple((FileTuple)tuple, output);
                         break;
 
+                    case TupleDefinitionType.Media:
+                        this.AddMediaTuple((MediaTuple)tuple, output);
+                        break;
+
+                    case TupleDefinitionType.Property:
+                        this.AddPropertyTuple((PropertyTuple)tuple, output);
+                        break;
+
                     case TupleDefinitionType.WixAction:
                         this.AddWixActionTuple((WixActionTuple)tuple, output);
-                        break; 
+                        break;
+
+                    case TupleDefinitionType.WixMedia:
+                        // Ignored.
+                        break;
 
                     default:
                         this.AddTupleDefaultly(tuple, output);
@@ -76,6 +88,34 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             row.Attributes = attributes;
         }
 
+        private void AddMediaTuple(MediaTuple tuple, Output output)
+        {
+            if (this.Section.Type != SectionType.Module)
+            {
+                var table = output.EnsureTable(this.TableDefinitions["Media"]);
+                var row = (MediaRow)table.CreateRow(tuple.SourceLineNumbers);
+                row.DiskId = tuple.DiskId;
+                row.LastSequence = tuple.LastSequence;
+                row.DiskPrompt = tuple.DiskPrompt;
+                row.Cabinet = tuple.Cabinet;
+                row.VolumeLabel = tuple.VolumeLabel;
+                row.Source = tuple.Source;
+            }
+        }
+
+        private void AddPropertyTuple(PropertyTuple tuple, Output output)
+        {
+            if (String.IsNullOrEmpty(tuple.Value))
+            {
+                return;
+            }
+
+            var table = output.EnsureTable(this.TableDefinitions["Property"]);
+            var row = (PropertyRow)table.CreateRow(tuple.SourceLineNumbers);
+            row.Property = tuple.Property;
+            row.Value = tuple.Value;
+        }
+
         private void AddWixActionTuple(WixActionTuple actionRow, Output output)
         {
             // Get the table definition for the action (and ensure the proper table exists for a module).
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs
index 32d1cfda..a31c8079 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs
@@ -14,7 +14,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using WixToolset.Msi;
     using WixToolset.Core.Native;
     using WixToolset.Core.Bind;
-    using WixToolset.Core.Cab;
     using WixToolset.Data.Tuples;
 
     /// <summary>
@@ -110,7 +109,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                                     wixFileRow.Directory_ = record[2];
                                     wixFileRow.DiskId = wixMergeRow.DiskId;
                                     wixFileRow.PatchGroup = -1;
-                                    wixFileRow.Source = Path.Combine(this.IntermediateFolder, wixMergeRow.Id.Id, record[1]);
+                                    wixFileRow.Source = new IntermediateFieldPathValue { Path = Path.Combine(this.IntermediateFolder, wixMergeRow.Id.Id, record[1]) };
                                     //WixFileRow wixFileRow = (WixFileRow)this.WixFileTable.CreateRow(wixMergeRow.SourceLineNumbers, false);
                                     //wixFileRow.Directory = record[2];
                                     //wixFileRow.DiskId = wixMergeRow.DiskId;
@@ -204,20 +203,18 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 string mergeIdPath = Path.Combine(this.IntermediateFolder, mergeId);
                 Directory.CreateDirectory(mergeIdPath);
 
-                using (var extractCab = new WixExtractCab())
+                try
                 {
-                    try
-                    {
-                        extractCab.Extract(moduleCabPath, mergeIdPath);
-                    }
-                    catch (FileNotFoundException)
-                    {
-                        throw new WixException(WixErrors.CabFileDoesNotExist(moduleCabPath, wixMergeRow.SourceFile, mergeIdPath));
-                    }
-                    catch
-                    {
-                        throw new WixException(WixErrors.CabExtractionFailed(moduleCabPath, wixMergeRow.SourceFile, mergeIdPath));
-                    }
+                    var cabinet = new Cabinet(moduleCabPath);
+                    cabinet.Extract(mergeIdPath);
+                }
+                catch (FileNotFoundException)
+                {
+                    throw new WixException(WixErrors.CabFileDoesNotExist(moduleCabPath, wixMergeRow.SourceFile, mergeIdPath));
+                }
+                catch
+                {
+                    throw new WixException(WixErrors.CabExtractionFailed(moduleCabPath, wixMergeRow.SourceFile, mergeIdPath));
                 }
             }
             catch (COMException ce)
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
index d71724d1..aa4382f5 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
@@ -105,7 +105,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
                             // finally put together the base media layout path and the relative file layout path
                             string fileLayoutPath = Path.Combine(mediaLayoutDirectory, relativeFileLayoutPath);
-                            if (FileTransfer.TryCreate(facade.WixFile.Source, fileLayoutPath, false, "File", facade.File.SourceLineNumbers, out var transfer))
+                            if (FileTransfer.TryCreate(facade.WixFile.Source.Path, fileLayoutPath, false, "File", facade.File.SourceLineNumbers, out var transfer))
                             {
                                 fileTransfers.Add(transfer);
                             }
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
index 030bc4cc..a9eb2a8f 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
@@ -57,27 +57,27 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             FileInfo fileInfo = null;
             try
             {
-                fileInfo = new FileInfo(file.WixFile.Source);
+                fileInfo = new FileInfo(file.WixFile.Source.Path);
             }
             catch (ArgumentException)
             {
-                Messaging.Instance.OnMessage(WixDataErrors.InvalidFileName(file.File.SourceLineNumbers, file.WixFile.Source));
+                Messaging.Instance.OnMessage(WixDataErrors.InvalidFileName(file.File.SourceLineNumbers, file.WixFile.Source.Path));
                 return;
             }
             catch (PathTooLongException)
             {
-                Messaging.Instance.OnMessage(WixDataErrors.InvalidFileName(file.File.SourceLineNumbers, file.WixFile.Source));
+                Messaging.Instance.OnMessage(WixDataErrors.InvalidFileName(file.File.SourceLineNumbers, file.WixFile.Source.Path));
                 return;
             }
             catch (NotSupportedException)
             {
-                Messaging.Instance.OnMessage(WixDataErrors.InvalidFileName(file.File.SourceLineNumbers, file.WixFile.Source));
+                Messaging.Instance.OnMessage(WixDataErrors.InvalidFileName(file.File.SourceLineNumbers, file.WixFile.Source.Path));
                 return;
             }
 
             if (!fileInfo.Exists)
             {
-                Messaging.Instance.OnMessage(WixErrors.CannotFindFile(file.File.SourceLineNumbers, file.File.File, file.File.LongFileName, file.WixFile.Source));
+                Messaging.Instance.OnMessage(WixErrors.CannotFindFile(file.File.SourceLineNumbers, file.File.File, file.File.LongFileName, file.WixFile.Source.Path));
                 return;
             }
 
@@ -85,7 +85,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             {
                 if (Int32.MaxValue < fileStream.Length)
                 {
-                    throw new WixException(WixErrors.FileTooLarge(file.File.SourceLineNumbers, file.WixFile.Source));
+                    throw new WixException(WixErrors.FileTooLarge(file.File.SourceLineNumbers, file.WixFile.Source.Path));
                 }
 
                 file.File.FileSize = Convert.ToInt32(fileStream.Length, CultureInfo.InvariantCulture);
@@ -372,7 +372,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 // Navigator is cheaper than dom.  Perhaps there is a cheaper API still.
                 try
                 {
-                    XPathDocument doc = new XPathDocument(fileManifest.WixFile.Source);
+                    XPathDocument doc = new XPathDocument(fileManifest.WixFile.Source.Path);
                     XPathNavigator nav = doc.CreateNavigator();
                     nav.MoveToRoot();
 
@@ -396,7 +396,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                             }
                             if (!hasNextSibling)
                             {
-                                Messaging.Instance.OnMessage(WixErrors.InvalidManifestContent(file.File.SourceLineNumbers, fileManifest.WixFile.Source));
+                                Messaging.Instance.OnMessage(WixErrors.InvalidManifestContent(file.File.SourceLineNumbers, fileManifest.WixFile.Source.Path));
                                 return;
                             }
 
@@ -434,11 +434,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 }
                 catch (FileNotFoundException fe)
                 {
-                    Messaging.Instance.OnMessage(WixErrors.FileNotFound(new SourceLineNumber(fileManifest.WixFile.Source), fe.FileName, "AssemblyManifest"));
+                    Messaging.Instance.OnMessage(WixErrors.FileNotFound(new SourceLineNumber(fileManifest.WixFile.Source.Path), fe.FileName, "AssemblyManifest"));
                 }
                 catch (XmlException xe)
                 {
-                    Messaging.Instance.OnMessage(WixErrors.InvalidXml(new SourceLineNumber(fileManifest.WixFile.Source), "manifest", xe.Message));
+                    Messaging.Instance.OnMessage(WixErrors.InvalidXml(new SourceLineNumber(fileManifest.WixFile.Source.Path), "manifest", xe.Message));
                 }
 
                 if (!String.IsNullOrEmpty(win32Name))
diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs
index 229e75b4..7985c120 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs
@@ -7,7 +7,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
     using System.Collections.Specialized;
     using System.Globalization;
     using System.IO;
-    using WixToolset.Core.Cab;
+    using WixToolset.Core.Native;
     using WixToolset.Data;
     using WixToolset.Data.Rows;
     using WixToolset.Msi;
@@ -88,9 +88,9 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
                                 string cabinetFile = Path.Combine(this.IntermediateFolder, String.Concat("Media", Path.DirectorySeparatorChar, diskId.ToString(CultureInfo.InvariantCulture), ".cab"));
 
                                 // ensure the parent directory exists
-                                System.IO.Directory.CreateDirectory(Path.GetDirectoryName(cabinetFile));
+                                Directory.CreateDirectory(Path.GetDirectoryName(cabinetFile));
 
-                                using (FileStream fs = System.IO.File.Create(cabinetFile))
+                                using (FileStream fs = File.Create(cabinetFile))
                                 {
                                     int bytesRead;
                                     byte[] buffer = new byte[512];
@@ -128,16 +128,14 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
 
                 foreach (string cabinetFile in cabinetFiles)
                 {
-                    using (var extractCab = new WixExtractCab())
+                    try
                     {
-                        try
-                        {
-                            extractCab.Extract(cabinetFile, fileDirectory);
-                        }
-                        catch (FileNotFoundException)
-                        {
-                            throw new WixException(WixErrors.FileNotFound(new SourceLineNumber(this.InputFilePath), cabinetFile));
-                        }
+                        var cabinet = new Cabinet(cabinetFile);
+                        cabinet.Extract(fileDirectory);
+                    }
+                    catch (FileNotFoundException)
+                    {
+                        throw new WixException(WixErrors.FileNotFound(new SourceLineNumber(this.InputFilePath), cabinetFile));
                     }
                 }
             }
diff --git a/src/WixToolset.Core/Cab/CabinetFileInfo.cs b/src/WixToolset.Core/Cab/CabinetFileInfo.cs
deleted file mode 100644
index 816f9e3e..00000000
--- a/src/WixToolset.Core/Cab/CabinetFileInfo.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolset.Core.Cab
-{
-    /// <summary>
-    /// Properties of a file in a cabinet.
-    /// </summary>
-    public sealed class CabinetFileInfo
-    {
-        /// <summary>
-        /// Constructs CabinetFileInfo
-        /// </summary>
-        /// <param name="fileId">File Id</param>
-        /// <param name="date">Last modified date (MS-DOS time)</param>
-        /// <param name="time">Last modified time (MS-DOS time)</param>
-        public CabinetFileInfo(string fileId, ushort date, ushort time, int size)
-        {
-            this.FileId = fileId;
-            this.Date = date;
-            this.Time = time;
-            this.Size = size;
-        }
-
-        /// <summary>
-        /// Gets the file Id of the file.
-        /// </summary>
-        /// <value>file Id</value>
-        public string FileId { get; }
-
-        /// <summary>
-        /// Gets modified date (DOS format).
-        /// </summary>
-        public ushort Date { get; }
-
-        /// <summary>
-        /// Gets modified time (DOS format).
-        /// </summary>
-        public ushort Time { get; }
-
-        /// <summary>
-        /// Gets the size of the file in bytes.
-        /// </summary>
-        public int Size { get; }
-    }
-}
diff --git a/src/WixToolset.Core/Cab/Interop/CabInterop.cs b/src/WixToolset.Core/Cab/Interop/CabInterop.cs
deleted file mode 100644
index 6c1ae2c1..00000000
--- a/src/WixToolset.Core/Cab/Interop/CabInterop.cs
+++ /dev/null
@@ -1,316 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-#if false
-
-namespace WixToolset.Cab.Interop
-{
-    using System;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Text;
-    using System.Runtime.InteropServices;
-    using WixToolset.Msi;
-    using WixToolset.Msi.Interop;
-
-    /// <summary>
-    /// The native methods.
-    /// </summary>
-    public sealed class NativeMethods
-    {
-        /// <summary>
-        /// Starts creating a cabinet.
-        /// </summary>
-        /// <param name="cabinetName">Name of cabinet to create.</param>
-        /// <param name="cabinetDirectory">Directory to create cabinet in.</param>
-        /// <param name="maxFiles">Maximum number of files that will be added to cabinet.</param>
-        /// <param name="maxSize">Maximum size of the cabinet.</param>
-        /// <param name="maxThreshold">Maximum threshold in the cabinet.</param>
-        /// <param name="compressionType">Type of compression to use in the cabinet.</param>
-        /// <param name="contextHandle">Handle to opened cabinet.</param>
-        [DllImport("winterop.dll", EntryPoint = "CreateCabBegin", CharSet = CharSet.Unicode, ExactSpelling = true, PreserveSig = false)]
-        internal static extern void CreateCabBegin(string cabinetName, string cabinetDirectory, uint maxFiles, uint maxSize, uint maxThreshold, uint compressionType, out IntPtr contextHandle);
-
-        /// <summary>
-        /// Adds a file to an open cabinet.
-        /// </summary>
-        /// <param name="file">Full path to file to add to cabinet.</param>
-        /// <param name="token">Name of file in cabinet.</param>
-        /// <param name="contextHandle">Handle to open cabinet.</param>
-        [DllImport("winterop.dll", EntryPoint = "CreateCabAddFile", CharSet = CharSet.Unicode, ExactSpelling = true, PreserveSig = false)]
-        internal static extern void CreateCabAddFile(string file, string token, MsiInterop.MSIFILEHASHINFO fileHash, IntPtr contextHandle);
-
-        /// <summary>
-        /// Closes a cabinet.
-        /// </summary>
-        /// <param name="contextHandle">Handle to open cabinet to close.</param>
-        /// <param name="newCabNamesCallBackAddress">Address of Binder's cabinet split callback</param>
-        [DllImport("winterop.dll", EntryPoint = "CreateCabFinish", CharSet = CharSet.Unicode, ExactSpelling = true, PreserveSig = false)]
-        internal static extern void CreateCabFinish(IntPtr contextHandle, IntPtr newCabNamesCallBackAddress);
-
-        /// <summary>
-        /// Cancels cabinet creation.
-        /// </summary>
-        /// <param name="contextHandle">Handle to open cabinet to cancel.</param>
-        [DllImport("winterop.dll", EntryPoint = "CreateCabCancel", CharSet = CharSet.Unicode, ExactSpelling = true, PreserveSig = false)]
-        internal static extern void CreateCabCancel(IntPtr contextHandle);
-
-        /// <summary>
-        /// Initializes cabinet extraction.
-        /// </summary>
-        [DllImport("winterop.dll", EntryPoint = "ExtractCabBegin", CharSet = CharSet.Unicode, ExactSpelling = true, PreserveSig = false)]
-        internal static extern void ExtractCabBegin();
-
-        /// <summary>
-        /// Extracts files from cabinet.
-        /// </summary>
-        /// <param name="cabinet">Path to cabinet to extract files from.</param>
-        /// <param name="extractDirectory">Directory to extract files to.</param>
-        [DllImport("winterop.dll", EntryPoint = "ExtractCab", CharSet = CharSet.Unicode, ExactSpelling = true, SetLastError = true, PreserveSig = false)]
-        internal static extern void ExtractCab(string cabinet, string extractDirectory);
-
-        /// <summary>
-        /// Cleans up after cabinet extraction.
-        /// </summary>
-        [DllImport("winterop.dll", EntryPoint = "ExtractCabFinish", CharSet = CharSet.Unicode, ExactSpelling = true, SetLastError = true)]
-        internal static extern void ExtractCabFinish();
-
-        /// <summary>
-        /// Initializes cabinet enumeration.
-        /// </summary>
-        [DllImport("winterop.dll", EntryPoint = "EnumerateCabBegin", CharSet = CharSet.Unicode, ExactSpelling = true, PreserveSig = false)]
-        internal static extern void EnumerateCabBegin();
-
-        /// <summary>
-        /// Enumerates files from cabinet.
-        /// </summary>
-        /// <param name="cabinet">Path to cabinet to enumerate files from.</param>
-        /// <param name="notify">callback that gets each file.</param>
-        [DllImport("winterop.dll", EntryPoint = "EnumerateCab", CharSet = CharSet.Unicode, ExactSpelling = true, SetLastError = true, PreserveSig = false)]
-        internal static extern void EnumerateCab(string cabinet, CabInterop.PFNNOTIFY notify);
-
-        /// <summary>
-        /// Cleans up after cabinet enumeration.
-        /// </summary>
-        [DllImport("winterop.dll", EntryPoint = "EnumerateCabFinish", CharSet = CharSet.Unicode, ExactSpelling = true, SetLastError = true)]
-        internal static extern void EnumerateCabFinish();
-
-        /// <summary>
-        /// Resets the DACL on an array of files to "empty".
-        /// </summary>
-        /// <param name="files">Array of file reset ACL to "empty".</param>
-        /// <param name="fileCount">Number of file paths in array.</param>
-        [DllImport("winterop.dll", EntryPoint = "ResetAcls", CharSet = CharSet.Unicode, ExactSpelling = true, PreserveSig = false)]
-        internal static extern void ResetAcls(string[] files, uint fileCount);
-
-        /// <summary>
-        /// Gets the hash of the pCertContext->pCertInfo->SubjectPublicKeyInfo using ::CryptHashPublicKeyInfo() which does not seem
-        /// to be exposed by .NET Frameowkr.
-        /// </summary>
-        /// <param name="certContext">Pointer to a CERT_CONTEXT struct with public key information to hash.</param>
-        /// <param name="fileCount">Number of file paths in array.</param>
-        [DllImport("winterop.dll", EntryPoint = "HashPublicKeyInfo", CharSet = CharSet.Unicode, ExactSpelling = true, PreserveSig = false)]
-        internal static extern void HashPublicKeyInfo(IntPtr certContext, byte[] publicKeyInfoHashed, ref uint sizePublicKeyInfoHashed);
-
-        /// <summary>
-        /// Converts file time to a local file time.
-        /// </summary>
-        /// <param name="fileTime">file time</param>
-        /// <param name="localTime">local file time</param>
-        /// <returns>true if successful, false otherwise</returns>
-        [DllImport("kernel32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool FileTimeToLocalFileTime(ref long fileTime, ref long localTime);
-
-        /// <summary>
-        /// Converts file time to a MS-DOS time.
-        /// </summary>
-        /// <param name="fileTime">file time</param>
-        /// <param name="wFatDate">MS-DOS date</param>
-        /// <param name="wFatTime">MS-DOS time</param>
-        /// <returns>true if successful, false otherwise</returns>
-        [DllImport("kernel32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool FileTimeToDosDateTime(ref long fileTime, out ushort wFatDate, out ushort wFatTime);
-    }
-
-    /// <summary>
-    /// Interop class for the winterop.dll.
-    /// </summary>
-    internal static class CabInterop
-    {
-        /// <summary>
-        /// Delegate type that's called by cabinet api for every file in cabinet.
-        /// </summary>
-        /// <param name="fdint">NOTIFICATIONTYPE</param>
-        /// <param name="pfdin">NOTIFICATION</param>
-        /// <returns>0 for success, -1 otherwise</returns>
-        public delegate Int32 PFNNOTIFY(NOTIFICATIONTYPE fdint, NOTIFICATION pfdin);
-
-        /// <summary>
-        /// Wraps FDINOTIFICATIONTYPE.
-        /// </summary>
-        public enum NOTIFICATIONTYPE : int
-        {
-            /// <summary>Info about the cabinet.</summary>
-            CABINET_INFO,
-            /// <summary>One or more files are continued.</summary>
-            PARTIAL_FILE,
-            /// <summary>Called for each file in cabinet.</summary>
-            COPY_FILE,
-            /// <summary>Called after all of the data has been written to a target file.</summary>
-            CLOSE_FILE_INFO,
-            /// <summary>A file is continued to the next cabinet.</summary>
-            NEXT_CABINET,
-            /// <summary>Called once after a call to FDICopy() starts scanning a CAB's CFFILE entries, and again when there are no more CFFILE entries.</summary>
-            ENUMERATE,
-        }
-
-        /// <summary>
-        /// Converts DateTime to MS-DOS date and time which cabinet uses.
-        /// </summary>
-        /// <param name="dateTime">DateTime</param>
-        /// <param name="cabDate">MS-DOS date</param>
-        /// <param name="cabTime">MS-DOS time</param>
-        public static void DateTimeToCabDateAndTime(DateTime dateTime, out ushort cabDate, out ushort cabTime)
-        {
-            // dateTime.ToLocalTime() does not match FileTimeToLocalFileTime() for some reason.
-            // so we need to call FileTimeToLocalFileTime() from kernel32.dll.
-            long filetime = dateTime.ToFileTime();
-            long localTime = 0;
-            NativeMethods.FileTimeToLocalFileTime(ref filetime, ref localTime);
-            NativeMethods.FileTimeToDosDateTime(ref localTime, out cabDate, out cabTime);
-        }
-
-        /// <summary>
-        /// Wraps FDINOTIFICATION.
-        /// </summary>
-        [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-        public class NOTIFICATION
-        {
-            private int cb;
-            [MarshalAs(UnmanagedType.LPStr)]
-            private string psz1;
-            [MarshalAs(UnmanagedType.LPStr)]
-            private string psz2;
-            [MarshalAs(UnmanagedType.LPStr)]
-            private string psz3;
-            private IntPtr pv;
-
-            private IntPtr hf;
-
-            private ushort date;
-            private ushort time;
-            private ushort attribs;
-            private ushort setID;
-            private ushort cabinet;
-            private ushort folder;
-            private int fdie;
-
-            /// <summary>
-            /// Uncompressed size of file.
-            /// </summary>
-            public int Cb
-            {
-                get { return this.cb; }
-            }
-
-            /// <summary>
-            /// File name in cabinet.
-            /// </summary>
-            public String Psz1 
-            { 
-                get { return this.psz1; } 
-            }
-
-            /// <summary>
-            /// Name of next disk.
-            /// </summary>
-            public string Psz2 
-            { 
-                get { return this.psz2; } 
-            }
-
-            /// <summary>
-            /// Points to a 256 character buffer.
-            /// </summary>
-            public string Psz3 
-            {
-                get { return this.psz3; } 
-            }
-
-            /// <summary>
-            /// Value for client.
-            /// </summary>
-            public IntPtr Pv 
-            { 
-                get { return this.pv; } 
-            }
-
-            /// <summary>
-            /// Not used.
-            /// </summary>
-            public Int32 Hf 
-            { 
-                get { return (Int32)this.hf; }
-            }
-
-            /// <summary>
-            /// Last modified MS-DOS date.
-            /// </summary>
-            public ushort Date 
-            { 
-                get { return this.date; } 
-            }
-
-            /// <summary>
-            /// Last modified MS-DOS time.
-            /// </summary>
-            public ushort Time 
-            { 
-                get { return this.time; } 
-            }
-
-            /// <summary>
-            /// File attributes.
-            /// </summary>
-            public ushort Attribs 
-            { 
-                get { return this.attribs; } 
-            }
-
-            /// <summary>
-            /// Cabinet set ID (a random 16-bit number).
-            /// </summary>
-            public ushort SetID 
-            {
-                get { return this.setID; } 
-            }
-
-            /// <summary>
-            /// Cabinet number within cabinet set (0-based).
-            /// </summary>
-            public ushort Cabinet 
-            { 
-                get { return this.cabinet; } 
-            }
-
-            /// <summary>
-            /// File's folder index.
-            /// </summary>
-            public ushort Folder 
-            { 
-                get { return this.folder; } 
-            }
-
-            /// <summary>
-            /// Error code.
-            /// </summary>
-            public int Fdie 
-            { 
-                get { return this.fdie; } 
-            }
-        }
-    }
-}
-
-#endif
diff --git a/src/WixToolset.Core/Cab/WixCreateCab.cs b/src/WixToolset.Core/Cab/WixCreateCab.cs
deleted file mode 100644
index 4ebdd1c0..00000000
--- a/src/WixToolset.Core/Cab/WixCreateCab.cs
+++ /dev/null
@@ -1,249 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolset.Core.Cab
-{
-    using System;
-    using System.Globalization;
-    using System.IO;
-    using System.Runtime.InteropServices;
-    using WixToolset.Core.Bind;
-    using WixToolset.Core.Native;
-    using WixToolset.Data;
-
-    /// <summary>
-    /// Wrapper class around interop with wixcab.dll to compress files into a cabinet.
-    /// </summary>
-    public sealed class WixCreateCab : IDisposable
-    {
-        private static readonly string CompressionLevelVariable = "WIX_COMPRESSION_LEVEL";
-        private IntPtr handle = IntPtr.Zero;
-        private bool disposed;
-        private int maxSize;
-
-        /// <summary>
-        /// Creates a cabinet.
-        /// </summary>
-        /// <param name="cabName">Name of cabinet to create.</param>
-        /// <param name="cabDir">Directory to create cabinet in.</param>
-        /// <param name="maxFiles">Maximum number of files that will be added to cabinet.</param>
-        /// <param name="maxSize">Maximum size of cabinet.</param>
-        /// <param name="maxThresh">Maximum threshold for each cabinet.</param>
-        /// <param name="compressionLevel">Level of compression to apply.</param>
-        public WixCreateCab(string cabName, string cabDir, int maxFiles, int maxSize, int maxThresh, CompressionLevel compressionLevel)
-        {
-            string compressionLevelVariable = Environment.GetEnvironmentVariable(CompressionLevelVariable);
-            this.maxSize = maxSize;
-
-            try
-            {
-                // Override authored compression level if environment variable is present.
-                if (!String.IsNullOrEmpty(compressionLevelVariable))
-                {
-                    compressionLevel = WixCreateCab.CompressionLevelFromString(compressionLevelVariable);
-                }
-            }
-            catch (WixException)
-            {
-                throw new WixException(WixErrors.IllegalEnvironmentVariable(CompressionLevelVariable, compressionLevelVariable));
-            }
-
-            if (String.IsNullOrEmpty(cabDir))
-            {
-                cabDir = Directory.GetCurrentDirectory();
-            }
-
-            try
-            {
-                NativeMethods.CreateCabBegin(cabName, cabDir, (uint)maxFiles, (uint)maxSize, (uint)maxThresh, (uint)compressionLevel, out this.handle);
-            }
-            catch (COMException ce)
-            {
-                // If we get a "the file exists" error, we must have a full temp directory - so report the issue
-                if (0x80070050 == unchecked((uint)ce.ErrorCode))
-                {
-                    throw new WixException(WixErrors.FullTempDirectory("WSC", Path.GetTempPath()));
-                }
-
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// Destructor for cabinet creation.
-        /// </summary>
-        ~WixCreateCab()
-        {
-            this.Dispose();
-        }
-
-        /// <summary>
-        /// Converts a compression level from its string to its enum value.
-        /// </summary>
-        /// <param name="compressionLevel">Compression level as a string.</param>
-        /// <returns>CompressionLevel enum value</returns>
-        public static CompressionLevel CompressionLevelFromString(string compressionLevel)
-        {
-            switch (compressionLevel.ToLower(CultureInfo.InvariantCulture))
-            {
-                case "low":
-                    return CompressionLevel.Low;
-                case "medium":
-                    return CompressionLevel.Medium;
-                case "high":
-                    return CompressionLevel.High;
-                case "none":
-                    return CompressionLevel.None;
-                case "mszip":
-                    return CompressionLevel.Mszip;
-                default:
-                    throw new WixException(WixErrors.IllegalCompressionLevel(compressionLevel));
-            }
-        }
-
-        /// <summary>
-        /// Adds a file to the cabinet.
-        /// </summary>
-        /// <param name="fileFacade">The file facade of the file to add.</param>
-        public void AddFile(FileFacade fileFacade)
-        {
-            MsiInterop.MSIFILEHASHINFO hashInterop = new MsiInterop.MSIFILEHASHINFO();
-
-            if (null != fileFacade.Hash)
-            {
-                hashInterop.FileHashInfoSize = 20;
-                hashInterop.Data0 = (int)fileFacade.Hash[2];
-                hashInterop.Data1 = (int)fileFacade.Hash[3];
-                hashInterop.Data2 = (int)fileFacade.Hash[4];
-                hashInterop.Data3 = (int)fileFacade.Hash[5];
-
-                this.AddFile(fileFacade.WixFile.Source, fileFacade.File.File, hashInterop);
-            }
-            else
-            {
-                this.AddFile(fileFacade.WixFile.Source, fileFacade.File.File);
-            }
-        }
-
-        /// <summary>
-        /// Adds a file to the cabinet.
-        /// </summary>
-        /// <param name="file">The file to add.</param>
-        /// <param name="token">The token for the file.</param>
-        public void AddFile(string file, string token)
-        {
-            this.AddFile(file, token, null);
-        }
-
-        /// <summary>
-        /// Adds a file to the cabinet with an optional MSI file hash.
-        /// </summary>
-        /// <param name="file">The file to add.</param>
-        /// <param name="token">The token for the file.</param>
-        /// <param name="fileHash">The MSI file hash of the file.</param>
-        private void AddFile(string file, string token, MsiInterop.MSIFILEHASHINFO fileHash)
-        {
-            try
-            {
-                NativeMethods.CreateCabAddFile(file, token, fileHash, this.handle);
-            }
-            catch (COMException ce)
-            {
-                if (0x80004005 == unchecked((uint)ce.ErrorCode)) // E_FAIL
-                {
-                    throw new WixException(WixErrors.CreateCabAddFileFailed());
-                }
-                else if (0x80070070 == unchecked((uint)ce.ErrorCode)) // ERROR_DISK_FULL
-                {
-                    throw new WixException(WixErrors.CreateCabInsufficientDiskSpace());
-                }
-                else
-                {
-                    throw;
-                }
-            }
-            catch (DirectoryNotFoundException)
-            {
-                throw new WixFileNotFoundException(file);
-            }
-            catch (FileNotFoundException)
-            {
-                throw new WixFileNotFoundException(file);
-            }
-        }
-
-        /// <summary>
-        /// Complete/commit the cabinet - this must be called before Dispose so that errors will be
-        /// reported on the same thread.
-        /// This Complete should be used with no Cabinet splitting as it has the split cabinet names callback address as Zero
-        /// </summary>
-        public void Complete()
-        {
-            this.Complete(IntPtr.Zero);
-        }
-
-        /// <summary>
-        /// Complete/commit the cabinet - this must be called before Dispose so that errors will be
-        /// reported on the same thread.
-        /// </summary>
-        /// <param name="newCabNamesCallBackAddress">Address of Binder's callback function for Cabinet Splitting</param>
-        public void Complete(IntPtr newCabNamesCallBackAddress)
-        {
-            if (IntPtr.Zero != this.handle)
-            {
-                try
-                {
-                    if (newCabNamesCallBackAddress != IntPtr.Zero && this.maxSize != 0)
-                    {
-                        NativeMethods.CreateCabFinish(this.handle, newCabNamesCallBackAddress);
-                    }
-                    else
-                    {
-                        NativeMethods.CreateCabFinish(this.handle, IntPtr.Zero);
-                    }
-
-                    GC.SuppressFinalize(this);
-                    this.disposed = true;
-                }
-                catch (COMException ce)
-                {
-                    if (0x80004005 == unchecked((uint)ce.ErrorCode)) // E_FAIL
-                    {
-                        // This error seems to happen, among other situations, when cabbing more than 0xFFFF files
-                        throw new WixException(WixErrors.FinishCabFailed());
-                    }
-                    else if (0x80070070 == unchecked((uint)ce.ErrorCode)) // ERROR_DISK_FULL
-                    {
-                        throw new WixException(WixErrors.CreateCabInsufficientDiskSpace());
-                    }
-                    else
-                    {
-                        throw;
-                    }
-                }
-                finally
-                {
-                    this.handle = IntPtr.Zero;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Cancels ("rolls back") the creation of the cabinet.
-        /// Don't throw WiX errors from here, because we're in a different thread, and they won't be reported correctly.
-        /// </summary>
-        public void Dispose()
-        {
-            if (!this.disposed)
-            {
-                if (IntPtr.Zero != this.handle)
-                {
-                    NativeMethods.CreateCabCancel(this.handle);
-                    this.handle = IntPtr.Zero;
-                }
-
-                GC.SuppressFinalize(this);
-                this.disposed = true;
-            }
-        }
-    }
-}
diff --git a/src/WixToolset.Core/Cab/WixEnumerateCab.cs b/src/WixToolset.Core/Cab/WixEnumerateCab.cs
deleted file mode 100644
index 0b4055d6..00000000
--- a/src/WixToolset.Core/Cab/WixEnumerateCab.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolset.Core.Cab
-{
-    using System;
-    using System.Collections.Generic;
-    using WixToolset.Core.Native;
-    using Handle = System.Int32;
-
-    /// <summary>
-    /// Wrapper class around interop with wixcab.dll to enumerate files from a cabinet.
-    /// </summary>
-    public sealed class WixEnumerateCab : IDisposable
-    {
-        private bool disposed;
-        private List<CabinetFileInfo> fileInfoList;
-        private CabInterop.PFNNOTIFY pfnNotify;
-
-        /// <summary>
-        /// Creates a cabinet enumerator.
-        /// </summary>
-        public WixEnumerateCab()
-        {
-            this.pfnNotify = new CabInterop.PFNNOTIFY(this.Notify);
-            NativeMethods.EnumerateCabBegin();
-        }
-
-        /// <summary>
-        /// Destructor for cabinet enumeration.
-        /// </summary>
-        ~WixEnumerateCab()
-        {
-            this.Dispose();
-        }
-
-        /// <summary>
-        /// Enumerates all files in a cabinet.
-        /// </summary>
-        /// <param name="cabinetFile">path to cabinet</param>
-        /// <returns>list of CabinetFileInfo</returns>
-        public List<CabinetFileInfo> Enumerate(string cabinetFile)
-        {
-            this.fileInfoList = new List<CabinetFileInfo>();
-
-            // the callback (this.Notify) will populate the list for each file in cabinet
-            NativeMethods.EnumerateCab(cabinetFile, this.pfnNotify);
-
-            return this.fileInfoList;
-        }
-
-        /// <summary>
-        /// Disposes the managed and unmanaged objects in this object.
-        /// </summary>
-        public void Dispose()
-        {
-            if (!this.disposed)
-            {
-                NativeMethods.EnumerateCabFinish();
-
-                GC.SuppressFinalize(this);
-                this.disposed = true;
-            }
-        }
-
-        /// <summary>
-        /// Delegate that's called for every file in cabinet.
-        /// </summary>
-        /// <param name="fdint">NOTIFICATIONTYPE</param>
-        /// <param name="pfdin">NOTIFICATION</param>
-        /// <returns>System.Int32</returns>
-        internal Handle Notify(CabInterop.NOTIFICATIONTYPE fdint, CabInterop.NOTIFICATION pfdin)
-        {
-            // This is FDI's way of notifying us of how many files total are in the cab, accurate even
-            // if the files are split into multiple folders - use it to allocate the precise size we need
-            if (CabInterop.NOTIFICATIONTYPE.ENUMERATE == fdint && 0 == this.fileInfoList.Count)
-            {
-                this.fileInfoList.Capacity = pfdin.Folder;
-            }
-
-            if (fdint == CabInterop.NOTIFICATIONTYPE.COPY_FILE)
-            {
-                CabinetFileInfo fileInfo = new CabinetFileInfo(pfdin.Psz1, pfdin.Date, pfdin.Time, pfdin.Cb);
-                this.fileInfoList.Add(fileInfo);
-            }
-
-            return 0; // tell cabinet api to skip this file.
-        }
-    }
-}
diff --git a/src/WixToolset.Core/Cab/WixExtractCab.cs b/src/WixToolset.Core/Cab/WixExtractCab.cs
deleted file mode 100644
index e776b08e..00000000
--- a/src/WixToolset.Core/Cab/WixExtractCab.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolset.Core.Cab
-{
-    using System;
-    using WixToolset.Core.Native;
-
-    /// <summary>
-    /// Wrapper class around interop with wixcab.dll to extract files from a cabinet.
-    /// </summary>
-    public sealed class WixExtractCab : IDisposable
-    {
-        private bool disposed;
-
-        /// <summary>
-        /// Creates a cabinet extractor.
-        /// </summary>
-        public WixExtractCab()
-        {
-            NativeMethods.ExtractCabBegin();
-        }
-
-        /// <summary>
-        /// Destructor for cabinet extraction.
-        /// </summary>
-        ~WixExtractCab()
-        {
-            this.Dispose();
-        }
-
-        /// <summary>
-        /// Extracts all the files from a cabinet to a directory.
-        /// </summary>
-        /// <param name="cabinetFile">Cabinet file to extract from.</param>
-        /// <param name="extractDir">Directory to extract files to.</param>
-        public void Extract(string cabinetFile, string extractDir)
-        {
-            if (null == cabinetFile)
-            {
-                throw new ArgumentNullException("cabinetFile");
-            }
-
-            if (null == extractDir)
-            {
-                throw new ArgumentNullException("extractDir");
-            }
-
-            if (this.disposed)
-            {
-                throw new ObjectDisposedException("WixExtractCab");
-            }
-
-            if (!extractDir.EndsWith("\\", StringComparison.Ordinal))
-            {
-                extractDir = String.Concat(extractDir, "\\");
-            }
-
-            NativeMethods.ExtractCab(cabinetFile, extractDir);
-        }
-
-        /// <summary>
-        /// Disposes the managed and unmanaged objects in this object.
-        /// </summary>
-        public void Dispose()
-        {
-            if (!this.disposed)
-            {
-                NativeMethods.ExtractCabFinish();
-
-                GC.SuppressFinalize(this);
-                this.disposed = true;
-            }
-        }
-    }
-}
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index 4b1ef033..406bc46a 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -5803,7 +5803,7 @@ namespace WixToolset.Core
                 wixFileRow.File_AssemblyApplication = assemblyApplication;
                 wixFileRow.Directory_ = directoryId;
                 wixFileRow.DiskId = (CompilerConstants.IntegerNotSet == diskId) ? 0 : diskId;
-                wixFileRow.Source = source;
+                wixFileRow.Source = new IntermediateFieldPathValue { Path = source };
                 wixFileRow.ProcessorArchitecture = procArch;
                 wixFileRow.PatchGroup = (CompilerConstants.IntegerNotSet != patchGroup ? patchGroup : -1);
                 wixFileRow.Attributes = (generatedShortFileName ? 0x1 : 0x0);
diff --git a/src/WixToolset.Core/Link/ResolveReferencesCommand.cs b/src/WixToolset.Core/Link/ResolveReferencesCommand.cs
index 9c3b2765..266871bd 100644
--- a/src/WixToolset.Core/Link/ResolveReferencesCommand.cs
+++ b/src/WixToolset.Core/Link/ResolveReferencesCommand.cs
@@ -62,7 +62,7 @@ namespace WixToolset.Link
             {
                 // If we're building a Merge Module, ignore all references to the Media table
                 // because Merge Modules don't have Media tables.
-                if (this.BuildingMergeModule && wixSimpleReferenceRow.Definition.Type == TupleDefinitionType.Media)
+                if (this.BuildingMergeModule && wixSimpleReferenceRow.Table== "Media")
                 {
                     continue;
                 }
diff --git a/src/WixToolset.Core/Preprocess/IfContext.cs b/src/WixToolset.Core/Preprocess/IfContext.cs
index 64b5bd91..e7c6e6f5 100644
--- a/src/WixToolset.Core/Preprocess/IfContext.cs
+++ b/src/WixToolset.Core/Preprocess/IfContext.cs
@@ -1,46 +1,21 @@
 // Copyright (c) .NET Foundation 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.Preprocess
+namespace WixToolset.Core.Preprocess
 {
-    using System;
-
-    /// <summary>
-    /// Current state of the if context.
-    /// </summary>
-    internal enum IfState
-    {
-        /// <summary>Context currently in unknown state.</summary>
-        Unknown,
-
-        /// <summary>Context currently inside if statement.</summary>
-        If,
-
-        /// <summary>Context currently inside elseif statement..</summary>
-        ElseIf,
-
-        /// <summary>Conext currently inside else statement.</summary>
-        Else,
-    }
-
     /// <summary>
     /// Context for an if statement in the preprocessor.
     /// </summary>
     internal sealed class IfContext
     {
-        private bool active;
         private bool keep;
-        private bool everKept;
-        private IfState state;
 
         /// <summary>
         /// Creates a default if context object, which are used for if's within an inactive preprocessor block
         /// </summary>
         public IfContext()
         {
-            this.active = false;
-            this.keep = false;
-            this.everKept = true;
-            this.state = IfState.If;
+            this.WasEverTrue = true;
+            this.IfState = IfState.If;
         }
 
         /// <summary>
@@ -51,21 +26,17 @@ namespace WixToolset.Preprocess
         /// <param name="state">State of context to start in.</param>
         public IfContext(bool active, bool keep, IfState state)
         {
-            this.active = active;
+            this.Active = active;
             this.keep = keep;
-            this.everKept = keep;
-            this.state = state;
+            this.WasEverTrue = keep;
+            this.IfState = IfState.If;
         }
 
         /// <summary>
         /// Gets and sets if this if context is currently active.
         /// </summary>
         /// <value>true if context is active.</value>
-        public bool Active
-        {
-            get { return this.active; }
-            set { this.active = value; }
-        }
+        public bool Active { get; set; }
 
         /// <summary>
         /// Gets and sets if context is current true.
@@ -83,7 +54,7 @@ namespace WixToolset.Preprocess
                 this.keep = value;
                 if (this.keep)
                 {
-                    this.everKept = true;
+                    this.WasEverTrue = true;
                 }
             }
         }
@@ -92,19 +63,12 @@ namespace WixToolset.Preprocess
         /// Gets if the context was ever true.
         /// </summary>
         /// <value>True if context was ever true.</value>
-        public bool WasEverTrue
-        {
-            get { return this.everKept; }
-        }
+        public bool WasEverTrue { get; private set; }
 
         /// <summary>
         /// Gets the current state of the if context.
         /// </summary>
         /// <value>Current state of context.</value>
-        public IfState IfState
-        {
-            get { return this.state; }
-            set { this.state = value; }
-        }
+        public IfState IfState { get; set; }
     }
 }
diff --git a/src/WixToolset.Core/Preprocess/IfState.cs b/src/WixToolset.Core/Preprocess/IfState.cs
new file mode 100644
index 00000000..f5bb3e87
--- /dev/null
+++ b/src/WixToolset.Core/Preprocess/IfState.cs
@@ -0,0 +1,22 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Core.Preprocess
+{
+    /// <summary>
+    /// Current state of the if context.
+    /// </summary>
+    internal enum IfState
+    {
+        /// <summary>Context currently in unknown state.</summary>
+        Unknown,
+
+        /// <summary>Context currently inside if statement.</summary>
+        If,
+
+        /// <summary>Context currently inside elseif statement..</summary>
+        ElseIf,
+
+        /// <summary>Conext currently inside else statement.</summary>
+        Else,
+    }
+}
diff --git a/src/WixToolset.Core/Preprocessor.cs b/src/WixToolset.Core/Preprocessor.cs
index 23f568a8..3aed0735 100644
--- a/src/WixToolset.Core/Preprocessor.cs
+++ b/src/WixToolset.Core/Preprocessor.cs
@@ -13,7 +13,7 @@ namespace WixToolset.Core
     using System.Xml.Linq;
     using WixToolset.Data;
     using WixToolset.Extensibility;
-    using WixToolset.Preprocess;
+    using WixToolset.Core.Preprocess;
 
     /// <summary>
     /// Preprocessor object
diff --git a/src/WixToolset.Data.WindowsInstaller/ColumnDefinition.cs b/src/WixToolset.Data.WindowsInstaller/ColumnDefinition.cs
index 7e5a07c5..056be1e9 100644
--- a/src/WixToolset.Data.WindowsInstaller/ColumnDefinition.cs
+++ b/src/WixToolset.Data.WindowsInstaller/ColumnDefinition.cs
@@ -975,7 +975,8 @@ namespace WixToolset.Data
                 {
                     if (!(value is string))
                     {
-                        throw new InvalidOperationException(String.Format(CultureInfo.InvariantCulture, "Cannot set string column '{0}' with a value of type '{1}'.", this.name, value.GetType().ToString()));
+                        //throw new InvalidOperationException(String.Format(CultureInfo.InvariantCulture, "Cannot set string column '{0}' with a value of type '{1}'.", this.name, value.GetType().ToString()));
+                        return value.ToString();
                     }
                 }
             }
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs b/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs
index 4b4daeda..da9f3a38 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs
@@ -39,5 +39,52 @@ namespace WixToolsetTest.CoreIntegrationFixture
                 Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path);
             }
         }
+
+        [Fact]
+        public void CanBuildSimpleModule()
+        {
+            var folder = TestData.Get(@"TestData\SimpleModule");
+
+            using (var fs = new DisposableFileSystem())
+            using (var pushd = new Pushd(folder))
+            {
+                var intermediateFolder = fs.GetFolder();
+
+                var program = new Program();
+                var result = program.Run(new WixToolsetServiceProvider(), new[] { "build", "Module.wxs", "-loc", "Module.en-us.wxl", "-bindpath", "data", "-intermediateFolder", intermediateFolder, "-o", $@"{intermediateFolder}\bin\test.msm" });
+
+                Assert.Equal(0, result);
+
+                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msm")));
+                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb")));
+
+                var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wir"));
+                Assert.Single(intermediate.Sections);
+
+                var wixFile = intermediate.Sections.SelectMany(s => s.Tuples).OfType<WixFileTuple>().Single();
+                Assert.Equal(@"data\test.txt", wixFile[WixFileTupleFields.Source].AsPath().Path);
+                Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path);
+            }
+        }
+
+        [Fact(Skip = "Not implemented yet.")]
+        public void CanBuildInstanceTransform()
+        {
+            var folder = TestData.Get(@"TestData\InstanceTransform");
+
+            using (var fs = new DisposableFileSystem())
+            using (var pushd = new Pushd(folder))
+            {
+                var intermediateFolder = fs.GetFolder();
+
+                var program = new Program();
+                var result = program.Run(new WixToolsetServiceProvider(), new[] { "build", "Package.wxs", "PackageComponents.wxs", "-loc", "Package.en-us.wxl", "-bindpath", "data", "-intermediateFolder", intermediateFolder, "-o", $@"{intermediateFolder}\bin\test.msi" });
+
+                Assert.Equal(0, result);
+
+                var pdb = Pdb.Load(Path.Combine(intermediateFolder, @"bin\test.wixpdb"), false);
+                Assert.NotEmpty(pdb.Output.SubStorages);
+            }
+        }
     }
 }
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/InstanceTransform/Package.en-us.wxl b/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/InstanceTransform/Package.en-us.wxl
new file mode 100644
index 00000000..38c12ac1
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/InstanceTransform/Package.en-us.wxl
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+This file contains the declaration of all the localizable strings.
+-->
+<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
+
+  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
+  <String Id="FeatureTitle">MsiPackage</String>
+
+</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/InstanceTransform/Package.wxs b/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/InstanceTransform/Package.wxs
new file mode 100644
index 00000000..9c529668
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/InstanceTransform/Package.wxs
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
+    <Package InstallerVersion="200" Compressed="no" InstallScope="perMachine" />
+
+    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
+    <MediaTemplate />
+
+    <Property Id="INSTANCEPROPERTY" Secure="yes" />
+
+    <InstanceTransforms Property="INSTANCEPROPERTY">
+      <Instance Id="I1" ProductCode="*" ProductName="MsiPackage (Instance 1)" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" />
+    </InstanceTransforms>
+
+    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
+      <ComponentGroupRef Id="ProductComponents" />
+    </Feature>
+  </Product>
+
+  <Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="INSTALLFOLDER" Name="MsiPackageInstance" />
+      </Directory>
+    </Directory>
+  </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/InstanceTransform/PackageComponents.wxs b/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/InstanceTransform/PackageComponents.wxs
new file mode 100644
index 00000000..e26c4509
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/InstanceTransform/PackageComponents.wxs
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+       <Component>
+         <File Source="test.txt" />
+       </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/InstanceTransform/data/test.txt b/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/InstanceTransform/data/test.txt
new file mode 100644
index 00000000..cd0db0e1
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/InstanceTransform/data/test.txt
@@ -0,0 +1 @@
+This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SimpleModule/Module.en-us.wxl b/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SimpleModule/Module.en-us.wxl
new file mode 100644
index 00000000..c74e86a7
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SimpleModule/Module.en-us.wxl
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+This file contains the declaration of all the localizable strings.
+-->
+<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
+
+  <String Id="Manufacturer">Example Company</String>
+
+</WixLocalization>
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SimpleModule/Module.wixproj b/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SimpleModule/Module.wixproj
new file mode 100644
index 00000000..597d4318
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SimpleModule/Module.wixproj
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>0.9</ProductVersion>
+    <ProjectGuid>27df04c6-3cef-4b9a-bac6-4e78d188384f</ProjectGuid>
+    <OutputName>MergeModule1</OutputName>
+    <OutputType>Module</OutputType>
+    <Name>MergeModule1</Name>
+    <RootNamespace>MergeModule1</RootNamespace>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformName>$(Platform)</PlatformName>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <PlatformName>$(Platform)</PlatformName>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <PlatformName>$(Platform)</PlatformName>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <PlatformName>$(Platform)</PlatformName>
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="MergeModule.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="MergeModule.en-us.wxl" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="FgwepExtension.wixext">
+      <Name>FgwepExtension.wixext</Name>
+      <HintPath>$(WixExtDir)\FgwepExtension.wixext.dll</HintPath>
+    </WixExtension>
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+    <Error Text="FG-WiX or WiX Toolset build tools (v3.11 or later) must be installed to build this project. To download FG-WiX, go to https://www.firegiant.com/downloads/. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SimpleModule/Module.wxs b/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SimpleModule/Module.wxs
new file mode 100644
index 00000000..260339ba
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SimpleModule/Module.wxs
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Module Id="MergeModule1" Language="1033" Version="1.0.0.0">
+    <Package Id="243FB739-4D05-472F-9CFB-EF6B1017B6DE" Manufacturer="!(loc.Manufacturer)" InstallerVersion="200" />
+
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="MergeRedirectFolder">
+
+         <Component Id="ModuleComponent" Guid="A04E61B2-3ED4-4803-B2EB-4B773576FA45">
+           <File Source="test.txt" />
+         </Component> 
+
+      </Directory>
+    </Directory>
+  </Module>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SimpleModule/data/test.txt b/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SimpleModule/data/test.txt
new file mode 100644
index 00000000..cd0db0e1
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegrationFixture/TestData/SimpleModule/data/test.txt
@@ -0,0 +1 @@
+This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/WixToolsetTest.CoreIntegrationFixture.csproj b/src/test/WixToolsetTest.CoreIntegrationFixture/WixToolsetTest.CoreIntegrationFixture.csproj
index bce6e6b2..f9042cda 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/WixToolsetTest.CoreIntegrationFixture.csproj
+++ b/src/test/WixToolsetTest.CoreIntegrationFixture/WixToolsetTest.CoreIntegrationFixture.csproj
@@ -7,11 +7,14 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <NoWarn>NU1701</NoWarn>
-  </PropertyGroup>
-
   <ItemGroup>
+    <Content Include="TestData\SimpleModule\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\SimpleModule\Module.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\SimpleModule\Module.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\InstanceTransform\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\InstanceTransform\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\InstanceTransform\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\InstanceTransform\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\SingleFile\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\SingleFile\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\SingleFile\Package.wxs" CopyToOutputDirectory="PreserveNewest" />