[azure-sdk-for-cpp] Upgrade vcpkg manifest files (#17447)

* [azure-sdk-for-cpp] Upgrade vcpkg manifest files

* Update version files

* vcpkg format-manifest

* Update version files

* Minor change to re-trigger CI

* Undo that minor change

* Bump up port-version

* Update x-add-version

* redo x-add-version without overwrite

Co-authored-by: Anton Kolesnyk <antkmsft@users.noreply.github.com>

ports/azure-core-cpp/portfile.cmake

@@ -12,7 +12,7 @@ vcpkg_check_features(
         winhttp BUILD_TRANSPORT_WINHTTP
 )
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}/sdk/core/azure-core/
     PREFER_NINJA
     OPTIONS
@@ -20,8 +20,8 @@ vcpkg_configure_cmake(
         -DWARNINGS_AS_ERRORS=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 vcpkg_copy_pdbs()

ports/azure-core-cpp/vcpkg.json

@@ -1,15 +1,25 @@
 {
   "name": "azure-core-cpp",
-  "version-string": "1.0.0-beta.8",
+  "version-semver": "1.0.0-beta.8",
+  "port-version": 1,
   "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",
+  "license": "MIT",
   "dependencies": [
     {
       "name": "openssl",
       "platform": "!windows & !uwp"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ],
   "default-features": [
@@ -17,17 +27,23 @@
   ],
   "features": {
     "curl": {
-      "description": "Build an HTTP transport implementation with LibCURL",
+      "description": "LibCURL HTTP transport implementation",
       "dependencies": [
         {
           "name": "azure-core-cpp",
           "default-features": false
         },
-        "curl"
+        {
+          "name": "curl",
+          "default-features": false,
+          "features": [
+            "ssl"
+          ]
+        }
       ]
     },
     "http": {
-      "description": "Build all HTTP transport implementations, depending on the platform",
+      "description": "All HTTP transport implementations available on the platform",
       "dependencies": [
         {
           "name": "azure-core-cpp",
@@ -48,7 +64,7 @@
       ]
     },
     "winhttp": {
-      "description": "Build an HTTP transport implementation with WinHTTP",
+      "description": "WinHTTP HTTP transport implementation",
       "dependencies": [
         {
           "name": "azure-core-cpp",

ports/azure-identity-cpp/portfile.cmake

@@ -5,15 +5,15 @@ vcpkg_from_github(
     SHA512 9ff56d719d77c7b0db3054788dc69aee18105e27d0732d79b1eb7b86fd8e568dd52631aaf329c4b0f4c65699c2d8bda0a050586bcd8052cb1e74cb46f3f2c85a
 )
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}/sdk/identity/azure-identity/
     PREFER_NINJA
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 vcpkg_copy_pdbs()

ports/azure-identity-cpp/vcpkg.json

@@ -1,12 +1,25 @@
 {
   "name": "azure-identity-cpp",
-  "version-string": "1.0.0-beta.5",
+  "version-semver": "1.0.0-beta.5",
+  "port-version": 1,
   "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",
+  "license": "MIT",
   "dependencies": [
-    "azure-core-cpp"
+    {
+      "name": "azure-core-cpp",
+      "default-features": false
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }

ports/azure-security-keyvault-common-cpp/portfile.cmake

@@ -5,15 +5,15 @@ vcpkg_from_github(
     SHA512 7364bf775bbf6115bf54ee0c2df8b2bae35ea31c669fcbc358edd00a948f2c73926fbf88282ff5442f40ead9cdfc78661a08e4f86002ac2eac5e78ddd13eb33d
 )
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-common/
     PREFER_NINJA
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 vcpkg_copy_pdbs()

ports/azure-security-keyvault-common-cpp/vcpkg.json

@@ -1,12 +1,25 @@
 {
   "name": "azure-security-keyvault-common-cpp",
-  "version-string": "4.0.0-beta.1",
+  "version-semver": "4.0.0-beta.1",
+  "port-version": 1,
   "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",
+  "license": "MIT",
   "dependencies": [
-    "azure-core-cpp"
+    {
+      "name": "azure-core-cpp",
+      "default-features": false
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }

ports/azure-security-keyvault-keys-cpp/portfile.cmake

@@ -5,15 +5,15 @@ vcpkg_from_github(
     SHA512 fb5158320c859f27c97c86908fd4c3f7ceec2ec8b0ca3c213a075992b62dfdefa3a560173bc7034153c273c30abd7fd0a84f98842810de2f78412549e5d34ee4
 )
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys/
     PREFER_NINJA
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 vcpkg_copy_pdbs()

ports/azure-security-keyvault-keys-cpp/vcpkg.json

@@ -1,12 +1,25 @@
 {
   "name": "azure-security-keyvault-keys-cpp",
-  "version-string": "4.0.0-beta.1",
+  "version-semver": "4.0.0-beta.1",
+  "port-version": 1,
   "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",
+  "license": "MIT",
   "dependencies": [
-    "azure-security-keyvault-common-cpp"
+    {
+      "name": "azure-security-keyvault-common-cpp",
+      "default-features": false
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }

ports/azure-storage-blobs-cpp/portfile.cmake

@@ -5,15 +5,15 @@ vcpkg_from_github(
     SHA512 d8afc221f8132fefd7a56cb0fb22549bce3b2b35bc532f43e0f37335f9cc46389028b51068813240f9b083c87b78a3007240cbaf37a5d9dd96b94e002fbc945f
 )
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-blobs/
     PREFER_NINJA
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 vcpkg_copy_pdbs()

ports/azure-storage-blobs-cpp/vcpkg.json

@@ -1,12 +1,25 @@
 {
   "name": "azure-storage-blobs-cpp",
-  "version-string": "12.0.0-beta.10",
+  "version-semver": "12.0.0-beta.10",
+  "port-version": 1,
   "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",
+  "license": "MIT",
   "dependencies": [
-    "azure-storage-common-cpp"
+    {
+      "name": "azure-storage-common-cpp",
+      "default-features": false
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }

ports/azure-storage-common-cpp/portfile.cmake

@@ -5,15 +5,15 @@ vcpkg_from_github(
     SHA512 f49f74c9a6d7b80b0f7c8a9b9d2e4595dc304439d30c8c83f520833f81ef7d3480b858ada61c12f76e82eea7960eb155453b0acdcea143f163a12d567adbf18d
 )
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-common/
     PREFER_NINJA
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 vcpkg_copy_pdbs()

ports/azure-storage-common-cpp/vcpkg.json

@@ -1,17 +1,30 @@
 {
   "name": "azure-storage-common-cpp",
-  "version-string": "12.0.0-beta.10",
+  "version-semver": "12.0.0-beta.10",
+  "port-version": 1,
   "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",
+  "license": "MIT",
   "dependencies": [
-    "azure-core-cpp",
+    {
+      "name": "azure-core-cpp",
+      "default-features": false
+    },
     "libxml2",
     {
       "name": "openssl",
       "platform": "!windows"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ]
 }

ports/azure-storage-files-datalake-cpp/portfile.cmake

@@ -5,15 +5,15 @@ vcpkg_from_github(
     SHA512 9b8f2acbb8cfae1acd4275bca9d9d1a4c9f77a4a38484c88fc89a2081554d4ca6ed64f79a5102ee303c2c72648229e46ff282309868cda8f69f69389747d7e9d
 )
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake/
     PREFER_NINJA
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 vcpkg_copy_pdbs()

ports/azure-storage-files-datalake-cpp/vcpkg.json

@@ -1,12 +1,25 @@
 {
   "name": "azure-storage-files-datalake-cpp",
-  "version-string": "12.0.0-beta.10",
+  "version-semver": "12.0.0-beta.10",
+  "port-version": 1,
   "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",
+  "license": "MIT",
   "dependencies": [
-    "azure-storage-blobs-cpp"
+    {
+      "name": "azure-storage-blobs-cpp",
+      "default-features": false
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }

ports/azure-storage-files-shares-cpp/portfile.cmake

@@ -5,15 +5,15 @@ vcpkg_from_github(
     SHA512 028e60284f59849ab331ccd5ba7b650ac8ecdf7fc3a2d8eda60b29f88c78e7fb9166eb10e021feafa630a103c036f24c84951c729da1a8766fa028b7f9d7ebbd
 )
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-files-shares/
     PREFER_NINJA
     OPTIONS
         -DWARNINGS_AS_ERRORS=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 vcpkg_copy_pdbs()

ports/azure-storage-files-shares-cpp/vcpkg.json

@@ -1,12 +1,25 @@
 {
   "name": "azure-storage-files-shares-cpp",
-  "version-string": "12.0.0-beta.10",
+  "version-semver": "12.0.0-beta.10",
+  "port-version": 1,
   "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",
+  "license": "MIT",
   "dependencies": [
-    "azure-storage-common-cpp"
+    {
+      "name": "azure-storage-common-cpp",
+      "default-features": false
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }

versions/a-/azure-core-cpp.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "48c994ba970ba698f09e0dcc425947f5b9b8b865",
+      "version-semver": "1.0.0-beta.8",
+      "port-version": 1
+    },
     {
       "git-tree": "2950f581cd5d38ae9b8fdc35b8c0c69c19ff209c",
       "version-string": "1.0.0-beta.8",

versions/a-/azure-identity-cpp.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "bf9a1c77957b02e2b1521fc5847d4c8ab617ebcd",
+      "version-semver": "1.0.0-beta.5",
+      "port-version": 1
+    },
     {
       "git-tree": "3353c1b44fa79a1935f488a6a66ecad2fa35d5ac",
       "version-string": "1.0.0-beta.5",

versions/a-/azure-security-keyvault-common-cpp.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c3e9761add3c0ad93a038ab859d288e64fc7860e",
+      "version-semver": "4.0.0-beta.1",
+      "port-version": 1
+    },
     {
       "git-tree": "c084ea582625d5235560b84953af1240270c5a18",
       "version-string": "4.0.0-beta.1",

versions/a-/azure-security-keyvault-keys-cpp.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "030fd5b9588b63350781bb875a3fc2d67d0d13f0",
+      "version-semver": "4.0.0-beta.1",
+      "port-version": 1
+    },
     {
       "git-tree": "816b5bddbbd2e2396336120039220dd7c83a898d",
       "version-string": "4.0.0-beta.1",

versions/a-/azure-storage-blobs-cpp.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "62d9013672397f9c80ae95611cb7318b649b92ec",
+      "version-semver": "12.0.0-beta.10",
+      "port-version": 1
+    },
     {
       "git-tree": "2601572d72191d63ad6c6f093f00857b71b9ef96",
       "version-string": "12.0.0-beta.10",

versions/a-/azure-storage-common-cpp.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e088ce294ef101d5d4be7621973121ba1105c408",
+      "version-semver": "12.0.0-beta.10",
+      "port-version": 1
+    },
     {
       "git-tree": "9b0d48def9ae816374193c587750c40ba924cda7",
       "version-string": "12.0.0-beta.10",

versions/a-/azure-storage-files-datalake-cpp.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a067bf73d77aa871c394d7972db69939940c114f",
+      "version-semver": "12.0.0-beta.10",
+      "port-version": 1
+    },
     {
       "git-tree": "d76b0d95a42ff1a91e73cf46527284844c848f33",
       "version-string": "12.0.0-beta.10",

versions/a-/azure-storage-files-shares-cpp.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "aa4d77e84688efab3d4f4771a90a586fc8c0dc90",
+      "version-semver": "12.0.0-beta.10",
+      "port-version": 1
+    },
     {
       "git-tree": "d93d47f9c0ddf42c33aebe38c312083b043c3713",
       "version-string": "12.0.0-beta.10",

versions/baseline.json

@@ -246,11 +246,11 @@
     },
     "azure-core-cpp": {
       "baseline": "1.0.0-beta.8",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-identity-cpp": {
       "baseline": "1.0.0-beta.5",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-iot-sdk-c": {
       "baseline": "2020-12-09",
@@ -266,19 +266,19 @@
     },
     "azure-security-keyvault-common-cpp": {
       "baseline": "4.0.0-beta.1",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-security-keyvault-keys-cpp": {
       "baseline": "4.0.0-beta.1",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-storage-blobs-cpp": {
       "baseline": "12.0.0-beta.10",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-storage-common-cpp": {
       "baseline": "12.0.0-beta.10",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-storage-cpp": {
       "baseline": "7.5.0",
@@ -286,11 +286,11 @@
     },
     "azure-storage-files-datalake-cpp": {
       "baseline": "12.0.0-beta.10",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-storage-files-shares-cpp": {
       "baseline": "12.0.0-beta.10",
-      "port-version": 0
+      "port-version": 1
     },
     "azure-uamqp-c": {
       "baseline": "2020-12-09",