@joebigelow / wix-1 / commits / 48a7e646

Add some useful testing to VS.wixext.

Bob Arnson committed Feb 9, 2023 at 19:18 UTC 48a7e6460707d8d6e1587cccdbf028249a417093
1 file changed +21 -2
src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs
+21 -2
@@ -42,7 +42,9 @@ namespace WixToolsetTest.VisualStudio
42 var folder = TestData.Get(@"TestData\UsingVsixPackage");
43 var build = new Builder(folder, typeof(VSExtensionFactory), new[] { folder });
44
45 - var results = build.BuildAndQuery(BuildARM64, "CustomAction");
45 + var results = build.BuildAndQuery(BuildARM64, "CustomAction", "Property");
46 +
47 + var customActionResults = results.Where(r => r.StartsWith("CustomAction:")).ToArray();
48 WixAssert.CompareLineByLine(new[]
49 {
50 "CustomAction:SetVS2010Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2010_VSIX_INSTALLER_PATH]\t",
@@ -59,7 +61,24 @@ namespace WixToolsetTest.VisualStudio
61 "CustomAction:Vwd2013VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2013_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t",
62 "CustomAction:Vwd2015VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2015_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t",
63 "CustomAction:Wix4VSFindInstances_A64\t257\tVSCA_A64\tFindInstances\t",
62 - }, results);
64 + }, customActionResults);
65 +
66 + var propertyResults = results.Single(r => r.StartsWith("Property:SecureCustomProperties")).Split('\t')[1].Split(';');
67 + WixAssert.CompareLineByLine(new[]
68 + {
69 + "VS_VSIX_INSTALLER_PATH",
70 + "VS2010_VSIX_INSTALLER_PATH",
71 + "VS2012_VSIX_INSTALLER_PATH",
72 + "VS2013_VSIX_INSTALLER_PATH",
73 + "VS2015_VSIX_INSTALLER_PATH",
74 + "VS2017_IDE_DIR",
75 + "VS2017_ROOT_FOLDER",
76 + "VS2017DEVENV",
77 + "VS2019_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED",
78 + "VS2022_ROOT_FOLDER",
79 + "WIX_DOWNGRADE_DETECTED",
80 + "WIX_UPGRADE_DETECTED",
81 + }, propertyResults);
82 }
83
84 private static void Build(string[] args)