From ac46ec7451b00c8bae6c4f8562e3660936ed6642 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Tue, 27 Feb 2018 16:05:47 -0800
Subject: [PATCH 1/4] Remove 'Add-AppveyorCompilationMessage' from
 'Start-NativeExecution'

---
 build.psm1 | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/build.psm1 b/build.psm1
index 7e0940776bf..80424229aec 100644
--- a/build.psm1
+++ b/build.psm1
@@ -2076,12 +2076,6 @@ function script:Start-NativeExecution
                 $callerLine = $callerLocationParts[1]
 
                 $errorMessage = "Execution of {$sb} by ${callerFile}: line $callerLine failed with exit code $LASTEXITCODE"
-
-                if ($null -ne $env:CI)
-                {
-                   Add-AppveyorCompilationMessage $errorMessage -Category Error -FileName $callerFile -Line $callerLine
-                }
-
                 throw $errorMessage
             }
             throw "Execution of {$sb} failed with exit code $LASTEXITCODE"

From f8242f06732404cd7b6512024df6af52d3f9db4a Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 28 Feb 2018 08:56:20 -0800
Subject: [PATCH 2/4] Attemp to fix the mac build

---
 build.psm1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.psm1 b/build.psm1
index 80424229aec..2f363ab0ff2 100644
--- a/build.psm1
+++ b/build.psm1
@@ -536,6 +536,7 @@ Fix steps:
             $RestoreArguments += "quiet"
         }
 
+        Start-NativeExecution { dotnet nuget locals all --clear }
         ($srcProjectDirs + $testProjectDirs) | ForEach-Object {
             log "Run dotnet restore $_ $RestoreArguments"
             Start-NativeExecution { dotnet restore $_ $RestoreArguments }

From bd330e298c1268a2b8fe9d0d644c33cd1d5af805 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 28 Feb 2018 09:42:43 -0800
Subject: [PATCH 3/4] Increase cache.push timeout to 20 mins temorarily

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b84708f21af..6ca73fb8629 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,7 +61,7 @@ env:
 
 # timeout uploading cache after 6 minutes (360 seconds)
 cache:
-  timeout: 360
+  timeout: 1200
   directories:
     - $HOME/.nuget
     - $HOME/.dotnet

From 58f6188d465ce7205f70f984c26de4638305ab27 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 28 Feb 2018 12:19:14 -0800
Subject: [PATCH 4/4] Remove temporary changes

---
 .travis.yml | 2 +-
 build.psm1  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6ca73fb8629..b84708f21af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,7 +61,7 @@ env:
 
 # timeout uploading cache after 6 minutes (360 seconds)
 cache:
-  timeout: 1200
+  timeout: 360
   directories:
     - $HOME/.nuget
     - $HOME/.dotnet
diff --git a/build.psm1 b/build.psm1
index 2f363ab0ff2..80424229aec 100644
--- a/build.psm1
+++ b/build.psm1
@@ -536,7 +536,6 @@ Fix steps:
             $RestoreArguments += "quiet"
         }
 
-        Start-NativeExecution { dotnet nuget locals all --clear }
         ($srcProjectDirs + $testProjectDirs) | ForEach-Object {
             log "Run dotnet restore $_ $RestoreArguments"
             Start-NativeExecution { dotnet restore $_ $RestoreArguments }