aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/burn/TestData/Templates/Bundle.wxs4
-rw-r--r--src/test/burn/TestData/TestData.proj2
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/ArchSpecificBundle.wixproj17
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/ArchSpecificBundle.wxs13
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/Bundle.wxs63
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/DtfSamples.sln (renamed from src/test/dtf/DtfE2ETests.sln)2
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/EmbeddedUI.config (renamed from src/test/dtf/EmbeddedUI/EmbeddedUI.config)0
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/EmbeddedUI.csproj (renamed from src/test/dtf/EmbeddedUI/EmbeddedUI.csproj)0
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/InstallProgressCounter.cs (renamed from src/test/dtf/EmbeddedUI/InstallProgressCounter.cs)0
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/SampleEmbeddedUI.cs (renamed from src/test/dtf/EmbeddedUI/SampleEmbeddedUI.cs)0
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/SetupWizard.xaml (renamed from src/test/dtf/EmbeddedUI/SetupWizard.xaml)0
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/SetupWizard.xaml.cs (renamed from src/test/dtf/EmbeddedUI/SetupWizard.xaml.cs)0
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/Bundle.wxs63
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/EmbeddedUIBundle.wixproj15
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/EmbeddedUIBundle.wxs11
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/EmbeddedUIPackage/EmbeddedUIPackage.wixproj16
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/EmbeddedUIPackage/EmbeddedUIPackage.wxs13
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/Bundle.wxs63
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/InternalUIBundle.wixproj14
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/InternalUIBundle.wxs10
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/InternalUIPackage/InternalUIPackage.wixproj16
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/InternalUIPackage/InternalUIPackage.wxs24
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/InternalUIarm64Package/InternalUIarm64Package.wixproj14
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/InternalUIarm64Package/InternalUIarm64Package.wxs9
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/InternalUIx64Package/InternalUIx64Package.wixproj14
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/InternalUIx64Package/InternalUIx64Package.wxs9
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/InternalUIx86Package/InternalUIx86Package.wixproj14
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/InternalUIx86Package/InternalUIx86Package.wxs9
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/ManagedCA/CustomAction.config (renamed from src/test/dtf/SampleCA/CustomAction.config)0
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/ManagedCA/ManagedCA.csproj (renamed from src/test/dtf/SampleCA/SampleCA.csproj)0
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/ManagedCA/SampleCA.cs (renamed from src/test/dtf/SampleCA/SampleCA.cs)0
-rw-r--r--src/test/burn/TestData/WixIuiBaTests/ManagedCA/testsub/testfile.txt (renamed from src/test/dtf/SampleCA/testsub/testfile.txt)0
-rw-r--r--src/test/burn/WixTestTools/PackageVerifier.cs18
-rw-r--r--src/test/burn/WixToolsetTest.BurnE2E/WixIuiBaTests.cs144
-rw-r--r--src/test/dtf/Directory.Build.props11
-rw-r--r--src/test/dtf/Directory.Build.targets6
-rw-r--r--src/test/test.cmd2
37 files changed, 571 insertions, 25 deletions
diff --git a/src/test/burn/TestData/Templates/Bundle.wxs b/src/test/burn/TestData/Templates/Bundle.wxs
index 612e67f5..c55f67a7 100644
--- a/src/test/burn/TestData/Templates/Bundle.wxs
+++ b/src/test/burn/TestData/Templates/Bundle.wxs
@@ -33,6 +33,10 @@
33 <BootstrapperApplication> 33 <BootstrapperApplication>
34 <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" /> 34 <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
35 </BootstrapperApplication> 35 </BootstrapperApplication>
36 <?elseif $(var.BA) = "iui"?>
37 <BootstrapperApplication>
38 <bal:WixInternalUIBootstrapperApplication />
39 </BootstrapperApplication>
36 <?else?> 40 <?else?>
37 <BootstrapperApplicationRef Id="$(var.BA)" /> 41 <BootstrapperApplicationRef Id="$(var.BA)" />
38 <?endif?> 42 <?endif?>
diff --git a/src/test/burn/TestData/TestData.proj b/src/test/burn/TestData/TestData.proj
index 27bfb02b..0f7cbee9 100644
--- a/src/test/burn/TestData/TestData.proj
+++ b/src/test/burn/TestData/TestData.proj
@@ -4,7 +4,7 @@
4<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 4<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5 <ItemGroup> 5 <ItemGroup>
6 <TestDataProject Include="**\*.wixproj" /> 6 <TestDataProject Include="**\*.wixproj" />
7 7
8 <!-- https://github.com/wixtoolset/issues/issues/6401 --> 8 <!-- https://github.com/wixtoolset/issues/issues/6401 -->
9 <TestDataProject Remove="DependencyTests\BundleC\BundleC.wixproj" /> 9 <TestDataProject Remove="DependencyTests\BundleC\BundleC.wixproj" />
10 <TestDataProject Remove="DependencyTests\BundleF_PatchAv1_0_1\BundleF_PatchAv1_0_1.wixproj" /> 10 <TestDataProject Remove="DependencyTests\BundleF_PatchAv1_0_1\BundleF_PatchAv1_0_1.wixproj" />
diff --git a/src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/ArchSpecificBundle.wixproj b/src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/ArchSpecificBundle.wixproj
new file mode 100644
index 00000000..9e3cba8b
--- /dev/null
+++ b/src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/ArchSpecificBundle.wixproj
@@ -0,0 +1,17 @@
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>iui</BA>
6 <UpgradeCode>{22B5ADAF-74D3-424A-8D32-9901FCF97E6D}</UpgradeCode>
7 </PropertyGroup>
8 <ItemGroup>
9 <ProjectReference Include="..\InternalUIPackage\InternalUIPackage.wixproj" />
10 <ProjectReference Include="..\InternalUIarm64Package\InternalUIarm64Package.wixproj" />
11 <ProjectReference Include="..\InternalUIx64Package\InternalUIx64Package.wixproj" />
12 <ProjectReference Include="..\InternalUIx86Package\InternalUIx86Package.wixproj" />
13 </ItemGroup>
14 <ItemGroup>
15 <PackageReference Include="WixToolset.Bal.wixext" />
16 </ItemGroup>
17</Project> \ No newline at end of file
diff --git a/src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/ArchSpecificBundle.wxs b/src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/ArchSpecificBundle.wxs
new file mode 100644
index 00000000..71b8665f
--- /dev/null
+++ b/src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/ArchSpecificBundle.wxs
@@ -0,0 +1,13 @@
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" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
5 <Fragment>
6 <PackageGroup Id="BundlePackages">
7 <MsiPackage Id="InternalUIPackage" SourceFile="$(var.InternalUIPackage.TargetPath)" />
8 <MsiPackage Id="InternalUIarm64Package" SourceFile="$(var.InternalUIarm64Package.TargetPath)" bal:PrimaryPackageType="arm64" />
9 <MsiPackage Id="InternalUIx64Package" SourceFile="$(var.InternalUIx64Package.TargetPath)" bal:PrimaryPackageType="x64" />
10 <MsiPackage Id="InternalUIx86Package" SourceFile="$(var.InternalUIx86Package.TargetPath)" bal:PrimaryPackageType="x86" />
11 </PackageGroup>
12 </Fragment>
13</Wix>
diff --git a/src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/Bundle.wxs b/src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/Bundle.wxs
new file mode 100644
index 00000000..195c159e
--- /dev/null
+++ b/src/test/burn/TestData/WixIuiBaTests/ArchSpecificBundle/Bundle.wxs
@@ -0,0 +1,63 @@
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<?ifndef Version?>
4<?define Version = 1.0.0.0?>
5<?endif?>
6<?ifndef BundleLogDirectory?>
7<?define BundleLogDirectory = .?>
8<?endif?>
9
10<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
11 <!-- The only difference from the template should be the SplashScreen and uncompressed -->
12 <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp">
13 <Log Prefix="$(var.BundleLogDirectory)\~$(var.TestGroupName)_$(var.BundleName)" />
14
15 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
16
17 <?ifdef SoftwareTag?>
18 <SoftwareTag Regid="regid.1995-08.com.example" InstallPath="[CommonAppDataFolder]regid.1995-08.com.example" />
19 <?endif?>
20
21 <?ifndef BA?>
22 <!-- pulled in through the PackageGroupRef below -->
23 <?elseif $(var.BA) = "TestBAdnc"?>
24 <!-- pulled in through the PackageGroupRef below -->
25 <?elseif $(var.BA) = "TestBA_x64"?>
26 <!-- pulled in through the PackageGroupRef below -->
27 <?elseif $(var.BA) = "TestBAdnc_x64"?>
28 <!-- pulled in through the PackageGroupRef below -->
29 <?elseif $(var.BA) = "WixBA"?>
30 <!-- pulled in through the PackageGroupRef below -->
31 <?elseif $(var.BA) = "WixBAdnc_x64"?>
32 <!-- pulled in through the PackageGroupRef below -->
33 <?elseif $(var.BA) = "hyperlinkLicense"?>
34 <BootstrapperApplication>
35 <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
36 </BootstrapperApplication>
37 <?elseif $(var.BA) = "iui"?>
38 <BootstrapperApplication>
39 <bal:WixInternalUIBootstrapperApplication />
40 </BootstrapperApplication>
41 <?else?>
42 <BootstrapperApplicationRef Id="$(var.BA)" />
43 <?endif?>
44
45 <Chain>
46 <?ifndef BA?>
47 <PackageGroupRef Id="TestBA" />
48 <?elseif $(var.BA) = "TestBAdnc"?>
49 <PackageGroupRef Id="TestBAdnc" />
50 <?elseif $(var.BA) = "TestBA_x64"?>
51 <PackageGroupRef Id="TestBA_x64" />
52 <?elseif $(var.BA) = "TestBAdnc_x64"?>
53 <PackageGroupRef Id="TestBAdnc_x64" />
54 <?elseif $(var.BA) = "WixBA"?>
55 <PackageGroupRef Id="WixBA" />
56 <?elseif $(var.BA) = "WixBAdnc_x64"?>
57 <PackageGroupRef Id="WixBAdnc_x64" />
58 <?endif?>
59
60 <PackageGroupRef Id="BundlePackages" />
61 </Chain>
62 </Bundle>
63</Wix>
diff --git a/src/test/dtf/DtfE2ETests.sln b/src/test/burn/TestData/WixIuiBaTests/DtfSamples.sln
index 39d8cf08..1e6c2082 100644
--- a/src/test/dtf/DtfE2ETests.sln
+++ b/src/test/burn/TestData/WixIuiBaTests/DtfSamples.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.30114.105
5MinimumVisualStudioVersion = 10.0.40219.1 5MinimumVisualStudioVersion = 10.0.40219.1
6Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmbeddedUI", "EmbeddedUI\EmbeddedUI.csproj", "{864B8C50-7895-4485-AC89-900D86FD8C0D}" 6Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmbeddedUI", "EmbeddedUI\EmbeddedUI.csproj", "{864B8C50-7895-4485-AC89-900D86FD8C0D}"
7EndProject 7EndProject
8Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleCA", "SampleCA\SampleCA.csproj", "{8F53B9CC-6FBE-493D-9C9A-09B2AD578CE7}" 8Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManagedCA", "ManagedCA\ManagedCA.csproj", "{8F53B9CC-6FBE-493D-9C9A-09B2AD578CE7}"
9EndProject 9EndProject
10Global 10Global
11 GlobalSection(SolutionConfigurationPlatforms) = preSolution 11 GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/test/dtf/EmbeddedUI/EmbeddedUI.config b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/EmbeddedUI.config
index 700aff6f..700aff6f 100644
--- a/src/test/dtf/EmbeddedUI/EmbeddedUI.config
+++ b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/EmbeddedUI.config
diff --git a/src/test/dtf/EmbeddedUI/EmbeddedUI.csproj b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/EmbeddedUI.csproj
index a6339220..a6339220 100644
--- a/src/test/dtf/EmbeddedUI/EmbeddedUI.csproj
+++ b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/EmbeddedUI.csproj
diff --git a/src/test/dtf/EmbeddedUI/InstallProgressCounter.cs b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/InstallProgressCounter.cs
index 3d75081c..3d75081c 100644
--- a/src/test/dtf/EmbeddedUI/InstallProgressCounter.cs
+++ b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/InstallProgressCounter.cs
diff --git a/src/test/dtf/EmbeddedUI/SampleEmbeddedUI.cs b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/SampleEmbeddedUI.cs
index ae86dc97..ae86dc97 100644
--- a/src/test/dtf/EmbeddedUI/SampleEmbeddedUI.cs
+++ b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/SampleEmbeddedUI.cs
diff --git a/src/test/dtf/EmbeddedUI/SetupWizard.xaml b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/SetupWizard.xaml
index 97e406c2..97e406c2 100644
--- a/src/test/dtf/EmbeddedUI/SetupWizard.xaml
+++ b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/SetupWizard.xaml
diff --git a/src/test/dtf/EmbeddedUI/SetupWizard.xaml.cs b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/SetupWizard.xaml.cs
index a4345481..a4345481 100644
--- a/src/test/dtf/EmbeddedUI/SetupWizard.xaml.cs
+++ b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUI/SetupWizard.xaml.cs
diff --git a/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/Bundle.wxs b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/Bundle.wxs
new file mode 100644
index 00000000..195c159e
--- /dev/null
+++ b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/Bundle.wxs
@@ -0,0 +1,63 @@
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<?ifndef Version?>
4<?define Version = 1.0.0.0?>
5<?endif?>
6<?ifndef BundleLogDirectory?>
7<?define BundleLogDirectory = .?>
8<?endif?>
9
10<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
11 <!-- The only difference from the template should be the SplashScreen and uncompressed -->
12 <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp">
13 <Log Prefix="$(var.BundleLogDirectory)\~$(var.TestGroupName)_$(var.BundleName)" />
14
15 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
16
17 <?ifdef SoftwareTag?>
18 <SoftwareTag Regid="regid.1995-08.com.example" InstallPath="[CommonAppDataFolder]regid.1995-08.com.example" />
19 <?endif?>
20
21 <?ifndef BA?>
22 <!-- pulled in through the PackageGroupRef below -->
23 <?elseif $(var.BA) = "TestBAdnc"?>
24 <!-- pulled in through the PackageGroupRef below -->
25 <?elseif $(var.BA) = "TestBA_x64"?>
26 <!-- pulled in through the PackageGroupRef below -->
27 <?elseif $(var.BA) = "TestBAdnc_x64"?>
28 <!-- pulled in through the PackageGroupRef below -->
29 <?elseif $(var.BA) = "WixBA"?>
30 <!-- pulled in through the PackageGroupRef below -->
31 <?elseif $(var.BA) = "WixBAdnc_x64"?>
32 <!-- pulled in through the PackageGroupRef below -->
33 <?elseif $(var.BA) = "hyperlinkLicense"?>
34 <BootstrapperApplication>
35 <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
36 </BootstrapperApplication>
37 <?elseif $(var.BA) = "iui"?>
38 <BootstrapperApplication>
39 <bal:WixInternalUIBootstrapperApplication />
40 </BootstrapperApplication>
41 <?else?>
42 <BootstrapperApplicationRef Id="$(var.BA)" />
43 <?endif?>
44
45 <Chain>
46 <?ifndef BA?>
47 <PackageGroupRef Id="TestBA" />
48 <?elseif $(var.BA) = "TestBAdnc"?>
49 <PackageGroupRef Id="TestBAdnc" />
50 <?elseif $(var.BA) = "TestBA_x64"?>
51 <PackageGroupRef Id="TestBA_x64" />
52 <?elseif $(var.BA) = "TestBAdnc_x64"?>
53 <PackageGroupRef Id="TestBAdnc_x64" />
54 <?elseif $(var.BA) = "WixBA"?>
55 <PackageGroupRef Id="WixBA" />
56 <?elseif $(var.BA) = "WixBAdnc_x64"?>
57 <PackageGroupRef Id="WixBAdnc_x64" />
58 <?endif?>
59
60 <PackageGroupRef Id="BundlePackages" />
61 </Chain>
62 </Bundle>
63</Wix>
diff --git a/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/EmbeddedUIBundle.wixproj b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/EmbeddedUIBundle.wixproj
new file mode 100644
index 00000000..7c856200
--- /dev/null
+++ b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/EmbeddedUIBundle.wixproj
@@ -0,0 +1,15 @@
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>iui</BA>
6 <UpgradeCode>{5115D6AC-A1FE-40C6-BEB3-BEBB39E61579}</UpgradeCode>
7 </PropertyGroup>
8 <ItemGroup>
9 <ProjectReference Include="..\EmbeddedUIPackage\EmbeddedUIPackage.wixproj" />
10 <ProjectReference Include="..\InternalUIPackage\InternalUIPackage.wixproj" />
11 </ItemGroup>
12 <ItemGroup>
13 <PackageReference Include="WixToolset.Bal.wixext" />
14 </ItemGroup>
15</Project> \ No newline at end of file
diff --git a/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/EmbeddedUIBundle.wxs b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/EmbeddedUIBundle.wxs
new file mode 100644
index 00000000..6adda9de
--- /dev/null
+++ b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIBundle/EmbeddedUIBundle.wxs
@@ -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
3
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <Fragment>
6 <PackageGroup Id="BundlePackages">
7 <MsiPackage Id="InternalUIPackage" SourceFile="$(var.InternalUIPackage.TargetPath)" Permanent="yes" />
8 <MsiPackage Id="EmbeddedUIPackage" SourceFile="$(var.EmbeddedUIPackage.TargetPath)" />
9 </PackageGroup>
10 </Fragment>
11</Wix>
diff --git a/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIPackage/EmbeddedUIPackage.wixproj b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIPackage/EmbeddedUIPackage.wixproj
new file mode 100644
index 00000000..0a62f38b
--- /dev/null
+++ b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIPackage/EmbeddedUIPackage.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 <PropertyGroup>
4 <ProductComponentsRef>true</ProductComponentsRef>
5 <UpgradeCode>{A6826B6D-2F3F-456D-BABF-1B8CDCE3AE68}</UpgradeCode>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
9 </ItemGroup>
10 <ItemGroup>
11 <ProjectReference Include="..\EmbeddedUI\EmbeddedUI.csproj" />
12 </ItemGroup>
13 <ItemGroup>
14 <PackageReference Include="WixToolset.UI.wixext" />
15 </ItemGroup>
16</Project> \ No newline at end of file
diff --git a/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIPackage/EmbeddedUIPackage.wxs b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIPackage/EmbeddedUIPackage.wxs
new file mode 100644
index 00000000..e5d18c80
--- /dev/null
+++ b/src/test/burn/TestData/WixIuiBaTests/EmbeddedUIPackage/EmbeddedUIPackage.wxs
@@ -0,0 +1,13 @@
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" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
4 <Fragment>
5 <ComponentGroup Id="ProductComponents" />
6
7 <ui:WixUI Id="WixUI_Minimal" />
8
9 <UI>
10 <EmbeddedUI SourceFile="$(var.EmbeddedUI.TargetDir)$(var.EmbeddedUI.TargetName).CA.dll" />
11 </UI>
12 </Fragment>
13</Wix>
diff --git a/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/Bundle.wxs b/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/Bundle.wxs
new file mode 100644
index 00000000..195c159e
--- /dev/null
+++ b/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/Bundle.wxs
@@ -0,0 +1,63 @@
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<?ifndef Version?>
4<?define Version = 1.0.0.0?>
5<?endif?>
6<?ifndef BundleLogDirectory?>
7<?define BundleLogDirectory = .?>
8<?endif?>
9
10<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
11 <!-- The only difference from the template should be the SplashScreen and uncompressed -->
12 <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp">
13 <Log Prefix="$(var.BundleLogDirectory)\~$(var.TestGroupName)_$(var.BundleName)" />
14
15 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
16
17 <?ifdef SoftwareTag?>
18 <SoftwareTag Regid="regid.1995-08.com.example" InstallPath="[CommonAppDataFolder]regid.1995-08.com.example" />
19 <?endif?>
20
21 <?ifndef BA?>
22 <!-- pulled in through the PackageGroupRef below -->
23 <?elseif $(var.BA) = "TestBAdnc"?>
24 <!-- pulled in through the PackageGroupRef below -->
25 <?elseif $(var.BA) = "TestBA_x64"?>
26 <!-- pulled in through the PackageGroupRef below -->
27 <?elseif $(var.BA) = "TestBAdnc_x64"?>
28 <!-- pulled in through the PackageGroupRef below -->
29 <?elseif $(var.BA) = "WixBA"?>
30 <!-- pulled in through the PackageGroupRef below -->
31 <?elseif $(var.BA) = "WixBAdnc_x64"?>
32 <!-- pulled in through the PackageGroupRef below -->
33 <?elseif $(var.BA) = "hyperlinkLicense"?>
34 <BootstrapperApplication>
35 <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
36 </BootstrapperApplication>
37 <?elseif $(var.BA) = "iui"?>
38 <BootstrapperApplication>
39 <bal:WixInternalUIBootstrapperApplication />
40 </BootstrapperApplication>
41 <?else?>
42 <BootstrapperApplicationRef Id="$(var.BA)" />
43 <?endif?>
44
45 <Chain>
46 <?ifndef BA?>
47 <PackageGroupRef Id="TestBA" />
48 <?elseif $(var.BA) = "TestBAdnc"?>
49 <PackageGroupRef Id="TestBAdnc" />
50 <?elseif $(var.BA) = "TestBA_x64"?>
51 <PackageGroupRef Id="TestBA_x64" />
52 <?elseif $(var.BA) = "TestBAdnc_x64"?>
53 <PackageGroupRef Id="TestBAdnc_x64" />
54 <?elseif $(var.BA) = "WixBA"?>
55 <PackageGroupRef Id="WixBA" />
56 <?elseif $(var.BA) = "WixBAdnc_x64"?>
57 <PackageGroupRef Id="WixBAdnc_x64" />
58 <?endif?>
59
60 <PackageGroupRef Id="BundlePackages" />
61 </Chain>
62 </Bundle>
63</Wix>
diff --git a/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/InternalUIBundle.wixproj b/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/InternalUIBundle.wixproj
new file mode 100644
index 00000000..193d0ca6
--- /dev/null
+++ b/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/InternalUIBundle.wixproj
@@ -0,0 +1,14 @@
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>iui</BA>
6 <UpgradeCode>{62CB2BAE-129D-41D1-928B-5353FC542130}</UpgradeCode>
7 </PropertyGroup>
8 <ItemGroup>
9 <ProjectReference Include="..\InternalUIPackage\InternalUIPackage.wixproj" />
10 </ItemGroup>
11 <ItemGroup>
12 <PackageReference Include="WixToolset.Bal.wixext" />
13 </ItemGroup>
14</Project> \ No newline at end of file
diff --git a/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/InternalUIBundle.wxs b/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/InternalUIBundle.wxs
new file mode 100644
index 00000000..332f0b08
--- /dev/null
+++ b/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/InternalUIBundle.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="InternalUIPackage" SourceFile="$(var.InternalUIPackage.TargetPath)" />
8 </PackageGroup>
9 </Fragment>
10</Wix>
diff --git a/src/test/burn/TestData/WixIuiBaTests/InternalUIPackage/InternalUIPackage.wixproj b/src/test/burn/TestData/WixIuiBaTests/InternalUIPackage/InternalUIPackage.wixproj
new file mode 100644
index 00000000..2744d4b3
--- /dev/null
+++ b/src/test/burn/TestData/WixIuiBaTests/InternalUIPackage/InternalUIPackage.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 <PropertyGroup>
4 <ProductComponentsRef>true</ProductComponentsRef>
5 <UpgradeCode>{7A0FE267-9EAE-4780-B41E-60C9E7044F53}</UpgradeCode>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
9 </ItemGroup>
10 <ItemGroup>
11 <ProjectReference Include="..\ManagedCA\ManagedCA.csproj" />
12 </ItemGroup>
13 <ItemGroup>
14 <PackageReference Include="WixToolset.UI.wixext" />
15 </ItemGroup>
16</Project> \ No newline at end of file
diff --git a/src/test/burn/TestData/WixIuiBaTests/InternalUIPackage/InternalUIPackage.wxs b/src/test/burn/TestData/WixIuiBaTests/InternalUIPackage/InternalUIPackage.wxs
new file mode 100644
index 00000000..d5f30729
--- /dev/null
+++ b/src/test/burn/TestData/WixIuiBaTests/InternalUIPackage/InternalUIPackage.wxs
@@ -0,0 +1,24 @@
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" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
4 <Fragment>
5 <ComponentGroup Id="ProductComponents" />
6
7 <ui:WixUI Id="WixUI_Minimal" />
8
9 <Binary Id="TestData" SourceFile="$(var.ManagedCA.TargetDir)testsub\testfile.txt" />
10 <Binary Id="ManagedCA" SourceFile="$(var.ManagedCA.TargetDir)$(var.ManagedCA.TargetName).CA.dll" />
11 <CustomAction Id="SampleCA1" BinaryRef="ManagedCA" DllEntry="SampleCA1" Execute="firstSequence" />
12 <CustomAction Id="SampleCustomAction2" BinaryRef="ManagedCA" DllEntry="SampleCA2" Execute="firstSequence" Return="ignore" />
13
14 <InstallUISequence>
15 <Custom Action="SampleCA1" After="CostFinalize" Condition="NOT Installed" />
16 <Custom Action="SampleCustomAction2" After="SampleCA1" Condition="NOT Installed" />
17 </InstallUISequence>
18
19 <InstallExecuteSequence>
20 <Custom Action="SampleCA1" After="CostFinalize" Condition="NOT Installed" />
21 <Custom Action="SampleCustomAction2" After="SampleCA1" Condition="NOT Installed" />
22 </InstallExecuteSequence>
23 </Fragment>
24</Wix>
diff --git a/src/test/burn/TestData/WixIuiBaTests/InternalUIarm64Package/InternalUIarm64Package.wixproj b/src/test/burn/TestData/WixIuiBaTests/InternalUIarm64Package/InternalUIarm64Package.wixproj
new file mode 100644
index 00000000..e7d5b484
--- /dev/null
+++ b/src/test/burn/TestData/WixIuiBaTests/InternalUIarm64Package/InternalUIarm64Package.wixproj
@@ -0,0 +1,14 @@
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 <ProductComponentsRef>true</ProductComponentsRef>
6 <UpgradeCode>{357EBF93-039C-4378-8BCB-8B53F9B9F69A}</UpgradeCode>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
10 </ItemGroup>
11 <ItemGroup>
12 <PackageReference Include="WixToolset.UI.wixext" />
13 </ItemGroup>
14</Project> \ No newline at end of file
diff --git a/src/test/burn/TestData/WixIuiBaTests/InternalUIarm64Package/InternalUIarm64Package.wxs b/src/test/burn/TestData/WixIuiBaTests/InternalUIarm64Package/InternalUIarm64Package.wxs
new file mode 100644
index 00000000..c30cf607
--- /dev/null
+++ b/src/test/burn/TestData/WixIuiBaTests/InternalUIarm64Package/InternalUIarm64Package.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" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
4 <Fragment>
5 <ComponentGroup Id="ProductComponents" />
6
7 <ui:WixUI Id="WixUI_Minimal" />
8 </Fragment>
9</Wix>
diff --git a/src/test/burn/TestData/WixIuiBaTests/InternalUIx64Package/InternalUIx64Package.wixproj b/src/test/burn/TestData/WixIuiBaTests/InternalUIx64Package/InternalUIx64Package.wixproj
new file mode 100644
index 00000000..ff646914
--- /dev/null
+++ b/src/test/burn/TestData/WixIuiBaTests/InternalUIx64Package/InternalUIx64Package.wixproj
@@ -0,0 +1,14 @@
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 <ProductComponentsRef>true</ProductComponentsRef>
6 <UpgradeCode>{2EBACF8F-BECD-401C-94F2-CFA2C9C3C07F}</UpgradeCode>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
10 </ItemGroup>
11 <ItemGroup>
12 <PackageReference Include="WixToolset.UI.wixext" />
13 </ItemGroup>
14</Project> \ No newline at end of file
diff --git a/src/test/burn/TestData/WixIuiBaTests/InternalUIx64Package/InternalUIx64Package.wxs b/src/test/burn/TestData/WixIuiBaTests/InternalUIx64Package/InternalUIx64Package.wxs
new file mode 100644
index 00000000..c30cf607
--- /dev/null
+++ b/src/test/burn/TestData/WixIuiBaTests/InternalUIx64Package/InternalUIx64Package.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" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
4 <Fragment>
5 <ComponentGroup Id="ProductComponents" />
6
7 <ui:WixUI Id="WixUI_Minimal" />
8 </Fragment>
9</Wix>
diff --git a/src/test/burn/TestData/WixIuiBaTests/InternalUIx86Package/InternalUIx86Package.wixproj b/src/test/burn/TestData/WixIuiBaTests/InternalUIx86Package/InternalUIx86Package.wixproj
new file mode 100644
index 00000000..4107ab44
--- /dev/null
+++ b/src/test/burn/TestData/WixIuiBaTests/InternalUIx86Package/InternalUIx86Package.wixproj
@@ -0,0 +1,14 @@
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 <ProductComponentsRef>true</ProductComponentsRef>
6 <UpgradeCode>{1FA46DA0-5F83-459A-8A30-3E5A54D20A4D}</UpgradeCode>
7 </PropertyGroup>
8 <ItemGroup>
9 <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
10 </ItemGroup>
11 <ItemGroup>
12 <PackageReference Include="WixToolset.UI.wixext" />
13 </ItemGroup>
14</Project> \ No newline at end of file
diff --git a/src/test/burn/TestData/WixIuiBaTests/InternalUIx86Package/InternalUIx86Package.wxs b/src/test/burn/TestData/WixIuiBaTests/InternalUIx86Package/InternalUIx86Package.wxs
new file mode 100644
index 00000000..c30cf607
--- /dev/null
+++ b/src/test/burn/TestData/WixIuiBaTests/InternalUIx86Package/InternalUIx86Package.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" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
4 <Fragment>
5 <ComponentGroup Id="ProductComponents" />
6
7 <ui:WixUI Id="WixUI_Minimal" />
8 </Fragment>
9</Wix>
diff --git a/src/test/dtf/SampleCA/CustomAction.config b/src/test/burn/TestData/WixIuiBaTests/ManagedCA/CustomAction.config
index 700aff6f..700aff6f 100644
--- a/src/test/dtf/SampleCA/CustomAction.config
+++ b/src/test/burn/TestData/WixIuiBaTests/ManagedCA/CustomAction.config
diff --git a/src/test/dtf/SampleCA/SampleCA.csproj b/src/test/burn/TestData/WixIuiBaTests/ManagedCA/ManagedCA.csproj
index 866b7575..866b7575 100644
--- a/src/test/dtf/SampleCA/SampleCA.csproj
+++ b/src/test/burn/TestData/WixIuiBaTests/ManagedCA/ManagedCA.csproj
diff --git a/src/test/dtf/SampleCA/SampleCA.cs b/src/test/burn/TestData/WixIuiBaTests/ManagedCA/SampleCA.cs
index fc9f30fe..fc9f30fe 100644
--- a/src/test/dtf/SampleCA/SampleCA.cs
+++ b/src/test/burn/TestData/WixIuiBaTests/ManagedCA/SampleCA.cs
diff --git a/src/test/dtf/SampleCA/testsub/testfile.txt b/src/test/burn/TestData/WixIuiBaTests/ManagedCA/testsub/testfile.txt
index 8056aefd..8056aefd 100644
--- a/src/test/dtf/SampleCA/testsub/testfile.txt
+++ b/src/test/burn/TestData/WixIuiBaTests/ManagedCA/testsub/testfile.txt
diff --git a/src/test/burn/WixTestTools/PackageVerifier.cs b/src/test/burn/WixTestTools/PackageVerifier.cs
index fd8378e0..4545b9ec 100644
--- a/src/test/burn/WixTestTools/PackageVerifier.cs
+++ b/src/test/burn/WixTestTools/PackageVerifier.cs
@@ -63,17 +63,27 @@ namespace WixTestTools
63 return row.Value; 63 return row.Value;
64 } 64 }
65 65
66 public void VerifyInstalled(bool installed) 66 public bool IsInstalled()
67 { 67 {
68 var productCode = this.GetProperty("ProductCode"); 68 var productCode = this.GetProperty("ProductCode");
69 Assert.Equal(installed, MsiUtilities.IsProductInstalled(productCode)); 69 return MsiUtilities.IsProductInstalled(productCode);
70 } 70 }
71 71
72 public void VerifyInstalledWithVersion(bool installed) 72 public bool IsInstalledWithVersion()
73 { 73 {
74 var productCode = this.GetProperty("ProductCode"); 74 var productCode = this.GetProperty("ProductCode");
75 Version prodVersion = new Version(this.GetProperty("ProductVersion")); 75 Version prodVersion = new Version(this.GetProperty("ProductVersion"));
76 Assert.Equal(installed, MsiUtilities.IsProductInstalledWithVersion(productCode, prodVersion)); 76 return MsiUtilities.IsProductInstalledWithVersion(productCode, prodVersion);
77 }
78
79 public void VerifyInstalled(bool installed)
80 {
81 Assert.Equal(installed, this.IsInstalled());
82 }
83
84 public void VerifyInstalledWithVersion(bool installed)
85 {
86 Assert.Equal(installed, this.IsInstalledWithVersion());
77 } 87 }
78 88
79 public void DeleteTestRegistryValue(string name) 89 public void DeleteTestRegistryValue(string name)
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/WixIuiBaTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/WixIuiBaTests.cs
new file mode 100644
index 00000000..18dd41db
--- /dev/null
+++ b/src/test/burn/WixToolsetTest.BurnE2E/WixIuiBaTests.cs
@@ -0,0 +1,144 @@
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
3namespace WixToolsetTest.BurnE2E
4{
5 using WixTestTools;
6 using Xunit;
7 using Xunit.Abstractions;
8
9 public class WixIuiBaTests : BurnE2ETests
10 {
11 public WixIuiBaTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
12
13 [RuntimeFact]
14 public void CanInstallArchitectureSpecificPrimaryPackage()
15 {
16 var defaultPackage = this.CreatePackageInstaller("InternalUIPackage");
17 var x86Package = this.CreatePackageInstaller("InternalUIx86Package");
18 var x64Package = this.CreatePackageInstaller("InternalUIx64Package");
19 var arm64Package = this.CreatePackageInstaller("InternalUIarm64Package");
20 var bundle = this.CreateBundleInstaller("ArchSpecificBundle");
21
22 defaultPackage.VerifyInstalled(false);
23 x86Package.VerifyInstalled(false);
24 x64Package.VerifyInstalled(false);
25 arm64Package.VerifyInstalled(false);
26 bundle.VerifyUnregisteredAndRemovedFromPackageCache();
27
28 bundle.Install();
29 bundle.VerifyRegisteredAndInPackageCache();
30 defaultPackage.VerifyInstalled(false);
31
32 var archSpecificInstalls = 0;
33 if (x86Package.IsInstalled())
34 {
35 ++archSpecificInstalls;
36 }
37
38 if (x64Package.IsInstalled())
39 {
40 ++archSpecificInstalls;
41 }
42
43 if (arm64Package.IsInstalled())
44 {
45 ++archSpecificInstalls;
46 }
47
48 Assert.Equal(1, archSpecificInstalls);
49
50 bundle.Uninstall();
51 bundle.VerifyUnregisteredAndRemovedFromPackageCache();
52 defaultPackage.VerifyInstalled(false);
53 x86Package.VerifyInstalled(false);
54 x64Package.VerifyInstalled(false);
55 arm64Package.VerifyInstalled(false);
56 }
57
58 [RuntimeFact]
59 public void CanSilentlyInstallAndUninstallEmbeddedUIBundle()
60 {
61 var prereqPackage = this.CreatePackageInstaller("InternalUIPackage");
62 var package = this.CreatePackageInstaller("EmbeddedUIPackage");
63 var bundle = this.CreateBundleInstaller("EmbeddedUIBundle");
64
65 prereqPackage.VerifyInstalled(false);
66 package.VerifyInstalled(false);
67 bundle.VerifyUnregisteredAndRemovedFromPackageCache();
68
69 bundle.Install();
70 bundle.VerifyRegisteredAndInPackageCache();
71 prereqPackage.VerifyInstalled(true);
72 package.VerifyInstalled(true);
73
74 bundle.Uninstall();
75 bundle.VerifyUnregisteredAndRemovedFromPackageCache();
76 prereqPackage.VerifyInstalled(true);
77 package.VerifyInstalled(false);
78 }
79
80 [RuntimeFact]
81 public void CanSilentlyInstallAndUninstallInternalUIBundle()
82 {
83 var package = this.CreatePackageInstaller("InternalUIPackage");
84 var bundle = this.CreateBundleInstaller("InternalUIBundle");
85
86 package.VerifyInstalled(false);
87 bundle.VerifyUnregisteredAndRemovedFromPackageCache();
88
89 bundle.Install();
90 bundle.VerifyRegisteredAndInPackageCache();
91 package.VerifyInstalled(true);
92
93 bundle.Uninstall();
94 bundle.VerifyUnregisteredAndRemovedFromPackageCache();
95 package.VerifyInstalled(false);
96 }
97
98 // Manual test for EmbeddedUIBundle:
99 // 1. Double click EmbeddedUIBundle.exe.
100 // 2. Verify that the prereq BA came up and click the install button (allow elevation).
101 // 3. Verify that the prereq BA automatically closed after installing the prereq.
102 // 4. Verify that the MSI UI came up and click the install button.
103 // 5. After it's finished, click the exit button.
104 // 6. Verify that no other UI is shown and that everything was installed.
105 // 7. Double click EmbeddedUIBundle.exe (allow elevation).
106 // 8. Verify that the prereq BA did not come up.
107 // 9. Verify that the MSI UI came up and click the uninstall button.
108 // 10. After it's finished, click the exit button.
109 // 11. Verify that no other UI is shown and that everything was uninstalled except for the prereq which was permanent.
110 // 12. Uninstall InternalUIPackage to make sure the machine is clean for other tests.
111
112 // Alternate EmbeddedUIBundle test - manually install InternalUIPackage first and verify that the prereq BA doesn't come up during install either.
113
114 // Manual test for InternalUIBundle:
115 // 1. Double click InternalUIBundle.exe on a machine that will prompt for elevation.
116 // 2. Verify that the splash screen appeared but the prereq BA did not come up.
117 // 3. Verify that the elevation prompt came up immediately instead of flashing on the taskbar. (This is currently broken)
118 // 4. Allow elevation.
119 // 5. Verify that the MSI UI came up and the splash screen disappeared.
120 // 6. Accept the two CA messages and click the install button.
121 // 7. After it's finished, click the exit button.
122 // 8. Verify that no other UI is shown and that everything was installed.
123 // 9. Double click InternalUIBundle.exe (allow elevation).
124 // 10. Verify that the prereq BA did not come up.
125 // 11. Verify that the MSI UI came up and click the uninstall button.
126 // 12. After it's finished, click the exit button.
127 // 13. Verify that no other UI is shown and that everything was uninstalled to make sure the machine is clean for other tests.
128
129 // Manual test for Help:
130 // 1. Run EmbeddedUIBundle.exe /help from the command line.
131 // 2. Verify that the prereq BA shows the help information without trying to install the prereqs.
132
133 // Manual test for Layout:
134 // 1. Run EmbeddedUIBundle.exe /layout from an unelevated command line on a machine that will prompt for elevation.
135 // 2. Verify that the prereq BA performs the layout without requiring any input from the user.
136 // 3. Verify that it never prompted for elevation.
137 // 4. Click the exit button.
138
139 // Manual test for Caching error:
140 // 1. Copy InternalUIBundle.exe to a separate folder so that it can't find InternalUIPackage.msi.
141 // 2. Attempt to install InternalUIBundle.exe (allow elevation).
142 // 3. Verify that the prereq BA comes up with the Failure page saying that a file couldn't be found.
143 }
144}
diff --git a/src/test/dtf/Directory.Build.props b/src/test/dtf/Directory.Build.props
deleted file mode 100644
index 0035a9e6..00000000
--- a/src/test/dtf/Directory.Build.props
+++ /dev/null
@@ -1,11 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!-- 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. -->
3<Project>
4 <PropertyGroup>
5 <SegmentName>IntegrationDtf</SegmentName>
6 <SignOutput>false</SignOutput>
7 </PropertyGroup>
8
9 <Import Project="..\..\Directory.Build.props" />
10 <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " />
11</Project>
diff --git a/src/test/dtf/Directory.Build.targets b/src/test/dtf/Directory.Build.targets
deleted file mode 100644
index 4e97b6ca..00000000
--- a/src/test/dtf/Directory.Build.targets
+++ /dev/null
@@ -1,6 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!-- 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. -->
3<Project>
4 <Import Project="..\..\Directory.Build.targets" />
5 <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " />
6</Project>
diff --git a/src/test/test.cmd b/src/test/test.cmd
index 1c2c154b..85deb61e 100644
--- a/src/test/test.cmd
+++ b/src/test/test.cmd
@@ -14,8 +14,6 @@
14@call msi\test_msi.cmd %_C% %_T% || exit /b 14@call msi\test_msi.cmd %_C% %_T% || exit /b
15@call burn\test_burn.cmd %_C% %_T% || exit /b 15@call burn\test_burn.cmd %_C% %_T% || exit /b
16 16
17msbuild -Restore dtf\DtfE2ETests.sln -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\dtfe2etests.binlog || exit /b
18
19dotnet test wix -c %_C% --nologo -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.WixE2ETests.trx" || exit /b 17dotnet test wix -c %_C% --nologo -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.WixE2ETests.trx" || exit /b
20 18
21@popd 19@popd
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-21 13:51:00 +0000