diff --git a/vcpkg/reference/vcpkg-json.md b/vcpkg/reference/vcpkg-json.md index 40d84894..d74ad301 100644 --- a/vcpkg/reference/vcpkg-json.md +++ b/vcpkg/reference/vcpkg-json.md @@ -220,10 +220,10 @@ Exact version pins to use for specific dependencies. An array of Override object | Name | Required | Type | Description | |------|----------|--------|-------------| | name | Yes | string | The port name | -| version | Yes | string | The pinned version | -| port-version | No | integer | The pinned port version | +| [version
version-semver
version-date
version-string](#version) | Yes | string | Upstream version information to pin | +| [port-version](#port-version) | No | integer | Port files revision to pin | -`"port-version"` can also be specified as a `#N` suffix in the `"version"` field. For example, `1.2.3#7`. +`"port-version"` can also be specified as a `#N` suffix in one of the fields. For example, `1.2.3#7`. See also [versioning](../users/versioning.md#overrides) for more semantic details. @@ -233,6 +233,9 @@ See also [versioning](../users/versioning.md#overrides) for more semantic detail "overrides": [ { "name": "arrow", "version": "1.2.3", "port-version": 7 + }, + { + "name": "openssl", "version-string": "1.1.1h#3" } ] ``` diff --git a/vcpkg/users/versioning.md b/vcpkg/users/versioning.md index e735cadd..4013ab5d 100644 --- a/vcpkg/users/versioning.md +++ b/vcpkg/users/versioning.md @@ -161,12 +161,14 @@ For an override to take effect, the overridden package must form part of the dep "name": "project", "version-semver": "1.0.0", "dependencies": [ + "curl", { "name": "zlib", "version>=": "1.2.11#9" }, "fmt" ], "builtin-baseline":"3426db05b996481ca31e95fff3734cf23e0f51bc", "overrides": [ - { "name": "fmt", "version": "6.0.0" } + { "name": "fmt", "version": "6.0.0" }, + { "name": "openssl", "version-string": "1.1.1h#3" } ] } ```