diff --git a/vcbuild.bat b/vcbuild.bat index 81a8efb62e553f..fe41bc14c1bad7 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -334,8 +334,11 @@ if "%target%"=="Build" ( if defined cctest set target="Build" ) if "%target%"=="node" if exist "%config%\cctest.exe" del "%config%\cctest.exe" -@rem TODO(targos): Remove next line after MSBuild 16.10.1 is released. -if "%target%"=="node" set target="Build" +@rem Workaround bug in MSBuild 16.10.0. (https://github.com/dotnet/msbuild/pull/6465) +for /F %%V in ('msbuild -version -nologo') do set msbuild_ver=%%V +if "%msbuild_ver:~0,7%"=="16.10.0" ( + if "%target%"=="node" set target="Build" +) if defined msbuild_args set "extra_msbuild_args=%extra_msbuild_args% %msbuild_args%" @rem Setup env variables to use multiprocessor build set UseMultiToolTask=True