diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index 1c740cf6c..b07469254 100644 --- a/cmake-modules/AzureVcpkg.cmake +++ b/cmake-modules/AzureVcpkg.cmake @@ -18,7 +18,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 7d5ed6bd1bc4faf32f1ebcdee30b5842d30032c6) # default SDK tested commit + set(VCPKG_COMMIT_STRING 43cf47eccfbe27006cf9534a5db809798f8c37fe) # 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 diff --git a/sdk/attestation/azure-security-attestation/vcpkg/vcpkg.json b/sdk/attestation/azure-security-attestation/vcpkg/vcpkg.json index 7ca3e2d0b..4dede4b1a 100644 --- a/sdk/attestation/azure-security-attestation/vcpkg/vcpkg.json +++ b/sdk/attestation/azure-security-attestation/vcpkg/vcpkg.json @@ -2,7 +2,10 @@ # Licensed under the MIT License. { - "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-security-attestation-cpp", "version-semver": "@AZ_LIBRARY_VERSION@", "description": [ diff --git a/sdk/core/azure-core-amqp/vcpkg/vcpkg.json b/sdk/core/azure-core-amqp/vcpkg/vcpkg.json index 92502dcc8..b31b46b28 100644 --- a/sdk/core/azure-core-amqp/vcpkg/vcpkg.json +++ b/sdk/core/azure-core-amqp/vcpkg/vcpkg.json @@ -2,7 +2,10 @@ # Licensed under the MIT License. { - "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-core-amqp-cpp", "version-semver": "@AZ_LIBRARY_VERSION@", "description": [ diff --git a/sdk/core/azure-core-tracing-opentelemetry/test/ut/test_exporter.hpp b/sdk/core/azure-core-tracing-opentelemetry/test/ut/test_exporter.hpp index 6469a2712..9609e4214 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/test/ut/test_exporter.hpp +++ b/sdk/core/azure-core-tracing-opentelemetry/test/ut/test_exporter.hpp @@ -11,6 +11,7 @@ #endif #include +#include #if defined(_MSC_VER) #pragma warning(pop) diff --git a/sdk/core/azure-core-tracing-opentelemetry/vcpkg/vcpkg.json b/sdk/core/azure-core-tracing-opentelemetry/vcpkg/vcpkg.json index f54848a9f..0cdf12968 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/vcpkg/vcpkg.json +++ b/sdk/core/azure-core-tracing-opentelemetry/vcpkg/vcpkg.json @@ -2,7 +2,10 @@ # Licensed under the MIT License. { - "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-core-tracing-opentelemetry-cpp", "version-semver": "@AZ_LIBRARY_VERSION@", "description": [ diff --git a/sdk/core/azure-core/vcpkg/vcpkg.json b/sdk/core/azure-core/vcpkg/vcpkg.json index 1088a6f9e..70baee877 100644 --- a/sdk/core/azure-core/vcpkg/vcpkg.json +++ b/sdk/core/azure-core/vcpkg/vcpkg.json @@ -2,7 +2,10 @@ # Licensed under the MIT License. { - "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-core-cpp", "version-semver": "@AZ_LIBRARY_VERSION@", "description": [ diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/vcpkg.json b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/vcpkg.json index 904ee0d6b..3be0c2cda 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/vcpkg.json +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/vcpkg.json @@ -2,7 +2,10 @@ # Licensed under the MIT License. { - "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-messaging-eventhubs-checkpointstore-blob-cpp", "version-semver": "@AZ_LIBRARY_VERSION@", "description": [ diff --git a/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/vcpkg.json b/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/vcpkg.json index bf3399100..44289a29c 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/vcpkg.json +++ b/sdk/eventhubs/azure-messaging-eventhubs/vcpkg/vcpkg.json @@ -2,7 +2,10 @@ # Licensed under the MIT License. { - "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-messaging-eventhubs-cpp", "version-semver": "@AZ_LIBRARY_VERSION@", "description": [ diff --git a/sdk/identity/azure-identity/vcpkg/vcpkg.json b/sdk/identity/azure-identity/vcpkg/vcpkg.json index f31067c9a..1437a3fca 100644 --- a/sdk/identity/azure-identity/vcpkg/vcpkg.json +++ b/sdk/identity/azure-identity/vcpkg/vcpkg.json @@ -2,7 +2,10 @@ # Licensed under the MIT License. { - "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-identity-cpp", "version-semver": "@AZ_LIBRARY_VERSION@", "description": [ diff --git a/sdk/keyvault/azure-security-keyvault-administration/vcpkg/vcpkg.json b/sdk/keyvault/azure-security-keyvault-administration/vcpkg/vcpkg.json index d99d4c345..7923e168d 100644 --- a/sdk/keyvault/azure-security-keyvault-administration/vcpkg/vcpkg.json +++ b/sdk/keyvault/azure-security-keyvault-administration/vcpkg/vcpkg.json @@ -2,7 +2,10 @@ # Licensed under the MIT License. { - "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-security-keyvault-administration-cpp", "version-semver": "@AZ_LIBRARY_VERSION@", "description": [ diff --git a/sdk/keyvault/azure-security-keyvault-certificates/vcpkg/vcpkg.json b/sdk/keyvault/azure-security-keyvault-certificates/vcpkg/vcpkg.json index 72f0117ef..df6338e16 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/vcpkg/vcpkg.json +++ b/sdk/keyvault/azure-security-keyvault-certificates/vcpkg/vcpkg.json @@ -2,7 +2,10 @@ # Licensed under the MIT License. { - "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-security-keyvault-certificates-cpp", "version-semver": "@AZ_LIBRARY_VERSION@", "description": [ diff --git a/sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json b/sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json index e95ab3345..94ca3da71 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json +++ b/sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json @@ -2,7 +2,10 @@ # Licensed under the MIT License. { - "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-security-keyvault-keys-cpp", "version-semver": "@AZ_LIBRARY_VERSION@", "description": [ diff --git a/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/vcpkg.json b/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/vcpkg.json index 0b04f4788..69858b49f 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/vcpkg.json +++ b/sdk/keyvault/azure-security-keyvault-secrets/vcpkg/vcpkg.json @@ -2,7 +2,10 @@ # Licensed under the MIT License. { - "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-security-keyvault-secrets-cpp", "version-semver": "@AZ_LIBRARY_VERSION@", "description": [ diff --git a/sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json b/sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json index 8673e06fd..541a9546b 100644 --- a/sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json +++ b/sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json @@ -2,7 +2,10 @@ # Licensed under the MIT License. { - "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-storage-blobs-cpp", "version-semver": "@AZ_LIBRARY_VERSION@", "description": [ diff --git a/sdk/storage/azure-storage-common/vcpkg/vcpkg.json b/sdk/storage/azure-storage-common/vcpkg/vcpkg.json index 439b2ffea..e52ffb5c4 100644 --- a/sdk/storage/azure-storage-common/vcpkg/vcpkg.json +++ b/sdk/storage/azure-storage-common/vcpkg/vcpkg.json @@ -2,7 +2,10 @@ # Licensed under the MIT License. { - "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-storage-common-cpp", "version-semver": "@AZ_LIBRARY_VERSION@", "description": [ diff --git a/sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json b/sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json index 056ff02cc..0c653b819 100644 --- a/sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json +++ b/sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json @@ -2,7 +2,10 @@ # Licensed under the MIT License. { - "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-storage-files-datalake-cpp", "version-semver": "@AZ_LIBRARY_VERSION@", "description": [ diff --git a/sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json b/sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json index 2144a78f0..514c55f02 100644 --- a/sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json +++ b/sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json @@ -2,7 +2,10 @@ # Licensed under the MIT License. { - "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-storage-files-shares-cpp", "version-semver": "@AZ_LIBRARY_VERSION@", "description": [ diff --git a/sdk/storage/azure-storage-queues/vcpkg/vcpkg.json b/sdk/storage/azure-storage-queues/vcpkg/vcpkg.json index e97989faf..5e31db956 100644 --- a/sdk/storage/azure-storage-queues/vcpkg/vcpkg.json +++ b/sdk/storage/azure-storage-queues/vcpkg/vcpkg.json @@ -2,7 +2,10 @@ # Licensed under the MIT License. { - "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-storage-queues-cpp", "version-semver": "@AZ_LIBRARY_VERSION@", "description": [ diff --git a/sdk/template/azure-template/vcpkg/vcpkg.json b/sdk/template/azure-template/vcpkg/vcpkg.json index 8b8c58eb1..efef8da11 100644 --- a/sdk/template/azure-template/vcpkg/vcpkg.json +++ b/sdk/template/azure-template/vcpkg/vcpkg.json @@ -2,7 +2,10 @@ # Licensed under the MIT License. { - "$comment": "NOTE: All changes made to this file will get overwritten by the next port release. Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp.", + "$comment": [ + "NOTE: All changes made to this file will get overwritten by the next port release.", + "Please contribute your changes to https://github.com/Azure/azure-sdk-for-cpp." + ], "name": "azure-template-cpp", "version-semver": "@AZ_LIBRARY_VERSION@", "description": [ diff --git a/vcpkg.json b/vcpkg.json index 41ee5ca05..cc5c112b9 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-sdk-for-cpp", "version": "1.5.0", - "builtin-baseline": "7d5ed6bd1bc4faf32f1ebcdee30b5842d30032c6", + "builtin-baseline": "43cf47eccfbe27006cf9534a5db809798f8c37fe", "dependencies": [ { "name": "curl"