From fb0a8b74b598331dcf037d97a3adf89f5fe5ba92 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Tue, 6 Dec 2022 15:55:18 -0800 Subject: Correctly harvest registry files with multisz Fixes 7044 --- src/tools/heat/Serialize/wix.cs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/tools/heat/Serialize') 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 /// /// 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. /// - 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(); } -- cgit v1.2.3-55-g6feb