From 9bdf3730cd43e1af8a4ea9be6cf2fba77fcff2d2 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Thu, 1 Jul 2021 09:30:10 -0500
Subject: Add bundle option for command line variables to always be uppercase.

Fixes #3777
---
 .../TestData/VariableTests/BundleA/BundleA.wixproj | 17 +++++++
 .../TestData/VariableTests/BundleA/BundleA.wxs     | 17 +++++++
 .../burn/TestData/VariableTests/BundleB/Bundle.wxs | 40 +++++++++++++++++
 .../TestData/VariableTests/BundleB/BundleB.wixproj | 14 ++++++
 .../TestData/VariableTests/BundleB/BundleB.wxs     | 17 +++++++
 .../VariableTests/PackageA/PackageA.wixproj        |  9 ++++
 .../burn/WixToolsetTest.BurnE2E/VariableTests.cs   | 52 ++++++++++++++++++++++
 7 files changed, 166 insertions(+)
 create mode 100644 src/test/burn/TestData/VariableTests/BundleA/BundleA.wixproj
 create mode 100644 src/test/burn/TestData/VariableTests/BundleA/BundleA.wxs
 create mode 100644 src/test/burn/TestData/VariableTests/BundleB/Bundle.wxs
 create mode 100644 src/test/burn/TestData/VariableTests/BundleB/BundleB.wixproj
 create mode 100644 src/test/burn/TestData/VariableTests/BundleB/BundleB.wxs
 create mode 100644 src/test/burn/TestData/VariableTests/PackageA/PackageA.wixproj
 create mode 100644 src/test/burn/WixToolsetTest.BurnE2E/VariableTests.cs

(limited to 'src/test')

