diff options
Diffstat (limited to 'src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs')
| -rw-r--r-- | src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs index 361f5274..bffb5e14 100644 --- a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs +++ b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs | |||
| @@ -36,7 +36,7 @@ namespace WixToolsetTest.VisualStudio | |||
| 36 | "CustomAction:Vwd2012VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2012_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t", | 36 | "CustomAction:Vwd2012VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2012_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t", |
| 37 | "CustomAction:Vwd2013VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2013_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t", | 37 | "CustomAction:Vwd2013VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2013_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t", |
| 38 | "CustomAction:Vwd2015VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2015_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t", | 38 | "CustomAction:Vwd2015VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2015_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t", |
| 39 | "CustomAction:Wix4VSFindInstances_X86\t257\tVSCA_X86\tFindInstances\t", | 39 | "CustomAction:Wix4VSFindInstances_X86\t257\tWix4VSCA_X86\tFindInstances\t", |
| 40 | }, results); | 40 | }, results); |
| 41 | } | 41 | } |
| 42 | 42 | ||
| @@ -64,7 +64,7 @@ namespace WixToolsetTest.VisualStudio | |||
| 64 | "CustomAction:Vwd2012VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2012_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t", | 64 | "CustomAction:Vwd2012VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2012_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t", |
| 65 | "CustomAction:Vwd2013VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2013_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t", | 65 | "CustomAction:Vwd2013VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2013_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t", |
| 66 | "CustomAction:Vwd2015VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2015_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t", | 66 | "CustomAction:Vwd2015VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2015_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t", |
| 67 | "CustomAction:Wix4VSFindInstances_A64\t257\tVSCA_A64\tFindInstances\t", | 67 | "CustomAction:Wix4VSFindInstances_A64\t257\tWix4VSCA_A64\tFindInstances\t", |
| 68 | }, customActionResults); | 68 | }, customActionResults); |
| 69 | 69 | ||
| 70 | var propertyResults = results.Single(r => r.StartsWith("Property:SecureCustomProperties")).Split('\t')[1].Split(';'); | 70 | var propertyResults = results.Single(r => r.StartsWith("Property:SecureCustomProperties")).Split('\t')[1].Split(';'); |
| @@ -77,9 +77,18 @@ namespace WixToolsetTest.VisualStudio | |||
| 77 | "VS2015_VSIX_INSTALLER_PATH", | 77 | "VS2015_VSIX_INSTALLER_PATH", |
| 78 | "VS2017_IDE_DIR", | 78 | "VS2017_IDE_DIR", |
| 79 | "VS2017_ROOT_FOLDER", | 79 | "VS2017_ROOT_FOLDER", |
| 80 | "VS2017_VSIX_INSTALLER_PATH", | ||
| 80 | "VS2017DEVENV", | 81 | "VS2017DEVENV", |
| 82 | "VS2019_IDE_DIR", | ||
| 81 | "VS2019_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED", | 83 | "VS2019_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED", |
| 84 | "VS2019_ROOT_FOLDER", | ||
| 85 | "VS2019_VSIX_INSTALLER_PATH", | ||
| 86 | "VS2022_IDE_DIR", | ||
| 82 | "VS2022_ROOT_FOLDER", | 87 | "VS2022_ROOT_FOLDER", |
| 88 | "VS2022_VSIX_INSTALLER_PATH", | ||
| 89 | "VS2026_IDE_DIR", | ||
| 90 | "VS2026_ROOT_FOLDER", | ||
| 91 | "VS2026_VSIX_INSTALLER_PATH", | ||
| 83 | "WIX_DOWNGRADE_DETECTED", | 92 | "WIX_DOWNGRADE_DETECTED", |
| 84 | "WIX_UPGRADE_DETECTED", | 93 | "WIX_UPGRADE_DETECTED", |
| 85 | }, propertyResults); | 94 | }, propertyResults); |
