Support and test preprocessor variables without "var." prefix

2 files changed, 2 insertions, 29 deletions

diff --git a/src/WixToolset.Core/CommandLine/CommandLineOption.cs b/src/WixToolset.Core/CommandLine/CommandLineOption.cs
deleted file mode 100644
index 85a654bf..00000000
--- a/src/WixToolset.Core/CommandLine/CommandLineOption.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolset
-{
-    /// <summary>
-    /// A command line option.
-    /// </summary>
-    public struct CommandLineOption
-    {
-        public string Option;
-        public string Description;
-        public int AdditionalArguments;
-
-        /// <summary>
-        /// Instantiates a new BuilderCommandLineOption.
-        /// </summary>
-        /// <param name="option">The option name.</param>
-        /// <param name="description">The description of the option.</param>
-        /// <param name="additionalArguments">Count of additional arguments to require after this switch.</param>
-        public CommandLineOption(string option, string description, int additionalArguments)
-        {
-            this.Option = option;
-            this.Description = description;
-            this.AdditionalArguments = additionalArguments;
-        }
-    }
-}
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
             // the use of open and closed parens inside variable names. Example: $(env.ProgramFiles(x86)) should resolve.
             if (result == null)
             {
-                result = this.GetVariableValue(context, function, false);
+                result = this.GetVariableValue(context, function, true);
             }
 
             return result;
@@ -403,7 +403,7 @@ namespace WixToolset.Core.ExtensibilityServices
                     }
                     else
                     {
-                        result = this.GetVariableValue(context, subString, false);
+                        result = this.GetVariableValue(context, subString, true);
                     }
 
                     if (null == result)