From c7346fe24b6fbdd916fca2892c09053a26fa2b42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yao=20Wei=20Tjong=20=E5=A7=9A=E4=BC=9F=E5=BF=A0?=
 <weitjong@gmail.com>
Date: Wed, 17 Jan 2018 21:30:26 +0800
Subject: [PATCH] For CI - use AppVeyor CI image with VS 2017. [skip travis]
 [ci only: master]

---
 .appveyor.yml | 8 +++++++-
 Rakefile      | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 4e780b28545..4eb30b16f20 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -21,6 +21,7 @@
 #
 
 version: '{build}'
+image: Visual Studio 2017
 platform:
   - x86
   - x64
@@ -70,7 +71,12 @@ before_build:
           $env:URHO3D_TOOLS = "0";
           iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-desktop.ps1'))
         }
-  - if "%PLATFORM%" == "x64" set "URHO3D_64BIT=1"
+  - if "%PLATFORM%" == "x64" (
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" &&
+      set "URHO3D_64BIT=1"
+    ) else (
+      call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
+    )
   # rake ci_setup_cache
 build_script:
   - rake ci && if "%PACKAGE_UPLOAD%" == "1" (rake ci_package_upload && move %build_tree%\*.zip . && rd /S /Q %build_tree%\_CPack_Packages)
diff --git a/Rakefile b/Rakefile
index ecea51ed281..65e11ddb7b3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -349,7 +349,7 @@ task :ci do
   # Currently we don't have the infra to test run all the platforms; also skip when doing packaging build due to time constraint
   ENV['URHO3D_TESTING'] = '1' if (((ENV['LINUX'] && !ENV['URHO3D_64BIT']) || (ENV['OSX'] && !ENV['IOS'] && !ENV['TVOS']) || ENV['APPVEYOR']) && !ENV['PACKAGE_UPLOAD']) || ENV['WEB']
   # When not explicitly specified then use generic generator
-  generator = ENV['XCODE'] ? 'xcode' : (ENV['APPVEYOR'] && !ENV['MINGW'] ? 'vs2015' : '')
+  generator = ENV['XCODE'] ? 'xcode' : ''
   # LuaJIT on MinGW build is not possible on Travis-CI with Ubuntu 14.04 LTS still as its GCC cross-compiler does not have native exception handling
   # LuaJIT on Web platform is not possible
   jit = (ENV['WIN32'] && ENV['TRAVIS']) || ENV['WEB'] ? '' : 'JIT=1 URHO3D_LUAJIT_AMALG='