github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update vcpkg baseline (#4772)

Browse Source 
* Update vcpkg baseline

* Update in another place as well

* Remove default-features requirement for telemetry and amqp in manifest mode

* Also remove default-features for storage

---------

Co-authored-by: Anton Kolesnyk <antkmsft@users.noreply.github.com>
This commit is contained in:
Anton Kolesnyk 2023-07-10 14:22:40 -07:00 committed by GitHub
parent cf1c01e089
commit 7da5a4568c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake-modules/AzureVcpkg.cmake
View File

@ -17,7 +17,7 @@ macro(az_vcpkg_integrate)
message("AZURE_SDK_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.")
# GET VCPKG FROM SOURCE
# User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch
set(VCPKG_COMMIT_STRING 94ce0dab56f4d8ba6bd631ba59ed682b02d45c46) # default SDK tested commit
set(VCPKG_COMMIT_STRING dafef74af53669ef1cc9015f55e0ce809ead62aa) # default SDK tested commit
if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT})
message("AZURE_SDK_VCPKG_COMMIT is defined. Using that instead of the default.")
set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit

5
sdk/core/azure-core-amqp/vcpkg.json
View File

@ -3,10 +3,7 @@
"version-string": "1.0.0-beta.1",
"supports": "!uwp",
"dependencies": [
{
"name": "azure-core-cpp",
"default-features": false
},
"azure-core-cpp",
{
"name": "azure-uamqp-c",
"platform": "!uwp"

5
sdk/core/azure-core-tracing-opentelemetry/vcpkg.json
View File

@ -3,10 +3,7 @@
"version-string": "1.0.0-beta.1",
"supports": "!(windows & !static)",
"dependencies": [
{
"name": "azure-core-cpp",
"default-features": false
},
"azure-core-cpp",
{
"name": "opentelemetry-cpp",
"platform": "!(windows & !static)"

6
sdk/storage/azure-storage-common/vcpkg.json
View File

@ -8,11 +8,7 @@
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-common",
"license": "MIT",
"dependencies": [
{
"name": "azure-core-cpp",
"default-features": false,
"version>=": "1.9.0"
},
"azure-core-cpp",
{
"name": "libxml2",
"platform": "!windows"

2
vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "azure-sdk-for-cpp",
"version": "1.5.0",
"builtin-baseline": "94ce0dab56f4d8ba6bd631ba59ed682b02d45c46",
"builtin-baseline": "dafef74af53669ef1cc9015f55e0ce809ead62aa",
"dependencies": [
{
"name": "curl"