From fe8bd4f1f8975f4154ce0bd4fae21a6ef9915de3 Mon Sep 17 00:00:00 2001
From: Gerhard Olsson <gerhardol@users.noreply.github.com>
Date: Tue, 23 Apr 2019 23:54:04 +0200
Subject: [PATCH] Support for VS2019 msbuild

---
 frontend.bat | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend.bat b/frontend.bat
index 0b2c734..058a29c 100644
--- a/frontend.bat
+++ b/frontend.bat
@@ -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
@@ -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."