Azure-IoT-Sdk for C release 2020-01-22 (#9805)2020.01

* Azure-IoT-Sdk for C release 2020-01-22

* [azure-c-shared-utility] Patch conditionals in azure_c_shared_utilityFunctions.cmake

Co-authored-by: Victor Romero <romerosanchezv@gmail.com>

15 files changed, 281 insertions, 21 deletions

diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL
index 42ace4276..ebedec68b 100644
--- a/ports/azure-c-shared-utility/CONTROL
+++ b/ports/azure-c-shared-utility/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-c-shared-utility
-Version: 2019-10-07.2-1
+Version: 2020-01-22
 Description: Azure C SDKs common code
 Build-Depends: curl (linux), openssl (linux), azure-macro-utils-c, umock-c
 
diff --git a/ports/azure-c-shared-utility/fix-utilityFunctions-conditions.patch b/ports/azure-c-shared-utility/fix-utilityFunctions-conditions.patch
new file mode 100644
index 000000000..7b60af94b
--- /dev/null
+++ b/ports/azure-c-shared-utility/fix-utilityFunctions-conditions.patch
@@ -0,0 +1,256 @@
+diff --git a/configs/azure_c_shared_utilityFunctions.cmake b/configs/azure_c_shared_utilityFunctions.cmake

+index 6c2f415..e6133af 100644

+--- a/configs/azure_c_shared_utilityFunctions.cmake

++++ b/configs/azure_c_shared_utilityFunctions.cmake

+@@ -2,11 +2,11 @@

+ #Licensed under the MIT license. See LICENSE file in the project root for full license information.

+ 

+ function(target_link_libraries_with_arg_prefix arg_prefix whatIsBuilding lib)

+-    if(${arg_prefix} STREQUAL "debug")

++    if(arg_prefix STREQUAL "debug")

+         target_link_libraries(${whatIsBuilding} debug ${lib})

+-    elseif(${arg_prefix} STREQUAL "optimized")

++    elseif(arg_prefix STREQUAL "optimized")

+         target_link_libraries(${whatIsBuilding} optimized ${lib})

+-    elseif(${arg_prefix} STREQUAL "general")

++    elseif(arg_prefix STREQUAL "general")

+         target_link_libraries(${whatIsBuilding} general ${lib})

+     else()

+         target_link_libraries(${whatIsBuilding} ${lib})

+@@ -43,13 +43,13 @@ function(windows_unittests_add_dll whatIsBuilding)

+     set(ARG_PREFIX "none")

+     foreach(f ${ARGN})

+         set(skip_to_next FALSE)

+-        if(${f} STREQUAL "ADDITIONAL_LIBS")

++        if(f STREQUAL "ADDITIONAL_LIBS")

+             SET(PARSING_ADDITIONAL_LIBS ON)

+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)

+             set(ARG_PREFIX "none")

+             #also unset all the other states

+             set(skip_to_next TRUE)

+-        elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")

++        elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")

+             SET(PARSING_ADDITIONAL_LIBS OFF)

+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)

+             set(skip_to_next TRUE)

+@@ -57,7 +57,7 @@ function(windows_unittests_add_dll whatIsBuilding)

+ 

+         if(NOT skip_to_next)

+             if(PARSING_ADDITIONAL_LIBS)

+-                if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))

++                if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))

+                     SET(ARG_PREFIX ${f})

+                 else()

+                     target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_dll ${f})

+@@ -90,13 +90,13 @@ function(windows_unittests_add_exe whatIsBuilding)

+     set(ARG_PREFIX "none")

+     foreach(f ${ARGN})

+         set(skip_to_next FALSE)

+-        if(${f} STREQUAL "ADDITIONAL_LIBS")

++        if(f STREQUAL "ADDITIONAL_LIBS")

+             SET(PARSING_ADDITIONAL_LIBS ON)

+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)

+             set(ARG_PREFIX "none")

+             #also unset all the other states

+             set(skip_to_next TRUE)

+-        elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")

++        elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")

+             SET(PARSING_ADDITIONAL_LIBS OFF)

