@@ -410,6 +410,18 @@ if "%RestorePackages%"=="" (
410410
411411@ call src\update.cmd signonly
412412
413+ echo ===========================================================
414+ echo ===========================================================
415+ echo %VS150COMNTOOLS%
416+ echo ===========================================================
417+ echo ===========================================================
418+ dir " %ProgramFiles(x86)% \Microsoft Visual Studio"
419+ echo ===========================================================
420+ echo ===========================================================
421+ dir " %ProgramFiles(x86)% \Microsoft Visual Studio\2017"
422+ echo ===========================================================
423+ echo ===========================================================
424+
413425:: Check prerequisites
414426if not " %VisualStudioVersion% " == " " goto vsversionset
415427if exist " %VS150COMNTOOLS% \..\ide\devenv.exe" set VisualStudioVersion = 15.0
@@ -584,13 +596,13 @@ if "%OSARCH%"=="AMD64" set SYSWOW64=SysWoW64
584596if not " %OSARCH% " == " x86" set REGEXE32BIT = %WINDIR% \syswow64\reg.exe
585597
586598echo SDK environment vars from Registry
587- FOR /F" tokens=2* delims=" %%A IN (' %REGEXE32BIT% QUERY " HKLM\Software\WOW6432Node\Microsoft\Microsoft SDKs\NETFXSDK\4.6.2\WinSDK-NetFx40Tools" /v InstallationFolder' )DO SET WINSDKNETFXTOOLS = %%B
588- if " %WINSDKNETFXTOOLS% " == " " FOR /F" tokens=2* delims=" %%A IN (' %REGEXE32BIT% QUERY " HKLM\Software\WOW6432Node\Microsoft\Microsoft SDKs\NETFXSDK\4.6.1\WinSDK-NetFx40Tools" /v InstallationFolder' )DO SET WINSDKNETFXTOOLS = %%B
589- if " %WINSDKNETFXTOOLS% " == " " FOR /F" tokens=2* delims=" %%A IN (' %REGEXE32BIT% QUERY " HKLM\Software\Microsoft\Microsoft SDKs\NETFXSDK\4.6\WinSDK-NetFx40Tools" /v InstallationFolder' )DO SET WINSDKNETFXTOOLS = %%B
590- if " %WINSDKNETFXTOOLS% " == " " FOR /F" tokens=2* delims=" %%A IN (' %REGEXE32BIT% QUERY " HKLM\Software\Microsoft\Microsoft SDKs\Windows\v8.1A\WinSDK-NetFx40Tools" /v InstallationFolder' )DO SET WINSDKNETFXTOOLS = %%B
591- if " %WINSDKNETFXTOOLS% " == " " FOR /F" tokens=2* delims=" %%A IN (' %REGEXE32BIT% QUERY " HKLM\Software\Microsoft\Microsoft SDKs\Windows\v8.0A\WinSDK-NetFx40Tools" /v InstallationFolder' )DO SET WINSDKNETFXTOOLS = %%B
592- if " %WINSDKNETFXTOOLS% " == " " FOR /F" tokens=2* delims=" %%A IN (' %REGEXE32BIT% QUERY " HKLM\Software\Microsoft\Microsoft SDKs\Windows\v7.1\WinSDK-NetFx40Tools" /v InstallationFolder' )DO SET WINSDKNETFXTOOLS = %%B
593- if " %WINSDKNETFXTOOLS% " == " " FOR /F" tokens=2* delims=" %%A IN (' %REGEXE32BIT% QUERY " HKLM\Software\Microsoft\Microsoft SDKs\Windows\v7.0A\WinSDK-NetFx40Tools" /v InstallationFolder' )DO SET WINSDKNETFXTOOLS = %%B
599+ FOR /F" tokens=2* delims=" %%A IN (" %REGEXE32BIT% QUERY" HKLM\Software\WOW6432Node\Microsoft\Microsoft SDKs\NETFXSDK\4.6.2\WinSDK-NetFx40Tools" /v InstallationFolder" )DO SET WINSDKNETFXTOOLS = %%B
600+ if " %WINSDKNETFXTOOLS% " == " " FOR /F" tokens=2* delims=" %%A IN (" %REGEXE32BIT% QUERY" HKLM\Software\WOW6432Node\Microsoft\Microsoft SDKs\NETFXSDK\4.6.1\WinSDK-NetFx40Tools" /v InstallationFolder" )DO SET WINSDKNETFXTOOLS = %%B
601+ if " %WINSDKNETFXTOOLS% " == " " FOR /F" tokens=2* delims=" %%A IN (" %REGEXE32BIT% QUERY" HKLM\Software\Microsoft\Microsoft SDKs\NETFXSDK\4.6\WinSDK-NetFx40Tools" /v InstallationFolder" )DO SET WINSDKNETFXTOOLS = %%B
602+ if " %WINSDKNETFXTOOLS% " == " " FOR /F" tokens=2* delims=" %%A IN (" %REGEXE32BIT% QUERY" HKLM\Software\Microsoft\Microsoft SDKs\Windows\v8.1A\WinSDK-NetFx40Tools" /v InstallationFolder" )DO SET WINSDKNETFXTOOLS = %%B
603+ if " %WINSDKNETFXTOOLS% " == " " FOR /F" tokens=2* delims=" %%A IN (" %REGEXE32BIT% QUERY" HKLM\Software\Microsoft\Microsoft SDKs\Windows\v8.0A\WinSDK-NetFx40Tools" /v InstallationFolder" )DO SET WINSDKNETFXTOOLS = %%B
604+ if " %WINSDKNETFXTOOLS% " == " " FOR /F" tokens=2* delims=" %%A IN (" %REGEXE32BIT% QUERY" HKLM\Software\Microsoft\Microsoft SDKs\Windows\v7.1\WinSDK-NetFx40Tools" /v InstallationFolder" )DO SET WINSDKNETFXTOOLS = %%B
605+ if " %WINSDKNETFXTOOLS% " == " " FOR /F" tokens=2* delims=" %%A IN (" %REGEXE32BIT% QUERY" HKLM\Software\Microsoft\Microsoft SDKs\Windows\v7.0A\WinSDK-NetFx40Tools" /v InstallationFolder" )DO SET WINSDKNETFXTOOLS = %%B
594606
595607set PATH = %PATH% ;%WINSDKNETFXTOOLS%
596608for /d%%i in (%WINDIR% \Microsoft.NET\Framework\v4.0.?????)do set CORDIR = %%i