From 669d61606d89949f43093cf5986c4991914f215a Mon Sep 17 00:00:00 2001
From: Vance Morrison <vancem@microsoft.com>
Date: Fri, 7 Oct 2016 23:18:11 -0700
Subject: [PATCH] Fix _echo to be uniform (_echo just needs to be defined for
 it to be on). (#12475)

---
 build.cmd                   | 4 ++--
 clean.cmd                   | 4 ++--
 init-tools.cmd              | 4 ++--
 run-test.cmd                | 2 +-
 run.cmd                     | 4 ++--
 src/Native/build-native.cmd | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.cmd b/build.cmd
index 56a83b291896..5f22be79c1ef 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,4 +1,4 @@
-@if "%_echo%" neq "on" echo off
+@if not defined _echo @echo off
 setlocal
 
 if /I [%1] == [-?] goto Usage
@@ -23,4 +23,4 @@ echo For more information: "https://github.com/dotnet/corefx/blob/master/Documen
 echo ----------------------------------------------------------------------------
 echo.
 echo.
-goto :Build
\ No newline at end of file
+goto :Build
diff --git a/clean.cmd b/clean.cmd
index 15932da7e53c..90c62f53eabc 100644
--- a/clean.cmd
+++ b/clean.cmd
@@ -1,4 +1,4 @@
-@if "%_echo%" neq "on" echo off
+@if not defined _echo @echo off
 setlocal EnableDelayedExpansion
 
 echo Stop VBCSCompiler.exe execution.
@@ -31,4 +31,4 @@ echo     -all   - Combines all of the above.
 echo.
 echo If no option is specified then clean.cmd -b is implied.
 
-exit /b 1
\ No newline at end of file
+exit /b 1
diff --git a/init-tools.cmd b/init-tools.cmd
index 7d5be5ee16aa..c0bf6707c91b 100644
--- a/init-tools.cmd
+++ b/init-tools.cmd
@@ -1,4 +1,4 @@
-@if "%_echo%" neq "on" echo off
+@if not defined _echo @echo off
 setlocal
 
 set INIT_TOOLS_LOG=%~dp0init-tools.log
@@ -80,4 +80,4 @@ if %UPDATE_CLI_ERRORLEVEL% GTR 1 (
 :: Create sempahore file
 echo Done initializing tools.
 echo Init-Tools.cmd completed for BuildTools Version: %BUILDTOOLS_VERSION% > "%BUILD_TOOLS_SEMAPHORE%"
-exit /b 0
\ No newline at end of file
+exit /b 0
diff --git a/run-test.cmd b/run-test.cmd
index 59b3d0491f87..243dd8e14b79 100644
--- a/run-test.cmd
+++ b/run-test.cmd
@@ -1,4 +1,4 @@
-@if "%_echo%" neq "on" echo off
+@if not defined _echo @echo off
 
 :: To run tests outside of MSBuild.exe
 :: %1 is the path to the tests\<OSConfig> folder
diff --git a/run.cmd b/run.cmd
index a0ddf00d9d16..1b0ab1a96add 100644
--- a/run.cmd
+++ b/run.cmd
@@ -1,4 +1,4 @@
-@if "%_echo%" neq "on" echo off
+@if not defined _echo @echo off
 setlocal
 
 if not defined VisualStudioVersion (
@@ -24,4 +24,4 @@ set _toolRuntime=%~dp0Tools
 set _dotnet=%_toolRuntime%\dotnetcli\dotnet.exe
 
 call %_dotnet% %_toolRuntime%\run.exe %*
-exit /b %ERRORLEVEL%
\ No newline at end of file
+exit /b %ERRORLEVEL%
diff --git a/src/Native/build-native.cmd b/src/Native/build-native.cmd
index abc4a5b4c229..85bdcd26700f 100644
--- a/src/Native/build-native.cmd
+++ b/src/Native/build-native.cmd
@@ -1,4 +1,4 @@
-@if "%_echo%" neq "on" echo off
+@if not defined _echo @echo off
 setlocal
 
 :SetupArgs