aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core/Compiler_EmbeddedUI.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-06-17 14:07:26 -0700
committerRob Mensching <rob@firegiant.com>2020-06-23 02:10:31 -0700
commit06e86dadb969ad1d337db11956814a1f79bbcd02 (patch)
tree897300b277c758a2e9bb6db223e7ccee40a583ee /src/WixToolset.Core/Compiler_EmbeddedUI.cs
parent099a5bc83bfde2a713a94d47e613dba16fdcee2a (diff)
downloadwix-06e86dadb969ad1d337db11956814a1f79bbcd02.tar.gz
wix-06e86dadb969ad1d337db11956814a1f79bbcd02.tar.bz2
wix-06e86dadb969ad1d337db11956814a1f79bbcd02.zip
Moved more inner text to attribute
Diffstat (limited to 'src/WixToolset.Core/Compiler_EmbeddedUI.cs')
-rw-r--r--src/WixToolset.Core/Compiler_EmbeddedUI.cs11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/WixToolset.Core/Compiler_EmbeddedUI.cs b/src/WixToolset.Core/Compiler_EmbeddedUI.cs
index 706fe6e9..1827a200 100644
--- a/src/WixToolset.Core/Compiler_EmbeddedUI.cs
+++ b/src/WixToolset.Core/Compiler_EmbeddedUI.cs
@@ -23,6 +23,7 @@ namespace WixToolset.Core
23 var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); 23 var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
24 Identifier id = null; 24 Identifier id = null;
25 string commandLine = null; 25 string commandLine = null;
26 string condition = null;
26 string source = null; 27 string source = null;
27 var type = 0; 28 var type = 0;
28 29
@@ -47,6 +48,9 @@ namespace WixToolset.Core
47 case "CommandLine": 48 case "CommandLine":
48 commandLine = this.Core.GetAttributeValue(sourceLineNumbers, attrib); 49 commandLine = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
49 break; 50 break;
51 case "Condition":
52 condition = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
53 break;
50 case "FileSource": 54 case "FileSource":
51 if (null != source) 55 if (null != source)
52 { 56 {
@@ -76,8 +80,11 @@ namespace WixToolset.Core
76 } 80 }
77 } 81 }
78 82
79 // Get the condition from the inner text of the element. 83 if (condition == null)
80 var condition = this.Core.GetConditionInnerText(node); 84 {
85 // Get the condition from the inner text of the element.
86 condition = this.Core.GetConditionInnerText(node);
87 }
81 88
82 if (null == id) 89 if (null == id)
83 { 90 {