[azure-c-shared-utility] Fix patch when selected feature public-preview (#9871)

3 files changed, 250 insertions, 2 deletions

diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL
index ebedec68b..7e313e72f 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: 2020-01-22
+Version: 2020-01-22-1
 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-preview.patch b/ports/azure-c-shared-utility/fix-utilityFunctions-conditions-preview.patch
new file mode 100644
index 000000000..c89d92f58
--- /dev/null
+++ b/ports/azure-c-shared-utility/fix-utilityFunctions-conditions-preview.patch
@@ -0,0 +1,248 @@
+diff --git a/configs/azure_c_shared_utilityFunctions.cmake b/configs/azure_c_shared_utilityFunctions.cmake
+index e85defa..7f450ab 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,8 +641,8 @@ function(set_platform_files c_shared_dir)
+             set(CONDITION_C_FILE ${c_shared_dir}/adapters/condition_win32.c PARENT_SCOPE)
+         endif()
+         if(use_etw)
+-            if(${use_etw} OR (${use_etw} STREQUAL "ON_WITH_CONSOLE"))
+-                if (${use_etw} STREQUAL "ON_WITH_CONSOLE")
++            if(use_etw OR (use_etw STREQUAL "ON_WITH_CONSOLE"))
++                if (use_etw STREQUAL "ON_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_RC_FILE ${c_shared_dir}/res/etwlogger.rc CACHE INTERNAL "")
diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake
index fb9444da9..2e0e779be 100644
--- a/ports/azure-c-shared-utility/portfile.cmake
+++ b/ports/azure-c-shared-utility/portfile.cmake
@@ -10,7 +10,7 @@ if("public-preview" IN_LIST FEATURES)
         SHA512 dfe6ccede4bebdb3a39fbfea1dc55ddca57cced0d2656ee4bed1a5e5c9c434e1f2d892eb4e29bbb424cb9a02f2374a95fb9a020442bea580d39c242efad1b789
         HEAD_REF master
         PATCHES 
-            fix-utilityFunctions-conditions.patch
+            fix-utilityFunctions-conditions-preview.patch
     )
 else()
     vcpkg_from_github(