Start on new patch infrastructure

2 files changed, 125 insertions, 11 deletions

diff --git a/src/WixToolset.Core/Bind/FileFacade.cs b/src/WixToolset.Core/Bind/FileFacade.cs
index d631a3b5..7bfdb9bb 100644
--- a/src/WixToolset.Core/Bind/FileFacade.cs
+++ b/src/WixToolset.Core/Bind/FileFacade.cs
@@ -2,32 +2,146 @@
 
 namespace WixToolset.Core.Bind
 {
+    using System;
     using System.Collections.Generic;
+    using WixToolset.Data;
     using WixToolset.Data.Tuples;
+    using WixToolset.Data.WindowsInstaller;
+    using WixToolset.Data.WindowsInstaller.Rows;
 
     public class FileFacade
     {
         public FileFacade(FileTuple file, AssemblyTuple assembly)
         {
-            this.File = file;
-            this.Assembly = assembly;
+            this.FileTuple = file;
+            this.AssemblyTuple = assembly;
         }
 
         public FileFacade(bool fromModule, FileTuple file)
         {
             this.FromModule = fromModule;
-            this.File = file;
+            this.FileTuple = file;
+        }
+
+        internal FileFacade(FileRow row)
+        {
+            this.FromTransform = true;
+            this.FileRow = row;
         }
 
         public bool FromModule { get; }
 
-        public FileTuple File { get; }
+        public bool FromTransform { get; }
+
+        private FileRow FileRow { get; }
+
+        private FileTuple FileTuple { get; }
+
+        private AssemblyTuple AssemblyTuple { get; }
+
+        public string Id => this.FileRow == null ? this.FileTuple.Id.Id : this.FileRow.File;
+
+        public Identifier Identifier => this.FileRow == null ? this.FileTuple.Id : throw new NotImplementedException();
+
+        public string ComponentRef => this.FileRow == null ? this.FileTuple.ComponentRef : this.FileRow.Component;
+
+        public int DiskId
+        {
+            get => this.FileRow == null ? this.FileTuple.DiskId ?? 0 : this.FileRow.DiskId;
+            set
+            {
+                if (this.FileRow == null)
+                {
+                    this.FileTuple.DiskId = value;
+                }
+                else
+                {
+                    this.FileRow.DiskId = value;
+                }
+            }
+        }
+
+        public string FileName => this.FileRow == null ? this.FileTuple.Name : this.FileRow.FileName;
+
+        public int FileSize
+        {
+            get => this.FileRow == null ? this.FileTuple.FileSize : this.FileRow.FileSize;
+            set
+            {
+                if (this.FileRow == null)
+                {
+                    this.FileTuple.FileSize = value;
+                }
+                else
+                {
+                    this.FileRow.FileSize = value;
+                }
+            }
+        }
+
+        public string Language
+        {
+            get => this.FileRow == null ? this.FileTuple.Language : this.FileRow.Language;
+            set
+            {
+                if (this.FileRow == null)
+                {
+                    this.FileTuple.Language = value;
+                }
+                else
+                {
+                    this.FileRow.Language = value;
+                }
+            }
+        }
+
+        public int? PatchGroup => this.FileRow == null ? this.FileTuple.PatchGroup : null;
+
+        public int Sequence
+        {
+            get => this.FileRow == null ? this.FileTuple.Sequence : this.FileRow.Sequence;
+            set
+            {
+                if (this.FileRow == null)
+                {
+                    this.FileTuple.Sequence = value;
+                }
+                else
+                {
+                    this.FileRow.Sequence = value;
+                }
+            }
+        }
+
+        public SourceLineNumber SourceLineNumber => this.FileRow == null ? this.FileTuple.SourceLineNumbers : this.FileRow.SourceLineNumbers;
+
+        public string SourcePath => this.FileRow == null ? this.FileTuple.Source.Path : this.FileRow.Source;
+
+        public bool Compressed => this.FileRow == null ? (this.FileTuple.Attributes & FileTupleAttributes.Compressed) == FileTupleAttributes.Compressed : (this.FileRow.Attributes & WindowsInstallerConstants.MsidbFileAttributesCompressed) == WindowsInstallerConstants.MsidbFileAttributesCompressed;
+
+        public bool Uncompressed => this.FileRow == null ? (this.FileTuple.Attributes & FileTupleAttributes.Uncompressed) == FileTupleAttributes.Uncompressed : (this.FileRow.Attributes & WindowsInstallerConstants.MsidbFileAttributesNoncompressed) == WindowsInstallerConstants.MsidbFileAttributesNoncompressed;
+
+        public string Version
+        {
+            get => this.FileRow == null ? this.FileTuple.Version : this.FileRow.Version;
+            set
+            {
+                if (this.FileRow == null)
+                {
+                    this.FileTuple.Version = value;
+                }
+                else
+                {
+                    this.FileRow.Version = value;
+                }
+            }
+        }
 
-        public AssemblyTuple Assembly { get; }
+        public AssemblyType? AssemblyType => this.FileRow == null ? this.AssemblyTuple?.Type : throw new NotImplementedException();
 
-        public int DiskId => this.File.DiskId ?? 0;
+        public string AssemblyApplicationFileRef => this.FileRow == null ? this.AssemblyTuple?.ApplicationFileRef : throw new NotImplementedException();
 
-        public bool Uncompressed => (this.File.Attributes & FileTupleAttributes.Uncompressed) == FileTupleAttributes.Uncompressed;
+        public string AssemblyManifestFileRef => this.FileRow == null ? this.AssemblyTuple?.ManifestFileRef : throw new NotImplementedException();
 
         /// <summary>
         /// Gets the set of MsiAssemblyName rows created for this file.
diff --git a/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs b/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs
index 19a26915..5cb2524d 100644
--- a/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs
+++ b/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs
@@ -89,7 +89,7 @@ namespace WixToolset.Core.Bind
                         {
                             var objectField = field.AsPath();
 
-#if REVISIT_FOR_PATCHING
+#if TODO_PATCHING
                             // Skip file resolution if the file is to be deleted.
                             if (RowOperation.Delete == tuple.Operation)
                             {
@@ -111,7 +111,7 @@ namespace WixToolset.Core.Bind
                                 {
                                     if (!this.BuildingPatch) // Normal binding for non-Patch scenario such as link (light.exe)
                                     {
-#if REVISIT_FOR_PATCHING
+#if TODO_PATCHING
                                         // keep a copy of the un-resolved data for future replay. This will be saved into wixpdb file
                                         if (null == objectField.UnresolvedData)
                                         {
@@ -129,7 +129,7 @@ namespace WixToolset.Core.Bind
                                         var value = fileResolver.ResolveFile(objectField.Path, tuple.Definition, tuple.SourceLineNumbers, BindStage.Normal);
                                         field.Set(value);
                                     }
-#if REVISIT_FOR_PATCHING
+#if TODO_PATCHING
                                     else // Re-base binding path scenario caused by pyro.exe -bt -bu
                                     {
                                         // by default, use the resolved Data for file lookup
@@ -158,7 +158,7 @@ namespace WixToolset.Core.Bind
                                 }
                             }
 
-#if REVISIT_FOR_PATCHING
+#if TODO_PATCHING
                             if (null != objectField.PreviousData)
                             {
                                 objectField.PreviousData = this.BindVariableResolver.ResolveVariables(tuple.SourceLineNumbers, objectField.PreviousData, false, out isDefault);