From df709d87c25945c10b9d29273dd90b6df6359a99 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sun, 10 Nov 2019 18:19:36 -0500
Subject: Clean up upgrade properties; support <?ifdef $()?>

---
 src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs')

diff --git a/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs b/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
index 60726a02..215c7bc4 100644
--- a/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
@@ -154,10 +154,10 @@ namespace WixToolset.Core.ExtensibilityServices
 
         public string GetVariableValue(IPreprocessContext context, string variable, bool allowMissingPrefix)
         {
-            // Strip the "$(" off the front.
+            // Strip the "$(" off the front and the ")" off the back.
             if (variable.StartsWith("$(", StringComparison.Ordinal))
             {
-                variable = variable.Substring(2);
+                variable = variable.Substring(2, variable.Length - 3);
             }
 
             var parts = variable.Split(VariableSplitter, 2);
-- 
cgit v1.2.3-55-g6feb