From f331ce814b9e42568c089f798e38a97ae330c3f6 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 12 Nov 2018 16:15:21 +0000
Subject: [PATCH] Change appveyor build matrix, add VS2017 x64 Development
 build

---
 util/appveyor.yml | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/util/appveyor.yml b/util/appveyor.yml
index f2aed2b76..97afc1b69 100644
--- a/util/appveyor.yml
+++ b/util/appveyor.yml
@@ -5,17 +5,7 @@ branches:
   - v1.x
   - ci-test
 
-image: Visual Studio 2015
-
-configuration:
-  - Development
-  - Release
-
-platform:
-  - x86
-  - x64
-
-clone_depth: 50
+image: Visual Studio 2017
 
 environment:
   coverity_token:
@@ -23,8 +13,28 @@ environment:
   coverity_email:
     secure: ndq7n9R6NhCV8mENhPAH4VTFNUeROGK/uFlqfUVwxAc=
 
-init:
-  - if "%PLATFORM%" EQU "x86" ( if "%CONFIGURATION%"=="Release" (echo "Skipping x86 Release" && appveyor exit ) )
+  matrix:
+    # VS2015 x86 Development
+    - platform: x86
+      configuration: Development
+      TOOLSET: v140
+
+    # VS2015 x64 Development
+    - platform: x64
+      configuration: Development
+      TOOLSET: v140
+
+    # VS2015 x64 Release
+    - platform: x64
+      configuration: Release
+      TOOLSET: v140
+
+    # VS2017 x64 Development
+    - platform: x64
+      configuration: Development
+      TOOLSET: v141
+
+clone_depth: 50
 
 install:
 - ps: $env:PATH = 'C:\MinGW\bin;C:\MinGW\mingw32\bin;C:\MinGW\msys\1.0\bin;' + $env:PATH
@@ -64,7 +74,7 @@ build_script:
       return
     }
 
-    msbuild renderdoc.sln /v:m "/p:Configuration=$env:CONFIGURATION" "/p:Platform=$env:PLATFORM" /p:PlatformToolset=v140
+    msbuild renderdoc.sln /v:m "/p:Configuration=$env:CONFIGURATION" "/p:Platform=$env:PLATFORM" "/p:PlatformToolset=$env:TOOLSET"
 
 test_script:
 - ps: $env:testexe = "$env:PLATFORM\$env:CONFIGURATION\renderdoccmd.exe"