Add missing Binary simple reference for UI.wixext dll.

author: Sean Hall <r.sean.hall@gmail.com> 2022-07-05 10:33:58 -0500
committer: Sean Hall <r.sean.hall@gmail.com> 2022-07-05 11:46:35 -0500
commit: a3a3b2aca8978b9ff00d64a3be20ce6525ee78cd (patch)
tree: b5fc823125ae9c9c3cee01bc09e5e076dcdd44ef /src/ext/UI/test/WixToolsetTest.UI
parent: 1e21a5de35a9d12218065e999f172ea766ffd3df (diff)
download: wix-a3a3b2aca8978b9ff00d64a3be20ce6525ee78cd.tar.gz
wix-a3a3b2aca8978b9ff00d64a3be20ce6525ee78cd.tar.bz2
wix-a3a3b2aca8978b9ff00d64a3be20ce6525ee78cd.zip
1 files changed, 124 insertions, 25 deletions
diff --git a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
index 4b1c8575..f93f232c 100644
--- a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
+++ b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
@@ -20,14 +20,27 @@ namespace WixToolsetTest.UI
            var bindFolder = TestData.Get(@"TestData\data");
            var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
-            var results = build.BuildAndQuery(Build, "Dialog", "CustomAction");
+            var results = build.BuildAndQuery(Build, "Binary", "Dialog", "CustomAction");
            Assert.Single(results, result => result.StartsWith("Dialog:AdvancedWelcomeEulaDlg\t"));
-            Assert.Single(results, result => result.StartsWith("CustomAction:WixSetDefaultPerMachineFolder\t"));
+            WixAssert.CompareLineByLine(new[]
-            Assert.Single(results, result => result.StartsWith("CustomAction:WixSetDefaultPerUserFolder\t"));
+            {
-            Assert.Single(results, result => result.StartsWith("CustomAction:WixSetPerMachineFolder\t"));
+                "Binary:WixUI_Bmp_Banner\t[Binary data]",
-            Assert.Single(results, result => result.StartsWith("CustomAction:WixSetPerUserFolder\t"));
+                "Binary:WixUI_Bmp_Dialog\t[Binary data]",
-            Assert.Single(results, result => result.StartsWith("CustomAction:WixUIPrintEula\t65\tWixUiCa_X86\t"));
+                "Binary:WixUI_Bmp_New\t[Binary data]",
-            Assert.Single(results, result => result.StartsWith("CustomAction:WixUIValidatePath\t65\tWixUiCa_X86\t"));
+                "Binary:WixUI_Bmp_Up\t[Binary data]",
+                "Binary:WixUI_Ico_Exclam\t[Binary data]",
+                "Binary:WixUI_Ico_Info\t[Binary data]",
+                "Binary:WixUiCa_X86\t[Binary data]",
+            }, results.Where(r => r.StartsWith("Binary:")).ToArray());
+            WixAssert.CompareLineByLine(new[]
+            {
+                "CustomAction:WixSetDefaultPerMachineFolder\t51\tWixPerMachineFolder\t[ProgramFilesFolder][ApplicationFolderName]\t",
+                "CustomAction:WixSetDefaultPerUserFolder\t51\tWixPerUserFolder\t[LocalAppDataFolder]Apps\\[ApplicationFolderName]\t",
+                "CustomAction:WixSetPerMachineFolder\t51\tAPPLICATIONFOLDER\t[WixPerMachineFolder]\t",
+                "CustomAction:WixSetPerUserFolder\t51\tAPPLICATIONFOLDER\t[WixPerUserFolder]\t",
+                "CustomAction:WixUIPrintEula\t65\tWixUiCa_X86\tPrintEula\t",
+                "CustomAction:WixUIValidatePath\t65\tWixUiCa_X86\tValidatePath\t",
+            }, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
        }
        [Fact]
@@ -37,14 +50,27 @@ namespace WixToolsetTest.UI
            var bindFolder = TestData.Get(@"TestData\data");
            var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
-            var results = build.BuildAndQuery(BuildX64, "Dialog", "CustomAction");
+            var results = build.BuildAndQuery(BuildX64, "Binary", "Dialog", "CustomAction");
            Assert.Single(results, result => result.StartsWith("Dialog:AdvancedWelcomeEulaDlg\t"));
