diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index 380db6035..d68103973 100644 --- a/cmake-modules/AzureVcpkg.cmake +++ b/cmake-modules/AzureVcpkg.cmake @@ -54,13 +54,13 @@ macro(az_vcpkg_portfile_prep targetName fileName contentToRemove) endmacro() macro(az_vcpkg_export targetName macroNamePart dllImportExportHeaderPath) - # CONTROL file has an extra '#' in the comment section, because VcPkg can't handle an empty line at that position, + # The vcpkg.json file has an extra '#' in the comment section, because VcPkg can't handle an empty line at that position, # and without that extra '#' line, the file contents look too crowded. # Ultimately, the lines passed to az_vcpkg_portfile_prep() have to match the header comment that is actually # present in the files, or otherwise nothing will be removed. az_vcpkg_portfile_prep( "${targetName}" - "CONTROL" + "vcpkg.json" "# Copyright (c) Microsoft Corporation. All rights reserved.\n# SPDX-License-Identifier: MIT\n#\n" ) diff --git a/eng/scripts/Initialize-VcpkgRelease.ps1 b/eng/scripts/Initialize-VcpkgRelease.ps1 index c62e54afd..46a1e8993 100644 --- a/eng/scripts/Initialize-VcpkgRelease.ps1 +++ b/eng/scripts/Initialize-VcpkgRelease.ps1 @@ -37,7 +37,7 @@ param ( # If there's nothing in the "port" folder to upload set SkipVcpkgUpdate to true # and exit. Other steps will check SkipVcpkgUpdate to decide whether to move # forward. -if (!(Get-ChildItem -Path "$SourceDirectory/port/CONTROL")) { +if (!(Get-ChildItem -Path "$SourceDirectory/port/vcpkg.json")) { Write-Host "###vso[task.setvariable variable=SkipVcpkgUpdate]true" exit } diff --git a/sdk/core/azure-core/vcpkg/CONTROL b/sdk/core/azure-core/vcpkg/CONTROL deleted file mode 100644 index 573576a0b..000000000 --- a/sdk/core/azure-core/vcpkg/CONTROL +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# SPDX-License-Identifier: MIT -# -Source: azure-core-cpp -Version: @AZ_LIBRARY_VERSION@ -Build-Depends: openssl (!windows&!uwp) -Description: Microsoft Azure Core SDK for C++ - This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++. -Homepage: https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/core/azure-core -Default-Features: http - -Feature: http -Build-Depends: azure-core-cpp[core, curl], azure-core-cpp[core, curl, winhttp] (windows&!uwp) -Description: Build all HTTP transport implementations, depending on the platform - -Feature: curl -Build-Depends: azure-core-cpp[core], curl -Description: Build an HTTP transport implementation with LibCURL - -Feature: winhttp -Build-Depends: azure-core-cpp[core] -Description: Build an HTTP transport implementation with WinHTTP diff --git a/sdk/core/azure-core/vcpkg/vcpkg.json b/sdk/core/azure-core/vcpkg/vcpkg.json new file mode 100644 index 000000000..f599f2dd9 --- /dev/null +++ b/sdk/core/azure-core/vcpkg/vcpkg.json @@ -0,0 +1,63 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# SPDX-License-Identifier: MIT +# +{ + "name": "azure-core-cpp", + "version-string": "@AZ_LIBRARY_VERSION@", + "description": [ + "Microsoft Azure Core SDK for C++", + "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/core/azure-core", + "dependencies": [ + { + "name": "openssl", + "platform": "!windows & !uwp" + } + ], + "default-features": [ + "http" + ], + "features": { + "curl": { + "description": "Build an HTTP transport implementation with LibCURL", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false + }, + "curl" + ] + }, + "http": { + "description": "Build all HTTP transport implementations, depending on the platform", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false, + "features": [ + "curl" + ] + }, + { + "name": "azure-core-cpp", + "default-features": false, + "features": [ + "curl", + "winhttp" + ], + "platform": "windows & !uwp" + } + ] + }, + "winhttp": { + "description": "Build an HTTP transport implementation with WinHTTP", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false + } + ] + } + } +} diff --git a/sdk/identity/azure-identity/vcpkg/CONTROL b/sdk/identity/azure-identity/vcpkg/CONTROL deleted file mode 100644 index 951f8f49d..000000000 --- a/sdk/identity/azure-identity/vcpkg/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# SPDX-License-Identifier: MIT -# -Source: azure-identity-cpp -Version: @AZ_LIBRARY_VERSION@ -Build-Depends: azure-core-cpp -Description: Microsoft Azure Identity SDK for C++ - This library provides common authentication-related abstractions for Azure SDK. -Homepage: https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/identity/azure-identity diff --git a/sdk/identity/azure-identity/vcpkg/vcpkg.json b/sdk/identity/azure-identity/vcpkg/vcpkg.json new file mode 100644 index 000000000..fb96493fb --- /dev/null +++ b/sdk/identity/azure-identity/vcpkg/vcpkg.json @@ -0,0 +1,15 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# SPDX-License-Identifier: MIT +# +{ + "name": "azure-identity-cpp", + "version-string": "@AZ_LIBRARY_VERSION@", + "description": [ + "Microsoft Azure Identity SDK for C++", + "This library provides common authentication-related abstractions for Azure SDK." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/identity/azure-identity", + "dependencies": [ + "azure-core-cpp" + ] +} diff --git a/sdk/keyvault/azure-security-keyvault-common/vcpkg/CONTROL b/sdk/keyvault/azure-security-keyvault-common/vcpkg/CONTROL deleted file mode 100644 index b5265f3cf..000000000 --- a/sdk/keyvault/azure-security-keyvault-common/vcpkg/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# SPDX-License-Identifier: MIT -# -Source: azure-security-keyvault-common-cpp -Version: @AZ_LIBRARY_VERSION@ -Build-Depends: azure-core-cpp -Description: Microsoft Azure Common Key Vault SDK for C++ - This library provides common Azure KeyVault-related abstractions for Azure SDK. -Homepage: https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/keyvault/azure-security-keyvault-common diff --git a/sdk/keyvault/azure-security-keyvault-common/vcpkg/vcpkg.json b/sdk/keyvault/azure-security-keyvault-common/vcpkg/vcpkg.json new file mode 100644 index 000000000..f35989ec8 --- /dev/null +++ b/sdk/keyvault/azure-security-keyvault-common/vcpkg/vcpkg.json @@ -0,0 +1,15 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# SPDX-License-Identifier: MIT +# +{ + "name": "azure-security-keyvault-common-cpp", + "version-string": "@AZ_LIBRARY_VERSION@", + "description": [ + "Microsoft Azure Common Key Vault SDK for C++", + "This library provides common Azure KeyVault-related abstractions for Azure SDK." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/keyvault/azure-security-keyvault-common", + "dependencies": [ + "azure-core-cpp" + ] +} diff --git a/sdk/keyvault/azure-security-keyvault-keys/vcpkg/CONTROL b/sdk/keyvault/azure-security-keyvault-keys/vcpkg/CONTROL deleted file mode 100644 index 3ac5ac97b..000000000 --- a/sdk/keyvault/azure-security-keyvault-keys/vcpkg/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# SPDX-License-Identifier: MIT -# -Source: azure-security-keyvault-keys-cpp -Version: @AZ_LIBRARY_VERSION@ -Build-Depends: azure-security-keyvault-common-cpp -Description: Microsoft Azure Key Vault Keys SDK for C++ - This library provides Azure Key Vault Keys SDK. -Homepage: https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/keyvault/azure-security-keyvault-keys diff --git a/sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json b/sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json new file mode 100644 index 000000000..3c5636f46 --- /dev/null +++ b/sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json @@ -0,0 +1,15 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# SPDX-License-Identifier: MIT +# +{ + "name": "azure-security-keyvault-keys-cpp", + "version-string": "@AZ_LIBRARY_VERSION@", + "description": [ + "Microsoft Azure Key Vault Keys SDK for C++", + "This library provides Azure Key Vault Keys SDK." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/keyvault/azure-security-keyvault-keys", + "dependencies": [ + "azure-security-keyvault-common-cpp" + ] +} diff --git a/sdk/storage/azure-storage-blobs/vcpkg/CONTROL b/sdk/storage/azure-storage-blobs/vcpkg/CONTROL deleted file mode 100644 index 1bd20a6ab..000000000 --- a/sdk/storage/azure-storage-blobs/vcpkg/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# SPDX-License-Identifier: MIT -# -Source: azure-storage-blobs-cpp -Version: @AZ_LIBRARY_VERSION@ -Build-Depends: azure-storage-common-cpp -Description: Microsoft Azure Storage Blobs SDK for C++ - This library provides Azure Storage Blobs SDK. -Homepage: https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-blobs diff --git a/sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json b/sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json new file mode 100644 index 000000000..688dc8100 --- /dev/null +++ b/sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json @@ -0,0 +1,15 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# SPDX-License-Identifier: MIT +# +{ + "name": "azure-storage-blobs-cpp", + "version-string": "@AZ_LIBRARY_VERSION@", + "description": [ + "Microsoft Azure Storage Blobs SDK for C++", + "This library provides Azure Storage Blobs SDK." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-blobs", + "dependencies": [ + "azure-storage-common-cpp" + ] +} diff --git a/sdk/storage/azure-storage-common/vcpkg/CONTROL b/sdk/storage/azure-storage-common/vcpkg/CONTROL deleted file mode 100644 index 500c1fb57..000000000 --- a/sdk/storage/azure-storage-common/vcpkg/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# SPDX-License-Identifier: MIT -# -Source: azure-storage-common-cpp -Version: @AZ_LIBRARY_VERSION@ -Build-Depends: azure-core-cpp, libxml2, openssl (!windows) -Description: Microsoft Azure Common Storage SDK for C++ - This library provides common Azure Storage-related abstractions for Azure SDK. -Homepage: https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-common diff --git a/sdk/storage/azure-storage-common/vcpkg/vcpkg.json b/sdk/storage/azure-storage-common/vcpkg/vcpkg.json new file mode 100644 index 000000000..57823d518 --- /dev/null +++ b/sdk/storage/azure-storage-common/vcpkg/vcpkg.json @@ -0,0 +1,20 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# SPDX-License-Identifier: MIT +# +{ + "name": "azure-storage-common-cpp", + "version-string": "@AZ_LIBRARY_VERSION@", + "description": [ + "Microsoft Azure Common Storage SDK for C++", + "This library provides common Azure Storage-related abstractions for Azure SDK." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-common", + "dependencies": [ + "azure-core-cpp", + "libxml2", + { + "name": "openssl", + "platform": "!windows" + } + ] +} diff --git a/sdk/storage/azure-storage-files-datalake/vcpkg/CONTROL b/sdk/storage/azure-storage-files-datalake/vcpkg/CONTROL deleted file mode 100644 index 6ac25bd7d..000000000 --- a/sdk/storage/azure-storage-files-datalake/vcpkg/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# SPDX-License-Identifier: MIT -# -Source: azure-storage-files-datalake-cpp -Version: @AZ_LIBRARY_VERSION@ -Build-Depends: azure-storage-blobs-cpp -Description: Microsoft Azure Storage Files Data Lake SDK for C++ - This library provides Azure Storage Files Data Lake SDK. -Homepage: https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-files-datalake diff --git a/sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json b/sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json new file mode 100644 index 000000000..b8bd6d23f --- /dev/null +++ b/sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json @@ -0,0 +1,15 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# SPDX-License-Identifier: MIT +# +{ + "name": "azure-storage-files-datalake-cpp", + "version-string": "@AZ_LIBRARY_VERSION@", + "description": [ + "Microsoft Azure Storage Files Data Lake SDK for C++", + "This library provides Azure Storage Files Data Lake SDK." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-files-datalake", + "dependencies": [ + "azure-storage-blobs-cpp" + ] +} diff --git a/sdk/storage/azure-storage-files-shares/vcpkg/CONTROL b/sdk/storage/azure-storage-files-shares/vcpkg/CONTROL deleted file mode 100644 index ba4e4f6c1..000000000 --- a/sdk/storage/azure-storage-files-shares/vcpkg/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# SPDX-License-Identifier: MIT -# -Source: azure-storage-files-shares-cpp -Version: @AZ_LIBRARY_VERSION@ -Build-Depends: azure-storage-common-cpp -Description: Microsoft Azure Storage Files Shares SDK for C++ - This library provides Azure Storage Files Shares SDK. -Homepage: https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-files-shares diff --git a/sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json b/sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json new file mode 100644 index 000000000..772bc56e6 --- /dev/null +++ b/sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json @@ -0,0 +1,15 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# SPDX-License-Identifier: MIT +# +{ + "name": "azure-storage-files-shares-cpp", + "version-string": "@AZ_LIBRARY_VERSION@", + "description": [ + "Microsoft Azure Storage Files Shares SDK for C++", + "This library provides Azure Storage Files Shares SDK." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-files-shares", + "dependencies": [ + "azure-storage-common-cpp" + ] +} diff --git a/sdk/template/azure-template/vcpkg/CONTROL b/sdk/template/azure-template/vcpkg/CONTROL deleted file mode 100644 index 300f103e4..000000000 --- a/sdk/template/azure-template/vcpkg/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# SPDX-License-Identifier: MIT -# -Source: azure-template-cpp -Version: @AZ_LIBRARY_VERSION@ -Build-Depends: azure-core-cpp -Description: Microsoft Azure Template SDK for C++ - This is a template library meant to illustrate initial client library development process for Azure SDK. - It is not meant to be published to vcpkg. -Homepage: https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/template/azure-template diff --git a/sdk/template/azure-template/vcpkg/vcpkg.json b/sdk/template/azure-template/vcpkg/vcpkg.json new file mode 100644 index 000000000..478246b27 --- /dev/null +++ b/sdk/template/azure-template/vcpkg/vcpkg.json @@ -0,0 +1,16 @@ +# Copyright (c) Microsoft Corporation. All rights reserved. +# SPDX-License-Identifier: MIT +# +{ + "name": "azure-template-cpp", + "version-string": "@AZ_LIBRARY_VERSION@", + "description": [ + "Microsoft Azure Template SDK for C++", + "This is a template library meant to illustrate initial client library development process for Azure SDK.", + "It is not meant to be published to vcpkg." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/template/azure-template", + "dependencies": [ + "azure-core-cpp" + ] +}