From 70f6c04122db39b5d234715c373d690f97892f8b Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sat, 1 May 2021 20:44:43 -0500
Subject: Add x64 Bundle tests.

---
 .../BundleA_x64/BundleA_x64.wixproj                | 19 ++++++++++++++
 .../BundleA_x64/BundleA_x64.wxs                    | 10 ++++++++
 .../BundleB/BundleB.wixproj                        | 19 ++++++++++++++
 .../BundleB_x64/BundleB_x64.wixproj                | 22 ++++++++++++++++
 .../BundleC/BundleC.wixproj                        | 20 +++++++++++++++
 .../BundleC_x64/BundleC_x64.wixproj                | 22 ++++++++++++++++
 .../PackageA_x64/PackageA_x64.wixproj              | 10 ++++++++
 src/TestData/Templates/Bundle.wxs                  |  8 ++++++
 src/TestData/Templates/Package.wxs                 |  2 +-
 .../TestBA/TestBAWixlib_x64/TestBA_x64.wxs         | 30 ++++++++++++++++++++++
 .../TestBA/TestBAWixlib_x64/TestExe_x64.wxs        |  9 +++++++
 .../TestBAWixlib_x64/testbawixlib_x64.wixproj      | 20 +++++++++++++++
 12 files changed, 190 insertions(+), 1 deletion(-)
 create mode 100644 src/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj
 create mode 100644 src/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wxs
 create mode 100644 src/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj
 create mode 100644 src/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj
 create mode 100644 src/TestData/BasicFunctionalityTests/BundleC/BundleC.wixproj
 create mode 100644 src/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj
 create mode 100644 src/TestData/BasicFunctionalityTests/PackageA_x64/PackageA_x64.wixproj
 create mode 100644 src/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs
 create mode 100644 src/TestData/TestBA/TestBAWixlib_x64/TestExe_x64.wxs
 create mode 100644 src/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj

(limited to 'src/TestData')

diff --git a/src/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj b/src/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj
new file mode 100644
index 00000000..f5c53195
--- /dev/null
+++ b/src/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj
@@ -0,0 +1,19 @@
+<!-- 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>
+    <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings>
+    <BA>hyperlinkLicense</BA>
+    <UpgradeCode>{6E86B95A-24F6-4C89-AF2E-470C0C734FCB}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA_x64\PackageA_x64.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wxs b/src/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wxs
new file mode 100644
index 00000000..d34e51b6
--- /dev/null
+++ b/src/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_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="PackageA_x64" SourceFile="$(var.PackageA_x64.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj b/src/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj
new file mode 100644
index 00000000..8ea9afe0
--- /dev/null
+++ b/src/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj
@@ -0,0 +1,19 @@
+<!-- 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>
+    <UpgradeCode>{02258734-E25E-4A2C-AFC5-55C34F1994CB}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+    <Compile Include="..\BundleA\BundleA.wxs" Link="BundleB.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA\PackageA.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj b/src/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj
new file mode 100644
index 00000000..35f78cb8
--- /dev/null
+++ b/src/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj
@@ -0,0 +1,22 @@
+<!-- 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>TestBA_x64</BA>
+    <UpgradeCode>{79F45B7A-D990-46E4-819B-078D87C3321A}</UpgradeCode>
+    <InstallerPlatform>x64</InstallerPlatform>
+    <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+    <Compile Include="..\BundleA_x64\BundleA_x64.wxs" Link="BundleB_x64.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA_x64\PackageA_x64.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/BasicFunctionalityTests/BundleC/BundleC.wixproj b/src/TestData/BasicFunctionalityTests/BundleC/BundleC.wixproj
new file mode 100644
index 00000000..104a6003
--- /dev/null
+++ b/src/TestData/BasicFunctionalityTests/BundleC/BundleC.wixproj
@@ -0,0 +1,20 @@
+<!-- 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>TestBAdnc</BA>
+    <UpgradeCode>{DD790BAA-FE9F-4B0D-8AF4-DE4E1D674637}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+    <Compile Include="..\BundleA\BundleA.wxs" Link="BundleC.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA\PackageA.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj b/src/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj
new file mode 100644
index 00000000..aef5e18e
--- /dev/null
+++ b/src/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj
@@ -0,0 +1,22 @@
+<!-- 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>TestBAdnc_x64</BA>
+    <UpgradeCode>{638D31D0-92BA-4BCD-82F0-7F549820D9AB}</UpgradeCode>
+    <InstallerPlatform>x64</InstallerPlatform>
+    <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+    <Compile Include="..\BundleA_x64\BundleA_x64.wxs" Link="BundleC_x64.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA_x64\PackageA_x64.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/BasicFunctionalityTests/PackageA_x64/PackageA_x64.wixproj b/src/TestData/BasicFunctionalityTests/PackageA_x64/PackageA_x64.wixproj
new file mode 100644
index 00000000..8dbab284
--- /dev/null
+++ b/src/TestData/BasicFunctionalityTests/PackageA_x64/PackageA_x64.wixproj
@@ -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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <CabPrefix>a_x64</CabPrefix>
+    <UpgradeCode>{BDB9EF6A-B2DE-4929-9BE3-0CD71BDAEF6E}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/Templates/Bundle.wxs b/src/TestData/Templates/Bundle.wxs
index c77bfbd7..06409504 100644
--- a/src/TestData/Templates/Bundle.wxs
+++ b/src/TestData/Templates/Bundle.wxs
@@ -18,6 +18,10 @@
       <!-- pulled in through the PackageGroupRef below -->
     <?elseif $(var.BA) = "TestBAdnc"?>
       <!-- pulled in through the PackageGroupRef below -->