-            Assert.Single(results, result => result.StartsWith("CustomAction:WixSetDefaultPerMachineFolder\t"));
+            WixAssert.CompareLineByLine(new[]
-            Assert.Single(results, result => result.StartsWith("CustomAction:WixSetDefaultPerUserFolder\t"));
+            {
-            Assert.Single(results, result => result.StartsWith("CustomAction:WixSetPerMachineFolder\t"));
+                "Binary:WixUI_Bmp_Banner\t[Binary data]",
-            Assert.Single(results, result => result.StartsWith("CustomAction:WixSetPerUserFolder\t"));
+                "Binary:WixUI_Bmp_Dialog\t[Binary data]",
-            Assert.Single(results, result => result.StartsWith("CustomAction:WixUIPrintEula\t65\tWixUiCa_X64\t"));
+                "Binary:WixUI_Bmp_New\t[Binary data]",
-            Assert.Single(results, result => result.StartsWith("CustomAction:WixUIValidatePath\t65\tWixUiCa_X64\t"));
+                "Binary:WixUI_Bmp_Up\t[Binary data]",
+                "Binary:WixUI_Ico_Exclam\t[Binary data]",
+                "Binary:WixUI_Ico_Info\t[Binary data]",
+                "Binary:WixUiCa_X64\t[Binary data]",
+            }, results.Where(r => r.StartsWith("Binary:")).ToArray());
+            WixAssert.CompareLineByLine(new[]
+            {
+                "CustomAction:WixSetDefaultPerMachineFolder\t51\tWixPerMachineFolder\t[ProgramFilesFolder][ApplicationFolderName]\t",
+                "CustomAction:WixSetDefaultPerUserFolder\t51\tWixPerUserFolder\t[LocalAppDataFolder]Apps\\[ApplicationFolderName]\t",
+                "CustomAction:WixSetPerMachineFolder\t51\tAPPLICATIONFOLDER\t[WixPerMachineFolder]\t",
+                "CustomAction:WixSetPerUserFolder\t51\tAPPLICATIONFOLDER\t[WixPerUserFolder]\t",
+                "CustomAction:WixUIPrintEula\t65\tWixUiCa_X64\tPrintEula\t",
+                "CustomAction:WixUIValidatePath\t65\tWixUiCa_X64\tValidatePath\t",
+            }, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
        }
        [Fact]
@@ -54,14 +80,27 @@ namespace WixToolsetTest.UI
            var bindFolder = TestData.Get(@"TestData\data");
            var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
-            var results = build.BuildAndQuery(BuildARM64, "Dialog", "CustomAction");
+            var results = build.BuildAndQuery(BuildARM64, "Binary", "Dialog", "CustomAction");
            Assert.Single(results, result => result.StartsWith("Dialog:AdvancedWelcomeEulaDlg\t"));
-            Assert.Single(results, result => result.StartsWith("CustomAction:WixSetDefaultPerMachineFolder\t"));
+            WixAssert.CompareLineByLine(new[]
-            Assert.Single(results, result => result.StartsWith("CustomAction:WixSetDefaultPerUserFolder\t"));
+            {
-            Assert.Single(results, result => result.StartsWith("CustomAction:WixSetPerMachineFolder\t"));
+                "Binary:WixUI_Bmp_Banner\t[Binary data]",
-            Assert.Single(results, result => result.StartsWith("CustomAction:WixSetPerUserFolder\t"));
+                "Binary:WixUI_Bmp_Dialog\t[Binary data]",
-            Assert.Single(results, result => result.StartsWith("CustomAction:WixUIPrintEula\t65\tWixUiCa_A64\t"));
+                "Binary:WixUI_Bmp_New\t[Binary data]",
-            Assert.Single(results, result => result.StartsWith("CustomAction:WixUIValidatePath\t65\tWixUiCa_A64\t"));
+                "Binary:WixUI_Bmp_Up\t[Binary data]",
+                "Binary:WixUI_Ico_Exclam\t[Binary data]",
+                "Binary:WixUI_Ico_Info\t[Binary data]",
+                "Binary:WixUiCa_A64\t[Binary data]",
+            }, results.Where(r => r.StartsWith("Binary:")).ToArray());
+            WixAssert.CompareLineByLine(new[]
+            {
+                "CustomAction:WixSetDefaultPerMachineFolder\t51\tWixPerMachineFolder\t[ProgramFilesFolder][ApplicationFolderName]\t",
+                "CustomAction:WixSetDefaultPerUserFolder\t51\tWixPerUserFolder\t[LocalAppDataFolder]Apps\\[ApplicationFolderName]\t",
+                "CustomAction:WixSetPerMachineFolder\t51\tAPPLICATIONFOLDER\t[WixPerMachineFolder]\t",
+                "CustomAction:WixSetPerUserFolder\t51\tAPPLICATIONFOLDER\t[WixPerUserFolder]\t",
+                "CustomAction:WixUIPrintEula\t65\tWixUiCa_A64\tPrintEula\t",
+                "CustomAction:WixUIValidatePath\t65\tWixUiCa_A64\tValidatePath\t",
+            }, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
        }
        [Fact]
