aboutsummaryrefslogtreecommitdiff
path: root/src/TestData
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-05-01 20:44:43 -0500
committerSean Hall <r.sean.hall@gmail.com>2021-05-04 11:33:47 -0500
commit70f6c04122db39b5d234715c373d690f97892f8b (patch)
treeb5db48faa12017b9c807fb616aba8926fb7e7d9b /src/TestData
parent0ef54303db8ce523908af744ffc318128405bebd (diff)
downloadwix-70f6c04122db39b5d234715c373d690f97892f8b.tar.gz
wix-70f6c04122db39b5d234715c373d690f97892f8b.tar.bz2
wix-70f6c04122db39b5d234715c373d690f97892f8b.zip
Add x64 Bundle tests.
Diffstat (limited to 'src/TestData')
-rw-r--r--src/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj19
-rw-r--r--src/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wxs10
-rw-r--r--src/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj19
-rw-r--r--src/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj22
-rw-r--r--src/TestData/BasicFunctionalityTests/BundleC/BundleC.wixproj20
-rw-r--r--src/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj22
-rw-r--r--src/TestData/BasicFunctionalityTests/PackageA_x64/PackageA_x64.wixproj10
-rw-r--r--src/TestData/Templates/Bundle.wxs8
-rw-r--r--src/TestData/Templates/Package.wxs2
-rw-r--r--src/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs30
-rw-r--r--src/TestData/TestBA/TestBAWixlib_x64/TestExe_x64.wxs9
-rw-r--r--src/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj20
12 files changed, 190 insertions, 1 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 @@
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
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 @@
18 <!-- pulled in through the PackageGroupRef below --> 18 <!-- pulled in through the PackageGroupRef below -->
19 <?elseif $(var.BA) = "TestBAdnc"?> 19 <?elseif $(var.BA) = "TestBAdnc"?>
20 <!-- pulled in through the PackageGroupRef below --> 20 <!-- pulled in through the PackageGroupRef below -->
21 <?elseif $(var.BA) = "TestBA_x64"?>
22 <!-- pulled in through the PackageGroupRef below -->
23 <?elseif $(var.BA) = "TestBAdnc_x64"?>
24 <!-- pulled in through the PackageGroupRef below -->
21 <?elseif $(var.BA) = "hyperlinkLicense"?> 25 <?elseif $(var.BA) = "hyperlinkLicense"?>
22 <BootstrapperApplication> 26 <BootstrapperApplication>
23 <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" /> 27 <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
@@ -31,6 +35,10 @@
31 <PackageGroupRef Id="TestBA" /> 35 <PackageGroupRef Id="TestBA" />
32 <?elseif $(var.BA) = "TestBAdnc"?> 36 <?elseif $(var.BA) = "TestBAdnc"?>
33 <PackageGroupRef Id="TestBAdnc" /> 37 <PackageGroupRef Id="TestBAdnc" />
38 <?elseif $(var.BA) = "TestBA_x64"?>
39 <PackageGroupRef Id="TestBA_x64" />
40 <?elseif $(var.BA) = "TestBAdnc_x64"?>
41 <PackageGroupRef Id="TestBAdnc_x64" />
34 <?endif?> 42 <?endif?>
35 43
36 <PackageGroupRef Id="BundlePackages" /> 44 <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 @@
35 </Package> 35 </Package>
36 36
37 <Fragment> 37 <Fragment>
38 <StandardDirectory Id="ProgramFilesFolder"> 38 <StandardDirectory Id="ProgramFiles6432Folder">
39 <Directory Id="WixDir" Name="~Test WiX"> 39 <Directory Id="WixDir" Name="~Test WiX">
40 <Directory Id="TestDir" Name="$(var.TestGroupName)"> 40 <Directory Id="TestDir" Name="$(var.TestGroupName)">
41 <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" /> 41 <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 @@
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<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
3 <Fragment>
4 <BootstrapperApplication>
5 <Payload SourceFile="!(bindpath.dnc5x64)\TestBA.deps.json" />
6 <Payload SourceFile="!(bindpath.dnc5x64)\TestBA.dll" bal:BAFactoryAssembly="yes" />
7 <Payload SourceFile="!(bindpath.dnc5x64)\TestBA.runtimeconfig.json" />
8 <Payload SourceFile="!(bindpath.dnc5x64)\mbanative.dll" />
9 <Payload SourceFile="!(bindpath.dnc5x64)\WixToolset.Mba.Core.dll" />
10 <bal:WixDotNetCoreBootstrapperApplicationHost />
11 </BootstrapperApplication>
12
13 <PackageGroup Id="TestBAdnc_x64">
14 <PackageGroupRef Id="NetFx48WebAsPrereq" /> <!-- Yes, this is wrong but we don't have .NET 5 packages yet -->
15 </PackageGroup>
16 </Fragment>
17 <Fragment>
18 <BootstrapperApplication>
19 <Payload Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.net2x64)\TestBA.BootstrapperCore.config" />
20 <Payload SourceFile="!(bindpath.net2x64)\TestBA.dll" />
21 <Payload SourceFile="!(bindpath.net2x64)\mbanative.dll" />
22 <Payload SourceFile="!(bindpath.net2x64)\WixToolset.Mba.Core.dll" />
23 <bal:WixManagedBootstrapperApplicationHost />
24 </BootstrapperApplication>
25
26 <PackageGroup Id="TestBA_x64">
27 <PackageGroupRef Id="NetFx48WebAsPrereq" />
28 </PackageGroup>
29 </Fragment>
30</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 @@
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<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3 <Fragment>
4 <PayloadGroup Id="TestExePayloads_x64">
5 <ExePackagePayload SourceFile="!(bindpath.net2x64)\TestExe.exe" />
6 <Payload SourceFile="!(bindpath.net2x64)\TestExe.exe.config" />
7 </PayloadGroup>
8 </Fragment>
9</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 @@
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>Library</OutputType>
5 <BindFiles>true</BindFiles>
6 <Cultures>en-us</Cultures>
7 <InstallerPlatform>x64</InstallerPlatform>
8 </PropertyGroup>
9 <ItemGroup>
10 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x64" BindName="net2x64" />
11 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net5.0-windows\win-x64" BindName="dnc5x64" />
12 </ItemGroup>
13 <ItemGroup>
14 <ProjectReference Include="..\..\..\TestBA\TestBA_x64.csproj" />
15 <ProjectReference Include="..\..\..\TestExe\TestExe_x64.csproj" />
16 </ItemGroup>
17 <ItemGroup>
18 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.101" />
19 </ItemGroup>
20</Project> \ No newline at end of file
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-26 11:03:45 +0000