Use run tool in coreclr dev workflow.

1 files changed, 220 insertions, 451 deletions

diff --git a/build.cmd b/build.cmd
index 5439ca551f..413f855f10 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,10 +1,8 @@
 @if not defined __echo @echo off
 setlocal EnableDelayedExpansion EnableExtensions
 
-set __ThisScriptShort=%0
 set __ThisScriptFull="%~f0"
-set __ThisScriptPath="%~dp0"
-
+set __VSToolsRoot=%VS140COMNTOOLS%
 :: Note that the msbuild project files (specifically, dir.proj) will use the following variables, if set:
 ::      __BuildArch         -- default: x64
 ::      __BuildType         -- default: Debug
@@ -28,11 +26,9 @@ set __BuildOS=Windows_NT
 :: Default to highest Visual Studio version available
 set __VSVersion=vs2015
 
-if defined VS140COMNTOOLS set __VSVersion=vs2015
-
 :: Define a prefix for most output progress messages that come from this script. That makes
 :: it easier to see where these are coming from. Note that there is a trailing space here.
-set __MsgPrefix=BUILD: 
+set __MsgPrefix=BUILD:
 
 :: Set the various build properties here so that CMake and MSBuild can pick them up
 set "__ProjectDir=%~dp0"
@@ -44,21 +40,6 @@ set "__PackagesDir=%__ProjectDir%\packages"
 set "__RootBinDir=%__ProjectDir%\bin"
 set "__LogsDir=%__RootBinDir%\Logs"
 
-set __CleanBuild=
-set __CoreLibOnly=
-set __CoreLibAlsoNativeImage=
-set __ConfigureOnly=
-set __SkipConfigure=
-set __SkipCoreLibBuild=
-set __SkipNativeBuild=
-set __SkipTestBuild=
-set __BuildSequential=
-set __SkipRestore=
-set __SkipBuildPackages=
-set __msbuildCleanBuildArgs=
-set __SignTypeReal=
-set __OfficialBuildIdArg=
-
 set __BuildAll=
 
 set __BuildArchX64=0
@@ -75,84 +56,62 @@ REM __PassThroughArgs is a set of things that will be passed through to nested c
 REM when using "all".
 set __PassThroughArgs=
 
-REM unprocessedBuildArgs are args that we pass to msbuild (e.g. /p:__BuildArch=x64)
+REM __UnprocessedBuildArgs are args that we pass to msbuild (e.g. /p:__BuildArch=x64)
 set "__args= %*"
 set processedArgs=
-set unprocessedBuildArgs=
+set __UnprocessedBuildArgs=
+set __RunArgs=
+
+set __BuildCoreLib=1
+set __BuildNative=1
+set __BuildTests=1
+set __BuildPackages=1
+set __BuildNativeCoreLib=1
 
 :Arg_Loop
 if "%1" == "" goto ArgsDone
 
-if /i "%1" == "/?"    goto Usage
 if /i "%1" == "-?"    goto Usage
-if /i "%1" == "/h"    goto Usage
 if /i "%1" == "-h"    goto Usage
-if /i "%1" == "/help" goto Usage
 if /i "%1" == "-help" goto Usage
 
