Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make vcpkg.json comment multiline #5175

Merged
merged 2 commits into from
Nov 22, 2023
Merged

Make vcpkg.json comment multiline #5175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7948534
Make vcpkg.json comment multiline
antkmsft Nov 21, 2023
b208d83
Update core-opentelemetry tests to be able to compile with openteleme…
antkmsft Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake-modules/AzureVcpkg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion sdk/attestation/azure-security-attestation/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
5 changes: 4 additions & 1 deletion sdk/core/azure-core-amqp/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
1 change: 1 addition & 0 deletions sdk/core/azure-core-tracing-opentelemetry/test/ut/test_exporter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#endif

#include <opentelemetry/sdk/trace/exporter.h>
#include <opentelemetry/sdk/trace/recordable.h>

#if defined(_MSC_VER)
#pragma warning(pop)
Expand Down
5 changes: 4 additions & 1 deletion sdk/core/azure-core-tracing-opentelemetry/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
5 changes: 4 additions & 1 deletion sdk/core/azure-core/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
5 changes: 4 additions & 1 deletion sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
5 changes: 4 additions & 1 deletion sdk/eventhubs/azure-messaging-eventhubs/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
5 changes: 4 additions & 1 deletion sdk/identity/azure-identity/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
5 changes: 4 additions & 1 deletion sdk/keyvault/azure-security-keyvault-administration/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
5 changes: 4 additions & 1 deletion sdk/keyvault/azure-security-keyvault-certificates/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
5 changes: 4 additions & 1 deletion sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
5 changes: 4 additions & 1 deletion sdk/keyvault/azure-security-keyvault-secrets/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
5 changes: 4 additions & 1 deletion sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
5 changes: 4 additions & 1 deletion sdk/storage/azure-storage-common/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
5 changes: 4 additions & 1 deletion sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
5 changes: 4 additions & 1 deletion sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
5 changes: 4 additions & 1 deletion sdk/storage/azure-storage-queues/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
5 changes: 4 additions & 1 deletion sdk/template/azure-template/vcpkg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "azure-sdk-for-cpp",
"version": "1.5.0",
"builtin-baseline": "7d5ed6bd1bc4faf32f1ebcdee30b5842d30032c6",
"builtin-baseline": "43cf47eccfbe27006cf9534a5db809798f8c37fe",
"dependencies": [
{
"name": "curl"
Expand Down
Loading