Support and test preprocessor variables without "var." prefix

4 files changed, 71 insertions, 33 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)
diff --git a/src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs
index 62920142..614107b0 100644
--- a/src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/ProgramFixture.cs
@@ -73,7 +73,7 @@ namespace WixToolsetTest.CoreIntegration
                 Assert.Equal(0, result);
 
                 Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msi")));
-                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\cab1.cab")));
+                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\example.cab")));
                 Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb")));
 
                 var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"bin\test.wir"));
@@ -86,6 +86,66 @@ namespace WixToolsetTest.CoreIntegration
         }
 
         [Fact]
+        public void CanBuildSingleFileCompressedWithMediaTemplate()
+        {
+            var folder = TestData.Get(@"TestData\SingleFileCompressed");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var intermediateFolder = fs.GetFolder();
+
+                var program = new Program();
+                var result = program.Run(new WixToolsetServiceProvider(), new[]
+                {
+                    "build",
+                    Path.Combine(folder, "Package.wxs"),
+                    Path.Combine(folder, "PackageComponents.wxs"),
+                    "-d", "MediaTemplateCompressionLevel",
+                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
+                    "-bindpath", Path.Combine(folder, "data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
+                });
+
+                Assert.Equal(0, result);
+
+                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msi")));
+                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\cab1.cab")));
+                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb")));
+            }
+        }
+
+        [Fact]
+        public void CanBuildSingleFileCompressedWithMediaTemplateWithLowCompression()
+        {
+            var folder = TestData.Get(@"TestData\SingleFileCompressed");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var intermediateFolder = fs.GetFolder();
+
+                var program = new Program();
+                var result = program.Run(new WixToolsetServiceProvider(), new[]
+                {
+                    "build",
+                    Path.Combine(folder, "Package.wxs"),
+                    Path.Combine(folder, "PackageComponents.wxs"),
+                    "-d", "MediaTemplateCompressionLevel=low",
+                    "-loc", Path.Combine(folder, "Package.en-us.wxl"),
+                    "-bindpath", Path.Combine(folder, "data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
+                });
+
+                Assert.Equal(0, result);
+
+                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msi")));
+                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\lowcab1.cab")));
+                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb")));
+            }
+        }
+
+        [Fact]
         public void CanBuildSimpleModule()
         {
             var folder = TestData.Get(@"TestData\SimpleModule");
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/Package.wxs
index 2f37a237..0b743c81 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/Package.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleFileCompressed/Package.wxs
@@ -4,10 +4,15 @@
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
 
     <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <!--<MediaTemplate />-->
-    <MediaTemplate CompressionLevel="low" />
-    <!--<Media Id="1" Cabinet="example.cab" />-->
 
+    <?ifndef MediaTemplateCompressionLevel?>
+    <Media Id="1" Cabinet="example.cab" />
+    <?elseif $(MediaTemplateCompressionLevel) = ""?>
+    <MediaTemplate />
+    <?else?>
+    <MediaTemplate CabinetTemplate="lowcab{0}.cab" CompressionLevel="$(MediaTemplateCompressionLevel)" />
+    <?endif?>
+    
     <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
       <ComponentGroupRef Id="ProductComponents" />
     </Feature>