From 51a47959868ae64b547af3235c688028ecf9dc61 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Fri, 4 Jun 2021 14:24:34 +0100 Subject: [PATCH 1/2] build: apply workaround for msbuild 16.10.0 only Only apply the msbuild target workaround for msbuild 16.10.0 only as that is the version containing the regression and the workaround will still be needed if building with that version even when a newer version of msbuild is available. --- vcbuild.bat | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vcbuild.bat b/vcbuild.bat index 81a8efb62e553f..6346690cf336ea 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,8%"=="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 From e25056bffa3f9975b20c8b30f954bdf5c605e42e Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Fri, 4 Jun 2021 15:24:33 +0100 Subject: [PATCH 2/2] fixup! build: apply workaround for msbuild 16.10.0 only Co-authored-by: bl-ue <54780737+bl-ue@users.noreply.github.com> --- vcbuild.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcbuild.bat b/vcbuild.bat index 6346690cf336ea..fe41bc14c1bad7 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -336,7 +336,7 @@ if "%target%"=="Build" ( if "%target%"=="node" if exist "%config%\cctest.exe" del "%config%\cctest.exe" @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,8%"=="16.10.0." ( +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%"