+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)

+             set(skip_to_next TRUE)

+@@ -104,7 +104,7 @@ function(windows_unittests_add_exe whatIsBuilding)

+ 

+         if(NOT skip_to_next)

+             if(PARSING_ADDITIONAL_LIBS)

+-                if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))

++                if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))

+                     SET(ARG_PREFIX ${f})

+                 else()

+                     target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f})

+@@ -150,14 +150,14 @@ function(linux_unittests_add_exe whatIsBuilding)

+     set(ARG_PREFIX "none")

+     foreach(f ${ARGN})

+         set(skip_to_next FALSE)

+-        if(${f} STREQUAL "ADDITIONAL_LIBS")

++        if(f STREQUAL "ADDITIONAL_LIBS")

+             SET(PARSING_ADDITIONAL_LIBS ON)

+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)

+             set(ARG_PREFIX "none")

+             set(skip_to_next TRUE)

+             #also unset all the other states

+ 

+-        elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")

++        elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")

+             SET(PARSING_ADDITIONAL_LIBS OFF)

+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)

+             set(skip_to_next TRUE)

+@@ -165,7 +165,7 @@ function(linux_unittests_add_exe whatIsBuilding)

+ 

+         if(NOT skip_to_next)

+             if(PARSING_ADDITIONAL_LIBS)

+-                if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))

++                if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))

+                     SET(ARG_PREFIX ${f})

+                 else()

+                     target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f})

+@@ -184,7 +184,7 @@ function(linux_unittests_add_exe whatIsBuilding)

+ 

+     if(${run_valgrind})

+         find_program(VALGRIND_FOUND NAMES valgrind)

+-        if(${VALGRIND_FOUND} STREQUAL VALGRIND_FOUND-NOTFOUND)

++        if(VALGRIND_FOUND STREQUAL VALGRIND_FOUND-NOTFOUND)

+             message(WARNING "run_valgrind was TRUE, but valgrind was not found - there will be no tests run under valgrind")

+         else()

+             add_test(NAME ${whatIsBuilding}_valgrind COMMAND valgrind                 --num-callers=100 --error-exitcode=1 --leak-check=full --track-origins=yes ${VALGRIND_SUPPRESSIONS_FILE_EXTRA_PARAMETER} $<TARGET_FILE:${whatIsBuilding}_exe>)

+@@ -307,13 +307,13 @@ function(c_windows_unittests_add_dll whatIsBuilding folder)

+     set(ARG_PREFIX "none")

+     foreach(f ${ARGN})

+         set(skip_to_next FALSE)

+-        if(${f} STREQUAL "ADDITIONAL_LIBS")

++        if(f STREQUAL "ADDITIONAL_LIBS")

+             SET(PARSING_ADDITIONAL_LIBS ON)

+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)

+             set(ARG_PREFIX "none")

+             #also unset all the other states

+             set(skip_to_next TRUE)

+-        elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")

++        elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")

+             SET(PARSING_ADDITIONAL_LIBS OFF)

+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)

+             set(skip_to_next TRUE)

+@@ -321,7 +321,7 @@ function(c_windows_unittests_add_dll whatIsBuilding folder)

+ 

+         if(NOT skip_to_next)

+             if(PARSING_ADDITIONAL_LIBS)

+-                if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))

++                if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))

+                     SET(ARG_PREFIX ${f})

+                 else()

+                     target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_dll ${f})

+@@ -369,13 +369,13 @@ function(c_windows_unittests_add_exe whatIsBuilding folder)

+     set(ARG_PREFIX "none")

+     foreach(f ${ARGN})

+         set(skip_to_next FALSE)

+-        if(${f} STREQUAL "ADDITIONAL_LIBS")

++        if(f STREQUAL "ADDITIONAL_LIBS")

+             SET(PARSING_ADDITIONAL_LIBS ON)

+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)

+             set(ARG_PREFIX "none")

+             #also unset all the other states

+             set(skip_to_next TRUE)

+-        elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")

++        elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")

+             SET(PARSING_ADDITIONAL_LIBS OFF)

