Sync appveyor script with ykman-gui

appveyor.yml

@@ -5,46 +5,44 @@
 # Syntax for this file:
 # https://www.appveyor.com/docs/appveyor-yml
 
-image: Visual Studio 2015
-
 environment:
   YKPERS_VERSION: "1.18.1"
   LIBUSB_VERSION: "1.0.21"
-  PY_VERSION: "3.6.4"
+  PY_VERSION: "3.6.5"
   PYOTHERSIDE_VERSION: "1.5.3"
   YKPERS_BASEURL: https://developers.yubico.com/yubikey-personalization/Releases
 
   matrix:
     - platform: x86
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       QT_VERSION: 5.10\msvc2015
       PYTHON: C:\Python36
       PY_ARCH: win32
       WIN_ARCH: win32
       LIBUSB_DLL_FOLDER: MS32
+      VCVARSALLPATH: C:\"Program Files (x86)\Microsoft Visual Studio 14.0"\VC\vcvarsall.bat
       VCVARSALL: x86
 
     - platform: x64
-      QT_VERSION: 5.10\msvc2015_64
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      QT_VERSION: 5.9\msvc2017_64
       PYTHON: C:\Python36-x64
       PY_ARCH: amd64
       WIN_ARCH: win64
-      LIBUSB_DLL_FOLDER: MS64
+      LIBUSB_DLL_FOLDER: MS6
+      VCVARSALLPATH: C:\"Program Files (x86)\Microsoft Visual Studio"\2017\Community\VC\Auxiliary\Build\vcvarsall.bat
       VCVARSALL: x64
 
 init:
   # Needed for jom to work.
-  - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %VCVARSALL%
+  - call %VCVARSALLPATH% %VCVARSALL%
   # Add python and Qt to PATH
   - set PATH=%PYTHON%;%PYTHON%\Scripts;C:\Qt\%QT_VERSION%\bin;C:\Qt\Tools\QtCreator\bin;%PATH%
 
 install:
-  - choco upgrade -y all
-  - choco install swig -y --allow-empty-checksums
+  - choco install swig -y
   - choco upgrade swig 
 
-  # Compute version before dirtying directory with PyOtherSide build
-  - python compute-version.py yubioath-desktop- > VERSION
-
   # Build and install PyOtherSide 
   # Reference: https://pyotherside.readthedocs.io/en/latest/#building-for-windows
   - mkdir lib
@@ -87,10 +85,6 @@ after_build:
   - ps: Get-ChildItem -Include *.cpp -Recurse | Remove-Item -Force
   # Remove object files
   - ps: Get-ChildItem -Include *.obj -Recurse | Remove-Item -Force
-  # Remove vcruntime140.dll and sqllite3.dll from python-embed
-  - ps: Get-ChildItem -Include vcruntime140.dll -Recurse | Remove-Item -Force
-  - ps: Get-ChildItem -Include sqlite3.dll -Recurse | Remove-Item -Force
-  - ps: Get-ChildItem -Include _sqlite3.pyd -Recurse | Remove-Item -Force
   # Create zip for deployment
   - set ARTIFACT_NAME=%APPVEYOR_REPO_BRANCH%-%WIN_ARCH%
   - if defined APPVEYOR_REPO_TAG_NAME set ARTIFACT_NAME=%APPVEYOR_REPO_TAG_NAME%-%WIN_ARCH%