[azure] Update vcpkgs (add new port dependencies) (#6511)

* [azure] Update vcpkgs (add new port dependencies)

* [azure-iot-sdk-c] Bump CONTROL versions and normalize tabs/spaces

* [azure] ACR of Update vcpkgs (add new port dependencies)

14 files changed, 99 insertions, 24 deletions

diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL
index 87ecfd32b..2db25a398 100644
--- a/ports/azure-c-shared-utility/CONTROL
+++ b/ports/azure-c-shared-utility/CONTROL
@@ -1,7 +1,7 @@
 Source: azure-c-shared-utility
-Version: 2019-03-18
+Version: 2019-03-18-1
 Description: Azure C SDKs common code
-Build-Depends: curl (linux), openssl (linux)
+Build-Depends: curl (linux), openssl (linux), azure-macro-utils-c, umock-c
 
 Feature: public-preview
 Description: Azure C SDKs common code (public preview)
diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake
index de7f3e61a..ee5bebf5c 100644
--- a/ports/azure-c-shared-utility/portfile.cmake
+++ b/ports/azure-c-shared-utility/portfile.cmake
@@ -15,8 +15,8 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-c-shared-utility
-        REF bc83cba1230e98988ae5cd2328f4dcf8c49d5866
-        SHA512 48947709f9c07c8a910d40066a52b746f9ab15543837f44207b787674efd2b11e7a7eb849c88e20984f0e2141e5611f6d6edea39c8b82687f371c08ab274bd7b
+        REF f0642196af85aeb4f2717d9cc11176290f321fb8
+        SHA512 fd8ee6e2be11c13f7388e57eb9c98397b6cb026ca370131db55b6118908701cdff2a1eaabb89bfe84591d6ee17163d06b7b86ad615216203bcbf0c8595d45452
         HEAD_REF master
         PATCHES no-double-expand-cmake.patch
     )
diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL
index a5725ed22..5cd4d2539 100644
--- a/ports/azure-iot-sdk-c/CONTROL
+++ b/ports/azure-iot-sdk-c/CONTROL
@@ -1,8 +1,8 @@
 Source: azure-iot-sdk-c
-Version: 2019-03-18
-Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c
+Version: 2019-03-18-1
+Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c, azure-macro-utils-c, umock-c
 Description: A C99 SDK for connecting devices to Microsoft Azure IoT services 
 
 Feature: public-preview
 Description: A version of the azure-iot-sdk-c containing public-preview features.
-Build-Depends: azure-uamqp-c[public-preview], azure-umqtt-c[public-preview], azure-c-shared-utility[public-preview], azure-uhttp-c[public-preview]
+Build-Depends: azure-uamqp-c[public-preview], azure-umqtt-c[public-preview], azure-c-shared-utility[public-preview], azure-uhttp-c[public-preview], azure-macro-utils-c, umock-c
diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake
index 42630117b..08c569086 100644
--- a/ports/azure-iot-sdk-c/portfile.cmake
+++ b/ports/azure-iot-sdk-c/portfile.cmake
@@ -15,14 +15,15 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-iot-sdk-c
-        REF 8c331e8552f754bb6e0502486ceee698625eb468
-        SHA512 cc6f34e04f237bb5e8e5445e033eefab00373d53a4847ab6089c9b8eb400ab87ced6905f1c78ea7d0da3e9a56145e86a58d2f226fcf38f08659330a33d68f82e
+        REF b386a10688e9f74c4627cedb9c35a40525c963d1
+        SHA512 5bb609bf5dda810b38cc34d5e43fb8a4b67cd417c86da8d17508f0d2f87b858647af402214fdce967df5917a58e036454b17d8c67a1331276f36c39a75cf135c
         HEAD_REF master
         PATCHES improve-external-deps.patch
     )
 endif()
 
 file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/)
+file(COPY ${SOURCE_PATH}/configs/azure_iot_sdksFunctions.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/cmake/azure_iot_sdks/)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
diff --git a/ports/azure-macro-utils-c/CONTROL b/ports/azure-macro-utils-c/CONTROL
new file mode 100644
index 000000000..3905f38a6
--- /dev/null
+++ b/ports/azure-macro-utils-c/CONTROL
@@ -0,0 +1,5 @@
+Source: azure-macro-utils-c
+Version: 2019-04-11-1
+Description: A library of macros for the Azure IoT SDK Suite
+Build-Depends: 
+
diff --git a/ports/azure-macro-utils-c/portfile.cmake b/ports/azure-macro-utils-c/portfile.cmake
new file mode 100644
index 000000000..d516e59e9
--- /dev/null
+++ b/ports/azure-macro-utils-c/portfile.cmake
@@ -0,0 +1,32 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Azure/azure-macro-utils-c
+    REF 38729b4b7ac3ea8b7d71e394782b861ecb25193e
+    SHA512 c9c820e74aee403d45f257359318d3435e5d6534afe821da5679bc462e26ad256dd01ed253a80ba1c58343f850ef1026280533a152c4b0465527f6537b3092d3
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -Drun_int_tests=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/azure_macro_utils_c)
+
+file(COPY ${SOURCE_PATH}/inc/azure_macro_utils/macro_utils.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/azure_macro_utils_c/include/azure_macro_utils)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug)
+
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-macro-utils-c/copyright COPYONLY)
+
+vcpkg_copy_pdbs()
+
+
diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL
index 06db79ec4..569f40006 100644
--- a/ports/azure-uamqp-c/CONTROL
+++ b/ports/azure-uamqp-c/CONTROL
@@ -1,8 +1,8 @@
 Source: azure-uamqp-c
-Version: 2019-03-18
-Build-Depends: azure-c-shared-utility
+Version: 2019-03-18-1
+Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
 Description: AMQP library for C
 
 Feature: public-preview
 Description: AMQP library for C (public preview)