-if /i "%1" == "all"                 (set __BuildAll=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-
-if /i "%1" == "x64"                 (set __BuildArchX64=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "x86"                 (set __BuildArchX86=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "arm"                 (set __BuildArchArm=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "arm64"               (set __BuildArchArm64=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
+if /i "%1" == "all"                 (set __BuildAll=1&set processedArgs=!processedArgs! %1&goto Arg_Next)
+if /i "%1" == "x64"                 (set __BuildArchX64=1&set processedArgs=!processedArgs! %1&goto Arg_Next)
+if /i "%1" == "x86"                 (set __BuildArchX86=1&set processedArgs=!processedArgs! %1&goto Arg_Next)
+if /i "%1" == "arm"                 (set __BuildArchArm=1&set processedArgs=!processedArgs! %1&goto Arg_Next)
+if /i "%1" == "arm64"               (set __BuildArchArm64=1&set processedArgs=!processedArgs! %1&goto Arg_Next)
 
-if /i "%1" == "debug"               (set __BuildTypeDebug=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "checked"             (set __BuildTypeChecked=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "release"             (set __BuildTypeRelease=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
+if /i "%1" == "debug"               (set __BuildTypeDebug=1&set processedArgs=!processedArgs! %1&goto Arg_Next)
+if /i "%1" == "checked"             (set __BuildTypeChecked=1&set processedArgs=!processedArgs! %1&goto Arg_Next)
+if /i "%1" == "release"             (set __BuildTypeRelease=1&set processedArgs=!processedArgs! %1&goto Arg_Next)
 
 REM All arguments after this point will be passed through directly to build.cmd on nested invocations
 REM using the "all" argument, and must be added to the __PassThroughArgs variable.
 set __PassThroughArgs=%__PassThroughArgs% %1
 
-if /i "%1" == "clean"               (set __CleanBuild=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-
-if /i "%1" == "freebsdmscorlib"     (set __CoreLibOnly=1&set __BuildOS=FreeBSD&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "linuxmscorlib"       (set __CoreLibOnly=1&set __BuildOS=Linux&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "netbsdmscorlib"      (set __CoreLibOnly=1&set __BuildOS=NetBSD&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "osxmscorlib"         (set __CoreLibOnly=1&set __BuildOS=OSX&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "windowsmscorlib"     (set __CoreLibOnly=1&set __BuildOS=Windows_NT&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-
-if /i "%1" == "nativemscorlib"      (set __CoreLibAlsoNativeImage=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "vs2015"              (set __VSVersion=%1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "configureonly"       (set __ConfigureOnly=1&set __SkipCoreLibBuild=1&set __SkipBuildPackages=1&set __SkipTestBuild=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "skipconfigure"       (set __SkipConfigure=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "skipmscorlib"        (set __SkipCoreLibBuild=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "skipnative"          (set __SkipNativeBuild=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "skiptests"           (set __SkipTestBuild=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "skiprestore"         (set __SkipRestore=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "skipbuildpackages"   (set __SkipBuildPackages=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "sequential"          (set __BuildSequential=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "disableoss"          (set __SignTypeReal="/p:SignType=real"&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-if /i "%1" == "priority"            (set __TestPriority=%2&set __PassThroughArgs=%__PassThroughArgs% %2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop)
-if /i "%1" == "officialbuildid"     (set __OfficialBuildIdArg=/p:OfficialBuildId=%2&set __PassThroughArgs=%__PassThroughArgs% %2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop)
-if /i "%1" == "buildjit32"          (set __BuildJit32="-DBUILD_JIT32=1"&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-
-@REM For backwards compatibility, continue accepting "skiptestbuild", which was the original name of the option.
-if /i "%1" == "skiptestbuild"       (set __SkipTestBuild=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
-
-@REM It was initially /toolset_dir. Not sure why, since it doesn't match the other usage.
-if /i "%1" == "/toolset_dir"        (set __ToolsetDir=%2&set __PassThroughArgs=%__PassThroughArgs% %2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop)
-if /i "%1" == "toolset_dir"         (set __ToolsetDir=%2&set __PassThroughArgs=%__PassThroughArgs% %2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop)
-
-if [!processedArgs!]==[] (
-  call set unprocessedBuildArgs=!__args!
-) else (
-  call set unprocessedBuildArgs=%%__args:*!processedArgs!=%%
-)
+if /i "%1" == "freebsdmscorlib"     (set __BuildNativeCoreLib=0&set __BuildNative=0&set __BuildTests=0&set __BuildPackages=0&set __BuildOS=FreeBSD&set __SkipNugetPackage=1&set processedArgs=!processedArgs! %1&goto Arg_Next)
+if /i "%1" == "linuxmscorlib"       (set __BuildNativeCoreLib=0&set __BuildNative=0&set __BuildTests=0&set __BuildPackages=0&set __BuildOS=Linux&set __SkipNugetPackage=1&set processedArgs=!processedArgs! %1&goto Arg_Next)
+if /i "%1" == "netbsdmscorlib"      (set __BuildNativeCoreLib=0&set __BuildNative=0&set __BuildTests=0&set __BuildPackages=0&set __BuildOS=NetBSD&set __SkipNugetPackage=1&set processedArgs=!processedArgs! %1&goto Arg_Next)
+if /i "%1" == "osxmscorlib"         (set __BuildNativeCoreLib=0&set __BuildNative=0&set __BuildTests=0&set __BuildPackages=0&set __BuildOS=OSX&set __SkipNugetPackage=1&set processedArgs=!processedArgs! %1&goto Arg_Next)
+if /i "%1" == "windowsmscorlib"     (set __BuildNativeCoreLib=0&set __BuildNative=0&set __BuildTests=0&set __BuildPackages=0&set __BuildOS=Windows_NT&set __SkipNugetPackage=1&set processedArgs=!processedArgs! %1&goto Arg_Next)
+if /i "%1" == "nativemscorlib"      (set __BuildNativeCoreLib=1&set __BuildCoreLib=0&set __BuildNative=0&set __BuildTests=0&set __BuildPackages=0&set processedArgs=!processedArgs! %1&goto Arg_Next)
+if /i "%1" == "configureonly"       (set __ConfigureOnly=1&set __BuildNative=1&set __BuildNativeCoreLib=0&set __BuildCoreLib=0&set __BuildTests=0&set __BuildPackages=0&set processedArgs=!processedArgs! %1&goto Arg_Next)
+if /i "%1" == "skipconfigure"       (set __SkipConfigure=1&set processedArgs=!processedArgs! %1&goto Arg_Next)
+if /i "%1" == "skipmscorlib"        (set __BuildCoreLib=0&set __BuildNativeCoreLib=0&set processedArgs=!processedArgs! %1&goto Arg_Next)
+if /i "%1" == "skipnative"          (set __BuildNative=0&set processedArgs=!processedArgs! %1&goto Arg_Next)
+if /i "%1" == "skiptests"           (set __BuildTests=0&set processedArgs=!processedArgs! %1&goto Arg_Next)
+if /i "%1" == "skipbuildpackages"   (set __BuildPackages=0&set processedArgs=!processedArgs! %1&goto Arg_Next)
+if /i "%1" == "buildjit32"          (set __BuildJit32="-DBUILD_JIT32=1"&set processedArgs=!processedArgs! %1&goto Arg_Next)
+if /i "%1" == "toolset_dir"         (set __ToolsetDir=%2&set __PassThroughArgs=%__PassThroughArgs% %2&set processedArgs=!processedArgs! %1 %2&shift&goto Arg_Next)
+
+set __UnprocessedBuildArgs=!__UnprocessedBuildArgs! %1
+
+:Arg_Next
+shift /1
+goto :Arg_Loop
 
 :ArgsDone
 
-if defined __ConfigureOnly if defined __SkipConfigure (
-    echo "Error: option 'configureonly' is incompatible with 'skipconfigure'"
-    goto Usage
-)
-
-if defined __SkipCoreLibBuild if defined __CoreLibOnly (
-    echo Error: option 'skipmscorlib' is incompatible with 'freebsdmscorlib', 'linuxmscorlib', 'netbsdmscorlib', 'osxmscorlib' and 'windowsmscorlib'.
-    goto Usage
-)
-
 if defined __BuildAll goto BuildAll
 
 set /A __TotalSpecifiedBuildArch=__BuildArchX64 + __BuildArchX86 + __BuildArchArm + __BuildArchArm64
@@ -179,7 +138,7 @@ if %__BuildTypeDebug%==1    set __BuildType=Debug
 if %__BuildTypeChecked%==1  set __BuildType=Checked
 if %__BuildTypeRelease%==1  set __BuildType=Release
 
-echo %__MsgPrefix%Commencing CoreCLR Repo build
+set __RunArgs=-BuildOS=%__BuildOS% -BuildType=%__BuildType% -BuildArch=%__BuildArch%
 
 :: Set the remaining variables based upon the determined build configuration
 set "__BinDir=%__RootBinDir%\Product\%__BuildOS%.%__BuildArch%.%__BuildType%"
@@ -189,201 +148,100 @@ set "__TestRootDir=%__RootBinDir%\tests"
 set "__TestBinDir=%__TestRootDir%\%__BuildOS%.%__BuildArch%.%__BuildType%"
 set "__TestIntermediatesDir=%__RootBinDir%\tests\obj\%__BuildOS%.%__BuildArch%.%__BuildType%"
 set "__CrossComponentBinDir=%__BinDir%"
+set "__CrossCompIntermediatesDir=%__IntermediatesDir%\crossgen"
+
 if NOT "%__CrossArch%" == "" set __CrossComponentBinDir=%__CrossComponentBinDir%\%__CrossArch%
+set "__CrossGenCoreLibLog=%__LogsDir%\CrossgenCoreLib_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
+set "__CrossgenExe=%__CrossComponentBinDir%\crossgen.exe"
 
 :: Generate path to be set for CMAKE_INSTALL_PREFIX to contain forward slash
 set "__CMakeBinDir=%__BinDir%"
 set "__CMakeBinDir=%__CMakeBinDir:\=/%"
 
-:: Configure environment if we are doing a clean build.
-if not defined __CleanBuild goto SkipCleanBuild
-echo %__MsgPrefix%Doing a clean build
-
-:: MSBuild projects would need a rebuild
-set __msbuildCleanBuildArgs=/t:rebuild
-
-:: Cleanup the previous output for the selected configuration
-if exist "%__BinDir%"               rd /s /q "%__BinDir%"
-if exist "%__IntermediatesDir%"     rd /s /q "%__IntermediatesDir%"
-if exist "%__LogsDir%"              del /f /q "%__LogsDir%\*_%__BuildOS%__%__BuildArch%__%__BuildType%.*"
-if exist "%__ProjectDir%\Tools"     rd /s /q "%__ProjectDir%\Tools"
-
-:SkipCleanBuild
-
 if not exist "%__BinDir%"           md "%__BinDir%"
 if not exist "%__IntermediatesDir%" md "%__IntermediatesDir%"
 if not exist "%__LogsDir%"          md "%__LogsDir%"
 
-:: CMake isn't a requirement when building CoreLib only
-if defined __CoreLibOnly goto CheckVS
-
-echo %__MsgPrefix%Checking prerequisites
-
-:: Validate that PowerShell is accessibile.
-for %%X in (powershell.exe) do (set __PSDir=%%~$PATH:X)
-if not defined __PSDir goto :NoPS
+echo %__MsgPrefix%Commencing CoreCLR Repo build
 
-:: Validate Powershell version
-set "PS_VERSION_LOG=%__LogsDir%\ps-version.log"
-powershell -NoProfile -ExecutionPolicy unrestricted -Command "$PSVersionTable.PSVersion.Major" > %PS_VERSION_LOG%
-set /P PS_VERSION=< %PS_VERSION_LOG%
-if %PS_VERSION% LEQ 2 (
-  goto :OldPS
-)
+:: Set the remaining variables based upon the determined build configuration
 
+echo %__MsgPrefix%Checking prerequisites
 :: Eval the output from probe-win1.ps1
 for /f "delims=" %%a in ('powershell -NoProfile -ExecutionPolicy RemoteSigned "& ""%__SourceDir%\pal\tools\probe-win.ps1"""') do %%a
 
-:CheckVS
-
-set __VSProductVersion=
-if /i "%__VSVersion%" == "vs2015" set __VSProductVersion=140
-
-:: Check presence of VS
-if not defined VS%__VSProductVersion%COMNTOOLS goto NoVS
-
-set __VSToolsRoot=!VS%__VSProductVersion%COMNTOOLS!
-if %__VSToolsRoot:~-1%==\ set "__VSToolsRoot=%__VSToolsRoot:~0,-1%"
-
-:: Does VS really exist?
-if not exist "%__VSToolsRoot%\..\IDE\devenv.exe"      goto NoVS
-if not exist "%__VSToolsRoot%\..\..\VC\vcvarsall.bat" goto NoVS
-if not exist "%__VSToolsRoot%\VsDevCmd.bat"           goto NoVS
-
-:MSBuild14
-set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"
-:CheckMSBuild14
-if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\14.0\Bin\MSBuild.exe"
-if not exist %_msbuildexe% echo %__MsgPrefix%Error: Could not find MSBuild.exe.  Please see https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/developer-guide.md for build instructions. && exit /b 1
-
-:: Note: We've disabled node reuse because it causes file locking issues.
-::       The issue is that we extend the build with our own targets which
-::       means that that rebuilding cannot successfully delete the task
-::       assembly. 
-set __msbuildCommonArgs=/nologo /nodeReuse:false %__msbuildCleanBuildArgs% %unprocessedBuildArgs% %__OfficialBuildIdArg%
-
-if not defined __BuildSequential (
-    set __msbuildCommonArgs=%__msbuildCommonArgs% /maxcpucount
-)
-if defined __SkipRestore (
-    set __msbuildCommonArgs=%__msbuildCommonArgs% /p:RestoreDuringBuild=false
-) 
-
-
 REM =========================================================================================
 REM ===
-REM === Restore Build Tools
+REM === Start the build steps
 REM ===
 REM =========================================================================================
-call %__ThisScriptPath%init-tools.cmd  
-if errorlevel 1 (
-  echo ERROR: Could not restore build tools.
-  exit /b 1
-)
+
+@call %~dp0run.cmd build -generateHeaderWindows -NativeVersionHeaderFile="%__RootBinDir%\obj\_version.h" %__RunArgs% %__UnprocessedBuildArgs% 
 
 REM =========================================================================================
 REM ===
-REM === Start the build steps
+REM === Build the CLR VM
 REM ===
 REM =========================================================================================
 
-:: Generate _version.h
-if exist "%__RootBinDir%\obj\_version.h" del "%__RootBinDir%\obj\_version.h"
-%_msbuildexe% "%__ProjectFilesDir%\build.proj" /t:GenerateVersionHeader /v:minimal /p:NativeVersionHeaderFile="%__RootBinDir%\obj\_version.h" /p:GenerateVersionHeader=true %__OfficialBuildIdArg%
-if defined __CoreLibOnly goto PerformCoreLibBuild
+if %__BuildNative% EQU 1 ( 
+    echo %__MsgPrefix%Commencing build of native components for %__BuildOS%.%__BuildArch%.%__BuildType%
 
-if defined __SkipNativeBuild (
-    echo %__MsgPrefix%Skipping native components build
-    goto SkipNativeBuild
-)
-
-echo %__MsgPrefix%Commencing build of native components for %__BuildOS%.%__BuildArch%.%__BuildType%
-
-REM Use setlocal to restrict environment changes form vcvarsall.bat and more to just this native components build section.
-setlocal EnableDelayedExpansion EnableExtensions
+	set nativePlatfromArgs=-platform=%__BuildArch%
+    if /i "%__BuildArch%" == "arm64" ( set nativePlatfromArgs=-useEnv )
 
-if /i "%__BuildArch%" == "arm64" ( 
-rem arm64 builds currently use private toolset which has not been released yet
-REM TODO, remove once the toolset is open.
-call :PrivateToolSet
+    set __MsbuildLog=/flp:Verbosity=normal;LogFile="%__LogsDir%\CoreCLR_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
+    set __MsbuildWrn=/flp1:WarningsOnly;LogFile="%__LogsDir%\CoreCLR_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn"
+    set __MsbuildErr=/flp2:ErrorsOnly;LogFile="%__LogsDir%\CoreCLR_%__BuildOS%__%__BuildArch%__%__BuildType%.err"
 
-goto GenVSSolution
-)
+    if /i "%__BuildArch%" == "arm64" ( 
+        rem arm64 builds currently use private toolset which has not been released yet
+        REM TODO, remove once the toolset is open.
+        call :PrivateToolSet
+        goto GenVSSolution
+    )
 
-:: Set the environment for the native build
-set __VCBuildArch=x86_amd64
-if /i "%__BuildArch%" == "x86" (set __VCBuildArch=x86)
-echo %__MsgPrefix%Using environment: "%__VSToolsRoot%\..\..\VC\vcvarsall.bat" %__VCBuildArch%
-call                                 "%__VSToolsRoot%\..\..\VC\vcvarsall.bat" %__VCBuildArch%
-@if defined __echo @echo on
-
-if not defined VSINSTALLDIR (
-    echo %__MsgPrefix%Error: VSINSTALLDIR variable not defined.
-    exit /b 1
-)
-if not exist "%VSINSTALLDIR%DIA SDK" goto NoDIA
+    :: Set the environment for the native build
+    set __VCBuildArch=x86_amd64
+    if /i "%__BuildArch%" == "x86" ( set __VCBuildArch=x86 )
+    echo %__MsgPrefix%Using environment: "%__VSToolsRoot%\..\..\VC\vcvarsall.bat" !__VCBuildArch!
+    call                                 "%__VSToolsRoot%\..\..\VC\vcvarsall.bat" !__VCBuildArch!
+	@if defined __echo @echo on
 
+    if not defined VSINSTALLDIR (
+        echo %__MsgPrefix%Error: VSINSTALLDIR variable not defined.
+        exit /b 1
+    )
+    if not exist "!VSINSTALLDIR!DIA SDK" goto NoDIA
 :GenVSSolution
+    if defined __SkipConfigure goto SkipConfigure
 
-if defined __SkipConfigure goto SkipConfigure
-
-echo %__MsgPrefix%Regenerating the Visual Studio solution
-
-pushd "%__IntermediatesDir%"
-call "%__SourceDir%\pal\tools\gen-buildsys-win.bat" "%__ProjectDir%" %__VSVersion% %__BuildArch% %__BuildJit32%
-@if defined __echo @echo on
-popd
+    echo %__MsgPrefix%Regenerating the Visual Studio solution
 
+    pushd "%__IntermediatesDir%"
+    call "%__SourceDir%\pal\tools\gen-buildsys-win.bat" "%__ProjectDir%" %__VSVersion% %__BuildArch% %__BuildJit32%
+	@if defined __echo @echo on
+    popd
 :SkipConfigure
+    if defined __ConfigureOnly goto SkipNativeBuild
 
-if not exist "%__IntermediatesDir%\install.vcxproj" (
-    echo %__MsgPrefix%Error: failed to generate native component build project!
-    exit /b 1
-)
-
-REM =========================================================================================
-REM ===
-REM === Build the CLR VM
-REM ===
-REM =========================================================================================
-
-if defined __ConfigureOnly goto SkipNativeBuild
-
-echo %__MsgPrefix%Invoking msbuild
-
-set "__BuildLog=%__LogsDir%\CoreCLR_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
-set "__BuildWrn=%__LogsDir%\CoreCLR_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn"
-set "__BuildErr=%__LogsDir%\CoreCLR_%__BuildOS%__%__BuildArch%__%__BuildType%.err"
-set __msbuildLogArgs=^
-/fileloggerparameters:Verbosity=normal;LogFile="%__BuildLog%" ^
-/fileloggerparameters1:WarningsOnly;LogFile="%__BuildWrn%" ^
-/fileloggerparameters2:ErrorsOnly;LogFile="%__BuildErr%" ^
-/consoleloggerparameters:Summary ^
-/verbosity:minimal
-
-set __msbuildArgs="%__IntermediatesDir%\install.vcxproj" %__msbuildCommonArgs% %__msbuildLogArgs% /p:Configuration=%__BuildType%
+    if not exist "%__IntermediatesDir%\install.vcxproj" (
+        echo %__MsgPrefix%Error: failed to generate native component build project!
+        exit /b 1
+    )
 
-if /i "%__BuildArch%" == "arm64" (  
-    REM TODO, remove once we have msbuild support for this platform.
-    set __msbuildArgs=%__msbuildArgs% /p:UseEnv=true
-) else (
-    set __msbuildArgs=%__msbuildArgs% /p:Platform=%__BuildArch%
-)
+    @call %~dp0run.cmd build -Project=%__IntermediatesDir%\install.vcxproj -MsBuildLog=!__MsbuildLog! -MsBuildWrn=!__MsbuildWrn! -MsBuildErr=!__MsbuildErr! -configuration=%__BuildType% %nativePlatfromArgs% %__RunArgs% %__UnprocessedBuildArgs%
 
-%_msbuildexe% %__msbuildArgs%
-if errorlevel 1 (
-    echo %__MsgPrefix%Error: native component build failed. Refer to the build log files for details:
-    echo     %__BuildLog%
-    echo     %__BuildWrn%
-    echo     %__BuildErr%
-    exit /b 1
+    if %errorlevel% == 1 (
+        echo %__MsgPrefix%Error: native component build failed. Refer to the build log files for details:
+        echo     "%__LogsDir%\CoreCLR_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
+        echo     "%__LogsDir%\CoreCLR_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn"
+        echo     "%__LogsDir%\CoreCLR_%__BuildOS%__%__BuildArch%__%__BuildType%.err"
+        exit /b 1
+    )   
 )
-
 :SkipNativeBuild
 
-REM endlocal to rid us of environment changes from vcvarsall.bat
-endlocal
-
 REM =========================================================================================
 REM ===
 REM === Build Cross-Architecture Native Components (if applicable)
@@ -391,227 +249,155 @@ REM ===
 REM =========================================================================================
 
 REM cross-arch build only enabled for arm64
-if "%__CrossArch%" == "" goto SkipCrossCompBuild
-
-echo %__MsgPrefix%Commencing build of cross architecture native components for %__BuildOS%.%__BuildArch%.%__BuildType%
-
-REM Use setlocal to restrict environment changes form vcvarsall.bat and more to just this native components build section.
-setlocal EnableDelayedExpansion EnableExtensions
-
-:: Set the environment for the native build
-set __VCBuildArch=x86_amd64
-if /i "%__CrossArch%" == "x86" (set __VCBuildArch=x86)
-call "%__VSToolsRoot%\..\..\VC\vcvarsall.bat" %__VCBuildArch%
-@if defined __echo @echo on
-
-set __CrossCompIntermediatesDir=%__IntermediatesDir%\crossgen
-if not exist "%__CrossCompIntermediatesDir%" md "%__CrossCompIntermediatesDir%"
-
-pushd "%__CrossCompIntermediatesDir%"
-
-set __CMakeBinDir=%__CrossComponentBinDir%
-set "__CMakeBinDir=%__CMakeBinDir:\=/%"
-set __ExtraCmakeArgs="-DCLR_CROSS_COMPONENTS_BUILD=1" "-DCLR_CMAKE_TARGET_ARCH=%__BuildArch%"
-call "%__SourceDir%\pal\tools\gen-buildsys-win.bat" "%__ProjectDir%" %__VSVersion% %__CrossArch% %__ExtraCmakeArgs%
-@if defined __echo @echo on
-popd
-
-if not exist "%__CrossCompIntermediatesDir%\install.vcxproj" (
-    echo %__MsgPrefix%Error: failed to generate cross-arch components build project!
-    exit /b 1
-)
 
-if defined __ConfigureOnly goto SkipCrossCompBuild
+if /i "%__BuildArch%"=="arm64" (
+
+    echo %__MsgPrefix%Commencing build of cross architecture native components for %__BuildOS%.%__BuildArch%.%__BuildType%
+
+    :: Set the environment for the native build
+    set __VCBuildArch=x86_amd64
+    if /i "%__CrossArch%" == "x86" ( set __VCBuildArch=x86 )
+    @call "%__VSToolsRoot%\..\..\VC\vcvarsall.bat" !__VCBuildArch!
+    @if defined __echo @echo on
+
+    if not exist "%__CrossCompIntermediatesDir%" md "%__CrossCompIntermediatesDir%"
+    if defined __SkipConfigure goto SkipConfigureCrossBuild
+
+    pushd "%__CrossCompIntermediatesDir%"
+    set __CMakeBinDir=%__CrossComponentBinDir%
+    set "__CMakeBinDir=%__CMakeBinDir:\=/%"
+    set __ExtraCmakeArgs="-DCLR_CROSS_COMPONENTS_BUILD=1" "-DCLR_CMAKE_TARGET_ARCH=%__BuildArch%"
+    call "%__SourceDir%\pal\tools\gen-buildsys-win.bat" "%__ProjectDir%" %__VSVersion% %__CrossArch% %__ExtraCmakeArgs%
+    @if defined __echo @echo on
+    popd
+:SkipConfigureCrossBuild
+    if not exist "%__CrossCompIntermediatesDir%\install.vcxproj" (
+        echo %__MsgPrefix%Error: failed to generate cross-arch components build project!
+        exit /b 1
+    )
 
-echo %__MsgPrefix%Invoking msbuild
+    if defined __ConfigureOnly goto SkipCrossCompBuild
 
-set "__BuildLog=%__LogsDir%\CrossComp_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
-set "__BuildWrn=%__LogsDir%\CrossComp_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn"
-set "__BuildErr=%__LogsDir%\CrossComp_%__BuildOS%__%__BuildArch%__%__BuildType%.err"
-set __msbuildLogArgs=^
-/fileloggerparameters:Verbosity=normal;LogFile="%__BuildLog%" ^
-/fileloggerparameters1:WarningsOnly;LogFile="%__BuildWrn%" ^
-/fileloggerparameters2:ErrorsOnly;LogFile="%__BuildErr%" ^
-/consoleloggerparameters:Summary ^
-/verbosity:minimal
+    echo %__MsgPrefix%Invoking msbuild
 
-set __msbuildArgs="%__CrossCompIntermediatesDir%\install.vcxproj" %__msbuildCommonArgs% %__msbuildLogArgs% /p:Configuration=%__BuildType% /p:Platform=%__CrossArch%
+    set __MsbuildLog=/flp:Verbosity=normal;LogFile="%__LogsDir%\Cross_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
+	set __MsbuildWrn=/flp1:WarningsOnly;LogFile="%__LogsDir%\Cross_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn"
+	set __MsbuildErr=/flp2:ErrorsOnly;LogFile="%__LogsDir%\Cross_%__BuildOS%__%__BuildArch%__%__BuildType%.err"
 
-%_msbuildexe% %__msbuildArgs%
-if errorlevel 1 (
-    echo %__MsgPrefix%Error: cross-arch components build failed. Refer to the build log files for details:
-    echo     %__BuildLog%
-    echo     %__BuildWrn%
-    echo     %__BuildErr%
-    exit /b 1
+    @call %~dp0run.cmd build -Project=%__CrossCompIntermediatesDir%\install.vcxproj -configuration=%__BuildType% -platform=%__CrossArch% -MsBuildLog=!__MsbuildLog! -MsBuildWrn=!__MsbuildWrn! -MsBuildErr=!__MsbuildErr! %__RunArgs% %__UnprocessedBuildArgs%
+    if %errorlevel% == 1 (
+        echo %__MsgPrefix%Error: cross-arch components build failed. Refer to the build log files for details:
+        echo     "%__LogsDir%\Cross_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
+        echo     "%__LogsDir%\Cross_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn"
+        echo     "%__LogsDir%\Cross_%__BuildOS%__%__BuildArch%__%__BuildType%.err"
+        exit /b 1
+    )    
 )
 
-REM endlocal to rid us of environment changes from vcvarsall.bat
-endlocal
-
 :SkipCrossCompBuild
-
 REM =========================================================================================
 REM ===
 REM === CoreLib and NuGet package build section.
 REM ===
 REM =========================================================================================
 
-:PerformCoreLibBuild
-
-REM setlocal to prepare for vsdevcmd.bat
-setlocal EnableDelayedExpansion EnableExtensions
-
-rem Explicitly set Platform causes conflicts in CoreLib project files. Clear it to allow building from VS x64 Native Tools Command Prompt
-set Platform=
-
-:: Set the environment for the managed build
-echo %__MsgPrefix%Using environment: "%__VSToolsRoot%\VsDevCmd.bat"
-call                                 "%__VSToolsRoot%\VsDevCmd.bat"
-
-if defined __SkipCoreLibBuild (
-    echo %__MsgPrefix%Skipping System.Private.CoreLib build
-    goto SkipCoreLibBuild
-)
-
-echo %__MsgPrefix%Commencing build of System.Private.CoreLib for %__BuildOS%.%__BuildArch%.%__BuildType%
-
-set "__BuildLog=%__LogsDir%\System.Private.CoreLib_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
-set "__BuildWrn=%__LogsDir%\System.Private.CoreLib_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn"
-set "__BuildErr=%__LogsDir%\System.Private.CoreLib_%__BuildOS%__%__BuildArch%__%__BuildType%.err"
-set __msbuildLogArgs=^
-/fileloggerparameters:Verbosity=normal;LogFile="%__BuildLog%" ^
-/fileloggerparameters1:WarningsOnly;LogFile="%__BuildWrn%" ^
-/fileloggerparameters2:ErrorsOnly;LogFile="%__BuildErr%" ^
-/consoleloggerparameters:Summary ^
-/verbosity:minimal
-
-set __msbuildArgs="%__ProjectFilesDir%\build.proj" %__msbuildCommonArgs% %__msbuildLogArgs% %__SignTypeReal%
-
-set __BuildNugetPackage=true
-if defined __CoreLibOnly       set __BuildNugetPackage=false
-if /i "%__BuildArch%" =="arm64" set __BuildNugetPackage=false
-if %__BuildNugetPackage%==false set __msbuildArgs=%__msbuildArgs% /p:BuildNugetPackage=false
-
-%_msbuildexe% %__msbuildArgs%
-if errorlevel 1 (
-    echo %__MsgPrefix%Error: System.Private.CoreLib build failed. Refer to the build log files for details:
-    echo     %__BuildLog%
-    echo     %__BuildWrn%
-    echo     %__BuildErr%
-    type     %__BuildErr%
-    exit /b 1
+if %__BuildCoreLib% EQU 1 (  
+	
+	echo %__MsgPrefix%Commencing build of System.Private.CoreLib for %__BuildOS%.%__BuildArch%.%__BuildType%
+    rem Explicitly set Platform causes conflicts in CoreLib project files. Clear it to allow building from VS x64 Native Tools Command Prompt
+    set Platform=
+
+    :: Set the environment for the managed build
+    echo %__MsgPrefix%Using environment: "%__VSToolsRoot%\VsDevCmd.bat"
+    call                                 "%__VSToolsRoot%\VsDevCmd.bat"
+
+    set __MsbuildLog=/flp:Verbosity=normal;LogFile="%__LogsDir%\System.Private.CoreLib_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
+	set __MsbuildWrn=/flp1:WarningsOnly;LogFile="%__LogsDir%\System.Private.CoreLib_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn"
+	set __MsbuildErr=/flp2:ErrorsOnly;LogFile="%__LogsDir%\System.Private.CoreLib_%__BuildOS%__%__BuildArch%__%__BuildType%.err"
+
+    if /i "%__BuildArch%" == "arm64" (
+		set __nugetBuildArgs=-buildNugetPackage=false
+    ) else if "%__SkipNugetPackage%" == "1" (
+		set __nugetBuildArgs=-buildNugetPackage=false
+    ) else (
+		set __nugetBuildArgs=-buildNugetPackage=true
+	)
+
+    @call %~dp0run.cmd build -buildCoreLib -MsBuildLog=!__MsbuildLog! -MsBuildWrn=!__MsbuildWrn! -MsBuildErr=!__MsbuildErr! %__RunArgs% %__UnprocessedBuildArgs% !__nugetBuildArgs!
+    if %errorlevel% == 1 (
+        echo %__MsgPrefix%Error: System.Private.CoreLib build failed. Refer to the build log files for details:
+        echo     "%__LogsDir%\System.Private.CoreLib_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
+        echo     "%__LogsDir%\System.Private.CoreLib_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn"
+        echo     "%__LogsDir%\System.Private.CoreLib_%__BuildOS%__%__BuildArch%__%__BuildType%.err"
+        exit /b 1
+    )
 )
 
-if defined __CoreLibOnly (
-    echo %__MsgPrefix%System.Private.CoreLib successfully built.
-    if not defined __CoreLibAlsoNativeImage (
-        exit /b 0
+if %__BuildNativeCoreLib% EQU 1 (
+    echo %__MsgPrefix%Generating native image of System.Private.CoreLib for %__BuildOS%.%__BuildArch%.%__BuildType%
+	
+    echo "%__CrossgenExe%" /Platform_Assemblies_Paths "%__BinDir%" /out "%__BinDir%\System.Private.CoreLib.ni.dll" "%__BinDir%\System.Private.CoreLib.dll"
+    "%__CrossgenExe%" /Platform_Assemblies_Paths "%__BinDir%" /out "%__BinDir%\System.Private.CoreLib.ni.dll" "%__BinDir%\System.Private.CoreLib.dll" > "%__CrossGenCoreLibLog%" 2>&1
+    if NOT %errorlevel% == 0 (
+        echo %__MsgPrefix%Error: CrossGen System.Private.CoreLib build failed. Refer to the build log file for details:
+        echo     %__CrossGenCoreLibLog%
+        exit /b 1
     )
-)
 
-echo %__MsgPrefix%Generating native image of System.Private.CoreLib for %__BuildOS%.%__BuildArch%.%__BuildType%
+    echo %__MsgPrefix%Generating native image of MScorlib facade for %__BuildOS%.%__BuildArch%.%__BuildType%
 
-set "__CrossGenCoreLibLog=%__LogsDir%\CrossgenCoreLib_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
-set "__CrossgenExe=%__CrossComponentBinDir%\crossgen.exe"
-"%__CrossgenExe%" /Platform_Assemblies_Paths "%__BinDir%" /out "%__BinDir%\System.Private.CoreLib.ni.dll" "%__BinDir%\System.Private.CoreLib.dll" > "%__CrossGenCoreLibLog%" 2>&1
-if NOT %errorlevel% == 0 (
-    echo %__MsgPrefix%Error: CrossGen System.Private.CoreLib build failed. Refer to the build log file for details:
-    echo     %__CrossGenCoreLibLog%
-    type     %__CrossGenCoreLibLog%
-    exit /b 1
+    set "__CrossGenCoreLibLog=%__LogsDir%\CrossgenMSCoreLib_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
+    set "__CrossgenExe=%__CrossComponentBinDir%\crossgen.exe"
+    "%__CrossgenExe%" /Platform_Assemblies_Paths "%__BinDir%" /out "%__BinDir%\mscorlib.ni.dll" "%__BinDir%\mscorlib.dll" > "%__CrossGenCoreLibLog%" 2>&1
+    if NOT %errorlevel% == 0 (
+        echo %__MsgPrefix%Error: CrossGen mscorlib facade build failed. Refer to the build log file for details:
+        echo     %__CrossGenCoreLibLog%
+        exit /b 1
+    )
 )
 
-echo %__MsgPrefix%Generating native image of MScorlib facade for %__BuildOS%.%__BuildArch%.%__BuildType%
+if %__BuildPackages% EQU 1 (
 
-set "__CrossGenCoreLibLog=%__LogsDir%\CrossgenMSCoreLib_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
-set "__CrossgenExe=%__CrossComponentBinDir%\crossgen.exe"
-"%__CrossgenExe%" /Platform_Assemblies_Paths "%__BinDir%" /out "%__BinDir%\mscorlib.ni.dll" "%__BinDir%\mscorlib.dll" > "%__CrossGenCoreLibLog%" 2>&1
-if NOT %errorlevel% == 0 (
-    echo %__MsgPrefix%Error: CrossGen mscorlib facade build failed. Refer to the build log file for details:
-    echo     %__CrossGenCoreLibLog%
-    type     %__CrossGenCoreLibLog%
-    exit /b 1
-)
+    set __MsbuildLog=/flp:Verbosity=normal;LogFile="%__LogsDir%\Nuget_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
+	set __MsbuildWrn=/flp1:WarningsOnly;LogFile="%__LogsDir%\Nuget_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn"
+	set __MsbuildErr=/flp2:ErrorsOnly;LogFile="%__LogsDir%\Nuget_%__BuildOS%__%__BuildArch%__%__BuildType%.err"
 
-if defined __CoreLibAlsoNativeImage (
-    exit /b 0
-)
+    REM The conditions as to what to build are captured in the builds file.
+    @call %~dp0run.cmd build -buildPackages -platform=%__BuildArch% -MsBuildLog=!__MsbuildLog! -MsBuildWrn=!__MsbuildWrn! -MsBuildErr=!__MsbuildErr! %__RunArgs% %__UnprocessedBuildArgs%
 
-:SkipCoreLibBuild
-
-:GenerateNuget
-if /i "%__SkipBuildPackages%" == "1" goto :SkipNuget
-
-set "__BuildLog=%__LogsDir%\Nuget_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
-set "__BuildWrn=%__LogsDir%\Nuget_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn"
-set "__BuildErr=%__LogsDir%\Nuget_%__BuildOS%__%__BuildArch%__%__BuildType%.err"
-set __msbuildLogArgs=^
-/fileloggerparameters:Verbosity=normal;LogFile="%__BuildLog%" ^
-/fileloggerparameters1:WarningsOnly;LogFile="%__BuildWrn%" ^
-/fileloggerparameters2:ErrorsOnly;LogFile="%__BuildErr%" ^
-/consoleloggerparameters:Summary ^
-/verbosity:minimal
-
-REM The conditions as to what to build are captured in the builds file.
-set __msbuildArgs="%__ProjectFilesDir%\src\.nuget\packages.builds" /p:Platform=%__BuildArch%
-%_msbuildexe% !__msbuildArgs! %__msbuildLogArgs%
-if errorlevel 1 (
-    echo %__MsgPrefix%Error: Nuget package generation failed build failed. Refer to the build log files for details:
-    echo     %__BuildLog%
-    echo     %__BuildWrn%
-    echo     %__BuildErr%
-    exit /b 1
+    if %errorlevel% == 1 (
+        echo %__MsgPrefix%Error: Nuget package generation failed build failed. Refer to the build log files for details:
+        echo     "%__LogsDir%\Nuget_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
+        echo     "%__LogsDir%\Nuget_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn"
+        echo     "%__LogsDir%\Nuget_%__BuildOS%__%__BuildArch%__%__BuildType%.err"
+        exit /b 1
+    )
 )
 
-
-:SkipNuget
-
-REM endlocal to rid us of environment changes from vsdevenv.bat
-endlocal
-
 REM =========================================================================================
 REM ===
 REM === Test build section
 REM ===
 REM =========================================================================================
 
-if defined __SkipTestBuild (
-    echo %__MsgPrefix%Skipping test build
-    goto SkipTestBuild
-)
-
-echo %__MsgPrefix%Commencing build of tests for %__BuildOS%.%__BuildArch%.%__BuildType%
+if %__BuildTests% EQU 1 (
+    echo %__MsgPrefix%Commencing build of tests for %__BuildOS%.%__BuildArch%.%__BuildType%
 
-REM Construct the arguments to pass to the test build script.
+    REM Construct the arguments to pass to the test build script.
 
-set __BuildtestArgs=%__BuildArch% %__BuildType% %__VSVersion%
+    rem arm64 builds currently use private toolset which has not been released yet
+    REM TODO, remove once the toolset is open.
+    if /i "%__BuildArch%" == "arm64" call :PrivateToolSet 
 
-if defined __CleanBuild (
-    set "__BuildtestArgs=%__BuildtestArgs% clean"
-)
-
-if defined __BuildSequential (
-    set "__BuildtestArgs=%__BuildtestArgs% sequential"
-)
+    echo "%__ProjectDir%\build-test.cmd %__BuildArch% %__BuildType% %__UnprocessedBuildArgs%"
+    @call %__ProjectDir%\build-test.cmd %__BuildArch% %__BuildType% %__UnprocessedBuildArgs%
 
-if defined __TestPriority (
-    set "__BuildtestArgs=%__BuildtestArgs% Priority %__TestPriority%"
-)
-
-rem arm64 builds currently use private toolset which has not been released yet
-REM TODO, remove once the toolset is open.
-if /i "%__BuildArch%" == "arm64" call :PrivateToolSet 
-
-call %__ProjectDir%\tests\buildtest.cmd %__BuildtestArgs%
-
-if errorlevel 1 (
-    REM buildtest.cmd has already emitted an error message and mentioned the build log file to examine.
-    exit /b 1
+    if %errorlevel% == 1 (
+        REM buildtest.cmd has already emitted an error message and mentioned the build log file to examine.
+        exit /b 1
+    )
 )
 
-:SkipTestBuild
-
 REM =========================================================================================
 REM ===
 REM === All builds complete!
@@ -620,7 +406,7 @@ REM ============================================================================
 
 echo %__MsgPrefix%Repo successfully built.
 echo %__MsgPrefix%Product binaries are available at !__BinDir!
-if not defined __SkipTestBuild (
+if %__BuildTests% EQU 1 (
     echo %__MsgPrefix%Test binaries are available at !__TestBinDir!
 )
 exit /b 0
@@ -692,7 +478,7 @@ set __BuildType=%2
 set __NextCmd=call %__ThisScriptFull% %__BuildArch% %__BuildType% %__PassThroughArgs%
 echo %__MsgPrefix%Invoking: %__NextCmd%
 %__NextCmd%
-if errorlevel 1 (
+if %errorlevel% == 1 (
     echo %__MsgPrefix%    %__BuildArch% %__BuildType% %__PassThroughArgs% >> %__BuildResultFile%
     set __AllBuildSuccess=false
 )
@@ -709,36 +495,36 @@ echo.
 echo Build the CoreCLR repo.
 echo.
 echo Usage:
-echo     %__ThisScriptShort% [option1] [option2] ...
+echo     build.cmd [option1] [option2]
 echo or:
-echo     %__ThisScriptShort% all [option1] [option2] ...
+echo     build.cmd all [option1] [option2] -- ...
 echo.
 echo All arguments are optional. The options are:
 echo.
-echo./? -? /h -h /help -help: view this message.
+echo.-? -h -help: view this message.
+echo all: Builds all configurations and platforms.
 echo Build architecture: one of x64, x86, arm, arm64 ^(default: x64^).
 echo Build type: one of Debug, Checked, Release ^(default: Debug^).
-echo Visual Studio version: ^(default: VS2015^).
-echo clean: force a clean build ^(default is to perform an incremental build^).
-echo msbuildargs ... : all arguments following this tag will be passed directly to msbuild.
+echo -- ... : all arguments following this tag will be passed directly to msbuild.
 echo mscorlib version: one of freebsdmscorlib, linuxmscorlib, netbsdmscorlib, osxmscorlib,
 echo     or windowsmscorlib. If one of these is passed, only System.Private.CoreLib is built,
 echo     for the specified platform ^(FreeBSD, Linux, NetBSD, OS X or Windows,
 echo     respectively^).
 echo     add nativemscorlib to go further and build the native image for designated mscorlib.
-echo priority ^<N^> : specify a set of test that will be built and run, with priority N.
-echo sequential: force a non-parallel build ^(default is to build in parallel
-echo     using all processors^).
+echo toolset_dir ^<dir^> : set the toolset directory -- Arm64 use only. Required for Arm64 builds.
 echo configureonly: skip all builds; only run CMake ^(default: CMake and builds are run^)
 echo skipconfigure: skip CMake ^(default: CMake is run^)
 echo skipmscorlib: skip building System.Private.CoreLib ^(default: System.Private.CoreLib is built^).
 echo skipnative: skip building native components ^(default: native components are built^).
 echo skiptests: skip building tests ^(default: tests are built^).
-echo skiprestore: skip restoring packages ^(default: packages are restored during build^).
 echo skipbuildpackages: skip building nuget packages ^(default: packages are built^).
-echo disableoss: Disable Open Source Signing for System.Private.CoreLib.
-echo toolset_dir ^<dir^> : set the toolset directory -- Arm64 use only. Required for Arm64 builds.
-echo officialbuildid ^<ID^>: specify the official build ID to be used by this build.
+echo -skiprestore: skip restoring packages ^(default: packages are restored during build^).
+echo -disableoss: Disable Open Source Signing for System.Private.CoreLib.
+echo -priority=^<N^> : specify a set of test that will be built and run, with priority N.
+echo -sequential: force a non-parallel build ^(default is to build in parallel
+echo     using all processors^).
+echo -officialbuildid=^<ID^>: specify the official build ID to be used by this build.
+echo -Rebuild: force a clean build ^(default is to perform an incremental build^).
 echo.
 echo If "all" is specified, then all build architectures and types are built. If, in addition,
 echo one or more build architectures or types is specified, then only those build architectures
@@ -753,23 +539,6 @@ echo     build all x64 x86 Checked Release
 echo        -- builds x64 and x86 architectures, Checked and Release build types for each
 exit /b 1
 
-:NoPS
-echo PowerShell v3.0 or later is a prerequisite to build this repository, but it is not accessible.
-echo Ensure that it is defined in the PATH environment variable.
-echo Typically it should be %%SYSTEMROOT%%\System32\WindowsPowerShell\v1.0\.
-exit /b 1
-
-:OldPS
-echo PowerShell v3.0 or later is a prerequisite to build this repository.
-echo See: https://github.com/dotnet/coreclr/blob/master/Documentation/building/windows-instructions.md
-echo Download via https://www.microsoft.com/en-us/download/details.aspx?id=40855
-exit /b 1
-
-:NoVS
-echo Visual Studio 2015+ ^(Community is free^) is a prerequisite to build this repository.
-echo See: https://github.com/dotnet/coreclr/blob/master/Documentation/building/windows-instructions.md
-exit /b 1
-
 :NoDIA
 echo Error: DIA SDK is missing at "%VSINSTALLDIR%DIA SDK". ^
 This is due to a bug in the Visual Studio installer. It does not install DIA SDK at "%VSINSTALLDIR%" but rather ^