3 files changed, 53 insertions, 58 deletions

diff --git a/src/WixToolset.Core/Bind/ExtractEmbeddedFilesCommand.cs b/src/WixToolset.Core/Bind/ExtractEmbeddedFilesCommand.cs
index 7de40fb8..7e7c21b1 100644
--- a/src/WixToolset.Core/Bind/ExtractEmbeddedFilesCommand.cs
+++ b/src/WixToolset.Core/Bind/ExtractEmbeddedFilesCommand.cs
@@ -11,7 +11,12 @@ namespace WixToolset.Core.Bind
 
     public class ExtractEmbeddedFilesCommand
     {
-        public IEnumerable<IExpectedExtractFile> FilesWithEmbeddedFiles { private get; set; }
+        public ExtractEmbeddedFilesCommand(IEnumerable<IExpectedExtractFile> embeddedFiles)
+        {
+            this.FilesWithEmbeddedFiles = embeddedFiles;
+        }
+
+        private IEnumerable<IExpectedExtractFile> FilesWithEmbeddedFiles { get; }
 
         public void Execute()
         {
@@ -28,10 +33,10 @@ namespace WixToolset.Core.Bind
                     // a .wixlib embedded in a WixExtension).
                     if ("embeddedresource" == baseUri.Scheme)
                     {
-                        string assemblyPath = Path.GetFullPath(baseUri.LocalPath);
-                        string resourceName = baseUri.Fragment.TrimStart('#');
+                        var assemblyPath = Path.GetFullPath(baseUri.LocalPath);
+                        var resourceName = baseUri.Fragment.TrimStart('#');
 
-                        Assembly assembly = Assembly.LoadFile(assemblyPath);
+                        var assembly = Assembly.LoadFile(assemblyPath);
                         stream = assembly.GetManifestResourceStream(resourceName);
                     }
                     else // normal file (usually a binary .wixlib on disk).
@@ -39,7 +44,7 @@ namespace WixToolset.Core.Bind
                         stream = File.OpenRead(baseUri.LocalPath);
                     }
 
-                    using (FileStructure fs = FileStructure.Read(stream))
+                    using (var fs = FileStructure.Read(stream))
                     {
                         var uniqueIndicies = new SortedSet<int>();
 
diff --git a/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs b/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs
index d05135cf..4585b71a 100644
--- a/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs
+++ b/src/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs
@@ -12,25 +12,28 @@ namespace WixToolset.Core.Bind
     /// Resolves the fields which had variables that needed to be resolved after the file information
     /// was loaded.
     /// </summary>
-    public class ResolveDelayedFieldsCommand : ICommand
+    public class ResolveDelayedFieldsCommand
     {
-        public OutputType OutputType { private get; set;}
-
-        public IEnumerable<IDelayedField> DelayedFields { private get; set;}
+        /// <summary>
+        /// Resolve delayed fields.
+        /// </summary>
+        /// <param name="delayedFields">The fields which had resolution delayed.</param>
+        /// <param name="variableCache">The file information to use when resolving variables.</param>
+        public ResolveDelayedFieldsCommand(IEnumerable<IDelayedField> delayedFields, Dictionary<string, string> variableCache)
+        {
+            this.DelayedFields = delayedFields;
+            this.VariableCache = variableCache;
+        }
 
-        public IDictionary<string, string> VariableCache { private get; set; }
+        private IEnumerable<IDelayedField> DelayedFields { get;}
 
-        public string ModularizationGuid { private get; set; }
+        private IDictionary<string, string> VariableCache { get; }
 
-        /// <param name="output">Internal representation of the msi database to operate upon.</param>
-        /// <param name="delayedFields">The fields which had resolution delayed.</param>
-        /// <param name="variableCache">The file information to use when resolving variables.</param>
-        /// <param name="modularizationGuid">The modularization guid (used in case of a merge module).</param>
         public void Execute()
         {
             var deferredFields = new List<IDelayedField>();
 
-            foreach (IDelayedField delayedField in this.DelayedFields)
+            foreach (var delayedField in this.DelayedFields)
             {
                 try
                 {
@@ -42,7 +45,7 @@ namespace WixToolset.Core.Bind
                         var value = WixVariableResolver.ResolveDelayedVariables(propertyRow.SourceLineNumbers, delayedField.Field.AsString(), this.VariableCache);
 
                         // update the variable cache with the new value
-                        var key = String.Concat("property.", Common.Demodularize(this.OutputType, this.ModularizationGuid, (string)propertyRow[0]));
+                        var key = String.Concat("property.", propertyRow.AsString(0));
                         this.VariableCache[key] = value;
 
                         // update the field data
@@ -62,43 +65,31 @@ namespace WixToolset.Core.Bind
 
             // add specialization for ProductVersion fields
             string keyProductVersion = "property.ProductVersion";
-            if (this.VariableCache.ContainsKey(keyProductVersion))
+            if (this.VariableCache.TryGetValue(keyProductVersion, out var versionValue) && Version.TryParse(versionValue, out Version productVersion))
             {
-                string value = this.VariableCache[keyProductVersion];
-                Version productVersion = null;
-
-                try
+                // Don't add the variable if it already exists (developer defined a property with the same name).
+                string fieldKey = String.Concat(keyProductVersion, ".Major");
+                if (!this.VariableCache.ContainsKey(fieldKey))
                 {
-                    productVersion = new Version(value);
-
-                    // Don't add the variable if it already exists (developer defined a property with the same name).
-                    string fieldKey = String.Concat(keyProductVersion, ".Major");
-                    if (!this.VariableCache.ContainsKey(fieldKey))
-                    {
-                        this.VariableCache[fieldKey] = productVersion.Major.ToString(CultureInfo.InvariantCulture);
-                    }
-
-                    fieldKey = String.Concat(keyProductVersion, ".Minor");
-                    if (!this.VariableCache.ContainsKey(fieldKey))
-                    {
-                        this.VariableCache[fieldKey] = productVersion.Minor.ToString(CultureInfo.InvariantCulture);
-                    }
+                    this.VariableCache[fieldKey] = productVersion.Major.ToString(CultureInfo.InvariantCulture);
+                }
 
-                    fieldKey = String.Concat(keyProductVersion, ".Build");
-                    if (!this.VariableCache.ContainsKey(fieldKey))
-                    {
-                        this.VariableCache[fieldKey] = productVersion.Build.ToString(CultureInfo.InvariantCulture);
-                    }
+                fieldKey = String.Concat(keyProductVersion, ".Minor");
+                if (!this.VariableCache.ContainsKey(fieldKey))
+                {
+                    this.VariableCache[fieldKey] = productVersion.Minor.ToString(CultureInfo.InvariantCulture);
+                }
 
-                    fieldKey = String.Concat(keyProductVersion, ".Revision");
-                    if (!this.VariableCache.ContainsKey(fieldKey))
-                    {
-                        this.VariableCache[fieldKey] = productVersion.Revision.ToString(CultureInfo.InvariantCulture);
-                    }
+                fieldKey = String.Concat(keyProductVersion, ".Build");
+                if (!this.VariableCache.ContainsKey(fieldKey))
+                {
+                    this.VariableCache[fieldKey] = productVersion.Build.ToString(CultureInfo.InvariantCulture);
                 }
-                catch
+
+                fieldKey = String.Concat(keyProductVersion, ".Revision");
+                if (!this.VariableCache.ContainsKey(fieldKey))
                 {
-                    // Ignore the error introduced by new behavior.
+                    this.VariableCache[fieldKey] = productVersion.Revision.ToString(CultureInfo.InvariantCulture);
                 }
             }
 
@@ -113,7 +104,6 @@ namespace WixToolset.Core.Bind
                 catch (WixException we)
                 {
                     Messaging.Instance.OnMessage(we.Error);
-                    continue;
                 }
             }
         }
diff --git a/src/WixToolset.Core/Bind/ResolvedDirectory.cs b/src/WixToolset.Core/Bind/ResolvedDirectory.cs
index fca706d8..9d07fc93 100644
--- a/src/WixToolset.Core/Bind/ResolvedDirectory.cs
+++ b/src/WixToolset.Core/Bind/ResolvedDirectory.cs
@@ -7,15 +7,6 @@ namespace WixToolset.Bind
     /// </summary>
     public struct ResolvedDirectory
     {
-        /// <summary>The directory parent.</summary>
-        public string DirectoryParent;
-
-        /// <summary>The name of this directory.</summary>
-        public string Name;
-
-        /// <summary>The path of this directory.</summary>
-        public string Path;
-
         /// <summary>
         /// Constructor for ResolvedDirectory.
         /// </summary>
@@ -27,5 +18,14 @@ namespace WixToolset.Bind
             this.Name = name;
             this.Path = null;
         }
+
+        /// <summary>The directory parent.</summary>
+        public string DirectoryParent { get; set; }
+
+        /// <summary>The name of this directory.</summary>
+        public string Name { get; set; }
+
+        /// <summary>The path of this directory.</summary>
+        public string Path { get; set; }
     }
 }