Skip to content

Commit

Permalink
wip review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
gerhardol committed Apr 25, 2019
1 parent 84ac62b commit ac8cc90
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions frontend.bat
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,8 @@ rem :: https://github.com/3F/hMSBuild/issues/8
set vswfilter=!vswPriority!

:_vswAttempt
call :dbgprint "attempts with filter: " vswfilter vswPreRel vswbin
call :dbgprint "attempts with filter: " vswfilter vswPreRel
call :dbgprint " using: " vswbin

set "vspath=" & set "vsver="
for /F "usebackq tokens=1* delims=: " %%a in (`"!vswbin!" -nologo !vswPreRel! -requires !vswfilter! Microsoft.Component.MSBuild`) do (
Expand Down Expand Up @@ -523,17 +524,17 @@ for /F "tokens=1,2 delims=." %%a in ("!vsver!") do (
rem https://github.com/3F/hMSBuild/issues/3
set vsver=%%~a.0
)
REM Workaround for VS2019, may use 'vswhere -find' instead
if !vsver! geq 16.0 set vsver=Current
set _msbp=!vspath!\MSBuild\!vsver!\Bin
REM VS2019 changes the path
if !vsver! geq 16 set vsver=Current

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

set _msbp=!vspath!\MSBuild\!vsver!\Bin
call :dbgprint "found path via vswhere: " _msbp

if not defined notamd64 (
if exist "!_msbp!\amd64" (
call :dbgprint "found /amd64"
set _msbp=!_msbp!\amd64
)
set _msbp=!_msbp!\amd64
)
call :msbfound _msbp _msbp

Expand Down Expand Up @@ -609,7 +610,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 ac8cc90

Please sign in to comment.