Respond to PR feedback.

4 files changed, 10 insertions, 9 deletions

diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt
index f03b16e558..f2d38c8ce7 100644
--- a/BuildToolsVersion.txt
+++ b/BuildToolsVersion.txt
@@ -1 +1 @@
-1.0.26-prerelease-00625-01
+1.0.26-prerelease-00629-09
diff --git a/build-packages.sh b/build-packages.sh
index b4dcaa884b..ce27dd556e 100755
--- a/build-packages.sh
+++ b/build-packages.sh
@@ -37,28 +37,28 @@ done
 $__ProjectRoot/run.sh build-packages -Project=$__ProjectRoot/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds -DistroRid=\${OSRid}-$__Arch -UseSharedCompilation=false -BuildNugetPackage=false $unprocessedBuildArgs
 if [ $? -ne 0 ]
 then
-    echo "ERROR: An error occurred while syncing packages; See build-packages.log for more details."
+    echo "ERROR: An error occurred while building packages; See build-packages.log for more details."
     exit 1
 fi
 
 $__ProjectRoot/run.sh build-packages -Project=$__ProjectRoot/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds -DistroRid=\${OSRid}-$__Arch -UseSharedCompilation=false -BuildNugetPackage=false $unprocessedBuildArgs
 if [ $? -ne 0 ]
 then
-    echo "ERROR: An error occurred while syncing packages; See build-packages.log for more details."
+    echo "ERROR: An error occurred while building packages; See build-packages.log for more details."
     exit 1
 fi
 
 $__ProjectRoot/run.sh build-packages -Project=$__ProjectRoot/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds -DistroRid=\${OSRid}-$__Arch -UseSharedCompilation=false -BuildNugetPackage=false $unprocessedBuildArgs
 if [ $? -ne 0 ]
 then
-    echo "ERROR: An error occurred while syncing packages; See build-packages.log for more details."
+    echo "ERROR: An error occurred while building packages; See build-packages.log for more details."
     exit 1
 fi
 
 $__ProjectRoot/run.sh build-packages -Project=$__ProjectRoot/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds -DistroRid=\${OSRid}-$__Arch -UseSharedCompilation=false -BuildNugetPackage=false $unprocessedBuildArgs
 if [ $? -ne 0 ]
 then
-    echo "ERROR: An error occurred while syncing packages; See build-packages.log for more details."
+    echo "ERROR: An error occurred while building packages; See build-packages.log for more details."
     exit 1
 fi
 
diff --git a/build.cmd b/build.cmd
index 413f855f10..62d7c2dfc6 100644
--- a/build.cmd
+++ b/build.cmd
@@ -312,8 +312,8 @@ if %__BuildCoreLib% EQU 1 (
     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"
+    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
diff --git a/build.sh b/build.sh
index 0e10b2cbcb..371ceb5868 100755
--- a/build.sh
+++ b/build.sh
@@ -44,7 +44,6 @@ usage()
     echo "verbose - optional argument to enable verbose build output."
     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."
@@ -174,10 +173,12 @@ build_coreclr()
         # Regenerate the CMake solution
         echo "Invoking \"$__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh\" \"$__ProjectRoot\" $__ClangMajorVersion $__ClangMinorVersion $__BuildArch $__BuildType $__CodeCoverage $__IncludeTests $generator $__cmakeargs"
         "$__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh" "$__ProjectRoot" $__ClangMajorVersion $__ClangMinorVersion $__BuildArch $__BuildType $__CodeCoverage $__IncludeTests $generator "$__cmakeargs"
+        popd
     fi
 
     # Check that the makefiles were created.
-
+    pushd "$__IntermediatesDir"
+    
     if [ ! -f "$__IntermediatesDir/$buildFile" ]; then
         echo "Failed to generate native component build project!"
         exit 1