Azure · ericwolz · Aug 13, 2021 · Jul 9, 2021 · Jul 9, 2021 · Jul 9, 2021
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft. All rights reserved.
 # Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 project(azure_iot_sdks)
 
 include("${CMAKE_CURRENT_LIST_DIR}/configs/azure_iot_sdksFunctions.cmake")
@@ -74,6 +74,7 @@ option(use_prov_client "Enable provisioning client" OFF)
 option(use_tpm_simulator "tpm simulator type of hsm used with the provisioning client" OFF)
 option(use_edge_modules "Enable support for running modules against Azure IoT Edge" OFF)
 option(use_custom_heap "use externally defined heap functions instead of the malloc family" OFF)
+option(use_cppunittest "set use_cppunittest to ON to build CppUnitTest tests on Windows (default is OFF)" OFF)
 
 set(compileOption_C "" CACHE STRING "passes a string to the command line of the C compiler")
 set(compileOption_CXX "" CACHE STRING "passes a string to the command line of the C++ compiler")
@@ -235,7 +236,6 @@ set(original_skip_samples ${skip_samples})
 set(run_e2e_tests OFF)
 set(run_unittests OFF)
 set(skip_samples ON)
-set(use_cppunittest OFF)
 
 if (NOT ${use_installed_dependencies})
     if (NOT TARGET azure_macro_utils_c AND EXISTS "${CMAKE_CURRENT_LIST_DIR}/deps/azure-macro-utils-c/CMakeLists.txt")

diff --git a/build/.vsts-ci.yml b/build/.vsts-ci.yml
@@ -25,7 +25,7 @@ jobs:
     displayName: 'build'
 - job: windowsx86
   pool:
-    name: 'aziotbld-win03'
+    name: 'sdk-c--win-vs2017'
   steps:
   - script: |
       call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
@@ -62,7 +62,8 @@ jobs:
 - job: raspberrypi
   variables:
     _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/raspberrypi-c-buster:brown"
-  pool: Hosted Ubuntu 1604
+  pool: 
+    name: 'sdk-c--ubuntu-18'
   displayName: raspberrypi
   steps:
   - script: |
@@ -78,7 +79,8 @@ jobs:
 - job: linuxoptions
   variables:
     _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/vsts-linux-c-ubuntu"
-  pool: Hosted Ubuntu 1604
+  pool: 
+    name: 'sdk-c--ubuntu-18'
   displayName: 'linux-options'
   steps:
   - script: 'sudo ./jenkins/linux_c_option_test.sh'
@@ -89,10 +91,10 @@ jobs:
     condition: always()
 - job: windowsdynamic
   pool:
-    name: 'aziotbld-win03'
+    name: 'sdk-c--win-vs2017'
   steps:
   - script: |
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
+      call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat"
       call jenkins\windows_c_build_as_dynamic.cmd
     displayName: 'build'
     env:
@@ -144,7 +146,8 @@ jobs:
 - job: clang
   variables:
     _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/ubuntu-clang"
-  pool: aziotbld-lin01
+  pool: 
+    name: 'sdk-c--ubuntu-18'
   displayName: 'clang'
   steps:
   - script: |