+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)

+             set(skip_to_next TRUE)

+@@ -383,7 +383,7 @@ function(c_windows_unittests_add_exe whatIsBuilding folder)

+ 

+         if(NOT skip_to_next)

+             if(PARSING_ADDITIONAL_LIBS)

+-                if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))

++                if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))

+                     SET(ARG_PREFIX ${f})

+                 else()

+                     target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f})

+@@ -429,13 +429,13 @@ function(c_linux_unittests_add_exe whatIsBuilding folder)

+     set(ARG_PREFIX "none")

+     foreach(f ${ARGN})

+         set(skip_to_next FALSE)

+-        if(${f} STREQUAL "ADDITIONAL_LIBS")

++        if(f STREQUAL "ADDITIONAL_LIBS")

+             SET(PARSING_ADDITIONAL_LIBS ON)

+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE OFF)

+             set(ARG_PREFIX "none")

+             #also unset all the other states

+             set(skip_to_next TRUE)

+-        elseif(${f} STREQUAL "VALGRIND_SUPPRESSIONS_FILE")

++        elseif(f STREQUAL "VALGRIND_SUPPRESSIONS_FILE")

+             SET(PARSING_ADDITIONAL_LIBS OFF)

+             SET(PARSING_VALGRIND_SUPPRESSIONS_FILE ON)

+             set(skip_to_next TRUE)

+@@ -443,7 +443,7 @@ function(c_linux_unittests_add_exe whatIsBuilding folder)

+ 

+         if(NOT skip_to_next)

+             if(PARSING_ADDITIONAL_LIBS)

+-                if((${f} STREQUAL "debug") OR (${f} STREQUAL "optimized") OR (${f} STREQUAL "general"))

++                if((f STREQUAL "debug") OR (f STREQUAL "optimized") OR (f STREQUAL "general"))

+                     SET(ARG_PREFIX ${f})

+                 else()

+                     target_link_libraries_with_arg_prefix(${ARG_PREFIX} ${whatIsBuilding}_exe ${f})

+@@ -462,7 +462,7 @@ function(c_linux_unittests_add_exe whatIsBuilding folder)

+ 

+     if(${run_valgrind})

+         find_program(VALGRIND_FOUND NAMES valgrind)

+-        if(${VALGRIND_FOUND} STREQUAL VALGRIND_FOUND-NOTFOUND)

++        if(VALGRIND_FOUND STREQUAL VALGRIND_FOUND-NOTFOUND)

+             message(WARNING "run_valgrind was TRUE, but valgrind was not found - there will be no tests run under valgrind")

+         else()

+             add_test(NAME ${whatIsBuilding}_valgrind COMMAND valgrind                 --gen-suppressions=all --num-callers=100 --error-exitcode=1 --leak-check=full --track-origins=yes ${VALGRIND_SUPPRESSIONS_FILE_EXTRA_PARAMETER} $<TARGET_FILE:${whatIsBuilding}_exe>)

+@@ -546,29 +546,29 @@ function(compile_c_test_artifacts_as whatIsBuilding compileAsWhat)

+             (("${whatIsBuilding}" MATCHES ".*int.*") AND ${run_int_tests})

+         )

+             if (${use_cppunittest})

+-                if(${compileAsWhat} STREQUAL "C99")

++                if(compileAsWhat STREQUAL "C99")

+                     compileTargetAsC99(${whatIsBuilding}_dll)

+                     compileTargetAsC99(${whatIsBuilding}_testsonly_lib)

+                 endif()

+-                if(${compileAsWhat} STREQUAL "C11")

++                if(compileAsWhat STREQUAL "C11")

+                     compileTargetAsC11(${whatIsBuilding}_dll)

+                     compileTargetAsC11(${whatIsBuilding}_testsonly_lib)

+                 endif()

+             endif()

+-            if(${compileAsWhat} STREQUAL "C99")

++            if(compileAsWhat STREQUAL "C99")

+                 compileTargetAsC99(${whatIsBuilding}_exe)

+             endif()

