From 450bfcc1d40b4bb17d72ccf5b9618a4ab45d4309 Mon Sep 17 00:00:00 2001
From: Jeremy Sinclair <4016293+snickler@users.noreply.github.com>
Date: Wed, 20 Aug 2025 11:25:51 -0400
Subject: [PATCH] [CI] Update VCToolsVersion detection to conditionally pass
 prerelease flag

---
 .pipelines/verifyAndSetLatestVCToolsVersion.ps1 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.pipelines/verifyAndSetLatestVCToolsVersion.ps1 b/.pipelines/verifyAndSetLatestVCToolsVersion.ps1
index 4ebf3a3eec..1200ec13fa 100644
--- a/.pipelines/verifyAndSetLatestVCToolsVersion.ps1
+++ b/.pipelines/verifyAndSetLatestVCToolsVersion.ps1
@@ -1,9 +1,13 @@
-$VSInstances = ([xml](& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -include packages -format xml))
+$extraVersionTarget = "";
+if($env:VCWhereExtraVersionTarget) {
+    $extraVersionTarget = "`"$env:VCWhereExtraVersionTarget`"";
+}
+$VSInstances = ([xml](& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest $extraVersionTarget -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -include packages -format xml))
 $VSPackages = $VSInstances.instances.instance.packages.package
 $LatestVCPackage = ($VSPackages | ? { $_.id -eq "Microsoft.VisualCpp.Tools.Core" })
 $LatestVCToolsVersion = $LatestVCPackage.version;
 
-$VSRoot = (& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property 'resolvedInstallationPath')
+$VSRoot = (& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest $extraVersionTarget -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property 'resolvedInstallationPath')
 $VCToolsRoot = Join-Path $VSRoot "VC\Tools\MSVC"
 
 # We have observed a few instances where the VC tools package version actually