From fdfc915565d003043e37da1e90eaed9b4e3fabd4 Mon Sep 17 00:00:00 2001
From: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com>
Date: Thu, 22 Apr 2021 19:27:56 +0000
Subject: [PATCH] VcPkg manifest tweaks (#2149)

---
 sdk/core/azure-core/vcpkg/portfile.cmake      |  6 +--
 sdk/core/azure-core/vcpkg/vcpkg.json          | 39 +++++++++++++------
 .../azure-identity/vcpkg/portfile.cmake       |  6 +--
 sdk/identity/azure-identity/vcpkg/vcpkg.json  | 14 ++++++-
 .../vcpkg/portfile.cmake                      |  6 +--
 .../vcpkg/vcpkg.json                          | 14 ++++++-
 .../vcpkg/portfile.cmake                      |  6 +--
 .../vcpkg/vcpkg.json                          | 14 ++++++-
 .../azure-storage-blobs/vcpkg/portfile.cmake  |  6 +--
 .../azure-storage-blobs/vcpkg/vcpkg.json      | 14 ++++++-
 .../azure-storage-common/vcpkg/portfile.cmake |  6 +--
 .../azure-storage-common/vcpkg/vcpkg.json     | 14 ++++++-
 .../vcpkg/portfile.cmake                      |  6 +--
 .../vcpkg/vcpkg.json                          | 14 ++++++-
 .../vcpkg/portfile.cmake                      |  6 +--
 .../vcpkg/vcpkg.json                          | 14 ++++++-
 .../azure-template/vcpkg/portfile.cmake       |  6 +--
 sdk/template/azure-template/vcpkg/vcpkg.json  | 14 ++++++-
 18 files changed, 158 insertions(+), 47 deletions(-)

diff --git a/sdk/core/azure-core/vcpkg/portfile.cmake b/sdk/core/azure-core/vcpkg/portfile.cmake
index a3895c276..bdef6d9ef 100644
--- a/sdk/core/azure-core/vcpkg/portfile.cmake
+++ b/sdk/core/azure-core/vcpkg/portfile.cmake
@@ -15,7 +15,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
@@ -23,8 +23,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()
diff --git a/sdk/core/azure-core/vcpkg/vcpkg.json b/sdk/core/azure-core/vcpkg/vcpkg.json
index 58dd650eb..f9fb0bb2b 100644
--- a/sdk/core/azure-core/vcpkg/vcpkg.json
+++ b/sdk/core/azure-core/vcpkg/vcpkg.json
@@ -9,7 +9,16 @@
     "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": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
     {
       "name": "openssl",
       "platform": "!windows & !uwp"
@@ -20,17 +29,32 @@
   ],
   "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"
+          ]
+        }
+      ]
+    },
+    "winhttp": {
+      "description": "WinHTTP HTTP transport implementation",
+      "dependencies": [
+        {
+          "name": "azure-core-cpp",
+          "default-features": false
+        }
       ]
     },
     "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",
@@ -49,15 +73,6 @@
           "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/portfile.cmake b/sdk/identity/azure-identity/vcpkg/portfile.cmake
index 41176a846..6eb46579f 100644
--- a/sdk/identity/azure-identity/vcpkg/portfile.cmake
+++ b/sdk/identity/azure-identity/vcpkg/portfile.cmake
@@ -8,15 +8,15 @@ vcpkg_from_github(
     SHA512 1
 )
 
-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()
diff --git a/sdk/identity/azure-identity/vcpkg/vcpkg.json b/sdk/identity/azure-identity/vcpkg/vcpkg.json
index db0c93c59..5e9cccbf5 100644
--- a/sdk/identity/azure-identity/vcpkg/vcpkg.json
+++ b/sdk/identity/azure-identity/vcpkg/vcpkg.json
@@ -9,7 +9,19 @@
     "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": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    {
+      "name": "azure-core-cpp",
+      "default-features": false
+    }
   ]
 }
diff --git a/sdk/keyvault/azure-security-keyvault-common/vcpkg/portfile.cmake b/sdk/keyvault/azure-security-keyvault-common/vcpkg/portfile.cmake
index e0ada1816..8d3835630 100644
--- a/sdk/keyvault/azure-security-keyvault-common/vcpkg/portfile.cmake
+++ b/sdk/keyvault/azure-security-keyvault-common/vcpkg/portfile.cmake
@@ -8,15 +8,15 @@ vcpkg_from_github(
     SHA512 1
 )
 
-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()
diff --git a/sdk/keyvault/azure-security-keyvault-common/vcpkg/vcpkg.json b/sdk/keyvault/azure-security-keyvault-common/vcpkg/vcpkg.json
index 7a9febfea..a0bd4130a 100644
--- a/sdk/keyvault/azure-security-keyvault-common/vcpkg/vcpkg.json
+++ b/sdk/keyvault/azure-security-keyvault-common/vcpkg/vcpkg.json
@@ -9,7 +9,19 @@
     "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": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    {
+      "name": "azure-core-cpp",
+      "default-features": false
+    }
   ]
 }
diff --git a/sdk/keyvault/azure-security-keyvault-keys/vcpkg/portfile.cmake b/sdk/keyvault/azure-security-keyvault-keys/vcpkg/portfile.cmake
index 2204dd910..442b38557 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/vcpkg/portfile.cmake
+++ b/sdk/keyvault/azure-security-keyvault-keys/vcpkg/portfile.cmake
@@ -8,15 +8,15 @@ vcpkg_from_github(
     SHA512 1
 )
 
