From 1dd9bf53400364d022f3cba7af8c42af06535c30 Mon Sep 17 00:00:00 2001
From: Jian Chen <cjian@microsoft.com>
Date: Mon, 20 Nov 2023 09:58:15 -0800
Subject: [PATCH] Remove setup_env_azure.bat (#18482)

### Description
<!-- Describe your changes. -->



### Motivation and Context
<!-- - Why is this change required? What problem does it solve?
- If it fixes an open issue, please link to the issue here. -->
---
 .../templates/jobs/win-ci-vs-2022-job.yml     |  1 +
 .../azure-pipelines/win-ci-pipeline.yml       | 19 ++++++++++---------
 .../github/windows/setup_env_azure.bat        |  4 ----
 3 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100644 tools/ci_build/github/windows/setup_env_azure.bat

diff --git a/tools/ci_build/github/azure-pipelines/templates/jobs/win-ci-vs-2022-job.yml b/tools/ci_build/github/azure-pipelines/templates/jobs/win-ci-vs-2022-job.yml
index 9282cfccd02f0..e40c4d0e95dc5 100644
--- a/tools/ci_build/github/azure-pipelines/templates/jobs/win-ci-vs-2022-job.yml
+++ b/tools/ci_build/github/azure-pipelines/templates/jobs/win-ci-vs-2022-job.yml
@@ -4,6 +4,7 @@ parameters:
 
 - name: EnvSetupScript
   type: string
+  default: setup_env.bat
 
 - name: job_name_suffix
   type: string
diff --git a/tools/ci_build/github/azure-pipelines/win-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/win-ci-pipeline.yml
index ed010b5619db5..d7ffc1828c943 100644
--- a/tools/ci_build/github/azure-pipelines/win-ci-pipeline.yml
+++ b/tools/ci_build/github/azure-pipelines/win-ci-pipeline.yml
@@ -40,7 +40,6 @@ stages:
     - template: templates/jobs/win-ci-vs-2022-job.yml
       parameters:
         BuildConfig: 'Debug'
-        EnvSetupScript: setup_env.bat
         buildArch: x64
         additionalBuildFlags: --build_java --build_nodejs --build_wheel --disable_memleak_checker
         msbuildPlatform: x64
@@ -59,7 +58,6 @@ stages:
     - template: templates/jobs/win-ci-vs-2022-job.yml
       parameters:
         BuildConfig: 'RelWithDebInfo'
-        EnvSetupScript: setup_env.bat
         buildArch: x64
         # Compare to our Nuget packaging pipeline, this job has "--build_wheel" but doesn't have "--enable_lto --disable_rtti --use_telemetry  --enable_wcos"
         # Python bindings use typeid so I can't disable RTTI here. If it causes a problem, we will need to split this job to two jobs.
@@ -80,7 +78,6 @@ stages:
     - template: templates/jobs/win-ci-vs-2022-job.yml
       parameters:
         BuildConfig: 'RelWithDebInfo'
-        EnvSetupScript: setup_env.bat
         buildArch: x64
         additionalBuildFlags: --build_wheel --use_dnnl --build_java
         msbuildPlatform: x64
@@ -101,7 +98,6 @@ stages:
     - template: templates/jobs/win-ci-vs-2022-job.yml
       parameters:
         BuildConfig: 'RelWithDebInfo'
-        EnvSetupScript: setup_env.bat
         buildArch: x64
         additionalBuildFlags: --build_wheel --use_xnnpack
         msbuildPlatform: x64
@@ -120,7 +116,6 @@ stages:
     - template: templates/jobs/win-ci-vs-2022-job.yml
       parameters:
         BuildConfig: 'RelWithDebInfo'
-        EnvSetupScript: setup_env.bat
         buildArch: x64
         additionalBuildFlags: --use_winml --enable_wcos --disable_rtti --cmake_extra_defines CMAKE_SYSTEM_VERSION=10.0.22000.0
         msbuildPlatform: x64
@@ -160,7 +155,6 @@ stages:
     - template: templates/jobs/win-ci-vs-2022-job.yml
       parameters:
         BuildConfig: 'Debug'
-        EnvSetupScript: setup_env.bat
         buildArch: x64
         additionalBuildFlags: --enable_training --build_wheel --disable_memleak_checker
         msbuildPlatform: x64
@@ -179,7 +173,6 @@ stages:
     - template: templates/jobs/win-ci-vs-2022-job.yml
       parameters:
         BuildConfig: 'RelWithDebInfo'
-        EnvSetupScript: setup_env.bat
         buildArch: x64
         additionalBuildFlags: --enable_training --build_wheel
         msbuildPlatform: x64
@@ -198,7 +191,6 @@ stages:
     - template: templates/jobs/win-ci-vs-2022-job.yml
       parameters:
         BuildConfig: 'RelWithDebInfo'
-        EnvSetupScript: setup_env.bat
         buildArch: x64
         additionalBuildFlags: --enable_training_apis
         msbuildPlatform: x64
@@ -215,10 +207,17 @@ stages:
 - stage: x64_release_azure
   dependsOn: []
   jobs:
+    - job:
+      steps:
+      - powershell: |
+          Write-Host "##vso[task.prependpath]$(Build.BinariesDirectory)\RelWithDebInfo\_deps\vcpkg-src\installed\x86-windows\bin"
+          $env:PATH
+          Write-Host "##vso[task.prependpath]$(Build.BinariesDirectory)\RelWithDebInfo\_deps\vcpkg-src\installed\x64-windows\bin"
+          $env:PATH
+      displayName: 'Append x64-windows and x86-windows to PATH'
     - template: templates/jobs/win-ci-vs-2022-job.yml
       parameters:
         BuildConfig: 'RelWithDebInfo'
-        EnvSetupScript: setup_env_azure.bat
         buildArch: x64
         additionalBuildFlags: --use_azure --use_lock_free_queue
         msbuildPlatform: x64
@@ -231,3 +230,5 @@ stages:
         GenerateDocumentation: false
         WITH_CACHE: true
         MachinePool: 'onnxruntime-Win-CPU-2022'
+
+
diff --git a/tools/ci_build/github/windows/setup_env_azure.bat b/tools/ci_build/github/windows/setup_env_azure.bat
deleted file mode 100644
index 44ba34b0bf23a..0000000000000
--- a/tools/ci_build/github/windows/setup_env_azure.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-REM Copyright (c) Microsoft Corporation. All rights reserved.
-REM Licensed under the MIT License.
-set PATH=%cd%\RelWithDebInfo\_deps\vcpkg-src\installed\x64-windows\bin;%cd%\RelWithDebInfo\_deps\vcpkg-src\installed\x86-windows\bin;%PATH%
-set GRADLE_OPTS=-Dorg.gradle.daemon=false