Skip to content

Commit 39b997e

Browse files
eserscorChangming SunGemini
authored
Update VCPKG to 25.08.27 (#26839)
### Description Executive Summary The PR successfully updates the VCPKG baseline and Abseil dependency to version 20250814.0. A significant improvement is the introduction of a dynamic dependency resolution script for Abseil. There are also substantial refactoring changes in the WebGPU provider build logic which appear to be bundled with this update. Key Changes Verified 1. VCPKG & Abseil Update VCPKG Baseline: Updated to 120deac3062162151622ca4860575a33844ba10b in cmake/vcpkg-configuration.json. Abseil Port: cmake/vcpkg-ports/abseil/vcpkg.json and portfile.cmake correctly updated to version 20250814.0. Dependencies: cmake/deps.txt reflects the correct URL and hash for the new Abseil version. 2. Dependency Management New Tool: tools/python/resolve_absl_deps_dynamic.py has been added. Review: This is a robust script that automatically resolves and topologically sorts Abseil dependencies by parsing CMake lists. This is a great addition for maintainability, replacing the manual list management. CMake Integration: cmake/external/abseil-cpp.cmake has been updated to use the new list of components, consistent with the script's output. ### 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. --> --------- Co-authored-by: Changming Sun <chasun@microsoft.com> Co-authored-by: Gemini <gemini@google.com>
1 parent bde0830 commit 39b997e

File tree

24 files changed

+406
-119
lines changed

24 files changed

+406
-119
lines changed

‎.github/actions/locate-vcvarsall-and-setup-env/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ runs:
1616
- name: Setup VCPKG
1717
uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
1818
with:
19-
vcpkg-version: '2025.06.13'
20-
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
19+
vcpkg-version: '2025.08.27'
20+
vcpkg-hash: '9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079'
2121
cmake-version: '3.31.6'
2222
cmake-hash: '0f1584e8666cf4a65ec514bd02afe281caabf1d45d2c963f3151c41484f457386aa03273ab25776a670be02725354ce0b46f3a5121857416da37366342a833a0'
2323
add-cmake-to-path: 'true'

‎.github/workflows/android.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ jobs:
132132

133133
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
134134
with:
135-
vcpkg-version: '2025.06.13'
136-
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
135+
vcpkg-version: '2025.08.27'
136+
vcpkg-hash: '9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079'
137137
cmake-version: '3.31.6'
138138
cmake-hash: '42395e20b10a8e9ef3e33014f9a4eed08d46ab952e02d2c1bbc8f6133eca0d7719fb75680f9bbff6552f20fcd1b73d86860f7f39388d631f98fb6f622b37cf04'
139139
add-cmake-to-path: 'true'

‎.github/workflows/ios.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
submodules: false
2626
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
2727
with:
28-
vcpkg-version: '2025.06.13'
29-
vcpkg-hash: 735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc
28+
vcpkg-version: '2025.08.27'
29+
vcpkg-hash: 9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079
3030
cmake-version: '3.31.8'
3131
cmake-hash: 99cc9c63ae49f21253efb5921de2ba84ce136018abf08632c92c060ba91d552e0f6acc214e9ba8123dee0cf6d1cf089ca389e321879fd9d719a60d975bcffcc8
3232
add-cmake-to-path: 'true'

‎.github/workflows/linux-wasm-ci-build-and-test-workflow.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ jobs:
7070

7171
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
7272
with:
73-
vcpkg-version: '2025.06.13'
74-
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
73+
vcpkg-version: '2025.08.27'
74+
vcpkg-hash: '9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079'
7575
cmake-version: '3.31.6'
7676
cmake-hash: '42395e20b10a8e9ef3e33014f9a4eed08d46ab952e02d2c1bbc8f6133eca0d7719fb75680f9bbff6552f20fcd1b73d86860f7f39388d631f98fb6f622b37cf04'
7777
add-cmake-to-path: 'true'

‎.github/workflows/linux_minimal_build.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ jobs:
4242

4343
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
4444
with:
45-
vcpkg-version: '2025.06.13'
46-
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
45+
vcpkg-version: '2025.08.27'
46+
vcpkg-hash: '9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079'
4747
cmake-version: '3.31.6'
4848
cmake-hash: '42395e20b10a8e9ef3e33014f9a4eed08d46ab952e02d2c1bbc8f6133eca0d7719fb75680f9bbff6552f20fcd1b73d86860f7f39388d631f98fb6f622b37cf04'
4949
add-cmake-to-path: 'true'
@@ -143,8 +143,8 @@ jobs:
143143

144144
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
145145
with:
146-
vcpkg-version: '2025.06.13'
147-
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
146+
vcpkg-version: '2025.08.27'
147+
vcpkg-hash: '9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079'
148148
cmake-version: '3.31.6'
149149
cmake-hash: '42395e20b10a8e9ef3e33014f9a4eed08d46ab952e02d2c1bbc8f6133eca0d7719fb75680f9bbff6552f20fcd1b73d86860f7f39388d631f98fb6f622b37cf04'
150150
add-cmake-to-path: 'true'
@@ -181,8 +181,8 @@ jobs:
181181

182182
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
183183
with:
184-
vcpkg-version: '2025.06.13'
185-
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
184+
vcpkg-version: '2025.08.27'
185+
vcpkg-hash: '9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079'
186186
cmake-version: '3.31.6'
187187
cmake-hash: '42395e20b10a8e9ef3e33014f9a4eed08d46ab952e02d2c1bbc8f6133eca0d7719fb75680f9bbff6552f20fcd1b73d86860f7f39388d631f98fb6f622b37cf04'
188188
add-cmake-to-path: 'true'
@@ -217,8 +217,8 @@ jobs:
217217

218218
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
219219
with:
220-
vcpkg-version: '2025.06.13'
221-
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
220+
vcpkg-version: '2025.08.27'
221+
vcpkg-hash: '9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079'
222222
cmake-version: '3.31.6'
223223
cmake-hash: '42395e20b10a8e9ef3e33014f9a4eed08d46ab952e02d2c1bbc8f6133eca0d7719fb75680f9bbff6552f20fcd1b73d86860f7f39388d631f98fb6f622b37cf04'
224224
add-cmake-to-path: 'true'

‎.github/workflows/mac.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ jobs:
7979
uses: actions/checkout@v6
8080
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
8181
with:
82-
vcpkg-version: '2025.06.13'
83-
vcpkg-hash: 735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc
82+
vcpkg-version: '2025.08.27'
83+
vcpkg-hash: 9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079
8484
cmake-version: '3.31.8'
8585
cmake-hash: 99cc9c63ae49f21253efb5921de2ba84ce136018abf08632c92c060ba91d552e0f6acc214e9ba8123dee0cf6d1cf089ca389e321879fd9d719a60d975bcffcc8
8686
add-cmake-to-path: 'true'
@@ -127,8 +127,8 @@ jobs:
127127
uses: actions/checkout@v6
128128
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
129129
with:
130-
vcpkg-version: '2025.06.13'
131-
vcpkg-hash: 735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc
130+
vcpkg-version: '2025.08.27'
131+
vcpkg-hash: 9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079
132132
cmake-version: '3.31.8'
133133
cmake-hash: 99cc9c63ae49f21253efb5921de2ba84ce136018abf08632c92c060ba91d552e0f6acc214e9ba8123dee0cf6d1cf089ca389e321879fd9d719a60d975bcffcc8
134134
add-cmake-to-path: 'true'

‎.github/workflows/macos-ci-build-and-test-workflow.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ jobs:
7878
uses: actions/checkout@v6
7979
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
8080
with:
81-
vcpkg-version: '2025.06.13'
82-
vcpkg-hash: 735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc
81+
vcpkg-version: '2025.08.27'
82+
vcpkg-hash: 9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079
8383
cmake-version: '3.31.8'
8484
cmake-hash: 99cc9c63ae49f21253efb5921de2ba84ce136018abf08632c92c060ba91d552e0f6acc214e9ba8123dee0cf6d1cf089ca389e321879fd9d719a60d975bcffcc8
8585
add-cmake-to-path: 'true'

‎.github/workflows/publish-objectivec-apidocs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626
- uses: actions/checkout@v6
2727
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
2828
with:
29-
vcpkg-version: '2025.06.13'
30-
vcpkg-hash: 735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc
29+
vcpkg-version: '2025.08.27'
30+
vcpkg-hash: 9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079
3131
cmake-version: '3.31.8'
3232
cmake-hash: 99cc9c63ae49f21253efb5921de2ba84ce136018abf08632c92c060ba91d552e0f6acc214e9ba8123dee0cf6d1cf089ca389e321879fd9d719a60d975bcffcc8
3333
add-cmake-to-path: 'true'

‎.github/workflows/react_native.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ jobs:
4242

4343
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
4444
with:
45-
vcpkg-version: '2025.06.13'
46-
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
45+
vcpkg-version: '2025.08.27'
46+
vcpkg-hash: '9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079'
4747
cmake-version: '3.31.6'
4848
cmake-hash: '42395e20b10a8e9ef3e33014f9a4eed08d46ab952e02d2c1bbc8f6133eca0d7719fb75680f9bbff6552f20fcd1b73d86860f7f39388d631f98fb6f622b37cf04'
4949
add-cmake-to-path: 'true'
@@ -199,8 +199,8 @@ jobs:
199199

200200
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
201201
with:
202-
vcpkg-version: '2025.06.13'
203-
vcpkg-hash: 735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc
202+
vcpkg-version: '2025.08.27'
203+
vcpkg-hash: 9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079
204204
cmake-version: '3.31.8'
205205
cmake-hash: 99cc9c63ae49f21253efb5921de2ba84ce136018abf08632c92c060ba91d552e0f6acc214e9ba8123dee0cf6d1cf089ca389e321879fd9d719a60d975bcffcc8
206206
add-cmake-to-path: 'true'
@@ -244,8 +244,8 @@ jobs:
244244

245245
- uses: microsoft/onnxruntime-github-actions/setup-build-tools@v0.0.9
246246
with:
247-
vcpkg-version: '2025.06.13'
248-
vcpkg-hash: 735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc
247+
vcpkg-version: '2025.08.27'
248+
vcpkg-hash: 9a4b32849792e13bee1d24726f073b3881acae4165206ddf1a6378e44a4ddd05b3ee93f55ff46d8e8873b3cbcd06606212989e248f0bd615a5bf365070074079
249249
cmake-version: '3.31.8'
250250
cmake-hash: 99cc9c63ae49f21253efb5921de2ba84ce136018abf08632c92c060ba91d552e0f6acc214e9ba8123dee0cf6d1cf089ca389e321879fd9d719a60d975bcffcc8
251251
add-cmake-to-path: 'true'

‎cmake/deps.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#since the file contains a version string: "lts_20230802". However, the file is for debugging purposes only and would
1010
#not affect built binaries.
1111
#
12-
abseil_cpp;https://github.com/abseil/abseil-cpp/archive/refs/tags/20250512.0.zip;3d6ff7e7ce144d9a53a53bef1f1bf79e1da4b8e1
12+
abseil_cpp;https://github.com/abseil/abseil-cpp/archive/refs/tags/20250814.0.zip;a9eb1d648cbca4d4d788737e971a6a7a63726b07
1313
coremltools;https://github.com/apple/coremltools/archive/refs/tags/7.1.zip;f1bab0f30966f2e217d8e01207d518f230a1641a
1414
cxxopts;https://github.com/jarro2783/cxxopts/archive/3c73d91c0b04e2b59462f0a741be8c07024c1bc0.zip;6c6ca7f8480b26c8d00476e0e24b7184717fe4f0
1515
date;https://github.com/HowardHinnant/date/archive/refs/tags/v3.0.1.zip;2dac0c81dc54ebdd8f8d073a75c053b04b56e159

0 commit comments

Comments
 (0)