Make vcpkg.json comment multiline (#5175)

* Make vcpkg.json comment multiline

* Update core-opentelemetry tests to be able to compile with opentelemetry-cpp version 1.12.0

---------

Co-authored-by: Anton Kolesnyk <antkmsft@users.noreply.github.com>
This commit is contained in:
Anton Kolesnyk 2023-11-21 17:06:37 -08:00 committed by GitHub
parent 94fc220f77
commit 05d1f5455c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 71 additions and 19 deletions

View File

@ -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

View File

@ -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": [

View File

@ -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": [

View File

@ -11,6 +11,7 @@
#endif
#include <opentelemetry/sdk/trace/exporter.h>
#include <opentelemetry/sdk/trace/recordable.h>
#if defined(_MSC_VER)
#pragma warning(pop)

View File

@ -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": [

View File

@ -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": [

View File

@ -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": [

View File

@ -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": [

View File

@ -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": [

View File

@ -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": [

View File

@ -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": [

View File

@ -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": [

View File

@ -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": [

View File

@ -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": [

View File

@ -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": [

View File

@ -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": [

View File

@ -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": [

View File

@ -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": [

View File

@ -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": [

View File

@ -1,7 +1,7 @@
{
"name": "azure-sdk-for-cpp",
"version": "1.5.0",
"builtin-baseline": "7d5ed6bd1bc4faf32f1ebcdee30b5842d30032c6",
"builtin-baseline": "43cf47eccfbe27006cf9534a5db809798f8c37fe",
"dependencies": [
{
"name": "curl"