+-            if(${compileAsWhat} STREQUAL "C11")

++            if(compileAsWhat STREQUAL "C11")

+                 compileTargetAsC11(${whatIsBuilding}_exe)

+             endif()

+         else()

+             if(

+                 (("${whatIsBuilding}" MATCHES ".*e2e.*") AND ${nuget_e2e_tests})

+             )

+-                if(${compileAsWhat} STREQUAL "C99")

++                if(compileAsWhat STREQUAL "C99")

+                     compileTargetAsC99(${whatIsBuilding}_exe)

+                 endif()

+-                if(${compileAsWhat} STREQUAL "C11")

++                if(compileAsWhat STREQUAL "C11")

+                     compileTargetAsC11(${whatIsBuilding}_exe)

+                 endif()

+             else()

+@@ -581,10 +581,10 @@ function(compile_c_test_artifacts_as whatIsBuilding compileAsWhat)

+             (("${whatIsBuilding}" MATCHES ".*e2e.*") AND ${run_e2e_tests}) OR

+             (("${whatIsBuilding}" MATCHES ".*int.*") AND ${run_int_tests})

+         )

+-            if(${compileAsWhat} STREQUAL "C99")

++            if(compileAsWhat STREQUAL "C99")

+                 compileTargetAsC99(${whatIsBuilding}_exe)

+             endif()

+-            if(${compileAsWhat} STREQUAL "C11")

++            if(compileAsWhat STREQUAL "C11")

+                 compileTargetAsC11(${whatIsBuilding}_exe)

+             endif()

+         endif()

+@@ -641,15 +641,15 @@ function(set_platform_files c_shared_dir)

+             set(CONDITION_C_FILE ${c_shared_dir}/adapters/condition_win32.c PARENT_SCOPE)

+         endif()

+         

+-        if(${use_etw} STREQUAL "OFF")

++        if(use_etw STREQUAL "OFF")

+             set(XLOGGING_C_FILE ${c_shared_dir}/src/xlogging.c PARENT_SCOPE)

+             set(LOGGING_C_FILE ${c_shared_dir}/src/consolelogger.c PARENT_SCOPE)

+             set(LOGGING_H_FILE ${c_shared_dir}/inc/azure_c_shared_utility/consolelogger.h PARENT_SCOPE)

+-        elseif(${use_etw} STREQUAL "TRACELOGGING")

++        elseif(use_etw STREQUAL "TRACELOGGING")

+             set(XLOGGING_C_FILE ${c_shared_dir}/src/etwxlogging.c PARENT_SCOPE)

+             set(LOGGING_C_FILE ${c_shared_dir}/src/etwlogger_driver.c PARENT_SCOPE)

+             set(LOGGING_H_FILE ${c_shared_dir}/inc/azure_c_shared_utility/etwlogger_driver.h PARENT_SCOPE)

+-        elseif(${use_etw} STREQUAL "TRACELOGGING_WITH_CONSOLE")

++        elseif(use_etw STREQUAL "TRACELOGGING_WITH_CONSOLE")

+             set(XLOGGING_C_FILE ${c_shared_dir}/src/etwxlogging.c PARENT_SCOPE)

+             set(LOGGING_C_FILE ${c_shared_dir}/src/etwlogger_driver.c ${c_shared_dir}/src/consolelogger.c PARENT_SCOPE)

+             set(LOGGING_H_FILE ${c_shared_dir}/inc/azure_c_shared_utility/etwlogger_driver.h ${c_shared_dir}/inc/azure_c_shared_utility/consolelogger.h PARENT_SCOPE)

diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake
index 4ae236b53..fb9444da9 100644
--- a/ports/azure-c-shared-utility/portfile.cmake
+++ b/ports/azure-c-shared-utility/portfile.cmake
@@ -9,14 +9,18 @@ if("public-preview" IN_LIST FEATURES)
         REF 42574842914591aadc77701aac72f18cc72319ad
         SHA512 dfe6ccede4bebdb3a39fbfea1dc55ddca57cced0d2656ee4bed1a5e5c9c434e1f2d892eb4e29bbb424cb9a02f2374a95fb9a020442bea580d39c242efad1b789
         HEAD_REF master
