diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-12-06 15:55:18 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-12-06 17:29:07 -0800 |
| commit | fb0a8b74b598331dcf037d97a3adf89f5fe5ba92 (patch) | |
| tree | e66f9b50a04a2589602c89cab8449e2bb9a8e88d /src/tools/heat/Serialize | |
| parent | aa591db212c3df5a5c9f501c01fb1fbf2deadb7c (diff) | |
| download | wix-fb0a8b74b598331dcf037d97a3adf89f5fe5ba92.tar.gz wix-fb0a8b74b598331dcf037d97a3adf89f5fe5ba92.tar.bz2 wix-fb0a8b74b598331dcf037d97a3adf89f5fe5ba92.zip | |
Correctly harvest registry files with multisz
Fixes 7044
Diffstat (limited to 'src/tools/heat/Serialize')
| -rw-r--r-- | src/tools/heat/Serialize/wix.cs | 24 |
1 files changed, 12 insertions, 12 deletions
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 | |||
| 27422 | 27422 | ||
| 27423 | private ISchemaElement parentElement; | 27423 | private ISchemaElement parentElement; |
| 27424 | 27424 | ||
| 27425 | private string contentField; | 27425 | private string valueField; |
| 27426 | 27426 | ||
| 27427 | private bool contentFieldSet; | 27427 | private bool valueFieldSet; |
| 27428 | 27428 | ||
| 27429 | public virtual ISchemaElement ParentElement | 27429 | public virtual ISchemaElement ParentElement |
| 27430 | { | 27430 | { |
| @@ -27441,18 +27441,18 @@ namespace WixToolset.Harvesters.Serialize | |||
| 27441 | /// <summary> | 27441 | /// <summary> |
| 27442 | /// Use several of these elements to specify each registry value in a multiString registry value. This element | 27442 | /// Use several of these elements to specify each registry value in a multiString registry value. This element |
| 27443 | /// cannot be used if the Value attribute is specified unless the Type attribute is set to 'multiString'. The | 27443 | /// cannot be used if the Value attribute is specified unless the Type attribute is set to 'multiString'. The |
| 27444 | /// values should go in the text area of the MultiStringValue element. | 27444 | /// values should go in the Value attribute of the MultiStringValue element. |
| 27445 | /// </summary> | 27445 | /// </summary> |
| 27446 | public string Content | 27446 | public string Value |
| 27447 | { | 27447 | { |
| 27448 | get | 27448 | get |
| 27449 | { | 27449 | { |
| 27450 | return this.contentField; | 27450 | return this.valueField; |
| 27451 | } | 27451 | } |
| 27452 | set | 27452 | set |
| 27453 | { | 27453 | { |
| 27454 | this.contentFieldSet = true; | 27454 | this.valueFieldSet = true; |
| 27455 | this.contentField = value; | 27455 | this.valueField = value; |
| 27456 | } | 27456 | } |
| 27457 | } | 27457 | } |
| 27458 | 27458 | ||
| @@ -27463,10 +27463,10 @@ namespace WixToolset.Harvesters.Serialize | |||
| 27463 | { | 27463 | { |
| 27464 | throw new ArgumentNullException("name"); | 27464 | throw new ArgumentNullException("name"); |
| 27465 | } | 27465 | } |
| 27466 | if (("Content" == name)) | 27466 | if (("Value" == name)) |
| 27467 | { | 27467 | { |
| 27468 | this.contentField = value; | 27468 | this.valueField = value; |
| 27469 | this.contentFieldSet = true; | 27469 | this.valueFieldSet = true; |
| 27470 | } | 27470 | } |
| 27471 | } | 27471 | } |
| 27472 | 27472 | ||
| @@ -27480,9 +27480,9 @@ namespace WixToolset.Harvesters.Serialize | |||
| 27480 | throw new ArgumentNullException("writer"); | 27480 | throw new ArgumentNullException("writer"); |
| 27481 | } | 27481 | } |
| 27482 | writer.WriteStartElement("MultiStringValue", "http://wixtoolset.org/schemas/v4/wxs"); | 27482 | writer.WriteStartElement("MultiStringValue", "http://wixtoolset.org/schemas/v4/wxs"); |
| 27483 | if (this.contentFieldSet) | 27483 | if (this.valueFieldSet) |
| 27484 | { | 27484 | { |
| 27485 | writer.WriteString(this.contentField); | 27485 | writer.WriteAttributeString("Value", this.valueField); |
| 27486 | } | 27486 | } |
| 27487 | writer.WriteEndElement(); | 27487 | writer.WriteEndElement(); |
| 27488 | } | 27488 | } |