@@ -71,10 +110,25 @@ namespace WixToolsetTest.UI
            var bindFolder = TestData.Get(@"TestData\data");
            var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
-            var results = build.BuildAndQuery(Build, "Dialog", "CustomAction");
+            var results = build.BuildAndQuery(Build, "Binary", "Dialog", "CustomAction");
            Assert.Single(results, result => result.StartsWith("Dialog:WelcomeDlg\t"));
            Assert.Single(results, result => result.StartsWith("Dialog:CustomizeDlg\t"));
            Assert.Empty(results.Where(result => result.StartsWith("Dialog:SetupTypeDlg\t")));
+            WixAssert.CompareLineByLine(new[]
+            {
+                "Binary:WixUI_Bmp_Banner\t[Binary data]",
+                "Binary:WixUI_Bmp_Dialog\t[Binary data]",
+                "Binary:WixUI_Bmp_New\t[Binary data]",
+                "Binary:WixUI_Bmp_Up\t[Binary data]",
+                "Binary:WixUI_Ico_Exclam\t[Binary data]",
+                "Binary:WixUI_Ico_Info\t[Binary data]",
+                "Binary:WixUiCa_X86\t[Binary data]",
+            }, results.Where(r => r.StartsWith("Binary:")).ToArray());
+            WixAssert.CompareLineByLine(new[]
+            {
+                "CustomAction:WixUIPrintEula\t65\tWixUiCa_X86\tPrintEula\t",
+                "CustomAction:WixUIValidatePath\t65\tWixUiCa_X86\tValidatePath\t",
+            }, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
        }
        [Fact]
@@ -84,8 +138,23 @@ namespace WixToolsetTest.UI
            var bindFolder = TestData.Get(@"TestData\data");
            var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
-            var results = build.BuildAndQuery(Build, "Dialog", "CustomAction");
+            var results = build.BuildAndQuery(Build, "Binary", "Dialog", "CustomAction");
            Assert.Single(results, result => result.StartsWith("Dialog:InstallDirDlg\t"));
+            WixAssert.CompareLineByLine(new[]
+            {
+                "Binary:WixUI_Bmp_Banner\t[Binary data]",
+                "Binary:WixUI_Bmp_Dialog\t[Binary data]",
+                "Binary:WixUI_Bmp_New\t[Binary data]",
+                "Binary:WixUI_Bmp_Up\t[Binary data]",
+                "Binary:WixUI_Ico_Exclam\t[Binary data]",
+                "Binary:WixUI_Ico_Info\t[Binary data]",
+                "Binary:WixUiCa_X86\t[Binary data]",
+            }, results.Where(r => r.StartsWith("Binary:")).ToArray());
+            WixAssert.CompareLineByLine(new[]
+            {
+                "CustomAction:WixUIPrintEula\t65\tWixUiCa_X86\tPrintEula\t",
+                "CustomAction:WixUIValidatePath\t65\tWixUiCa_X86\tValidatePath\t",
+            }, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
        }
        [Fact]
