Update Windows CI and installer config

Add a VCVer case for the new Visual Studio version.  Use
ilammy/msvc-dev-cmd to set up the build environments.

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 48c13a598080702da25a16929d8f6f28bf8be077..e7a58485aca525a893a4d25d437bbcb045d54572 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,7 +61,7 @@ jobs:
                 fi
 
     windows:
-        runs-on: windows-2019
+        runs-on: windows-latest
         env:
             KRB_INSTALL_DIR: C:\kfw
         steps:
@@ -71,11 +71,13 @@ jobs:
               shell: cmd
               run: |
                 mkdir %KRB_INSTALL_DIR%
+            - uses: ilammy/msvc-dev-cmd@v1
+              with:
+                arch: x86
             - name: Build 32-bit
               shell: cmd
               run: |
                 cd src
-                call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
                 set
                 set PATH=%PATH%;%wix%bin
                 nmake -f Makefile.in prep-windows
@@ -84,11 +86,13 @@ jobs:
                 cd windows\installer\wix
                 nmake
                 rename kfw.msi kfw32.msi
+            - uses: ilammy/msvc-dev-cmd@v1
+              with:
+                arch: x64
             - name: Build 64-bit
               shell: cmd
               run: |
                 cd src
-                call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
                 set
                 set PATH=%PATH%;%wix%bin;"%WindowsSdkVerBinPath%"\x86
                 nmake clean

diff --git a/src/windows/installer/wix/config.wxi b/src/windows/installer/wix/config.wxi
index c789668beafb32a36f9d86980d7dc2b55d204c7c..579de4399a646502ca19e9649f2af13aab27200a 100644 (file)
--- a/src/windows/installer/wix/config.wxi
+++ b/src/windows/installer/wix/config.wxi
@@ -51,6 +51,8 @@
         <?define VCVer="141"?>
     <?elseif $(env.VISUALSTUDIOVERSION) = "16.0"?>
         <?define VCVer="142"?>
+    <?elseif $(env.VISUALSTUDIOVERSION) = "17.0"?>
+        <?define VCVer="143"?>
     <?else?>
         <?error Unknown MFC version?>
     <?endif?>