diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-07-01 00:10:08 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-07-01 11:26:56 -0700 |
| commit | 181aa7076a5bdc4d554d29ec9f96dc923e40a6ed (patch) | |
| tree | e4a4d023b42b98e7b0b867367cd73e318dcdd903 /src/WixToolset.Converters | |
| parent | ea4fe9e10a1236262011f845585ae94154964a86 (diff) | |
| download | wix-181aa7076a5bdc4d554d29ec9f96dc923e40a6ed.tar.gz wix-181aa7076a5bdc4d554d29ec9f96dc923e40a6ed.tar.bz2 wix-181aa7076a5bdc4d554d29ec9f96dc923e40a6ed.zip | |
Make Publish/@Condition truly optional
There is a change to the Core to add the condition back
Diffstat (limited to 'src/WixToolset.Converters')
| -rw-r--r-- | src/WixToolset.Converters/WixConverter.cs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/WixToolset.Converters/WixConverter.cs b/src/WixToolset.Converters/WixConverter.cs index 73538d56..c18b095e 100644 --- a/src/WixToolset.Converters/WixConverter.cs +++ b/src/WixToolset.Converters/WixConverter.cs | |||
| @@ -601,7 +601,16 @@ namespace WixToolset.Converters | |||
| 601 | } | 601 | } |
| 602 | } | 602 | } |
| 603 | 603 | ||
| 604 | private void ConvertPublishElement(XElement element) => this.ConvertInnerTextToAttribute(element, "Condition"); | 604 | private void ConvertPublishElement(XElement element) |
| 605 | { | ||
| 606 | this.ConvertInnerTextToAttribute(element, "Condition"); | ||
| 607 | |||
| 608 | var xCondition = element.Attribute("Condition"); | ||
| 609 | if (xCondition?.Value == "1") | ||
| 610 | { | ||
| 611 | xCondition.Remove(); | ||
| 612 | } | ||
| 613 | } | ||
| 605 | 614 | ||
| 606 | private void ConvertMultiStringValueElement(XElement element) => this.ConvertInnerTextToAttribute(element, "Value"); | 615 | private void ConvertMultiStringValueElement(XElement element) => this.ConvertInnerTextToAttribute(element, "Value"); |
| 607 | 616 | ||
