update

microsoft · Feb 7, 2025 · 63f5866 · 63f5866
1 parent 758342a
commit 63f5866
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py
@@ -1075,12 +1075,8 @@ def generate_vcpkg_install_options(source_dir, args):
         ):
             vcpkg_install_options.append(
                 "--x-asset-sources=x-azurl,https://vcpkg.storage.devpackages.microsoft.io/artifacts/\\;x-block-origin"
-            )
-    if SYSTEM_COLLECTIONURI == "https://dev.azure.com/onnxruntime/":
-        vcpkg_install_options.append("--binarysource=x-az-universal,onnxruntime,onnxruntime,onnxruntime,readwrite")
-    elif SYSTEM_COLLECTIONURI == "https://dev.azure.com/aiinfra/" or SYSTEM_COLLECTIONURI == "https://aiinfra.visualstudio.com/":
-        vcpkg_install_options.append("--binarysource=x-az-universal,aiinfra,Lotus,Lotus,readwrite")
-    # Config binary cache
+            )    
+
     return vcpkg_install_options
 
 

diff --git a/tools/ci_build/github/azure-pipelines/win-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/win-ci-pipeline.yml
@@ -75,7 +75,7 @@ stages:
         displayName: 'Build and Test'
         inputs:
           scriptPath: '$(Build.SourcesDirectory)\tools\ci_build\build.py'
-          arguments: --config Debug --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --parallel --cmake_generator "Visual Studio 17 2022" --disable_memleak_checker --enable_address_sanitizer
+          arguments: --config Debug --build_dir $(Build.BinariesDirectory) --skip_submodule_sync --parallel --use_vcpkg --cmake_generator "Visual Studio 17 2022" --disable_memleak_checker --enable_address_sanitizer
           workingDirectory: '$(Build.BinariesDirectory)'
 
 
@@ -145,7 +145,7 @@ stages:
       parameters:
         BuildConfig: 'RelWithDebInfo'
         buildArch: x64
-        additionalBuildFlags: --build_wheel --use_vitisai
+        additionalBuildFlags: --build_wheel --use_vitisai --use_vcpkg
         msbuildPlatform: x64
         isX86: false
         job_name_suffix: x64_release

diff --git a/tools/ci_build/github/linux/ort_minimal/build_full_ort_and_create_ort_files.sh b/tools/ci_build/github/linux/ort_minimal/build_full_ort_and_create_ort_files.sh
@@ -22,7 +22,7 @@ python3 /onnxruntime_src/tools/ci_build/build.py \
     --build_dir ${BUILD_DIR} --cmake_generator Ninja \
     --config Debug \
     --skip_submodule_sync \
-    --parallel --use_binskim_compliant_compile_flags \
+    --parallel --use_vcpkg --use_binskim_compliant_compile_flags \
     --build_wheel \
     --skip_tests \
     --enable_training_ops \