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

3 files changed, 4 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);
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs
index 9f5e3f34..57c24f57 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Variables/Package.wxs
@@ -6,9 +6,11 @@
 <?define Bar = "Bar" ?>
 <?define Bar = "Baz" ?>
 
+<?ifdef $(sys.WIXVERSION) ?>
 <?if $(sys.WIXMAJORVERSION) >= 4 AND $(sys.WIXMAJORVERSION) < 5 ?>
   <?warning WiX v4 is in effect! ?>
 <?endif?>
+<?endif?>
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">