From 7bef14c502381d08c82d8b5f5092a66c8f6bdc32 Mon Sep 17 00:00:00 2001
From: Adam Boniecki <20281641+abonie@users.noreply.github.com>
Date: Thu, 13 Nov 2025 15:36:31 +0000
Subject: [PATCH] Quick fix for vs dir discovery

---
 vsintegration/tests/Salsa/VsMocks.fs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/vsintegration/tests/Salsa/VsMocks.fs b/vsintegration/tests/Salsa/VsMocks.fs
index 5189b7faec5..1ce67c04763 100644
--- a/vsintegration/tests/Salsa/VsMocks.fs
+++ b/vsintegration/tests/Salsa/VsMocks.fs
@@ -1653,12 +1653,18 @@ module internal VsActual =
     let vsInstallDir =
         // use the environment variable to find the VS installdir
         let vsvar =
-            let var = Environment.GetEnvironmentVariable("VS170COMNTOOLS")
-            if String.IsNullOrEmpty var then
-                Environment.GetEnvironmentVariable("VSAPPIDDIR")
+            // Try VS180COMNTOOLS first, then VS170COMNTOOLS, then VSAPPIDDIR
+            // TODO : use tryGetVSInstallDir from test utils instead
+            let var18 = Environment.GetEnvironmentVariable("VS180COMNTOOLS")
+            if String.IsNullOrEmpty var18 then
+                let var17 = Environment.GetEnvironmentVariable("VS170COMNTOOLS")
+                if String.IsNullOrEmpty var17 then
+                    Environment.GetEnvironmentVariable("VSAPPIDDIR")
+                else
+                    var17
             else
-                var
-        if String.IsNullOrEmpty vsvar then failwith "VS170COMNTOOLS and VSAPPIDDIR environment variables not found."
+                var18
+        if String.IsNullOrEmpty vsvar then failwith "VS180COMNTOOLS, VS170COMNTOOLS and VSAPPIDDIR environment variables not found."
         Path.Combine(vsvar, "..")
 
     let CreateEditorCatalog() =