-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()
diff --git a/sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json b/sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json
index 0db063ae6..0b1727c6b 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json
+++ b/sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json
@@ -9,7 +9,19 @@
     "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": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    {
+      "name": "azure-security-keyvault-common-cpp",
+      "default-features": false
+    }
   ]
 }
diff --git a/sdk/storage/azure-storage-blobs/vcpkg/portfile.cmake b/sdk/storage/azure-storage-blobs/vcpkg/portfile.cmake
index 3988f8bd7..774bc411c 100644
--- a/sdk/storage/azure-storage-blobs/vcpkg/portfile.cmake
+++ b/sdk/storage/azure-storage-blobs/vcpkg/portfile.cmake
@@ -8,15 +8,15 @@ vcpkg_from_github(
     SHA512 1
 )
 
-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()
diff --git a/sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json b/sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json
index 326a33e0d..cc0cebb34 100644
--- a/sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json
+++ b/sdk/storage/azure-storage-blobs/vcpkg/vcpkg.json
@@ -9,7 +9,19 @@
     "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": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    {
+      "name": "azure-storage-common-cpp",
+      "default-features": false
+    }
   ]
 }
diff --git a/sdk/storage/azure-storage-common/vcpkg/portfile.cmake b/sdk/storage/azure-storage-common/vcpkg/portfile.cmake
index d866fc468..4777d8ed4 100644
--- a/sdk/storage/azure-storage-common/vcpkg/portfile.cmake
+++ b/sdk/storage/azure-storage-common/vcpkg/portfile.cmake
@@ -8,15 +8,15 @@ vcpkg_from_github(
     SHA512 1
 )
 
-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()
diff --git a/sdk/storage/azure-storage-common/vcpkg/vcpkg.json b/sdk/storage/azure-storage-common/vcpkg/vcpkg.json
index cf233f4a3..678b3f6c6 100644
--- a/sdk/storage/azure-storage-common/vcpkg/vcpkg.json
+++ b/sdk/storage/azure-storage-common/vcpkg/vcpkg.json
@@ -9,8 +9,20 @@
     "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": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    {
+      "name": "azure-core-cpp",
+      "default-features": false
+    },
     "libxml2",
     {
       "name": "openssl",
diff --git a/sdk/storage/azure-storage-files-datalake/vcpkg/portfile.cmake b/sdk/storage/azure-storage-files-datalake/vcpkg/portfile.cmake
index 753ae3eda..fe371e2e0 100644
--- a/sdk/storage/azure-storage-files-datalake/vcpkg/portfile.cmake
+++ b/sdk/storage/azure-storage-files-datalake/vcpkg/portfile.cmake
@@ -8,15 +8,15 @@ vcpkg_from_github(
     SHA512 1
 )
 
-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()
diff --git a/sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json b/sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json
index 0a325fc29..8ed9c0b7a 100644
--- a/sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json
+++ b/sdk/storage/azure-storage-files-datalake/vcpkg/vcpkg.json
@@ -9,7 +9,19 @@
     "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": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    {
+      "name": "azure-storage-blobs-cpp",
+      "default-features": false
+    }
   ]
 }
diff --git a/sdk/storage/azure-storage-files-shares/vcpkg/portfile.cmake b/sdk/storage/azure-storage-files-shares/vcpkg/portfile.cmake
index 28da701c1..6a49dc5c6 100644
--- a/sdk/storage/azure-storage-files-shares/vcpkg/portfile.cmake
+++ b/sdk/storage/azure-storage-files-shares/vcpkg/portfile.cmake
@@ -8,15 +8,15 @@ vcpkg_from_github(
     SHA512 1
 )
 
-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()
diff --git a/sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json b/sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json
index 5ffb6e985..b23c4fa88 100644
--- a/sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json
+++ b/sdk/storage/azure-storage-files-shares/vcpkg/vcpkg.json
@@ -9,7 +9,19 @@
     "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": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    {
+      "name": "azure-storage-common-cpp",
+      "default-features": false
+    }
   ]
 }
diff --git a/sdk/template/azure-template/vcpkg/portfile.cmake b/sdk/template/azure-template/vcpkg/portfile.cmake
index c1ee95c5b..62607301d 100644
--- a/sdk/template/azure-template/vcpkg/portfile.cmake
+++ b/sdk/template/azure-template/vcpkg/portfile.cmake
@@ -8,15 +8,15 @@ vcpkg_from_github(
     SHA512 1
 )
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}/sdk/template/azure-template/
     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()
diff --git a/sdk/template/azure-template/vcpkg/vcpkg.json b/sdk/template/azure-template/vcpkg/vcpkg.json
index 30ce906a8..cbaa9ca29 100644
--- a/sdk/template/azure-template/vcpkg/vcpkg.json
+++ b/sdk/template/azure-template/vcpkg/vcpkg.json
@@ -10,7 +10,19 @@
     "It is not meant to be published to vcpkg."
   ],
   "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/template/azure-template",
+  "license": "MIT",
   "dependencies": [
-    "azure-core-cpp"
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    {
+      "name": "azure-core-cpp",
+      "default-features": false
+    }
   ]
 }