-Build-Depends: azure-c-shared-utility[public-preview]
+Build-Depends: azure-c-shared-utility[public-preview], azure-macro-utils-c, umock-c
diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake
index e5b4b3d96..0bbc68b96 100644
--- a/ports/azure-uamqp-c/portfile.cmake
+++ b/ports/azure-uamqp-c/portfile.cmake
@@ -14,8 +14,8 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-uamqp-c
-        REF 13f009ddd50a2837f651b0237de17db5f24c3af9
-        SHA512 649e1826c02a25c57031e1cf1ae92ff15f7caadd064d1dff4aa4ee579598af58ae03f778138cdf26918c1500ca1b8678a6f88c0ae24fd6fca37dab7b81b34984
+        REF 5ceebf6ec8d1973cfa80804077c7cef23d3b36af
+        SHA512 6dc7ffc386339db54ff387760119ae5ffd564642cd18d0dc177e6302167cc3b40bdd0f4d9e50478db8d2760166b15058b53b9eb2d1c160f234693a59ac762a75
         HEAD_REF master
     )
 endif()
diff --git a/ports/azure-uhttp-c/CONTROL b/ports/azure-uhttp-c/CONTROL
index 4f41f6931..2b91ad876 100644
--- a/ports/azure-uhttp-c/CONTROL
+++ b/ports/azure-uhttp-c/CONTROL
@@ -1,8 +1,8 @@
 Source: azure-uhttp-c
-Version: 2019-03-18
-Build-Depends: azure-c-shared-utility
+Version: 2019-03-18-1
+Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
 Description: Azure HTTP Library written in C
 
 Feature: public-preview
 Description: Azure HTTP Library written in C (public preview)
-Build-Depends: azure-c-shared-utility[public-preview]
+Build-Depends: azure-c-shared-utility[public-preview], azure-macro-utils-c, umock-c
diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake
index e99276af7..f14d6dca0 100644
--- a/ports/azure-uhttp-c/portfile.cmake
+++ b/ports/azure-uhttp-c/portfile.cmake
@@ -14,8 +14,8 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-uhttp-c
-        REF 43dce924b32818f8ab851f972cffebc204edc5c4
-        SHA512 0e5e9e7dac0c8a1a01cea2fd9ef068f988ad3453f978957cbcb009126637fe5810001e273e7b300b4540914705a89250d96df652c4bb2c7f5348cd8ce7240d70
+        REF b8976adff02e543fc00e7db59eae9ce78dd014fe
+        SHA512 65ddccc07831309c4f3f8546bb1a45a6eff84674013311a15c99389d4fc33eaf2ef3da6c7c8e4bb03d32955d12c978190e7badb597379a9fefda4ebcf18827ec
         HEAD_REF master
     )
 endif()
diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL
index eec4acb1b..2f7730868 100644
--- a/ports/azure-umqtt-c/CONTROL
+++ b/ports/azure-umqtt-c/CONTROL
@@ -1,8 +1,8 @@
 Source: azure-umqtt-c
-Version: 2019-03-18
-Build-Depends: azure-c-shared-utility
+Version: 2019-03-18-1
+Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
 Description: General purpose library for communication over the mqtt protocol
 
 Feature: public-preview
 Description: General purpose library for communication over the mqtt protocol (public preview)
-Build-Depends: azure-c-shared-utility[public-preview]
+Build-Depends: azure-c-shared-utility[public-preview], azure-macro-utils-c, umock-c
diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake
index 9f7002f32..e7e5a8df3 100644
--- a/ports/azure-umqtt-c/portfile.cmake
+++ b/ports/azure-umqtt-c/portfile.cmake
@@ -14,8 +14,8 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-umqtt-c
-        REF ea9f6112d002bdff55c94df327bc7effc8393c78
-        SHA512 68fdc22eb07d32cb9cf489d878db3be8326225e3a067153af7b9e29eabc8ee25162507b7e8921b71b83d42703d5a3d8e040f4a9e61a19540789432e2cecb782f
+        REF c37883fbb05218fd940b87899a116af240f90c40
+        SHA512 21bbe6dfafcc96d35775ab83a75334fbfd41a55a82a7da483d5ff179aa3792424851f250007c9603ef17c789d8b23b1a8b81580fc2cf793fd00b487c321fdba3
         HEAD_REF master
     )
 endif()
diff --git a/ports/umock-c/CONTROL b/ports/umock-c/CONTROL
new file mode 100644
index 000000000..8ec46e3aa
--- /dev/null
+++ b/ports/umock-c/CONTROL
@@ -0,0 +1,5 @@
+Source: umock-c
+Version: 2019-04-11-1
+Description: A pure C mocking library
+Build-Depends: azure-macro-utils-c
+
diff --git a/ports/umock-c/portfile.cmake b/ports/umock-c/portfile.cmake
new file mode 100644
index 000000000..0b30e8942
--- /dev/null
+++ b/ports/umock-c/portfile.cmake
@@ -0,0 +1,32 @@
+include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Azure/umock-c
+    REF 92772d9d8317a37dd0b656e95877ffb03bc67e92
+    SHA512 4dd738c7b2c7e1237ad874a7ad90bf81b864aa242af335dcc82d0cfea51bc33fe84de4eebedb6e00944c70d01d1ade4827716dbcf95754165b35981bde4147e7
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -Drun_unittests=OFF
+        -Drun_int_tests=OFF
+        -Duse_installed_dependencies=ON
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/umock_c)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
+
+configure_file(${SOURCE_PATH}/readme.md ${CURRENT_PACKAGES_DIR}/share/umock-c/copyright COPYONLY)
+
+vcpkg_copy_pdbs()
+
+