@@ -95,8 +164,23 @@ namespace WixToolsetTest.UI
            var bindFolder = TestData.Get(@"TestData\data");
            var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
-            var results = build.BuildAndQuery(Build, "Dialog", "CustomAction");
+            var results = build.BuildAndQuery(Build, "Binary", "Dialog", "CustomAction");
            Assert.Single(results, result => result.StartsWith("Dialog:WelcomeEulaDlg\t"));
+            WixAssert.CompareLineByLine(new[]
+            {
+                "Binary:WixUI_Bmp_Banner\t[Binary data]",
+                "Binary:WixUI_Bmp_Dialog\t[Binary data]",
+                "Binary:WixUI_Bmp_New\t[Binary data]",
+                "Binary:WixUI_Bmp_Up\t[Binary data]",
+                "Binary:WixUI_Ico_Exclam\t[Binary data]",
+                "Binary:WixUI_Ico_Info\t[Binary data]",
+                "Binary:WixUiCa_X86\t[Binary data]",
+            }, results.Where(r => r.StartsWith("Binary:")).ToArray());
+            WixAssert.CompareLineByLine(new[]
+            {
+                "CustomAction:WixUIPrintEula\t65\tWixUiCa_X86\tPrintEula\t",
+                "CustomAction:WixUIValidatePath\t65\tWixUiCa_X86\tValidatePath\t",
+            }, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
        }
        [Fact]
@@ -144,10 +228,25 @@ namespace WixToolsetTest.UI
            var bindFolder = TestData.Get(@"TestData\data");
            var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
-            var results = build.BuildAndQuery(Build, "Dialog", "CustomAction");
+            var results = build.BuildAndQuery(Build, "Binary", "Dialog", "CustomAction");
            Assert.Single(results, result => result.StartsWith("Dialog:WelcomeDlg\t"));
            Assert.Single(results, result => result.StartsWith("Dialog:CustomizeDlg\t"));
            Assert.Single(results, result => result.StartsWith("Dialog:SetupTypeDlg\t"));
+            WixAssert.CompareLineByLine(new[]
+            {
+                "Binary:WixUI_Bmp_Banner\t[Binary data]",
+                "Binary:WixUI_Bmp_Dialog\t[Binary data]",
+                "Binary:WixUI_Bmp_New\t[Binary data]",
+                "Binary:WixUI_Bmp_Up\t[Binary data]",
+                "Binary:WixUI_Ico_Exclam\t[Binary data]",
+                "Binary:WixUI_Ico_Info\t[Binary data]",
+                "Binary:WixUiCa_X86\t[Binary data]",
+            }, results.Where(r => r.StartsWith("Binary:")).ToArray());
+            WixAssert.CompareLineByLine(new[]
+            {
+                "CustomAction:WixUIPrintEula\t65\tWixUiCa_X86\tPrintEula\t",
+                "CustomAction:WixUIValidatePath\t65\tWixUiCa_X86\tValidatePath\t",
+            }, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
        }
        [Fact]
author	Sean Hall <r.sean.hall@gmail.com>	2022-07-05 10:33:58 -0500
committer	Sean Hall <r.sean.hall@gmail.com>	2022-07-05 11:46:35 -0500
commit	a3a3b2aca8978b9ff00d64a3be20ce6525ee78cd (patch)
tree	b5fc823125ae9c9c3cee01bc09e5e076dcdd44ef /src/ext/UI/test/WixToolsetTest.UI
parent	1e21a5de35a9d12218065e999f172ea766ffd3df (diff)
download	wix-a3a3b2aca8978b9ff00d64a3be20ce6525ee78cd.tar.gz wix-a3a3b2aca8978b9ff00d64a3be20ce6525ee78cd.tar.bz2 wix-a3a3b2aca8978b9ff00d64a3be20ce6525ee78cd.zip