@@ -172,10 +175,11 @@ jobs:
   - script: sudo rm -rf $(Agent.BuildDirectory)/*
     displayName: 'cleanup'
     condition: always()
-- job: ubuntu1604
+- job: ubuntu2004
   variables:
     _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/linux-c-ubuntu"
-  pool: aziotbld-lin02
+  pool:
+    name: 'sdk-c--ubuntu-18'
   displayName: 'ubuntu1604'
   steps:
   - script: |
@@ -206,7 +210,8 @@ jobs:
 - job: debian
   variables:
     _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/c-debian"
-  pool: aziotbld-lin02
+  pool: 
+    name: 'sdk-c--ubuntu-18'
   displayName: 'debian'
   steps:
   - script: |
@@ -235,7 +240,8 @@ jobs:
 - job: linux_installed_deps
   variables:
     _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/linux-c-ubuntu"
-  pool: aziotbld-lin02
+  pool: 
+    name: 'sdk-c--ubuntu-18'
   displayName: 'linux_installed_deps'
   steps:
   - script: |
@@ -266,7 +272,8 @@ jobs:
 - job: wolfssl
   variables:
     _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/wolfssl-1804"
-  pool: Hosted Ubuntu 1604
+  pool:
+    name: 'sdk-c--ubuntu-18'
   displayName: 'wolfssl'
   steps:
   - script: |
@@ -297,7 +304,8 @@ jobs:
 - job: bearssl
   variables:
     _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/devops-c-bearssl"
-  pool: Hosted Ubuntu 1604
+  pool:
+    name: 'sdk-c--ubuntu-18'
   displayName: 'bearssl'
   steps:
   - script: |
@@ -327,7 +335,7 @@ jobs:
     condition: always()
 - job: windowsx64
   pool:
-    name: 'aziotbld-win03'
+    name: 'sdk-c--win-vs2017'
   displayName: 'windowsx64'
   steps:
   - script: |
@@ -396,7 +404,8 @@ jobs:
 - job: cares
   variables:
     _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/c-ares"
-  pool: Hosted Ubuntu 1604
+  pool: 
+    name: 'sdk-c--ubuntu-18'
   displayName: 'cares'
   steps:
   - script: |
@@ -425,7 +434,8 @@ jobs:
 - job: openssl_engine
   variables:
     _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/openssl-pkcs11"
-  pool: Hosted Ubuntu 1604
+  pool: 
+    name: 'sdk-c--ubuntu-18'
   displayName: 'OpenSSL with pkcs11 engine and SoftHSM'
   steps:
   - script: |

diff --git a/build/longhaul.vsts-ci.yml b/build/longhaul.vsts-ci.yml
@@ -12,7 +12,7 @@ jobs:
   variables:
     _PREVIEW_VSTS_DOCKER_IMAGE: "aziotbld/linux-c-ubuntu"
   pool: 
-    name: 'aziotbld-lin01'
+    name: 'sdk-c--ubuntu-18'
   displayName: 'longhaul_linux'
   steps:
   - script: |
@@ -45,7 +45,7 @@ jobs:
 - job: longhaul_windows
   timeoutInMinutes: 800
   pool:
-    name: 'aziotbld-win10'
+    name: 'sdk-c--win-vs2017'
   steps:
   - script: |
       call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"

diff --git a/build_all/windows/build.cmd b/build_all/windows/build.cmd
@@ -53,7 +53,6 @@ if "%1" equ "--run-e2e-tests" goto arg-run-e2e-tests
 if "%1" equ "--run-sfc-tests" goto arg-run-sfc-tests
 if "%1" equ "--run-longhaul-tests" goto arg-longhaul-tests
 if "%1" equ "--run-unittests" goto arg-run-unittests
-if "%1" equ "--use-cppunittests" goto arg-use-cpp-unittests
 if "%1" equ "--make_nuget" goto arg-build-nuget
 if "%1" equ "--cmake-root" goto arg-cmake-root
 if "%1" equ "--no-make" goto arg-no-make
@@ -99,10 +98,6 @@ goto args-continue
 set CMAKE_run_unittests=ON
 goto args-continue
 
-:arg-use-cpp-unittests
-set CMAKE_use_cppunittests=ON
-goto args-continue
-
 :arg-build-nuget
 shift
 if "%1" equ "" call :usage && exit /b 1
@@ -158,9 +153,19 @@ mkdir %cmake-root%\cmake\%CMAKE_DIR%
 rem no error checking
 pushd %cmake-root%\cmake\%CMAKE_DIR%
 
+echo ***looking for cmake***
+rem dir /s "%ProgramFiles(x86)%\cmake.exe"
+rem dir /s "%ProgramFiles%\cmake.exe"
+
+echo ***looking for VsMSBuildCmd.bat***
+rem dir /s "%ProgramFiles(x86)%\VsMSBuildCmd.bat"
+
+echo ***looking for msbuild***
+rem dir /s "%ProgramFiles(x86)%\msbuild.exe"
+
 if %MAKE_NUGET_PKG% == yes (
     echo ***Running CMAKE for Win32***
-    cmake %build-root% -Drun_longhaul_tests:BOOL=%CMAKE_run_longhaul_tests% -Drun_e2e_tests:BOOL=%CMAKE_run_e2e_tests% -Drun_sfc_tests:BOOL=%CMAKE_run_sfc_tests% -Duse_cppunittest:BOOL=%CMAKE_use_cppunittests% -Drun_unittests:BOOL=%CMAKE_run_unittests% -Duse_prov_client:BOOL=%prov_auth% -G "Visual Studio 15 2017" -A Win32 -Duse_edge_modules=%use_edge_modules%
+    cmake %build-root% -Drun_longhaul_tests:BOOL=%CMAKE_run_longhaul_tests% -Drun_e2e_tests:BOOL=%CMAKE_run_e2e_tests% -Drun_sfc_tests:BOOL=%CMAKE_run_sfc_tests% -Duse_cppunittest:BOOL=ON -Drun_unittests:BOOL=%CMAKE_run_unittests% -Duse_prov_client:BOOL=%prov_auth% -G "Visual Studio 15 2017" -A Win32 -Duse_edge_modules=%use_edge_modules%
     if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
     popd
 
@@ -189,7 +194,7 @@ if %MAKE_NUGET_PKG% == yes (
 
 ) else if %build-platform% == x64 (
     echo ***Running CMAKE for Win64***
-    cmake -Drun_longhaul_tests:BOOL=%CMAKE_run_longhaul_tests% -Drun_e2e_tests:BOOL=%CMAKE_run_e2e_tests% -Drun_sfc_tests:BOOL=%CMAKE_run_sfc_tests% -Duse_cppunittest:BOOL=%CMAKE_use_cppunittests% -Drun_unittests:BOOL=%CMAKE_run_unittests% %build-root% -Duse_prov_client:BOOL=%prov_auth% -G "Visual Studio 15 2017" -A x64 -Duse_edge_modules=%use_edge_modules%
+    cmake -Drun_longhaul_tests:BOOL=%CMAKE_run_longhaul_tests% -Drun_e2e_tests:BOOL=%CMAKE_run_e2e_tests% -Drun_sfc_tests:BOOL=%CMAKE_run_sfc_tests% -Duse_cppunittest:BOOL=OFF -Drun_unittests:BOOL=%CMAKE_run_unittests% %build-root% -Duse_prov_client:BOOL=%prov_auth% -G "Visual Studio 15 2017" -A x64 -Duse_edge_modules=%use_edge_modules%
     if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
 ) else if %build-platform% == arm (
     echo ***Running CMAKE for ARM***
@@ -201,6 +206,14 @@ if %MAKE_NUGET_PKG% == yes (
     if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
 )
 
+echo ***checking msbuild***
+where /q msbuild
+IF ERRORLEVEL 1 (
+echo ***setting VC paths***
+    IF EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsMSBuildCmd.bat" call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsMSBuildCmd.bat"
+)
+where msbuild
+
 if %MAKE_NUGET_PKG% == yes (
     if %make%==yes (
         echo ***Building all configurations***

diff --git a/configs/azure_iot_sdksFunctions.cmake b/configs/azure_iot_sdksFunctions.cmake
@@ -170,3 +170,16 @@ function(setSdkTargetBuildProperties stbp_target)
         set_target_properties(${stbp_target} PROPERTIES XCODE_ATTRIBUTE_GCC_WARN_UNUSED_VARIABLE "YES")
     endif()
 endfunction()
+
+macro(generate_cppunittest_wrapper whatIsBuilding)
+    if (${use_cppunittest} AND WIN32)
+      file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${whatIsBuilding}.cxx "#include \"${CMAKE_CURRENT_SOURCE_DIR}/${whatIsBuilding}.c\"")
+      set(${whatIsBuilding}_test_files ${CMAKE_CURRENT_BINARY_DIR}/${whatIsBuilding}.cxx)
+      #CPP compiler on windows likes to complain about unused local function removed (C4505)
+      #C compiler doesn't like to complain about the same thing
+      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4505")
+    else()
+set(${whatIsBuilding}_test_files ${whatIsBuilding}.c)
+    endif()
+endmacro(generate_cppunittest_wrapper)
+
diff --git a/iothub_client/CMakeLists.txt b/iothub_client/CMakeLists.txt
@@ -1,7 +1,7 @@
 #Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 #this is CMakeLists for iothub_client
 
 if(POLICY CMP0042)

diff --git a/iothub_client/build/iothub_amqp_transport/mbed/CMakeLists.txt b/iothub_client/build/iothub_amqp_transport/mbed/CMakeLists.txt
@@ -1,7 +1,7 @@
 #Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 set(shared_util_base_path ../../../../c-utility)
 set(mbed_project_base "iothub_amqp_transport" CACHE STRING "The item being built")

diff --git a/iothub_client/build/iothub_client/mbed/CMakeLists.txt b/iothub_client/build/iothub_client/mbed/CMakeLists.txt
@@ -1,7 +1,7 @@
 #Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 set(shared_util_base_path ../../../../c-utility)
 set(mbed_project_base "iothub_client" CACHE STRING "The item being built")

diff --git a/iothub_client/build/iothub_http_transport/mbed/CMakeLists.txt b/iothub_client/build/iothub_http_transport/mbed/CMakeLists.txt
@@ -1,7 +1,7 @@
 #Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 set(shared_util_base_path ../../../../c-utility)
 set(mbed_project_base "iothub_http_transport" CACHE STRING "The item being built")

diff --git a/iothub_client/build/iothub_mqtt_transport/mbed/CMakeLists.txt b/iothub_client/build/iothub_mqtt_transport/mbed/CMakeLists.txt
@@ -1,7 +1,7 @@
 #Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 set(shared_util_base_path ../../../../c-utility)
 set(mbed_project_base "iothub_mqtt_transport" CACHE STRING "The item being built")

diff --git a/iothub_client/samples/iothub_client_sample_mqtt_dm/CMakeLists.txt b/iothub_client/samples/iothub_client_sample_mqtt_dm/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 Option(edison "set edison to ON to build the DM edison sample" OFF)
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 project(iothub_client_sample_firmware_update)
 

diff --git a/iothub_client/samples/iothub_client_sample_mqtt_dm/Template/CMakeLists.txt b/iothub_client/samples/iothub_client_sample_mqtt_dm/Template/CMakeLists.txt
@@ -2,7 +2,7 @@
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #this is CMakeLists.txt for iothub_client_sample_mqtt_dm
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 compileAsC99()
 

diff --git a/iothub_client/samples/iothub_client_sample_upload_to_blob/linux/CMakeLists.txt b/iothub_client/samples/iothub_client_sample_upload_to_blob/linux/CMakeLists.txt
@@ -2,7 +2,7 @@
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #this is CMakeLists.txt for iothub_client_sample_upload_to_blob
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 if(WIN32)
     message(FATAL_ERROR "This CMake file is only support Linux builds!")

diff --git a/iothub_client/samples/iothub_client_sample_upload_to_blob/mbed/CMakeLists.txt b/iothub_client/samples/iothub_client_sample_upload_to_blob/mbed/CMakeLists.txt
@@ -1,7 +1,7 @@
 #Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 set(shared_util_base_path ../../../../c-utility)
 set(mbed_project_base "iothub_client_sample_upload_to_blob" CACHE STRING "The item being built")

diff --git a/iothub_client/samples/iothub_client_sample_upload_to_blob_mb/linux/CMakeLists.txt b/iothub_client/samples/iothub_client_sample_upload_to_blob_mb/linux/CMakeLists.txt
@@ -2,7 +2,7 @@
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #this is CMakeLists.txt for iothub_client_sample_upload_to_blob_mb
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 if(WIN32)
     message(FATAL_ERROR "This CMake file is only support Linux builds!")

diff --git a/iothub_client/samples/iothub_client_sample_upload_to_blob_mb/mbed/CMakeLists.txt b/iothub_client/samples/iothub_client_sample_upload_to_blob_mb/mbed/CMakeLists.txt
@@ -1,7 +1,7 @@
 #Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 set(shared_util_base_path ../../../../c-utility)
 set(mbed_project_base "iothub_client_sample_upload_to_blob_mb" CACHE STRING "The item being built")

diff --git a/iothub_client/samples/iothub_ll_c2d_sample/linux/CMakeLists.txt b/iothub_client/samples/iothub_ll_c2d_sample/linux/CMakeLists.txt
@@ -2,7 +2,7 @@
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #this is CMakeLists.txt for iothub_ll_c2d_sample
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 if(WIN32)
     message(FATAL_ERROR "This CMake file is only support Linux builds!")

diff --git a/iothub_client/samples/iothub_ll_c2d_sample/mbed/CMakeLists.txt b/iothub_client/samples/iothub_ll_c2d_sample/mbed/CMakeLists.txt
@@ -1,7 +1,7 @@
 #Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 set(shared_util_base_path ../../../../c-utility)
 set(mbed_project_base "iothub_ll_c2d_sample" CACHE STRING "The item being built")

diff --git a/iothub_client/samples/iothub_ll_client_sample_amqp_shared/linux/CMakeLists.txt b/iothub_client/samples/iothub_ll_client_sample_amqp_shared/linux/CMakeLists.txt
@@ -2,7 +2,7 @@
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #this is CMakeLists.txt for iothub_ll_client_sample_amqp_shared
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 if(WIN32)
     message(FATAL_ERROR "This CMake file is only support Linux builds!")

diff --git a/iothub_client/samples/iothub_ll_client_sample_amqp_shared/mbed/CMakeLists.txt b/iothub_client/samples/iothub_ll_client_sample_amqp_shared/mbed/CMakeLists.txt
@@ -1,7 +1,7 @@
 #Copyright (c) Microsoft. All rights reserved.
 #Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required (VERSION 3.5)
 
 set(shared_util_base_path ../../../../azure-c-shared-utility)
 set(mbed_project_base "iothub_client_sample_amqp" CACHE STRING "The item being built")