Improve Visual Studio toolchain detection for Windows builds

Author: johnml1135

Build/Agent/FwBuildEnvironment.psm1

@@ -14,6 +14,51 @@
 # VS Environment Functions
 # =============================================================================
 
+function Get-PreferredVcToolBinPath {
+    <#
+    .SYNOPSIS
+        Returns the preferred HostX64\x64 MSVC tool bin directory.
+    #>
+    if (-not $env:VCINSTALLDIR) {
+        return $null
+    }
+
+    $toolsRoot = Join-Path $env:VCINSTALLDIR 'Tools\MSVC'
+    if (-not (Test-Path $toolsRoot)) {
+        return $null
+    }
+
+    $preferred = Get-ChildItem -Path $toolsRoot -Directory -ErrorAction SilentlyContinue |
+        Sort-Object Name -Descending |
+        ForEach-Object { Join-Path $_.FullName 'bin\HostX64\x64' } |
+        Where-Object { Test-Path $_ } |
+        Select-Object -First 1
+
+    return $preferred
+}
+
+function Ensure-PreferredVcToolPath {
+    <#
+    .SYNOPSIS
+        Moves the preferred HostX64\x64 MSVC bin directory to the front of PATH.
+    #>
+    $preferred = Get-PreferredVcToolBinPath
+    if (-not $preferred) {
+        return
+    }
+
+    $pathEntries = @()
+    if (-not [string]::IsNullOrWhiteSpace($env:PATH)) {
+        $pathEntries = $env:PATH -split ';' | Where-Object { -not [string]::IsNullOrWhiteSpace($_) }
+    }
+
+    $filteredEntries = $pathEntries | Where-Object {
+        -not [string]::Equals($_.TrimEnd('\'), $preferred.TrimEnd('\'), [System.StringComparison]::OrdinalIgnoreCase)
+    }
+
+    $env:PATH = (@($preferred) + $filteredEntries) -join ';'
+}
+
 function Initialize-VsDevEnvironment {
     <#
     .SYNOPSIS
@@ -27,6 +72,7 @@ function Initialize-VsDevEnvironment {
     }
 
     if ($env:VCINSTALLDIR) {
+        Ensure-PreferredVcToolPath
         Write-Host '[OK] Visual Studio environment already initialized' -ForegroundColor Green
         return
     }
@@ -87,6 +133,8 @@ function Initialize-VsDevEnvironment {
         throw 'Visual Studio C++ environment not configured'
     }
 
+    Ensure-PreferredVcToolPath
+
     Write-Host '[OK] Visual Studio environment initialized successfully' -ForegroundColor Green
     Write-Host "   VCINSTALLDIR: $env:VCINSTALLDIR" -ForegroundColor Gray
 }

Build/Src/FwBuildTasks/Make.cs

@@ -111,6 +111,39 @@ protected override string ToolName
 			}
 		}
 
+		private static string FindVisualStudioToolPath(string vcInstallDir, string toolName)
+		{
+			if (String.IsNullOrEmpty(vcInstallDir) || !Directory.Exists(vcInstallDir))
+				return null;
+
+			string toolsRoot = Path.Combine(vcInstallDir, "Tools", "MSVC");
+			if (!Directory.Exists(toolsRoot))
+				return null;
+
+			string[] versionDirs = Directory.GetDirectories(toolsRoot);
+			Array.Sort(versionDirs, StringComparer.OrdinalIgnoreCase);
+			Array.Reverse(versionDirs);
+
+			foreach (string versionDir in versionDirs)
+			{
+				string[] candidateDirs =
+				{
+					Path.Combine(versionDir, "bin", "Hostx64", "x64"),
+					Path.Combine(versionDir, "bin", "Hostx64", "x86"),
+					Path.Combine(versionDir, "bin", "Hostx86", "x86"),
+					Path.Combine(versionDir, "bin", "Hostx86", "x64")
+				};
+
+				foreach (string candidateDir in candidateDirs)
+				{
+					if (File.Exists(Path.Combine(candidateDir, toolName)))
+						return candidateDir;
+				}
+			}
+
+			return null;
+		}
+
 		private void CheckToolPath()
 		{
 			string path = Environment.GetEnvironmentVariable("PATH");
@@ -140,7 +173,21 @@ private void CheckToolPath()
 			// Fall Back to the install directory (if VCINSTALLDIR is set)
 			if (!String.IsNullOrEmpty(vcInstallDir))
 			{
-				ToolPath = Path.Combine(vcInstallDir, "bin");
+				string visualStudioToolPath = FindVisualStudioToolPath(vcInstallDir, ToolName);
+				if (!String.IsNullOrEmpty(visualStudioToolPath))
+				{
+					ToolPath = visualStudioToolPath;
+					return;
+				}
+
+				string legacyToolPath = Path.Combine(vcInstallDir, "bin");
+				if (File.Exists(Path.Combine(legacyToolPath, ToolName)))
+				{
+					ToolPath = legacyToolPath;
+					return;
+				}
+
+				ToolPath = String.Empty;
 			}
 			else
 			{