Add x64 Bundle tests.

author: Sean Hall <r.sean.hall@gmail.com> 2021-05-01 20:44:43 -0500
committer: Sean Hall <r.sean.hall@gmail.com> 2021-05-04 11:33:47 -0500
commit: 70f6c04122db39b5d234715c373d690f97892f8b (patch)
tree: b5db48faa12017b9c807fb616aba8926fb7e7d9b /src/TestData/BasicFunctionalityTests
parent: 0ef54303db8ce523908af744ffc318128405bebd (diff)
download: wix-70f6c04122db39b5d234715c373d690f97892f8b.tar.gz
wix-70f6c04122db39b5d234715c373d690f97892f8b.tar.bz2
wix-70f6c04122db39b5d234715c373d690f97892f8b.zip
7 files changed, 122 insertions, 0 deletions
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
author	Sean Hall <r.sean.hall@gmail.com>	2021-05-01 20:44:43 -0500
committer	Sean Hall <r.sean.hall@gmail.com>	2021-05-04 11:33:47 -0500
commit	70f6c04122db39b5d234715c373d690f97892f8b (patch)
tree	b5db48faa12017b9c807fb616aba8926fb7e7d9b /src/TestData/BasicFunctionalityTests
parent	0ef54303db8ce523908af744ffc318128405bebd (diff)
download	wix-70f6c04122db39b5d234715c373d690f97892f8b.tar.gz wix-70f6c04122db39b5d234715c373d690f97892f8b.tar.bz2 wix-70f6c04122db39b5d234715c373d690f97892f8b.zip

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 @@
	1	<!-- 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. -->
	2	<Project Sdk="WixToolset.Sdk">
	3	<PropertyGroup>
	4	<OutputType>Bundle</OutputType>
	5	<InstallerPlatform>x64</InstallerPlatform>
	6	<SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings>
	7	<BA>hyperlinkLicense</BA>
	8	<UpgradeCode>{6E86B95A-24F6-4C89-AF2E-470C0C734FCB}</UpgradeCode>
	9	</PropertyGroup>
	10	<ItemGroup>
	11	<Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
	12	</ItemGroup>
	13	<ItemGroup>
	14	<ProjectReference Include="..\PackageA_x64\PackageA_x64.wixproj" />
	15	</ItemGroup>
	16	<ItemGroup>
	17	<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
	18	</ItemGroup>
	19	</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 @@
	1	<!-- 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. -->
	2
	3
	4	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
	5	<Fragment>
	6	<PackageGroup Id="BundlePackages">
	7	<MsiPackage Id="PackageA_x64" SourceFile="$(var.PackageA_x64.TargetPath)" />
	8	</PackageGroup>
	9	</Fragment>
	10	</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 @@
	1	<!-- 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. -->
	2	<Project Sdk="WixToolset.Sdk">
	3	<PropertyGroup>
	4	<OutputType>Bundle</OutputType>
	5	<UpgradeCode>{02258734-E25E-4A2C-AFC5-55C34F1994CB}</UpgradeCode>
	6	</PropertyGroup>
	7	<ItemGroup>
	8	<Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
	9	<Compile Include="..\BundleA\BundleA.wxs" Link="BundleB.wxs" />
	10	</ItemGroup>
	11	<ItemGroup>
	12	<ProjectReference Include="..\PackageA\PackageA.wixproj" />
	13	<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
	14	</ItemGroup>
	15	<ItemGroup>
	16	<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
	17	<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" />
	18	</ItemGroup>
	19	</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 @@
	1	<!-- 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. -->
	2	<Project Sdk="WixToolset.Sdk">
	3	<PropertyGroup>
	4	<OutputType>Bundle</OutputType>
	5	<BA>TestBA_x64</BA>
	6	<UpgradeCode>{79F45B7A-D990-46E4-819B-078D87C3321A}</UpgradeCode>
	7	<InstallerPlatform>x64</InstallerPlatform>
	8	<SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings>
	9	</PropertyGroup>
	10	<ItemGroup>
	11	<Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
	12	<Compile Include="..\BundleA_x64\BundleA_x64.wxs" Link="BundleB_x64.wxs" />
	13	</ItemGroup>
	14	<ItemGroup>
	15	<ProjectReference Include="..\PackageA_x64\PackageA_x64.wixproj" />
	16	<ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />
	17	</ItemGroup>
	18	<ItemGroup>
	19	<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
	20	<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" />
	21	</ItemGroup>
	22	</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 @@
	1	<!-- 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. -->
	2	<Project Sdk="WixToolset.Sdk">
	3	<PropertyGroup>
	4	<OutputType>Bundle</OutputType>
	5	<BA>TestBAdnc</BA>
	6	<UpgradeCode>{DD790BAA-FE9F-4B0D-8AF4-DE4E1D674637}</UpgradeCode>
	7	</PropertyGroup>
	8	<ItemGroup>
	9	<Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
	10	<Compile Include="..\BundleA\BundleA.wxs" Link="BundleC.wxs" />
	11	</ItemGroup>
	12	<ItemGroup>
	13	<ProjectReference Include="..\PackageA\PackageA.wixproj" />
	14	<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
	15	</ItemGroup>
	16	<ItemGroup>
	17	<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
	18	<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" />
	19	</ItemGroup>
	20	</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 @@
	1	<!-- 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. -->
	2	<Project Sdk="WixToolset.Sdk">
	3	<PropertyGroup>
	4	<OutputType>Bundle</OutputType>
	5	<BA>TestBAdnc_x64</BA>
	6	<UpgradeCode>{638D31D0-92BA-4BCD-82F0-7F549820D9AB}</UpgradeCode>
	7	<InstallerPlatform>x64</InstallerPlatform>
	8	<SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings>
	9	</PropertyGroup>
	10	<ItemGroup>
	11	<Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
	12	<Compile Include="..\BundleA_x64\BundleA_x64.wxs" Link="BundleC_x64.wxs" />
	13	</ItemGroup>
	14	<ItemGroup>
	15	<ProjectReference Include="..\PackageA_x64\PackageA_x64.wixproj" />
	16	<ProjectReference Include="..\..\TestBA\TestBAWixlib_x64\testbawixlib_x64.wixproj" />
	17	</ItemGroup>
	18	<ItemGroup>
	19	<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
	20	<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.73" />
	21	</ItemGroup>
	22	</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 @@
	1	<!-- 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. -->
	2	<Project Sdk="WixToolset.Sdk">
	3	<PropertyGroup>
	4	<CabPrefix>a_x64</CabPrefix>
	5	<UpgradeCode>{BDB9EF6A-B2DE-4929-9BE3-0CD71BDAEF6E}</UpgradeCode>
	6	</PropertyGroup>
	7	<ItemGroup>
	8	<Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
	9	</ItemGroup>
	10	</Project> \ No newline at end of file