support VS2022

build/.vsts-ci.yml

@@ -48,7 +48,7 @@ jobs:
   steps:
   - script: |
      if exist jenkins\windows_c.cmd (
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
+      call jenkins\windows_c_VsDevCmd.cmd
       call jenkins\windows_c.cmd)
     displayName: 'build'
     env:
@@ -73,7 +73,7 @@ jobs:
   steps:
   - script: |
      if exist jenkins\windows_c.cmd (
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
+      call jenkins\windows_c_VsDevCmd.cmd
       call jenkins\windows_c.cmd --platform x64)
     displayName: 'build'
     env:
@@ -101,7 +101,7 @@ jobs:
   steps:
   - script: |
      if exist jenkins\windows_c_build_as_dynamic.cmd (
-      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
+      call jenkins\windows_c_VsDevCmd.cmd
       call jenkins\windows_c_build_as_dynamic.cmd)
     displayName: 'build'
     env:

build_all/windows/build.cmd

@@ -103,11 +103,6 @@ pushd %build-root%\cmake\%CMAKE_DIR%
 
 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 (
     echo ***Running CMAKE for Win32***
@@ -121,7 +116,7 @@ if %MAKE_NUGET_PKG% == yes (
     )
     mkdir %build-root%\cmake\umqtt_x64
     pushd %build-root%\cmake\umqtt_x64
-    cmake -Drun_unittests:BOOL=%CMAKE_run_unittests% %build-root% -G "Visual Studio 15 2017" -A x64
+    cmake -Drun_unittests:BOOL=%CMAKE_run_unittests% %build-root% -A x64
     if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
     popd
 
@@ -132,20 +127,20 @@ if %MAKE_NUGET_PKG% == yes (
     mkdir %build-root%\cmake\umqtt_arm
     pushd %build-root%\cmake\umqtt_arm
     echo ***Running CMAKE for ARM***
-    cmake -Drun_unittests:BOOL=%CMAKE_run_unittests% %build-root% -G "Visual Studio 15 2017" -A ARM
+    cmake -Drun_unittests:BOOL=%CMAKE_run_unittests% %build-root% -A ARM
     if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
 
 ) else if %build-platform% == Win32 (
     echo ***Running CMAKE for Win32***
-    cmake %build-root% -Drun_unittests:BOOL=%CMAKE_run_unittests% -G "Visual Studio 15 2017" -A Win32
+    cmake %build-root% -Drun_unittests:BOOL=%CMAKE_run_unittests% -A Win32
     if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
 ) else if %build-platform% == arm (
     echo ***Running CMAKE for ARM***
-    cmake -Drun_unittests:BOOL=%CMAKE_run_unittests% %build-root% -G "Visual Studio 15 2017" -A ARM
+    cmake -Drun_unittests:BOOL=%CMAKE_run_unittests% %build-root% -A ARM
     if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
 ) else (
     echo ***Running CMAKE for Win64***
-    cmake -Drun_unittests:BOOL=%CMAKE_run_unittests% %build-root% -G "Visual Studio 15 2017" -A x64
+    cmake -Drun_unittests:BOOL=%CMAKE_run_unittests% %build-root% -A x64
     if not !ERRORLEVEL!==0 exit /b !ERRORLEVEL!
 )
 

jenkins/windows_c_VsDevCmd.cmd

@@ -0,0 +1,27 @@
+@REM Copyright (c) Microsoft. All rights reserved.
+@REM Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+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"
+    set VSVERSION="Visual Studio 15 2017"
+) ELSE IF EXIST "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" (
+    IF "%1" == "x64" (
+        call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64
+    ) ELSE (
+        call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+    )
+    set VSVERSION="Visual Studio 17 2022"
+) ELSE (
+    echo "ERROR: Did not find Microsoft Visual Studio"
+    EXIT 1
+)
+
+where /q msbuild
+IF ERRORLEVEL 1 (
+    echo "ERROR: Did not find msbuild"
+    exit %ERRORLEVEL%
+)
+
+where msbuild
+msbuild -version