diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-10-13 18:59:30 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-10-13 19:01:17 -0400 |
| commit | 61cd9e6baeffa365ea535b09d3cf69731b989a9a (patch) | |
| tree | c0a00e141583a73c3c11a41aef82636d70883c05 /src/WixToolset.Converters | |
| parent | 04e2665cf230390c458edcc91ad0bac4b43e9195 (diff) | |
| download | wix-61cd9e6baeffa365ea535b09d3cf69731b989a9a.tar.gz wix-61cd9e6baeffa365ea535b09d3cf69731b989a9a.tar.bz2 wix-61cd9e6baeffa365ea535b09d3cf69731b989a9a.zip | |
Fix conversion of Product/@Condition.
Diffstat (limited to 'src/WixToolset.Converters')
| -rw-r--r-- | src/WixToolset.Converters/WixConverter.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/WixToolset.Converters/WixConverter.cs b/src/WixToolset.Converters/WixConverter.cs index b82c4490..1fcaacb4 100644 --- a/src/WixToolset.Converters/WixConverter.cs +++ b/src/WixToolset.Converters/WixConverter.cs | |||
| @@ -680,10 +680,10 @@ namespace WixToolset.Converters | |||
| 680 | } | 680 | } |
| 681 | } | 681 | } |
| 682 | 682 | ||
| 683 | var xCondition = element.Element(ConditionElementName); | 683 | var xConditions = element.Elements(ConditionElementName).ToList(); |
| 684 | if (xCondition != null) | 684 | foreach (var xCondition in xConditions) |
| 685 | { | 685 | { |
| 686 | var message = element.Attribute("Message")?.Value; | 686 | var message = xCondition.Attribute("Message")?.Value; |
| 687 | 687 | ||
| 688 | if (!String.IsNullOrEmpty(message) && | 688 | if (!String.IsNullOrEmpty(message) && |
| 689 | TryGetInnerText(xCondition, out var text) && | 689 | TryGetInnerText(xCondition, out var text) && |