From a92da42d4087b3e7989239d43aff2c7e1afe05a6 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Wed, 2 Jun 2021 20:46:54 -0400
Subject: Add some 64-bit Burn tests.

---
 .../BundleA_arm64/BundleA_arm64.wixproj                | 18 ++++++++++++++++++
 .../BundleA_arm64/BundleA_arm64.wxs                    | 10 ++++++++++
 .../BundleApu_x64/BundleApu_x64.wixproj                | 18 ++++++++++++++++++
 .../BundleApu_x64/BundleApu_x64.wxs                    | 10 ++++++++++
 .../PackageA_arm64/PackageA_arm64.wixproj              | 11 +++++++++++
 .../PackageA_x64/PackageA_x64.wixproj                  |  1 +
 .../PackageApu_x64/PackageApu_x64.wixproj              | 11 +++++++++++
 src/test/burn/TestData/Templates/Package.wxs           |  2 +-
 src/test/burn/TestData/Templates/PackageFail.wxs       |  2 +-
 src/test/burn/TestData/Templates/PackagePerUser.wxs    |  2 +-
 .../WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs  |  6 ++++++
 11 files changed, 88 insertions(+), 3 deletions(-)
 create mode 100644 src/test/burn/TestData/BasicFunctionalityTests/BundleA_arm64/BundleA_arm64.wixproj
 create mode 100644 src/test/burn/TestData/BasicFunctionalityTests/BundleA_arm64/BundleA_arm64.wxs
 create mode 100644 src/test/burn/TestData/BasicFunctionalityTests/BundleApu_x64/BundleApu_x64.wixproj
 create mode 100644 src/test/burn/TestData/BasicFunctionalityTests/BundleApu_x64/BundleApu_x64.wxs
 create mode 100644 src/test/burn/TestData/BasicFunctionalityTests/PackageA_arm64/PackageA_arm64.wixproj
 create mode 100644 src/test/burn/TestData/BasicFunctionalityTests/PackageApu_x64/PackageApu_x64.wixproj

(limited to 'src')

diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleA_arm64/BundleA_arm64.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleA_arm64/BundleA_arm64.wixproj
new file mode 100644
index 00000000..535129df
--- /dev/null
+++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleA_arm64/BundleA_arm64.wixproj
@@ -0,0 +1,18 @@
+<!-- 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>
+    <InstallerPlatform>arm64</InstallerPlatform>
+    <BA>hyperlinkLicense</BA>
+    <UpgradeCode>{94C9641C-8105-4E87-BC46-D21636F76949}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA_arm64\PackageA_arm64.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleA_arm64/BundleA_arm64.wxs b/src/test/burn/TestData/BasicFunctionalityTests/BundleA_arm64/BundleA_arm64.wxs
new file mode 100644
index 00000000..05cfa26c
--- /dev/null
+++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleA_arm64/BundleA_arm64.wxs
@@ -0,0 +1,10 @@
+<!-- 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">
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA_arm64" SourceFile="$(var.PackageA_arm64.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleApu_x64/BundleApu_x64.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleApu_x64/BundleApu_x64.wixproj
new file mode 100644
index 00000000..3cbedc3d
--- /dev/null
+++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleApu_x64/BundleApu_x64.wixproj
@@ -0,0 +1,18 @@
+<!-- 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>
+    <InstallerPlatform>x64</InstallerPlatform>
+    <BA>hyperlinkLicense</BA>
+    <UpgradeCode>{0B29528A-7FC5-4ACC-A465-497A9836FE8D}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageApu_x64\PackageApu_x64.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleApu_x64/BundleApu_x64.wxs b/src/test/burn/TestData/BasicFunctionalityTests/BundleApu_x64/BundleApu_x64.wxs
new file mode 100644
index 00000000..ebd6cce7
--- /dev/null
+++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleApu_x64/BundleApu_x64.wxs
@@ -0,0 +1,10 @@
+<!-- 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">
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageApu_x64" SourceFile="$(var.PackageApu_x64.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/PackageA_arm64/PackageA_arm64.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/PackageA_arm64/PackageA_arm64.wixproj
new file mode 100644
index 00000000..e70d13a0
--- /dev/null
+++ b/src/test/burn/TestData/BasicFunctionalityTests/PackageA_arm64/PackageA_arm64.wixproj
@@ -0,0 +1,11 @@
+<!-- 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>
+    <InstallerPlatform>arm64</InstallerPlatform>
+    <CabPrefix>a_arm64</CabPrefix>
+    <UpgradeCode>{A32CA5EE-029F-4F0E-B518-E0C14EDEEDE0}</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/TestData/BasicFunctionalityTests/PackageA_x64/PackageA_x64.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/PackageA_x64/PackageA_x64.wixproj
index 8dbab284..b1180f43 100644
--- a/src/test/burn/TestData/BasicFunctionalityTests/PackageA_x64/PackageA_x64.wixproj
+++ b/src/test/burn/TestData/BasicFunctionalityTests/PackageA_x64/PackageA_x64.wixproj
@@ -1,6 +1,7 @@
 <!-- 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>
+    <InstallerPlatform>x64</InstallerPlatform>
     <CabPrefix>a_x64</CabPrefix>
     <UpgradeCode>{BDB9EF6A-B2DE-4929-9BE3-0CD71BDAEF6E}</UpgradeCode>
   </PropertyGroup>
diff --git a/src/test/burn/TestData/BasicFunctionalityTests/PackageApu_x64/PackageApu_x64.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/PackageApu_x64/PackageApu_x64.wixproj
new file mode 100644
index 00000000..945dcfa4
--- /dev/null
+++ b/src/test/burn/TestData/BasicFunctionalityTests/PackageApu_x64/PackageApu_x64.wixproj
@@ -0,0 +1,11 @@
+<!-- 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>
+    <InstallerPlatform>x64</InstallerPlatform>
+    <CabPrefix>apu_x64</CabPrefix>
+    <UpgradeCode>{89FA641D-019D-42BF-BAD8-654675C83E6B}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\PackagePerUser.wxs" Link="PackagePerUser.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/TestData/Templates/Package.wxs b/src/test/burn/TestData/Templates/Package.wxs
index 48ed5e02..c7597131 100644
--- a/src/test/burn/TestData/Templates/Package.wxs
+++ b/src/test/burn/TestData/Templates/Package.wxs
@@ -11,7 +11,7 @@
 <?endif?>
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)">
+  <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)">
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
     <?ifndef CabPrefix?>
     <MediaTemplate EmbedCab="yes" />
diff --git a/src/test/burn/TestData/Templates/PackageFail.wxs b/src/test/burn/TestData/Templates/PackageFail.wxs
index 0139c22b..b3e59540 100644
--- a/src/test/burn/TestData/Templates/PackageFail.wxs
+++ b/src/test/burn/TestData/Templates/PackageFail.wxs
@@ -7,7 +7,7 @@
 <?endif?>
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-  <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
+  <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
     <MediaTemplate EmbedCab="yes" />
 
diff --git a/src/test/burn/TestData/Templates/PackagePerUser.wxs b/src/test/burn/TestData/Templates/PackagePerUser.wxs
index 5e18fefd..daac7658 100644
--- a/src/test/burn/TestData/Templates/PackagePerUser.wxs
+++ b/src/test/burn/TestData/Templates/PackagePerUser.wxs
@@ -11,7 +11,7 @@
 <?endif?>
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)" Scope="perUser">
+  <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)" Scope="perUser">
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
     <?ifndef CabPrefix?>
     <MediaTemplate EmbedCab="yes" />
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs
index f8361d90..1fb0dd58 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs
@@ -41,6 +41,12 @@ namespace WixToolsetTest.BurnE2E
             this.CanInstallAndUninstallSimpleBundle("PackageA_x64", "BundleA_x64");
         }
 
+        [Fact]
+        public void CanInstallAndUninstallSimplePerUserBundle_x64_wixstdba()
+        {
+            this.CanInstallAndUninstallSimpleBundle("PackageApu_x64", "BundleApu_x64");
+        }
+
         [Fact]
         public void CanInstallAndUninstallSimpleBundle_x64_testba()
         {
-- 
cgit v1.2.3-55-g6feb