From 48a7e6460707d8d6e1587cccdbf028249a417093 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Thu, 9 Feb 2023 19:18:53 -0500 Subject: Add some useful testing to VS.wixext. --- .../VisualStudioExtensionFixture.cs | 23 ++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'src/ext') diff --git a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs index d173bafd..f3e81e2d 100644 --- a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs +++ b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs @@ -42,7 +42,9 @@ namespace WixToolsetTest.VisualStudio var folder = TestData.Get(@"TestData\UsingVsixPackage"); var build = new Builder(folder, typeof(VSExtensionFactory), new[] { folder }); - var results = build.BuildAndQuery(BuildARM64, "CustomAction"); + var results = build.BuildAndQuery(BuildARM64, "CustomAction", "Property"); + + var customActionResults = results.Where(r => r.StartsWith("CustomAction:")).ToArray(); WixAssert.CompareLineByLine(new[] { "CustomAction:SetVS2010Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2010_VSIX_INSTALLER_PATH]\t", @@ -59,7 +61,24 @@ namespace WixToolsetTest.VisualStudio "CustomAction:Vwd2013VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2013_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t", "CustomAction:Vwd2015VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2015_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t", "CustomAction:Wix4VSFindInstances_A64\t257\tVSCA_A64\tFindInstances\t", - }, results); + }, customActionResults); + + var propertyResults = results.Single(r => r.StartsWith("Property:SecureCustomProperties")).Split('\t')[1].Split(';'); + WixAssert.CompareLineByLine(new[] + { + "VS_VSIX_INSTALLER_PATH", + "VS2010_VSIX_INSTALLER_PATH", + "VS2012_VSIX_INSTALLER_PATH", + "VS2013_VSIX_INSTALLER_PATH", + "VS2015_VSIX_INSTALLER_PATH", + "VS2017_IDE_DIR", + "VS2017_ROOT_FOLDER", + "VS2017DEVENV", + "VS2019_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED", + "VS2022_ROOT_FOLDER", + "WIX_DOWNGRADE_DETECTED", + "WIX_UPGRADE_DETECTED", + }, propertyResults); } private static void Build(string[] args) -- cgit v1.2.3-55-g6feb