From 98d8b9ab4a00014029d72fa5ecaa1ae10288297f Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Thu, 4 Apr 2019 20:39:52 +0200
Subject: [PATCH] [Infrastructure] Retry yarn install on failure (#9068)

* [Infrastructure] Retry yarn install on failure
---
 eng/targets/Npm.Common.targets                             | 7 ++++++-
 .../src/Microsoft.AspNetCore.NodeServices.csproj           | 7 ++++++-
 .../src/Microsoft.AspNetCore.SpaServices.csproj            | 7 ++++++-
 src/Shared/E2ETesting/E2ETesting.targets                   | 7 ++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets
index 4138c08933..e9b43744bd 100644
--- a/eng/targets/Npm.Common.targets
+++ b/eng/targets/Npm.Common.targets
@@ -18,7 +18,12 @@
 
   <Target Name="Restore">
     <Message Importance="High" Text="Running yarn install on $(MSBuildProjectFullPath)" />
-    <Yarn Command="install $(InstallArgs)" />
+    <Yarn Command="install $(InstallArgs)" ContinueOnError="true">
+      <Output TaskParameter="ExitCode" PropertyName="_YarnExitCode"/>
+    </Yarn>
+    <Yarn Command="install $(InstallArgs)" Condition="'$(_YarnExitCode)' != '0'">
+      <Output TaskParameter="ExitCode" PropertyName="_YarnExitCode"/>
+    </Yarn>
   </Target>
 
   <Target Name="PrepareForBuild">
diff --git a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj
index 3387ae5cdc..72b68ba13e 100644
--- a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj
+++ b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj
@@ -21,7 +21,12 @@
 
   <Target Name="YarnInstall">
     <Message Text="Running yarn install on $(MSBuildProjectFile)" Importance="High" />
-    <Yarn Command="install" />
+    <Yarn Command="install" ContinueOnError="true">
+      <Output TaskParameter="ExitCode" PropertyName="_YarnExitCode"/>
+    </Yarn>
+    <Yarn Command="install" Condition="'$(_YarnExitCode)' != '0'">
+      <Output TaskParameter="ExitCode" PropertyName="_YarnExitCode"/>
+    </Yarn>
   </Target>
 
   <Target Name="PrepublishScript" DependsOnTargets="YarnInstall" BeforeTargets="PrepareForPublish" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
diff --git a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj
index 3a165db8c5..6a1e5fce3f 100644
--- a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj
+++ b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj
@@ -25,7 +25,12 @@
 
   <Target Name="YarnInstall">
     <Message Text="Running yarn install on $(MSBuildProjectFile)" Importance="High" />
-    <Yarn Command="install" />
+    <Yarn Command="install" ContinueOnError="true">
+      <Output TaskParameter="ExitCode" PropertyName="_YarnExitCode"/>
+    </Yarn>
+    <Yarn Command="install" Condition="'$(_YarnExitCode)' != '0'">
+      <Output TaskParameter="ExitCode" PropertyName="_YarnExitCode"/>
+    </Yarn>
   </Target>
 
   <Target Name="PrepublishScript" DependsOnTargets="YarnInstall" BeforeTargets="PrepareForPublish" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
diff --git a/src/Shared/E2ETesting/E2ETesting.targets b/src/Shared/E2ETesting/E2ETesting.targets
index 03e01b21ca..96d1bb0a15 100644
--- a/src/Shared/E2ETesting/E2ETesting.targets
+++ b/src/Shared/E2ETesting/E2ETesting.targets
@@ -11,7 +11,12 @@
       Importance="High"
       Text="Prerequisites were not enforced at build time. Running Yarn or the E2E tests might fail as a result. Check /src/Shared/E2ETesting/Readme.md for instructions." />
 
-    <Yarn Command="install" />
+    <Yarn Command="install" ContinueOnError="true">
+      <Output TaskParameter="ExitCode" PropertyName="_YarnExitCode"/>
+    </Yarn>
+    <Yarn Command="install" Condition="'$(_YarnExitCode)' != '0'">
+      <Output TaskParameter="ExitCode" PropertyName="_YarnExitCode"/>
+    </Yarn>
   </Target>
 
   <Target