Skip to content

Fix for vs dir discovery 2 #19086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abonie merged 1 commit into from
Nov 13, 2025
Merged

Fix for vs dir discovery 2 #19086

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions vsintegration/tests/Salsa/VsMocks.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() =
Expand Down
Loading