From bc6f7937ee44054d9692d992bc5fd1990a032c94 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Wed, 7 Nov 2018 23:20:01 -0800
Subject: [PATCH] Attempt to disable pretty print control codes for CI

---
 build.sh            | 3 +++
 eng/_prettyprint.sh | 2 +-
 eng/build.yml       | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 07d6c9911..01aab3a14 100755
--- a/build.sh
+++ b/build.sh
@@ -34,6 +34,9 @@ while [[ $# > 0 ]]; do
             export DOCKER_IMAGENAME=$2
             shift
             ;;
+        --noprettyprint)
+            export DOTNET_CORESDK_NOPRETTYPRINT=1
+            ;;
         *)
             args="$args $1"
             ;;
diff --git a/eng/_prettyprint.sh b/eng/_prettyprint.sh
index 39ae58d4e..a77002dd5 100644
--- a/eng/_prettyprint.sh
+++ b/eng/_prettyprint.sh
@@ -5,7 +5,7 @@
 #
 
 # Detect build servers
-if [[ ! -z "$JENKINS_URL" || ! -z "$BUILD_BUILDID" ]]; then
+if [[ ! -z "$JENKINS_URL" || ! -z "$BUILD_BUILDID" || ! -z "$DOTNET_CORESDK_NOPRETTYPRINT" ]]; then
     # Jenkins or VSO build, disable colors because they make things gross.
     NO_COLOR=1
 fi
diff --git a/eng/build.yml b/eng/build.yml
index e8c72b9c5..f211779ce 100644
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -37,6 +37,7 @@ phases:
     - ${{ if eq(parameters.agentOs, 'Linux') }}:
       - script: ./build.sh
                   --test --pack --publish
+                  --noprettyprint
                   --configuration $(BuildConfig)
                   $(DockerParameter)
                   --architecture $(BuildArchitecture)
@@ -49,6 +50,7 @@ phases:
     - ${{ if eq(parameters.agentOs, 'Darwin') }}:
       - script: ./build.sh
                   --test --pack --publish
+                  --noprettyprint
                   --configuration $(BuildConfig)
         displayName: Build