+        PATCHES 
+            fix-utilityFunctions-conditions.patch
     )
 else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-c-shared-utility
-        REF 42574842914591aadc77701aac72f18cc72319ad
-        SHA512 dfe6ccede4bebdb3a39fbfea1dc55ddca57cced0d2656ee4bed1a5e5c9c434e1f2d892eb4e29bbb424cb9a02f2374a95fb9a020442bea580d39c242efad1b789
+        REF 48f7a556865731f0e96c47eb5e9537361f24647c
+        SHA512 c20074707e8601e090ee8daac1d96fdfb4f60ac60fd9c824dad81aa4c2f22b04733c82c01c1ae92110c26871b81674e8771d9ed65081f1c0c197a362275a28f1
         HEAD_REF master
+        PATCHES 
+            fix-utilityFunctions-conditions.patch
     )
 endif()
 
diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL
index f13b4d20e..bf2734357 100644
--- a/ports/azure-iot-sdk-c/CONTROL
+++ b/ports/azure-iot-sdk-c/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-iot-sdk-c
-Version: 2019-11-27.1
+Version: 2020-01-22
 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 
 
diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake
index 83f637114..08b3574b3 100644
--- a/ports/azure-iot-sdk-c/portfile.cmake
+++ b/ports/azure-iot-sdk-c/portfile.cmake
@@ -15,8 +15,8 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-iot-sdk-c
-        REF f8d260df190f90c04114ca8ff7d83dd03d4dd80d
-        SHA512 111331293cfbdbdac4a6460d293ec8650bee31940829852c27afc88cc6e742e96f71c996aa275dc5ed1f13e9fe19452d7b2685dde47bb7d6c135ebee58c50d21
+        REF a8a71c2d120c571a2d2ab6149863c2b075e7bea9
+        SHA512 bc9cae705bef7d9c5c33b80c1d564566058ae4e6bcd343d94df9d139d9f71e620da940c5dcf7ccdc16e75388a03ff3393b40fe603201938c7a37d60b938ca874
         HEAD_REF master
         PATCHES improve-external-deps.patch
     )
diff --git a/ports/azure-macro-utils-c/CONTROL b/ports/azure-macro-utils-c/CONTROL
index 519824497..103887c2d 100644
--- a/ports/azure-macro-utils-c/CONTROL
+++ b/ports/azure-macro-utils-c/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-macro-utils-c
-Version: 2019-11-27.1
+Version: 2020-01-22
 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
index 1758d13db..2f9e5829c 100644
--- a/ports/azure-macro-utils-c/portfile.cmake
+++ b/ports/azure-macro-utils-c/portfile.cmake
@@ -14,8 +14,8 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/azure-macro-utils-c
-        REF 7523af934fc4d9423111e358f49b19314ec9c3e3
-        SHA512 b53765096654fff9c5670004e4e107bffa81dd07e63eeac687c9e2b7e5ea2e1f26b6ae025c05c45f5c28152a457922f08c7f8d3303fa4d3b9194c34ba59533d5
+        REF 5926caf4e42e98e730e6d03395788205649a3ada
+        SHA512 97621f276657af976c4022c9600540ecae2287b3b386b9e097d661828a62c120348d354b3f86f3ef4d49f3c54830887662d3910ed5cec4a634949fa389b4ad55
         HEAD_REF master
     )
 endif()
diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL
index f67f773cd..cc18d253c 100644
--- a/ports/azure-uamqp-c/CONTROL
+++ b/ports/azure-uamqp-c/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-uamqp-c
-Version: 2019-11-27.1
+Version: 2020-01-22
 Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
 Description: AMQP library for C
 
diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake
index e40436a46..b8ce4b0bb 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 065ffdeeb47313ddbbc2a8e84ad52ab033e2e8d2
-        SHA512 bade6fae2d5479b7690632dbcc58bda5dd871eb0aa63d6a56cb35e81630121b5148309cd3414e6339c1218ec59fc12ac318b4964d295b579f7a0cacf5593b7ba
+        REF 142cfab9d66c6f81ea0cceb635f31e00cfa51c77
+        SHA512 80f95bc969c2e50124622561b5f939e981a8d317e3e9514e52ce020f0f20a125622bf914f16927edafc7ff3c878fb1d6a28f4f5e66bda52dcc8aa2dc34761f73
         HEAD_REF master
     )
 endif()
diff --git a/ports/azure-uhttp-c/CONTROL b/ports/azure-uhttp-c/CONTROL
index f485c0a4e..dc30fd350 100644
--- a/ports/azure-uhttp-c/CONTROL
+++ b/ports/azure-uhttp-c/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-uhttp-c
-Version: 2019-11-27.1
+Version: 2020-01-22
 Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
 Description: Azure HTTP Library written in C
 
diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake
index 3ca220822..d943e811d 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 d84a20609a2b5a555920389451fb3c9a2ed3656c
-        SHA512 4eadd7e120082cc3bcf696d6cd16bc7ee8e1082380dd7583fba7fad1bb95109f3456890495e25ae7675e656ef721fa12eff22eeb96d8a4cf359be5c96889cbd6
+        REF b67a6bfa0d018a8a23176ee214e46c208fc323c3
+        SHA512 75fafe242324bb2fc72befdd06427350e6f99aec9496fdf38b9660e7965fad89276ee543f36c3ba3360fc99b8301e74e2c1723d17f39e8471beee3e32cacb348
         HEAD_REF master
     )
 endif()
diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL
index 985959aee..2a0b9e4bc 100644
--- a/ports/azure-umqtt-c/CONTROL
+++ b/ports/azure-umqtt-c/CONTROL
@@ -1,5 +1,5 @@
 Source: azure-umqtt-c
-Version: 2019-11-27.1
+Version: 2020-01-22
 Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
 Description: General purpose library for communication over the mqtt protocol
 
diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake
index d55ec7d2f..0d070bf16 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 7557db6de094b67818d3c410dc95a3cf07cd86a6
-        SHA512 f2577379f711e2576fdd6dfecbc4d8a0b26c7670a77bc468238e8dd5fa43f208db85eddd06dd570fde4219ba19304338c712f671c059c6cc10abb4892d58ae40
+        REF 65cdd1013715fb9d208c42f957eb353fbe22bafb
+        SHA512 8cd33dcde966132e2aa0c6d931e75f9bcdc5734d57d8f6bb8a922711b0b63c2f0e58d379fe92371886387dfbb0b8c117b512873363eb76cf22fa985dbf11d52e
         HEAD_REF master
     )
 endif()
diff --git a/ports/umock-c/CONTROL b/ports/umock-c/CONTROL
index 3ef51001e..a84f5a7cb 100644
--- a/ports/umock-c/CONTROL
+++ b/ports/umock-c/CONTROL
@@ -1,5 +1,5 @@
 Source: umock-c
-Version: 2019-11-27.1
+Version: 2020-01-22
 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
index 5b6d6b32e..815a46547 100644
--- a/ports/umock-c/portfile.cmake
+++ b/ports/umock-c/portfile.cmake
@@ -14,8 +14,8 @@ else()
     vcpkg_from_github(
         OUT_SOURCE_PATH SOURCE_PATH
         REPO Azure/umock-c
-        REF 87d2214384c886a1e2406ac0756a0b3786add8da
-        SHA512 230b6c79a8346727bbc124d1aefaa14da8ecd82b2a56d68b3d2511b8efa5931872da440137a5d266835ba8c5193b83b4bc5ee85abb5242d07904a0706727926c
+        REF 5e3d93112360ee2d4a622b1c48eb70896da3e8c7
+        SHA512 9f5c0ce782f66a41e702e2d54dcff92b07b30e7c2be0ee2c63a56e2bff0c26a1de7f77abcb2a964d668deea817dcb3a4771e328707c2d982c23526465c950608
         HEAD_REF master
     )
 endif()