Correctly harvest registry files with multisz

Fixes 7044

5 files changed, 18 insertions, 18 deletions

diff --git a/src/tools/heat/RegFileHarvester.cs b/src/tools/heat/RegFileHarvester.cs
index fcb4a9c2..49cf4c01 100644
--- a/src/tools/heat/RegFileHarvester.cs
+++ b/src/tools/heat/RegFileHarvester.cs
@@ -200,7 +200,7 @@ namespace WixToolset.Harvesters
                         foreach (string part in parts)
                         {
                             Wix.MultiStringValue multiStringValue = new Wix.MultiStringValue();
-                            multiStringValue.Content = part;
+                            multiStringValue.Value = part;
                             registryValue.AddChild(multiStringValue);
                         }
 
diff --git a/src/tools/heat/RegistryHarvester.cs b/src/tools/heat/RegistryHarvester.cs
index 0dfd3a29..71dd3962 100644
--- a/src/tools/heat/RegistryHarvester.cs
+++ b/src/tools/heat/RegistryHarvester.cs
@@ -295,7 +295,7 @@ namespace WixToolset.Harvesters
                     {
                         Wix.MultiStringValue multiStringValue = new Wix.MultiStringValue();
 
-                        multiStringValue.Content = String.Empty;
+                        multiStringValue.Value = String.Empty;
 
                         registryValue.AddChild(multiStringValue);
                     }
@@ -305,7 +305,7 @@ namespace WixToolset.Harvesters
                         {
                             Wix.MultiStringValue multiStringValue = new Wix.MultiStringValue();
 
-                            multiStringValue.Content = multiStringValueContent;
+                            multiStringValue.Value = multiStringValueContent;
 
                             registryValue.AddChild(multiStringValue);
                         }
diff --git a/src/tools/heat/Serialize/wix.cs b/src/tools/heat/Serialize/wix.cs
index a3d9b33b..cb62079d 100644
--- a/src/tools/heat/Serialize/wix.cs
+++ b/src/tools/heat/Serialize/wix.cs
@@ -27422,9 +27422,9 @@ namespace WixToolset.Harvesters.Serialize
 
         private ISchemaElement parentElement;
 
-        private string contentField;
+        private string valueField;
 
-        private bool contentFieldSet;
+        private bool valueFieldSet;
 
         public virtual ISchemaElement ParentElement
         {
@@ -27441,18 +27441,18 @@ namespace WixToolset.Harvesters.Serialize
         /// <summary>
         /// Use several of these elements to specify each registry value in a multiString registry value.  This element
         /// cannot be used if the Value attribute is specified unless the Type attribute is set to 'multiString'.  The
-        /// values should go in the text area of the MultiStringValue element.
+        /// values should go in the Value attribute of the MultiStringValue element.
         /// </summary>
-        public string Content
+        public string Value
         {
             get
             {
-                return this.contentField;
+                return this.valueField;
             }
             set
             {
-                this.contentFieldSet = true;
-                this.contentField = value;
+                this.valueFieldSet = true;
+                this.valueField = value;
             }
         }
 
@@ -27463,10 +27463,10 @@ namespace WixToolset.Harvesters.Serialize
             {
                 throw new ArgumentNullException("name");
             }
-            if (("Content" == name))
+            if (("Value" == name))
             {
-                this.contentField = value;
-                this.contentFieldSet = true;
+                this.valueField = value;
+                this.valueFieldSet = true;
             }
         }
 
@@ -27480,9 +27480,9 @@ namespace WixToolset.Harvesters.Serialize
                 throw new ArgumentNullException("writer");
             }
             writer.WriteStartElement("MultiStringValue", "http://wixtoolset.org/schemas/v4/wxs");
-            if (this.contentFieldSet)
+            if (this.valueFieldSet)
             {
-                writer.WriteString(this.contentField);
+                writer.WriteAttributeString("Value", this.valueField);
             }
             writer.WriteEndElement();
         }
diff --git a/src/tools/heat/UtilFinalizeHarvesterMutator.cs b/src/tools/heat/UtilFinalizeHarvesterMutator.cs
index 5af56e89..61bb8731 100644
--- a/src/tools/heat/UtilFinalizeHarvesterMutator.cs
+++ b/src/tools/heat/UtilFinalizeHarvesterMutator.cs
@@ -1076,9 +1076,9 @@ namespace WixToolset.Harvesters
                     foreach (Wix.MultiStringValue multiStringValue in registryValue.Children)
                     {
                         // first replace file paths with their MSI tokens
-                        multiStringValue.Content = this.MutateRegistryString(multiStringValue.Content, (ICollection)this.filePaths);
+                        multiStringValue.Value = this.MutateRegistryString(multiStringValue.Value, (ICollection)this.filePaths);
                         // next replace directory paths with their MSI tokens
-                        multiStringValue.Content = this.MutateRegistryString(multiStringValue.Content, (ICollection)reversedDirectoryPaths);
+                        multiStringValue.Value = this.MutateRegistryString(multiStringValue.Value, (ICollection)reversedDirectoryPaths);
                     }
                 }
                 else
diff --git a/src/tools/heat/UtilMutator.cs b/src/tools/heat/UtilMutator.cs
index 287f5f5e..80fd470c 100644
--- a/src/tools/heat/UtilMutator.cs
+++ b/src/tools/heat/UtilMutator.cs
@@ -246,7 +246,7 @@ namespace WixToolset.Harvesters
                         c.Directory = parentDirectory.Id;
                         parentDirectory.RemoveChild(c);
                     }
-                    else if (c.ParentElement is Wix.DirectoryRef)
+                    else if (c.ParentElement is Wix.DirectoryRef || c.ParentElement is Wix.StandardDirectory)
                     {
                         var parentDirectory = c.ParentElement as Wix.DirectoryBase;