diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-08-22 15:11:15 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-08-23 10:26:26 -0500 |
commit | 42964da2a12df3b6e7d658a8037f17be003b1947 (patch) | |
tree | a4780a50a0fea0f51525e8a3c05d318e88aac9be /src/test/burn/TestData | |
parent | cb3776e5e3e075e8e4fe2ae7231ec19f3345c546 (diff) | |
download | wix-42964da2a12df3b6e7d658a8037f17be003b1947.tar.gz wix-42964da2a12df3b6e7d658a8037f17be003b1947.tar.bz2 wix-42964da2a12df3b6e7d658a8037f17be003b1947.zip |
Port EnableFeatureSelection tests from v3 repo, add a new one, fix them
Fixes 4616
Diffstat (limited to 'src/test/burn/TestData')
10 files changed, 153 insertions, 0 deletions
diff --git a/src/test/burn/TestData/FeatureTests/BundleAv1/BundleA.props b/src/test/burn/TestData/FeatureTests/BundleAv1/BundleA.props new file mode 100644 index 00000000..dcfcbc82 --- /dev/null +++ b/src/test/burn/TestData/FeatureTests/BundleAv1/BundleA.props | |||
@@ -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> | ||
3 | <PropertyGroup> | ||
4 | <OutputType>Bundle</OutputType> | ||
5 | <BundleName>BundleA</BundleName> | ||
6 | <UpgradeCode>{0A6EDDC7-236F-4367-97EF-EFB0F0B478DE}</UpgradeCode> | ||
7 | </PropertyGroup> | ||
8 | <ItemGroup> | ||
9 | <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" /> | ||
10 | </ItemGroup> | ||
11 | </Project> | ||
diff --git a/src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wixproj new file mode 100644 index 00000000..8a5c9594 --- /dev/null +++ b/src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wixproj | |||
@@ -0,0 +1,16 @@ | |||
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 | <Import Project="BundleA.props" /> | ||
4 | <PropertyGroup> | ||
5 | <Version>1.0.0.0</Version> | ||
6 | </PropertyGroup> | ||
7 | <ItemGroup> | ||
8 | <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" /> | ||
9 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | ||
10 | </ItemGroup> | ||
11 | <ItemGroup> | ||
12 | <PackageReference Include="WixToolset.Bal.wixext" /> | ||
13 | <PackageReference Include="WixToolset.NetFx.wixext" /> | ||
14 | <PackageReference Include="WixToolset.Util.wixext" /> | ||
15 | </ItemGroup> | ||
16 | </Project> \ No newline at end of file | ||
diff --git a/src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wxs b/src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wxs new file mode 100644 index 00000000..0fa01755 --- /dev/null +++ b/src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.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 | |||
3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
4 | <Fragment> | ||
5 | <PackageGroup Id="BundlePackages"> | ||
6 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" EnableFeatureSelection="yes" /> | ||
7 | </PackageGroup> | ||
8 | </Fragment> | ||
9 | </Wix> | ||
diff --git a/src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wixproj b/src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wixproj new file mode 100644 index 00000000..4c6a0993 --- /dev/null +++ b/src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wixproj | |||
@@ -0,0 +1,16 @@ | |||
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 | <Import Project="..\BundleAv1\BundleA.props" /> | ||
4 | <PropertyGroup> | ||
5 | <Version>1.0.1.0</Version> | ||
6 | </PropertyGroup> | ||
7 | <ItemGroup> | ||
8 | <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" /> | ||
9 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | ||
10 | </ItemGroup> | ||
11 | <ItemGroup> | ||
12 | <PackageReference Include="WixToolset.Bal.wixext" /> | ||
13 | <PackageReference Include="WixToolset.NetFx.wixext" /> | ||
14 | <PackageReference Include="WixToolset.Util.wixext" /> | ||
15 | </ItemGroup> | ||
16 | </Project> \ No newline at end of file | ||
diff --git a/src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wxs b/src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wxs new file mode 100644 index 00000000..68802a47 --- /dev/null +++ b/src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.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 | |||
3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
4 | <Fragment> | ||
5 | <PackageGroup Id="BundlePackages"> | ||
6 | <MsiPackage Id="PackageA" Name="PackageAv1.msi" SourceFile="$(var.PackageAv1_0_1.TargetPath)" EnableFeatureSelection="yes" /> | ||
7 | </PackageGroup> | ||
8 | </Fragment> | ||
9 | </Wix> | ||
diff --git a/src/test/burn/TestData/FeatureTests/PackageAv1/Package.wxs b/src/test/burn/TestData/FeatureTests/PackageAv1/Package.wxs new file mode 100644 index 00000000..20ce503a --- /dev/null +++ b/src/test/burn/TestData/FeatureTests/PackageAv1/Package.wxs | |||
@@ -0,0 +1,64 @@ | |||
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 | |||
5 | <?ifndef Version?> | ||
6 | <?define Version = 1.0.0.0?> | ||
7 | <?endif?> | ||
8 | |||
9 | <?ifndef ProductCode?> | ||
10 | <?define ProductCode = *?> | ||
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="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)"> | ||
15 | <MediaTemplate EmbedCab="yes" /> | ||
16 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | ||
17 | |||
18 | <PropertyRef Id="TestVersion" /> | ||
19 | |||
20 | <Feature Id="Complete" Level="1"> | ||
21 | <ComponentRef Id="RegistryComponent"/> | ||
22 | |||
23 | <!-- Not installed by default. --> | ||
24 | <Feature Id="Test" Level="100"> | ||
25 | <ComponentRef Id="FileComponent"/> | ||
26 | <ComponentRef Id="RegistryComponent2"/> | ||
27 | </Feature> | ||
28 | </Feature> | ||
29 | </Package> | ||
30 | |||
31 | <Fragment> | ||
32 | <StandardDirectory Id="ProgramFiles6432Folder"> | ||
33 | <Directory Id="WixDir" Name="~Test WiX"> | ||
34 | <Directory Id="TestDir" Name="$(var.TestGroupName)"> | ||
35 | <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" /> | ||
36 | </Directory> | ||
37 | </Directory> | ||
38 | </StandardDirectory> | ||
39 | </Fragment> | ||
40 | |||
41 | <Fragment> | ||
42 | <Component Id="FileComponent" Guid="{771E78AA-850D-4E08-AA6D-3F31E30ED140}" Directory="INSTALLFOLDER"> | ||
43 | <File Source="$(sys.SOURCEFILEPATH)" /> | ||
44 | <File Name="notkeypath.file" Source="$(sys.SOURCEFILEPATH)" /> | ||
45 | </Component> | ||
46 | </Fragment> | ||
47 | |||
48 | <Fragment> | ||
49 | <Component Id="RegistryComponent" Directory="INSTALLFOLDER"> | ||
50 | <RegistryValue Root="HKLM" Key="Software\WiX\Tests\$(var.TestGroupName)" Name="$(var.PackageName)" Value="!(bind.Property.TestVersion)" Type="string" /> | ||
51 | <Provides Key="WiX.$(var.TestGroupName).A,v1.0" /> | ||
52 | </Component> | ||
53 | </Fragment> | ||
54 | |||
55 | <Fragment> | ||
56 | <Component Id="RegistryComponent2" Directory="INSTALLFOLDER"> | ||
57 | <RegistryValue Root="HKLM" Key="Software\WiX\Tests\$(var.TestGroupName)" Name="$(var.PackageName)2" Value="!(bind.Property.TestVersion)" Type="string" /> | ||
58 | </Component> | ||
59 | </Fragment> | ||
60 | |||
61 | <Fragment> | ||
62 | <Property Id="TestVersion" Value="$(var.Version)" /> | ||
63 | </Fragment> | ||
64 | </Wix> | ||
diff --git a/src/test/burn/TestData/FeatureTests/PackageAv1/PackageA.props b/src/test/burn/TestData/FeatureTests/PackageAv1/PackageA.props new file mode 100644 index 00000000..a7c721c1 --- /dev/null +++ b/src/test/burn/TestData/FeatureTests/PackageAv1/PackageA.props | |||
@@ -0,0 +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> | ||
3 | <PropertyGroup> | ||
4 | <PackageName>PackageA</PackageName> | ||
5 | <UpgradeCode>{6E3370C1-12DE-4E1C-8AE6-C15113FCE22B}</UpgradeCode> | ||
6 | </PropertyGroup> | ||
7 | </Project> \ No newline at end of file | ||
diff --git a/src/test/burn/TestData/FeatureTests/PackageAv1/PackageAv1.props b/src/test/burn/TestData/FeatureTests/PackageAv1/PackageAv1.props new file mode 100644 index 00000000..0b0bb2c4 --- /dev/null +++ b/src/test/burn/TestData/FeatureTests/PackageAv1/PackageAv1.props | |||
@@ -0,0 +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> | ||
3 | <Import Project="PackageA.props" /> | ||
4 | <PropertyGroup> | ||
5 | <ProductCode>{DD17AA83-3B58-4C97-859A-78F228D0B680}</ProductCode> | ||
6 | </PropertyGroup> | ||
7 | </Project> \ No newline at end of file | ||
diff --git a/src/test/burn/TestData/FeatureTests/PackageAv1/PackageAv1.wixproj b/src/test/burn/TestData/FeatureTests/PackageAv1/PackageAv1.wixproj new file mode 100644 index 00000000..e85be384 --- /dev/null +++ b/src/test/burn/TestData/FeatureTests/PackageAv1/PackageAv1.wixproj | |||
@@ -0,0 +1,4 @@ | |||
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 | <Import Project="PackageAv1.props" /> | ||
4 | </Project> \ No newline at end of file | ||
diff --git a/src/test/burn/TestData/FeatureTests/PackageAv1_0_1/PackageAv1_0_1.wixproj b/src/test/burn/TestData/FeatureTests/PackageAv1_0_1/PackageAv1_0_1.wixproj new file mode 100644 index 00000000..74d94a41 --- /dev/null +++ b/src/test/burn/TestData/FeatureTests/PackageAv1_0_1/PackageAv1_0_1.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 | <Import Project="..\PackageAv1\PackageAv1.props" /> | ||
4 | <PropertyGroup> | ||
5 | <Version>1.0.1.0</Version> | ||
6 | </PropertyGroup> | ||
7 | <ItemGroup> | ||
8 | <Compile Include="..\PackageAv1\Package.wxs" Link="Package.wxs" /> | ||
9 | </ItemGroup> | ||
10 | </Project> \ No newline at end of file | ||