From 8213438baca85caae3f2b671a3251410b4ae48b5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 22 Nov 2024 00:39:32 +0100 Subject: [PATCH] Use latest MSVS 2022 solution files on AppVeyor For some reason we still used MSVS 2015 solutions, even when using MSVS 2017 compiler. --- appveyor.yml | 2 ++ build/tools/appveyor.bat | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 80f78887fa..e5b8d8c9bd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -35,10 +35,12 @@ environment: - TOOLSET: msbuild CONFIGURATION: DLL Release ARCH: x64 + VSVER: 17 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - TOOLSET: msbuild CONFIGURATION: Debug ARCH: x64 + VSVER: 17 wxUSE_UNICODE_UTF8: 1 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - TOOLSET: nmake diff --git a/build/tools/appveyor.bat b/build/tools/appveyor.bat index 4ce8c961c6..6b2d023efe 100644 --- a/build/tools/appveyor.bat +++ b/build/tools/appveyor.bat @@ -9,12 +9,12 @@ goto %TOOLSET% :msbuild cd build\msw -msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" wx_vc14.sln %MSBUILD_LOGGER% +msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" wx_vc%VSVER%.sln %MSBUILD_LOGGER% cd ..\..\tests -msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" test_vc14.sln %MSBUILD_LOGGER% -msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" test_gui_vc14.sln %MSBUILD_LOGGER% +msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" test_vc%VSVER%.sln %MSBUILD_LOGGER% +msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" test_gui_vc%VSVER%.sln %MSBUILD_LOGGER% cd ..\samples -msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" /t:"1 Fundamental Samples\minimal" samples_vc14.sln %MSBUILD_LOGGER% +msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" /t:"1 Fundamental Samples\minimal" samples_vc%VSVER%.sln %MSBUILD_LOGGER% goto :eof :nmake