[AppVeyor] Add VS2019 to CI

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>

3rdParty/vcpkg_ports/triplets/ci/x64-windows-static.cmake

@@ -0,0 +1,6 @@
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_LIBRARY_LINKAGE static)
+set(VCPKG_CXX_FLAGS /Qspectre)
+set(VCPKG_C_FLAGS /Qspectre)
+set(VCPKG_BUILD_TYPE release)

3rdParty/vcpkg_ports/triplets/default/x64-windows-static.cmake

@@ -0,0 +1,5 @@
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_LIBRARY_LINKAGE static)
+set(VCPKG_CXX_FLAGS /Qspectre)
+set(VCPKG_C_FLAGS /Qspectre)

appveyor.yml

@@ -1,11 +1,23 @@
 # NOTE: settings in this file have precedence over settings on the website
-image: Visual Studio 2013
+image: 
+  - Visual Studio 2013
+  - Visual Studio 2019
 
 matrix:
   fast_finish: true
   exclude:
     - platform: x64
       TOOLCHAIN_VERSION: 10.0
+    - platform: Win32
+      TOOLCHAIN_VERSION: 10.0
+      image: Visual Studio 2019
+    - TOOLCHAIN_VERSION: 12.0
+      image: Visual Studio 2019
+    - platform: Win32
+      TOOLCHAIN_VERSION: 16.0
+    - platform: x64
+      TOOLCHAIN_VERSION: 16.0
+      image: Visual Studio 2013
 
 platform:
   - Win32
@@ -66,11 +78,13 @@ environment:
     - TOOLCHAIN_VERSION: 10.0
       solution_name: win_build\boinc_vs2010.sln
       depends_zip_path: https://boinc.berkeley.edu/dl/boinc_depends/boinc_depends_win_vs2010.zip
-      depends_path: C:\projects\boinc_depends_win_vs2010    
+      depends_path: C:\projects\boinc_depends_win_vs2010
     - TOOLCHAIN_VERSION: 12.0
       solution_name: win_build\boinc_vs2013.sln
       depends_zip_path: https://boinc.berkeley.edu/dl/boinc_depends/boinc_depends_win_vs2013.zip
       depends_path: C:\projects\boinc_depends_win_vs2013
+    - TOOLCHAIN_VERSION: 16.0
+      solution_name: win_build\boinc_vs2019.sln
   BINTRAY_API_KEY:
     secure: kZI9k0Kh2bFSCbXfkz+J16fGNAee1ToRMl10D8QPQsKpC2PqhF/uVMpd6gRC+OSI
   APPVEYOR_CACHE_ENTRY_ZIP_ARGS: "-t7z -m0=lzma2 -mx=9 -ms=on"
@@ -80,14 +94,16 @@ cache:
   - C:\projects\boinc_depends_win_vs2010 -> appveyor.yml, win_build\load_dependencies.bat
 
 before_build:
-  - call win_build\load_dependencies.bat %depends_zip_path% %depends_path% %platform% %configuration%
+  - if %TOOLCHAIN_VERSION%==10.0 call win_build\load_dependencies.bat %depends_zip_path% %depends_path% %platform% %configuration%
+  - if %TOOLCHAIN_VERSION%==12.0 call win_build\load_dependencies.bat %depends_zip_path% %depends_path% %platform% %configuration%
   - if %TOOLCHAIN_VERSION%==10.0 call "%VS100COMNTOOLS%\vsvars32.bat"
-  - if %TOOLCHAIN_VERSION%==10.0 git apply boinc_vs2010.sln.ci.patch
+  - if %TOOLCHAIN_VERSION%==10.0 call git apply boinc_vs2010.sln.ci.patch
   - if %TOOLCHAIN_VERSION%==12.0 call "%VS120COMNTOOLS%\vsvars32.bat"
   - if %TOOLCHAIN_VERSION%==12.0 call rmdir /S /Q %localappdata%\Microsoft\VisualStudio\%TOOLCHAIN_VERSION%\ComponentModelCache
+  - if %TOOLCHAIN_VERSION%==16.0 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\vsdevcmd.bat"
 
 build_script:
-  - msbuild %solution_name% /p:Configuration=%configuration%;Platform=%platform%
+  - msbuild %solution_name% /p:Configuration=%configuration%;Platform=%platform%;VcpkgTripletConfig=ci -m
 
 after_build:
   - if %TOOLCHAIN_VERSION%==12.0 call deploy\prepare_deployment.bat
@@ -102,3 +118,6 @@ artifacts:
     name: win-manager
 
 test: off
+
+# on_finish:
+#   - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

win_build/vcpkg_3rdparty_dependencies_2019.vcxproj

@@ -15,6 +15,7 @@
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{D3E5B5B5-4FB1-4877-9B2C-6708B3D568F7}</ProjectGuid>
     <RootNamespace>vcpkg3rdpartydependencies</RootNamespace>
+    <VcpkgTripletConfig Condition="'$(VcpkgTripletConfig)' == ''">default</VcpkgTripletConfig>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -103,17 +104,7 @@
     <Exec Command="bootstrap-vcpkg.bat" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" />
   </Target>
   <Target Name="Build3rdPartyLibraries" BeforeTargets="ClCompile" DependsOnTargets="InstallVcpkg" AfterTargets="InstallVcpkg">
-    <ItemGroup>
-      <VcpkgItem Include="openssl-windows:x64-windows-static" />
-      <VcpkgItem Include="curl[core,openssl]:x64-windows-static" />
-      <VcpkgItem Include="freetype[core,bzip2,png]:x64-windows-static" />
-      <VcpkgItem Include="ftgl:x64-windows-static" />
-      <VcpkgItem Include="wxwidgets:x64-windows-static" />
-      <VcpkgItem Include="sqlite3:x64-windows-static" />
-      <VcpkgItem Include="opencl:x64-windows-static" />
-      <VcpkgItem Include="rappture:x64-windows-static" />
-    </ItemGroup>
-    <Exec Command="vcpkg.exe install %(VcpkgItem.Identity) --overlay-ports=../../vcpkg_ports" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" />
-    <Exec Command="vcpkg.exe upgrade --no-dry-run --overlay-ports=../../vcpkg_ports" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" />
+    <Exec Command="vcpkg.exe install openssl curl[core,openssl] freetype[core,bzip2,png] ftgl wxwidgets sqlite3 opencl rappture --overlay-ports=../../vcpkg_ports/ports --overlay-triplets=../../vcpkg_ports/triplets/$(VcpkgTripletConfig) --triplet x64-windows-static" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" />
+    <Exec Command="vcpkg.exe upgrade --no-dry-run --overlay-ports=../../vcpkg_ports/ports --overlay-triplets=../../vcpkg_ports/triplets/$(VcpkgTripletConfig) --triplet x64-windows-static" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" />
   </Target>
-</Project>
+</Project>