Clean up upgrade properties; support <?ifdef $()?>

2 files changed, 2 insertions, 8 deletions

diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index b983981b..56d3a8b4 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -7137,9 +7137,6 @@ namespace WixToolset.Core
 
                 this.Core.AddTuple(tuple);
 
-                // Ensure the action property is secure.
-                this.AddWixPropertyRow(sourceLineNumbers, new Identifier(AccessModifier.Public, Common.UpgradeDetectedProperty), false, true, false);
-
                 // Add launch condition that blocks upgrades
                 if (blockUpgrades)
                 {
@@ -7167,9 +7164,6 @@ namespace WixToolset.Core
 
                     this.Core.AddTuple(upgradeTuple);
 
-                    // Ensure the action property is secure.
-                    this.AddWixPropertyRow(sourceLineNumbers, new Identifier(AccessModifier.Public, Common.DowngradeDetectedProperty), false, true, false);
-
                     var conditionTuple = new LaunchConditionTuple(sourceLineNumbers)
                     {
                         Condition = Common.DowngradePreventedCondition,
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);