aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-01-07 15:12:13 -0800
committerRob Mensching <rob@firegiant.com>2021-01-07 15:17:07 -0800
commita36c59a4911a7db525f6b03dc98fac5adde163b4 (patch)
tree74b6b1edab6547fc6bc4db1c75fefa94a00bed65 /src/WixToolset.Core
parent1b10d394bc88c2840b355bb72c1a502181c28ca2 (diff)
downloadwix-a36c59a4911a7db525f6b03dc98fac5adde163b4.tar.gz
wix-a36c59a4911a7db525f6b03dc98fac5adde163b4.tar.bz2
wix-a36c59a4911a7db525f6b03dc98fac5adde163b4.zip
Support environment variables with parens in the preprocessor
Fixes wixtoolset/issues#4484
Diffstat (limited to 'src/WixToolset.Core')
-rw-r--r--src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs b/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
index df301196..041c7d5d 100644
--- a/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
@@ -386,6 +386,14 @@ namespace WixToolset.Core.ExtensibilityServices
386 } 386 }
387 } 387 }
388 388
389 // Environment variables may contain parens so if it looks
390 // like a function, check to see if the environment variable
391 // prefix was explicitly provided.
392 if (isFunction && remainder.StartsWith("(env.", StringComparison.Ordinal))
393 {
394 isFunction = false;
395 }
396
389 // move the currentPosition to the closing paren 397 // move the currentPosition to the closing paren
390 currentPosition += closingParenPosition; 398 currentPosition += closingParenPosition;
391 399