Skip to content

Commit

Permalink
build: fix detection of Visual Studio 2019
Browse files Browse the repository at this point in the history
If Visual Studio 2017 is not found, attempt to find Visual Studio 2019.

PR-URL: #42349
Refs: https://github.blog/changelog/2021-10-19-github-actions-the-windows-2016-runner-image-will-be-removed-from-github-hosted-runners-on-march-15-2022/
Reviewed-By: Mestery <mestery@protonmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
  • Loading branch information
richardlau committed Mar 16, 2022
1 parent 3901891 commit f41e777
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion vcbuild.bat
Expand Up @@ -244,7 +244,7 @@ if %target_arch%==x86 if %msvs_host_arch%==x86 set vcvarsall_arg=x86
if defined target_env if "%target_env%" NEQ "vs2017" goto vs-set-2019
echo Looking for Visual Studio 2017
call tools\msvs\vswhere_usability_wrapper.cmd "[15.0,16.0)"
if "_%VCINSTALLDIR%_" == "__" goto msbuild-not-found
if "_%VCINSTALLDIR%_" == "__" goto vs-set-2019
if defined msi (
echo Looking for WiX installation for Visual Studio 2017...
if not exist "%WIX%\SDK\VS2017" (
Expand Down

0 comments on commit f41e777

Please sign in to comment.