+    <?elseif $(var.BA) = "TestBA_x64"?>
+      <!-- pulled in through the PackageGroupRef below -->
+    <?elseif $(var.BA) = "TestBAdnc_x64"?>
+      <!-- pulled in through the PackageGroupRef below -->
     <?elseif $(var.BA) = "hyperlinkLicense"?>
       <BootstrapperApplication>
         <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
@@ -31,6 +35,10 @@
         <PackageGroupRef Id="TestBA" />
       <?elseif $(var.BA) = "TestBAdnc"?>
         <PackageGroupRef Id="TestBAdnc" />
+      <?elseif $(var.BA) = "TestBA_x64"?>
+        <PackageGroupRef Id="TestBA_x64" />
+      <?elseif $(var.BA) = "TestBAdnc_x64"?>
+        <PackageGroupRef Id="TestBAdnc_x64" />
       <?endif?>
 
       <PackageGroupRef Id="BundlePackages" />
diff --git a/src/TestData/Templates/Package.wxs b/src/TestData/Templates/Package.wxs
index e2aaa079..48ed5e02 100644
--- a/src/TestData/Templates/Package.wxs
+++ b/src/TestData/Templates/Package.wxs
@@ -35,7 +35,7 @@
   </Package>
 
   <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
+    <StandardDirectory Id="ProgramFiles6432Folder">
       <Directory Id="WixDir" Name="~Test WiX">
         <Directory Id="TestDir" Name="$(var.TestGroupName)">
           <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" />
diff --git a/src/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs b/src/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs
new file mode 100644
index 00000000..078f4f01
--- /dev/null
+++ b/src/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs
@@ -0,0 +1,30 @@
+<!-- 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>
+    <BootstrapperApplication>
+      <Payload SourceFile="!(bindpath.dnc5x64)\TestBA.deps.json" />
+      <Payload SourceFile="!(bindpath.dnc5x64)\TestBA.dll" bal:BAFactoryAssembly="yes" />
+      <Payload SourceFile="!(bindpath.dnc5x64)\TestBA.runtimeconfig.json" />
+      <Payload SourceFile="!(bindpath.dnc5x64)\mbanative.dll" />
+      <Payload SourceFile="!(bindpath.dnc5x64)\WixToolset.Mba.Core.dll" />
+      <bal:WixDotNetCoreBootstrapperApplicationHost />
+    </BootstrapperApplication>
+
+    <PackageGroup Id="TestBAdnc_x64">
+      <PackageGroupRef Id="NetFx48WebAsPrereq" /> <!-- Yes, this is wrong but we don't have .NET 5 packages yet -->
+    </PackageGroup>
+  </Fragment>
+  <Fragment>
+    <BootstrapperApplication>
+      <Payload Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.net2x64)\TestBA.BootstrapperCore.config" />
+      <Payload SourceFile="!(bindpath.net2x64)\TestBA.dll" />
+      <Payload SourceFile="!(bindpath.net2x64)\mbanative.dll" />
+      <Payload SourceFile="!(bindpath.net2x64)\WixToolset.Mba.Core.dll" />
+      <bal:WixManagedBootstrapperApplicationHost />
+    </BootstrapperApplication>
+
+    <PackageGroup Id="TestBA_x64">
+      <PackageGroupRef Id="NetFx48WebAsPrereq" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/TestBA/TestBAWixlib_x64/TestExe_x64.wxs b/src/TestData/TestBA/TestBAWixlib_x64/TestExe_x64.wxs
new file mode 100644
index 00000000..02bed038
--- /dev/null
+++ b/src/TestData/TestBA/TestBAWixlib_x64/TestExe_x64.wxs
@@ -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. -->
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+    <PayloadGroup Id="TestExePayloads_x64">
+      <ExePackagePayload SourceFile="!(bindpath.net2x64)\TestExe.exe" />
+      <Payload SourceFile="!(bindpath.net2x64)\TestExe.exe.config" />
+    </PayloadGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj b/src/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj
new file mode 100644
index 00000000..9b7d3c17
--- /dev/null
+++ b/src/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj
@@ -0,0 +1,20 @@
+<!-- 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>Library</OutputType>
+    <BindFiles>true</BindFiles>
+    <Cultures>en-us</Cultures>
+    <InstallerPlatform>x64</InstallerPlatform>
+  </PropertyGroup>
+  <ItemGroup>
+    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x64" BindName="net2x64" />
+    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net5.0-windows\win-x64" BindName="dnc5x64" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\TestBA\TestBA_x64.csproj" />
+    <ProjectReference Include="..\..\..\TestExe\TestExe_x64.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb