Skip to content

Use latest vcpkg commit in configuration, sync manifest with deps.txt #23554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snnn merged 3 commits into from
Jan 31, 2025
Merged

Use latest vcpkg commit in configuration, sync manifest with deps.txt #23554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a12796
vcpkg: use latest commit, remove nsync in manifest
luncliff Jan 31, 2025
eb4b404
vcpkg: sync dependency versions with deps.txt
luncliff Jan 31, 2025
2216339
cmake: remove custom onnx port
luncliff Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/vcpkg-configuration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"default-registry": {
"kind": "git",
"repository": "https://github.com/Microsoft/vcpkg",
"baseline": "93570a28ecdf49d3d9676cec8aa0cc72935d43db"
"baseline": "d504de05dcd7b55df34976be1c824324ec6bca2b"
},
"registries": []
}
67 changes: 0 additions & 67 deletions cmake/vcpkg-ports/onnx/fix-cmakelists.patch
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions cmake/vcpkg-ports/onnx/fix-dependency-protobuf.patch
View file
Open in desktop

This file was deleted.

83 changes: 0 additions & 83 deletions cmake/vcpkg-ports/onnx/portfile.cmake
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions cmake/vcpkg-ports/onnx/vcpkg.json
View file
Open in desktop

This file was deleted.

11 changes: 3 additions & 8 deletions cmake/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "onnxruntime",
"version-date": "2024-09-10",
"version-date": "2025-01-31",
"description": "ONNX Runtime: cross-platform, high performance ML inferencing and training accelerator",
"homepage": "https://onnxruntime.ai/",
"license": "MIT",
Expand Down Expand Up @@ -30,14 +30,9 @@
},
"ms-gsl",
"nlohmann-json",
{
"name": "nsync",
"platform": "!windows",
"version>=": "1.26.0"
},
{
"name": "onnx",
"version>=": "1.16.2"
"version>=": "1.17.0"
},
"optional-lite",
{
Expand Down Expand Up @@ -82,7 +77,7 @@
},
{
"name": "flatbuffers",
"version": "23.5.26"
"version": "23.5.26#1"
}
]
}