diff --git a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs index 4b1c8575..f93f232c 100644 --- a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs +++ b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
@@ -20,14 +20,27 @@ namespace WixToolsetTest.UI
20	var bindFolder = TestData.Get(@"TestData\data");	20	var bindFolder = TestData.Get(@"TestData\data");
21	var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });	21	var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
22		22
23	var results = build.BuildAndQuery(Build, "Dialog", "CustomAction");	23	var results = build.BuildAndQuery(Build, "Binary", "Dialog", "CustomAction");
24	Assert.Single(results, result => result.StartsWith("Dialog:AdvancedWelcomeEulaDlg\t"));	24	Assert.Single(results, result => result.StartsWith("Dialog:AdvancedWelcomeEulaDlg\t"));
25	Assert.Single(results, result => result.StartsWith("CustomAction:WixSetDefaultPerMachineFolder\t"));	25	WixAssert.CompareLineByLine(new[]
26	Assert.Single(results, result => result.StartsWith("CustomAction:WixSetDefaultPerUserFolder\t"));	26	{
27	Assert.Single(results, result => result.StartsWith("CustomAction:WixSetPerMachineFolder\t"));	27	"Binary:WixUI_Bmp_Banner\t[Binary data]",
28	Assert.Single(results, result => result.StartsWith("CustomAction:WixSetPerUserFolder\t"));	28	"Binary:WixUI_Bmp_Dialog\t[Binary data]",
29	Assert.Single(results, result => result.StartsWith("CustomAction:WixUIPrintEula\t65\tWixUiCa_X86\t"));	29	"Binary:WixUI_Bmp_New\t[Binary data]",
30	Assert.Single(results, result => result.StartsWith("CustomAction:WixUIValidatePath\t65\tWixUiCa_X86\t"));	30	"Binary:WixUI_Bmp_Up\t[Binary data]",
		31	"Binary:WixUI_Ico_Exclam\t[Binary data]",
		32	"Binary:WixUI_Ico_Info\t[Binary data]",
		33	"Binary:WixUiCa_X86\t[Binary data]",
		34	}, results.Where(r => r.StartsWith("Binary:")).ToArray());
		35	WixAssert.CompareLineByLine(new[]
		36	{
		37	"CustomAction:WixSetDefaultPerMachineFolder\t51\tWixPerMachineFolder\t[ProgramFilesFolder][ApplicationFolderName]\t",
		38	"CustomAction:WixSetDefaultPerUserFolder\t51\tWixPerUserFolder\t[LocalAppDataFolder]Apps\\[ApplicationFolderName]\t",
		39	"CustomAction:WixSetPerMachineFolder\t51\tAPPLICATIONFOLDER\t[WixPerMachineFolder]\t",
		40	"CustomAction:WixSetPerUserFolder\t51\tAPPLICATIONFOLDER\t[WixPerUserFolder]\t",
		41	"CustomAction:WixUIPrintEula\t65\tWixUiCa_X86\tPrintEula\t",
		42	"CustomAction:WixUIValidatePath\t65\tWixUiCa_X86\tValidatePath\t",
		43	}, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
31	}	44	}
32		45
33	[Fact]	46	[Fact]
@@ -37,14 +50,27 @@ namespace WixToolsetTest.UI
37	var bindFolder = TestData.Get(@"TestData\data");	50	var bindFolder = TestData.Get(@"TestData\data");
38	var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });	51	var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
39		52
40	var results = build.BuildAndQuery(BuildX64, "Dialog", "CustomAction");	53	var results = build.BuildAndQuery(BuildX64, "Binary", "Dialog", "CustomAction");
41	Assert.Single(results, result => result.StartsWith("Dialog:AdvancedWelcomeEulaDlg\t"));	54	Assert.Single(results, result => result.StartsWith("Dialog:AdvancedWelcomeEulaDlg\t"));
42	Assert.Single(results, result => result.StartsWith("CustomAction:WixSetDefaultPerMachineFolder\t"));	55	WixAssert.CompareLineByLine(new[]
43	Assert.Single(results, result => result.StartsWith("CustomAction:WixSetDefaultPerUserFolder\t"));	56	{
44	Assert.Single(results, result => result.StartsWith("CustomAction:WixSetPerMachineFolder\t"));	57	"Binary:WixUI_Bmp_Banner\t[Binary data]",
45	Assert.Single(results, result => result.StartsWith("CustomAction:WixSetPerUserFolder\t"));	58	"Binary:WixUI_Bmp_Dialog\t[Binary data]",
46	Assert.Single(results, result => result.StartsWith("CustomAction:WixUIPrintEula\t65\tWixUiCa_X64\t"));	59	"Binary:WixUI_Bmp_New\t[Binary data]",
47	Assert.Single(results, result => result.StartsWith("CustomAction:WixUIValidatePath\t65\tWixUiCa_X64\t"));	60	"Binary:WixUI_Bmp_Up\t[Binary data]",
		61	"Binary:WixUI_Ico_Exclam\t[Binary data]",
		62	"Binary:WixUI_Ico_Info\t[Binary data]",
		63	"Binary:WixUiCa_X64\t[Binary data]",
		64	}, results.Where(r => r.StartsWith("Binary:")).ToArray());
		65	WixAssert.CompareLineByLine(new[]
		66	{
		67	"CustomAction:WixSetDefaultPerMachineFolder\t51\tWixPerMachineFolder\t[ProgramFilesFolder][ApplicationFolderName]\t",
		68	"CustomAction:WixSetDefaultPerUserFolder\t51\tWixPerUserFolder\t[LocalAppDataFolder]Apps\\[ApplicationFolderName]\t",
		69	"CustomAction:WixSetPerMachineFolder\t51\tAPPLICATIONFOLDER\t[WixPerMachineFolder]\t",
		70	"CustomAction:WixSetPerUserFolder\t51\tAPPLICATIONFOLDER\t[WixPerUserFolder]\t",
		71	"CustomAction:WixUIPrintEula\t65\tWixUiCa_X64\tPrintEula\t",
		72	"CustomAction:WixUIValidatePath\t65\tWixUiCa_X64\tValidatePath\t",
		73	}, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
48	}	74	}
49		75
50	[Fact]	76	[Fact]
@@ -54,14 +80,27 @@ namespace WixToolsetTest.UI
54	var bindFolder = TestData.Get(@"TestData\data");	80	var bindFolder = TestData.Get(@"TestData\data");
55	var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });	81	var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
56		82
57	var results = build.BuildAndQuery(BuildARM64, "Dialog", "CustomAction");	83	var results = build.BuildAndQuery(BuildARM64, "Binary", "Dialog", "CustomAction");
58	Assert.Single(results, result => result.StartsWith("Dialog:AdvancedWelcomeEulaDlg\t"));	84	Assert.Single(results, result => result.StartsWith("Dialog:AdvancedWelcomeEulaDlg\t"));
59	Assert.Single(results, result => result.StartsWith("CustomAction:WixSetDefaultPerMachineFolder\t"));	85	WixAssert.CompareLineByLine(new[]
60	Assert.Single(results, result => result.StartsWith("CustomAction:WixSetDefaultPerUserFolder\t"));	86	{
61	Assert.Single(results, result => result.StartsWith("CustomAction:WixSetPerMachineFolder\t"));	87	"Binary:WixUI_Bmp_Banner\t[Binary data]",
62	Assert.Single(results, result => result.StartsWith("CustomAction:WixSetPerUserFolder\t"));	88	"Binary:WixUI_Bmp_Dialog\t[Binary data]",
63	Assert.Single(results, result => result.StartsWith("CustomAction:WixUIPrintEula\t65\tWixUiCa_A64\t"));	89	"Binary:WixUI_Bmp_New\t[Binary data]",
64	Assert.Single(results, result => result.StartsWith("CustomAction:WixUIValidatePath\t65\tWixUiCa_A64\t"));	90	"Binary:WixUI_Bmp_Up\t[Binary data]",
		91	"Binary:WixUI_Ico_Exclam\t[Binary data]",
		92	"Binary:WixUI_Ico_Info\t[Binary data]",
		93	"Binary:WixUiCa_A64\t[Binary data]",
		94	}, results.Where(r => r.StartsWith("Binary:")).ToArray());
		95	WixAssert.CompareLineByLine(new[]
		96	{
		97	"CustomAction:WixSetDefaultPerMachineFolder\t51\tWixPerMachineFolder\t[ProgramFilesFolder][ApplicationFolderName]\t",
		98	"CustomAction:WixSetDefaultPerUserFolder\t51\tWixPerUserFolder\t[LocalAppDataFolder]Apps\\[ApplicationFolderName]\t",
		99	"CustomAction:WixSetPerMachineFolder\t51\tAPPLICATIONFOLDER\t[WixPerMachineFolder]\t",
		100	"CustomAction:WixSetPerUserFolder\t51\tAPPLICATIONFOLDER\t[WixPerUserFolder]\t",
		101	"CustomAction:WixUIPrintEula\t65\tWixUiCa_A64\tPrintEula\t",
		102	"CustomAction:WixUIValidatePath\t65\tWixUiCa_A64\tValidatePath\t",
		103	}, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
65	}	104	}
66		105
67	[Fact]	106	[Fact]
@@ -71,10 +110,25 @@ namespace WixToolsetTest.UI
71	var bindFolder = TestData.Get(@"TestData\data");	110	var bindFolder = TestData.Get(@"TestData\data");
72	var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });	111	var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
73		112
74	var results = build.BuildAndQuery(Build, "Dialog", "CustomAction");	113	var results = build.BuildAndQuery(Build, "Binary", "Dialog", "CustomAction");
75	Assert.Single(results, result => result.StartsWith("Dialog:WelcomeDlg\t"));	114	Assert.Single(results, result => result.StartsWith("Dialog:WelcomeDlg\t"));
76	Assert.Single(results, result => result.StartsWith("Dialog:CustomizeDlg\t"));	115	Assert.Single(results, result => result.StartsWith("Dialog:CustomizeDlg\t"));
77	Assert.Empty(results.Where(result => result.StartsWith("Dialog:SetupTypeDlg\t")));	116	Assert.Empty(results.Where(result => result.StartsWith("Dialog:SetupTypeDlg\t")));
		117	WixAssert.CompareLineByLine(new[]
		118	{
		119	"Binary:WixUI_Bmp_Banner\t[Binary data]",
		120	"Binary:WixUI_Bmp_Dialog\t[Binary data]",
		121	"Binary:WixUI_Bmp_New\t[Binary data]",
		122	"Binary:WixUI_Bmp_Up\t[Binary data]",
		123	"Binary:WixUI_Ico_Exclam\t[Binary data]",
		124	"Binary:WixUI_Ico_Info\t[Binary data]",
		125	"Binary:WixUiCa_X86\t[Binary data]",
		126	}, results.Where(r => r.StartsWith("Binary:")).ToArray());
		127	WixAssert.CompareLineByLine(new[]
		128	{
		129	"CustomAction:WixUIPrintEula\t65\tWixUiCa_X86\tPrintEula\t",
		130	"CustomAction:WixUIValidatePath\t65\tWixUiCa_X86\tValidatePath\t",
		131	}, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
78	}	132	}
79		133
80	[Fact]	134	[Fact]
@@ -84,8 +138,23 @@ namespace WixToolsetTest.UI
84	var bindFolder = TestData.Get(@"TestData\data");	138	var bindFolder = TestData.Get(@"TestData\data");
85	var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });	139	var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
86		140
87	var results = build.BuildAndQuery(Build, "Dialog", "CustomAction");	141	var results = build.BuildAndQuery(Build, "Binary", "Dialog", "CustomAction");
88	Assert.Single(results, result => result.StartsWith("Dialog:InstallDirDlg\t"));	142	Assert.Single(results, result => result.StartsWith("Dialog:InstallDirDlg\t"));
		143	WixAssert.CompareLineByLine(new[]
		144	{
		145	"Binary:WixUI_Bmp_Banner\t[Binary data]",
		146	"Binary:WixUI_Bmp_Dialog\t[Binary data]",
		147	"Binary:WixUI_Bmp_New\t[Binary data]",
		148	"Binary:WixUI_Bmp_Up\t[Binary data]",
		149	"Binary:WixUI_Ico_Exclam\t[Binary data]",
		150	"Binary:WixUI_Ico_Info\t[Binary data]",
		151	"Binary:WixUiCa_X86\t[Binary data]",
		152	}, results.Where(r => r.StartsWith("Binary:")).ToArray());
		153	WixAssert.CompareLineByLine(new[]
		154	{
		155	"CustomAction:WixUIPrintEula\t65\tWixUiCa_X86\tPrintEula\t",
		156	"CustomAction:WixUIValidatePath\t65\tWixUiCa_X86\tValidatePath\t",
		157	}, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
89	}	158	}
90		159
91	[Fact]	160	[Fact]
@@ -95,8 +164,23 @@ namespace WixToolsetTest.UI
95	var bindFolder = TestData.Get(@"TestData\data");	164	var bindFolder = TestData.Get(@"TestData\data");
96	var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });	165	var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
97		166
98	var results = build.BuildAndQuery(Build, "Dialog", "CustomAction");	167	var results = build.BuildAndQuery(Build, "Binary", "Dialog", "CustomAction");
99	Assert.Single(results, result => result.StartsWith("Dialog:WelcomeEulaDlg\t"));	168	Assert.Single(results, result => result.StartsWith("Dialog:WelcomeEulaDlg\t"));
		169	WixAssert.CompareLineByLine(new[]
		170	{
		171	"Binary:WixUI_Bmp_Banner\t[Binary data]",
		172	"Binary:WixUI_Bmp_Dialog\t[Binary data]",
		173	"Binary:WixUI_Bmp_New\t[Binary data]",
		174	"Binary:WixUI_Bmp_Up\t[Binary data]",
		175	"Binary:WixUI_Ico_Exclam\t[Binary data]",
		176	"Binary:WixUI_Ico_Info\t[Binary data]",
		177	"Binary:WixUiCa_X86\t[Binary data]",
		178	}, results.Where(r => r.StartsWith("Binary:")).ToArray());
		179	WixAssert.CompareLineByLine(new[]
		180	{
		181	"CustomAction:WixUIPrintEula\t65\tWixUiCa_X86\tPrintEula\t",
		182	"CustomAction:WixUIValidatePath\t65\tWixUiCa_X86\tValidatePath\t",
		183	}, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
100	}	184	}
101		185
102	[Fact]	186	[Fact]
@@ -144,10 +228,25 @@ namespace WixToolsetTest.UI
144	var bindFolder = TestData.Get(@"TestData\data");	228	var bindFolder = TestData.Get(@"TestData\data");
145	var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });	229	var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
146		230
147	var results = build.BuildAndQuery(Build, "Dialog", "CustomAction");	231	var results = build.BuildAndQuery(Build, "Binary", "Dialog", "CustomAction");
148	Assert.Single(results, result => result.StartsWith("Dialog:WelcomeDlg\t"));	232	Assert.Single(results, result => result.StartsWith("Dialog:WelcomeDlg\t"));
149	Assert.Single(results, result => result.StartsWith("Dialog:CustomizeDlg\t"));	233	Assert.Single(results, result => result.StartsWith("Dialog:CustomizeDlg\t"));
150	Assert.Single(results, result => result.StartsWith("Dialog:SetupTypeDlg\t"));	234	Assert.Single(results, result => result.StartsWith("Dialog:SetupTypeDlg\t"));
		235	WixAssert.CompareLineByLine(new[]
		236	{
		237	"Binary:WixUI_Bmp_Banner\t[Binary data]",
		238	"Binary:WixUI_Bmp_Dialog\t[Binary data]",
		239	"Binary:WixUI_Bmp_New\t[Binary data]",
		240	"Binary:WixUI_Bmp_Up\t[Binary data]",
		241	"Binary:WixUI_Ico_Exclam\t[Binary data]",
		242	"Binary:WixUI_Ico_Info\t[Binary data]",
		243	"Binary:WixUiCa_X86\t[Binary data]",
		244	}, results.Where(r => r.StartsWith("Binary:")).ToArray());
		245	WixAssert.CompareLineByLine(new[]
		246	{
		247	"CustomAction:WixUIPrintEula\t65\tWixUiCa_X86\tPrintEula\t",
		248	"CustomAction:WixUIValidatePath\t65\tWixUiCa_X86\tValidatePath\t",
		249	}, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
151	}	250	}
152		251
153	[Fact]	252	[Fact]