diff --git a/src/test/burn/TestData/VariableTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/VariableTests/BundleA/BundleA.wixproj
new file mode 100644
index 00000000..91049cee
--- /dev/null
+++ b/src/test/burn/TestData/VariableTests/BundleA/BundleA.wixproj
@@ -0,0 +1,17 @@
+<!-- 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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <BA>hyperlinkLicense</BA>
+    <UpgradeCode>{DDB62589-C5AD-4E92-A697-EAD7D7C37C8D}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA\PackageA.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/TestData/VariableTests/BundleA/BundleA.wxs b/src/test/burn/TestData/VariableTests/BundleA/BundleA.wxs
new file mode 100644
index 00000000..f243c97d
--- /dev/null
+++ b/src/test/burn/TestData/VariableTests/BundleA/BundleA.wxs
@@ -0,0 +1,17 @@
+<!-- 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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)">
+        <MsiProperty Name="INSTALLLOCATION" Value="[INSTALLLOCATION]" />
+        <MsiProperty Name="LICENSEKEY" Value="[LICENSEKEY]" />
+      </MsiPackage>
+    </PackageGroup>
+
+    <Variable Name="INSTALLLOCATION" bal:Overridable="yes" />
+    <Variable Name="LICENSEKEY" Hidden="yes" bal:Overridable="yes" />
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/VariableTests/BundleB/Bundle.wxs b/src/test/burn/TestData/VariableTests/BundleB/Bundle.wxs
new file mode 100644
index 00000000..fb293d9b
--- /dev/null
+++ b/src/test/burn/TestData/VariableTests/BundleB/Bundle.wxs
@@ -0,0 +1,40 @@
+<!-- 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. -->
+
+<?ifndef Version?>
+<?define Version = 1.0.0.0?>
+<?endif?>
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <!-- CommandLineVariables should be the only thing different from the template -->
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" CommandLineVariables="caseSensitive">
+    <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
+
+    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
+
+    <?ifdef SoftwareTag?>
+    <SoftwareTag Regid="regid.1995-08.com.example" InstallPath="[CommonAppDataFolder]regid.1995-08.com.example" />
+    <?endif?>
+
+    <?ifndef BA?>
+      <!-- pulled in through the PackageGroupRef below -->
+    <?elseif $(var.BA) = "TestBAdnc"?>
+      <!-- pulled in through the PackageGroupRef below -->
+    <?elseif $(var.BA) = "hyperlinkLicense"?>
+      <BootstrapperApplication>
+        <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
+      </BootstrapperApplication>
+    <?else?>
+      <BootstrapperApplicationRef Id="$(var.BA)" />
+    <?endif?>
+
+    <Chain>
+      <?ifndef BA?>
+        <PackageGroupRef Id="TestBA" />
+      <?elseif $(var.BA) = "TestBAdnc"?>
+        <PackageGroupRef Id="TestBAdnc" />
+      <?endif?>
+
+      <PackageGroupRef Id="BundlePackages" />
+    </Chain>
+  </Bundle>
+</Wix>
diff --git a/src/test/burn/TestData/VariableTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/VariableTests/BundleB/BundleB.wixproj
new file mode 100644
index 00000000..fa11100b
--- /dev/null
+++ b/src/test/burn/TestData/VariableTests/BundleB/BundleB.wixproj
@@ -0,0 +1,14 @@
+<!-- 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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <BA>hyperlinkLicense</BA>
+    <UpgradeCode>{B735B6D2-9D4D-4E98-B464-946F7F62AFC8}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA\PackageA.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/TestData/VariableTests/BundleB/BundleB.wxs b/src/test/burn/TestData/VariableTests/BundleB/BundleB.wxs
new file mode 100644
index 00000000..f243c97d
--- /dev/null
+++ b/src/test/burn/TestData/VariableTests/BundleB/BundleB.wxs
@@ -0,0 +1,17 @@
+<!-- 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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)">
+        <MsiProperty Name="INSTALLLOCATION" Value="[INSTALLLOCATION]" />
+        <MsiProperty Name="LICENSEKEY" Value="[LICENSEKEY]" />
+      </MsiPackage>
+    </PackageGroup>
+
+    <Variable Name="INSTALLLOCATION" bal:Overridable="yes" />
+    <Variable Name="LICENSEKEY" Hidden="yes" bal:Overridable="yes" />
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/VariableTests/PackageA/PackageA.wixproj b/src/test/burn/TestData/VariableTests/PackageA/PackageA.wixproj
new file mode 100644
index 00000000..da99dfea
--- /dev/null
+++ b/src/test/burn/TestData/VariableTests/PackageA/PackageA.wixproj
@@ -0,0 +1,9 @@
+<!-- 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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <UpgradeCode>{7D70B3D9-968C-4599-9CB4-5A5D6CD17681}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/VariableTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/VariableTests.cs
new file mode 100644
index 00000000..fcec1df2
--- /dev/null
+++ b/src/test/burn/WixToolsetTest.BurnE2E/VariableTests.cs
@@ -0,0 +1,52 @@
+// 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 WixToolsetTest.BurnE2E
+{
+    using System.Collections.Generic;
+    using System.IO;
+    using WixBuildTools.TestSupport;
+    using WixTestTools;
+    using WixToolset.Mba.Core;
+    using Xunit;
+    using Xunit.Abstractions;
+
+    public class VariableTests : BurnE2ETests
+    {
+        public VariableTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
+
+        [Fact]
+        public void CanHideHiddenVariables()
+        {
+            var packageA = this.CreatePackageInstaller("PackageA");
+            var bundleA = this.CreateBundleInstaller("BundleA");
+
+            packageA.VerifyInstalled(false);
+
+            var logFilePath = bundleA.Install(0, "INSTALLLOCATION=nothingtoseehere", "licensekey=supersecretkey");
+            bundleA.VerifyRegisteredAndInPackageCache();
+
+            packageA.VerifyInstalled(true);
+
+            Assert.True(LogVerifier.MessageInLogFile(logFilePath, "INSTALLLOCATION=nothingtoseehere LICENSEKEY=*****"));
+            Assert.True(LogVerifier.MessageInLogFile(logFilePath, "INSTALLLOCATION=\"nothingtoseehere\" LICENSEKEY=\"*****\""));
+            Assert.False(LogVerifier.MessageInLogFile(logFilePath, "supersecretkey"));
+        }
+
+        [Fact]
+        public void CanSupportCaseSensitiveVariables()
+        {
+            var packageA = this.CreatePackageInstaller("PackageA");
+            var bundleB = this.CreateBundleInstaller("BundleB");
+
+            packageA.VerifyInstalled(false);
+
+            var logFilePath = bundleB.Install(0, "InstallLocation=nothingtoseehere", "licensekey=supersecretkey");
+            bundleB.VerifyRegisteredAndInPackageCache();
+
+            packageA.VerifyInstalled(true);
+
+            Assert.True(LogVerifier.MessageInLogFile(logFilePath, "InstallLocation=nothingtoseehere licensekey=supersecretkey"));
+            Assert.True(LogVerifier.MessageInLogFile(logFilePath, "INSTALLLOCATION=\"\" LICENSEKEY=\"*****\""));
+        }
+    }
+}
-- 
cgit v1.2.3-55-g6feb