Add some 64-bit Burn tests.
Bob Arnson committed
Jun 2, 2021 at 20:46 UTC
a92da42d4087b3e7989239d43aff2c7e1afe05a6
11 files changed
+88
-3
src/test/burn/TestData/BasicFunctionalityTests/BundleA_arm64/BundleA_arm64.wixproj
new
+18
@@ -0,0 +1,18 @@
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>arm64</InstallerPlatform>
6
+ <BA>hyperlinkLicense</BA>
7
+ <UpgradeCode>{94C9641C-8105-4E87-BC46-D21636F76949}</UpgradeCode>
8
+ </PropertyGroup>
9
+ <ItemGroup>
10
+ <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
11
+ </ItemGroup>
12
+ <ItemGroup>
13
+ <ProjectReference Include="..\PackageA_arm64\PackageA_arm64.wixproj" />
14
+ </ItemGroup>
15
+ <ItemGroup>
16
+ <PackageReference Include="WixToolset.Bal.wixext" />
17
+ </ItemGroup>
18
+</Project>
\ No newline at end of file
src/test/burn/TestData/BasicFunctionalityTests/BundleA_arm64/BundleA_arm64.wxs
new
+10
@@ -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_arm64" SourceFile="$(var.PackageA_arm64.TargetPath)" />
8
+ </PackageGroup>
9
+ </Fragment>
10
+</Wix>
src/test/burn/TestData/BasicFunctionalityTests/BundleApu_x64/BundleApu_x64.wixproj
new
+18
@@ -0,0 +1,18 @@
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
+ <BA>hyperlinkLicense</BA>
7
+ <UpgradeCode>{0B29528A-7FC5-4ACC-A465-497A9836FE8D}</UpgradeCode>
8
+ </PropertyGroup>
9
+ <ItemGroup>
10
+ <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
11
+ </ItemGroup>
12
+ <ItemGroup>
13
+ <ProjectReference Include="..\PackageApu_x64\PackageApu_x64.wixproj" />
14
+ </ItemGroup>
15
+ <ItemGroup>
16
+ <PackageReference Include="WixToolset.Bal.wixext" />
17
+ </ItemGroup>
18
+</Project>
\ No newline at end of file
src/test/burn/TestData/BasicFunctionalityTests/BundleApu_x64/BundleApu_x64.wxs
new
+10
@@ -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="PackageApu_x64" SourceFile="$(var.PackageApu_x64.TargetPath)" />
8
+ </PackageGroup>
9
+ </Fragment>
10
+</Wix>
src/test/burn/TestData/BasicFunctionalityTests/PackageA_arm64/PackageA_arm64.wixproj
new
+11
@@ -0,0 +1,11 @@
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
+ <InstallerPlatform>arm64</InstallerPlatform>
5
+ <CabPrefix>a_arm64</CabPrefix>
6
+ <UpgradeCode>{A32CA5EE-029F-4F0E-B518-E0C14EDEEDE0}</UpgradeCode>
7
+ </PropertyGroup>
8
+ <ItemGroup>
9
+ <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
10
+ </ItemGroup>
11
+</Project>
\ No newline at end of file
src/test/burn/TestData/BasicFunctionalityTests/PackageA_x64/PackageA_x64.wixproj
+1
@@ -1,6 +1,7 @@
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
+ <InstallerPlatform>x64</InstallerPlatform>
5
<CabPrefix>a_x64</CabPrefix>
6
<UpgradeCode>{BDB9EF6A-B2DE-4929-9BE3-0CD71BDAEF6E}</UpgradeCode>
7
</PropertyGroup>
src/test/burn/TestData/BasicFunctionalityTests/PackageApu_x64/PackageApu_x64.wixproj
new
+11
@@ -0,0 +1,11 @@
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
+ <InstallerPlatform>x64</InstallerPlatform>
5
+ <CabPrefix>apu_x64</CabPrefix>
6
+ <UpgradeCode>{89FA641D-019D-42BF-BAD8-654675C83E6B}</UpgradeCode>
7
+ </PropertyGroup>
8
+ <ItemGroup>
9
+ <Compile Include="..\..\Templates\PackagePerUser.wxs" Link="PackagePerUser.wxs" />
10
+ </ItemGroup>
11
+</Project>
\ No newline at end of file
src/test/burn/TestData/Templates/Package.wxs
+1
-1
@@ -11,7 +11,7 @@
11
<?endif?>
12
13
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
14
- <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)">
14
+ <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)">
15
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
16
<?ifndef CabPrefix?>
17
<MediaTemplate EmbedCab="yes" />
src/test/burn/TestData/Templates/PackageFail.wxs
+1
-1
@@ -7,7 +7,7 @@
7
<?endif?>
8
9
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
10
- <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
10
+ <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
11
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
12
<MediaTemplate EmbedCab="yes" />
13
src/test/burn/TestData/Templates/PackagePerUser.wxs
+1
-1
@@ -11,7 +11,7 @@
11
<?endif?>
12
13
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
14
- <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)" Scope="perUser">
14
+ <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)" Scope="perUser">
15
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
16
<?ifndef CabPrefix?>
17
<MediaTemplate EmbedCab="yes" />
src/test/burn/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs
+6
@@ -41,6 +41,12 @@ namespace WixToolsetTest.BurnE2E
41
this.CanInstallAndUninstallSimpleBundle("PackageA_x64", "BundleA_x64");
42
}
43
44
+ [Fact]
45
+ public void CanInstallAndUninstallSimplePerUserBundle_x64_wixstdba()
46
+ {
47
+ this.CanInstallAndUninstallSimpleBundle("PackageApu_x64", "BundleApu_x64");
48
+ }
49
+
50
[Fact]
51
public void CanInstallAndUninstallSimpleBundle_x64_testba()
52
{