3 files changed, 13 insertions, 3 deletions

diff --git a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/TestData/UsingVsixPackage/Package.wxs b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/TestData/UsingVsixPackage/Package.wxs
index d56674e3..d827dafb 100644
--- a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/TestData/UsingVsixPackage/Package.wxs
+++ b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/TestData/UsingVsixPackage/Package.wxs
@@ -6,6 +6,7 @@
     <PropertyRef Id="VS2017DEVENV" />
     <PropertyRef Id="VS2019_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED" />
     <PropertyRef Id="VS2022_ROOT_FOLDER" />
+    <PropertyRef Id="VS2026_ROOT_FOLDER" />
 
     <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
       <ComponentGroupRef Id="ProductComponents" />
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
                 "CustomAction:Vwd2012VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2012_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t",
                 "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_X86\t257\tVSCA_X86\tFindInstances\t",
+                "CustomAction:Wix4VSFindInstances_X86\t257\tWix4VSCA_X86\tFindInstances\t",
             }, results);
         }
 
@@ -64,7 +64,7 @@ namespace WixToolsetTest.VisualStudio
                 "CustomAction:Vwd2012VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2012_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t",
                 "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",
+                "CustomAction:Wix4VSFindInstances_A64\t257\tWix4VSCA_A64\tFindInstances\t",
             }, customActionResults);
 
             var propertyResults = results.Single(r => r.StartsWith("Property:SecureCustomProperties")).Split('\t')[1].Split(';');
@@ -77,9 +77,18 @@ namespace WixToolsetTest.VisualStudio
                 "VS2015_VSIX_INSTALLER_PATH",
                 "VS2017_IDE_DIR",
                 "VS2017_ROOT_FOLDER",
+                "VS2017_VSIX_INSTALLER_PATH",
                 "VS2017DEVENV",
+                "VS2019_IDE_DIR",
                 "VS2019_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED",
+                "VS2019_ROOT_FOLDER",
+                "VS2019_VSIX_INSTALLER_PATH",
+                "VS2022_IDE_DIR",
                 "VS2022_ROOT_FOLDER",
+                "VS2022_VSIX_INSTALLER_PATH",
+                "VS2026_IDE_DIR",
+                "VS2026_ROOT_FOLDER",
+                "VS2026_VSIX_INSTALLER_PATH",
                 "WIX_DOWNGRADE_DETECTED",
                 "WIX_UPGRADE_DETECTED",
             }, propertyResults);
diff --git a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj
index 8b8f6ad9..148b963b 100644
--- a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj
+++ b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="MSTest.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IsWixMSTestProject>true</IsWixMSTestProject>
   </PropertyGroup>