diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
index d115f99f6..710adfbf6 100644
--- a/build-tools/automation/azure-pipelines.yaml
+++ b/build-tools/automation/azure-pipelines.yaml
@@ -28,7 +28,6 @@ variables:
   1ESWindowsImage: AzurePipelinesWindows2022compliant
   1ESMacPool: Azure Pipelines
   1ESMacImage: internal-macos-11
-  VSInstallRoot: C:\Program Files\Microsoft Visual Studio\2022\Enterprise
 
 jobs:
 - job: windows_build
@@ -85,6 +84,8 @@ jobs:
     name: $(1ESWindowsPool)
     demands: 
     - ImageOverride -equals $(1ESWindowsImage)
+  variables:
+    VSINSTALLDIR: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\
   timeoutInMinutes: 20
   workspace:
     clean: all
diff --git a/build-tools/scripts/NativeToolchain.targets b/build-tools/scripts/NativeToolchain.targets
index 1618c5b44..5632946a5 100644
--- a/build-tools/scripts/NativeToolchain.targets
+++ b/build-tools/scripts/NativeToolchain.targets
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <PropertyGroup Condition=" $([MSBuild]::IsOSPlatform ('windows')) And '$(VSINSTALLROOT)' != '' ">
-    <_VcvarsallPath>$(VSINSTALLROOT)\VC\Auxiliary\Build\vcvarsall.bat</_VcvarsallPath>
+  <PropertyGroup Condition=" $([MSBuild]::IsOSPlatform ('windows')) ">
+    <_VSInstallDir Condition=" '$(VsInstallRoot)' != '' ">$(VsInstallRoot)</_VSInstallDir>
+    <_VSInstallDir Condition=" '$(_VSInstallDir)' == '' And '$(VsInstallDir)' != '' ">$(VsInstallDir)</_VSInstallDir>
+    <_VcvarsallPath Condition=" '$(_VSInstallDir)' != '' ">$(_VSInstallDir)\VC\Auxiliary\Build\vcvarsall.bat</_VcvarsallPath>
   </PropertyGroup>
 
   <PropertyGroup Condition=" $([MSBuild]::IsOSPlatform ('windows')) And Exists ('$(_VcvarsallPath)') ">