Skip to content

Commit 7da5a45

Browse files
authored
Update vcpkg baseline (Azure#4772)
* 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 <[email protected]>
1 parent cf1c01e commit 7da5a45

File tree

5 files changed

+5
-15
lines changed

5 files changed

+5
-15
lines changed

cmake-modules/AzureVcpkg.cmake

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

sdk/core/azure-core-amqp/vcpkg.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
"version-string": "1.0.0-beta.1",
44
"supports": "!uwp",
55
"dependencies": [
6-
{
7-
"name": "azure-core-cpp",
8-
"default-features": false
9-
},
6+
"azure-core-cpp",
107
{
118
"name": "azure-uamqp-c",
129
"platform": "!uwp"

sdk/core/azure-core-tracing-opentelemetry/vcpkg.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
"version-string": "1.0.0-beta.1",
44
"supports": "!(windows & !static)",
55
"dependencies": [
6-
{
7-
"name": "azure-core-cpp",
8-
"default-features": false
9-
},
6+
"azure-core-cpp",
107
{
118
"name": "opentelemetry-cpp",
129
"platform": "!(windows & !static)"

sdk/storage/azure-storage-common/vcpkg.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88
"homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-common",
99
"license": "MIT",
1010
"dependencies": [
11-
{
12-
"name": "azure-core-cpp",
13-
"default-features": false,
14-
"version>=": "1.9.0"
15-
},
11+
"azure-core-cpp",
1612
{
1713
"name": "libxml2",
1814
"platform": "!windows"

vcpkg.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "azure-sdk-for-cpp",
33
"version": "1.5.0",
4-
"builtin-baseline": "94ce0dab56f4d8ba6bd631ba59ed682b02d45c46",
4+
"builtin-baseline": "dafef74af53669ef1cc9015f55e0ce809ead62aa",
55
"dependencies": [
66
{
77
"name": "curl"

0 commit comments

Comments
 (0)