Skip to content

Commit

Permalink
Merge pull request #11 from gerhardol/bugfix/fix-10-vs2019
Browse files Browse the repository at this point in the history
Support for VS2019 msbuild (Thanks @gerhardol)
  • Loading branch information
3F authored May 27, 2019
2 parents c74ff05 + fe8bd4f commit d3c2970
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion frontend.bat
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,11 @@ for /F "tokens=1,2 delims=." %%a in ("!vsver!") do (
rem https://github.com/3F/hMSBuild/issues/3
set vsver=%%~a.0
)
REM VS2019 changed path
if !vsver! geq 16 set vsver=Current

if not exist "!vspath!\MSBuild\!vsver!\Bin" set "%3=" & exit /B %ERROR_PATH_NOT_FOUND%

set _msbp=!vspath!\MSBuild\!vsver!\Bin

call :dbgprint "found path via vswhere: " _msbp
Expand Down Expand Up @@ -606,7 +611,7 @@ if not defined notamd64 (

:: 7z & amd64\msbuild - https://github.com/3F/vsSolutionBuildEvent/issues/38
set _noamd=!_msbp:Framework64=Framework!
set _noamd=!_noamd:amd64=!
set _noamd=!_noamd:\amd64=!

if exist "!_noamd!" (
call :dbgprint "Return 32bit version because of -notamd64 key."
Expand Down

0 comments on commit d3c2970

Please sign in to comment.