diff options
| author | Rob Mensching <rob@firegiant.com> | 2017-12-08 10:10:26 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2017-12-08 10:10:26 -0800 |
| commit | c99ba1a05efffd7c43edd87380bc1442942de7a9 (patch) | |
| tree | 257baf2ee69ea20a3675e0fa3eb8bef9aae725f2 /src/WixToolset.Core/ExtensibilityServices | |
| parent | 760e7ebaa490ea6e1a20c9e127de5024d44a3fea (diff) | |
| download | wix-c99ba1a05efffd7c43edd87380bc1442942de7a9.tar.gz wix-c99ba1a05efffd7c43edd87380bc1442942de7a9.tar.bz2 wix-c99ba1a05efffd7c43edd87380bc1442942de7a9.zip | |
Support and test preprocessor variables without "var." prefix
Diffstat (limited to 'src/WixToolset.Core/ExtensibilityServices')
| -rw-r--r-- | src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs b/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs index 3b8011c4..bcbd6a67 100644 --- a/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs +++ b/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs | |||
| @@ -86,7 +86,7 @@ namespace WixToolset.Core.ExtensibilityServices | |||
| 86 | // the use of open and closed parens inside variable names. Example: $(env.ProgramFiles(x86)) should resolve. | 86 | // the use of open and closed parens inside variable names. Example: $(env.ProgramFiles(x86)) should resolve. |
| 87 | if (result == null) | 87 | if (result == null) |
| 88 | { | 88 | { |
| 89 | result = this.GetVariableValue(context, function, false); | 89 | result = this.GetVariableValue(context, function, true); |
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | return result; | 92 | return result; |
| @@ -403,7 +403,7 @@ namespace WixToolset.Core.ExtensibilityServices | |||
| 403 | } | 403 | } |
| 404 | else | 404 | else |
| 405 | { | 405 | { |
| 406 | result = this.GetVariableValue(context, subString, false); | 406 | result = this.GetVariableValue(context, subString, true); |
| 407 | } | 407 | } |
| 408 | 408 | ||
| 409 | if (null == result) | 409 | if (null == result) |
