From 5889aea06cc7ed5c2f743e2fd8ed8abcb7c2d957 Mon Sep 17 00:00:00 2001
From: Javier Calvarro Nelson <jacalvar@microsoft.com>
Date: Sun, 14 Apr 2019 15:02:37 +0200
Subject: [PATCH] Enable custom restore of NPM dependencies for csproj files

Enables custom restore of NPM dependencies for csproj files that require it.
---
 eng/targets/Npm.Common.targets                    |  7 +------
 korebuild-lock.txt                                |  4 ++--
 .../src/Microsoft.AspNetCore.NodeServices.csproj  | 15 +++++++++------
 .../src/Microsoft.AspNetCore.SpaServices.csproj   | 15 +++++++++------
 src/Shared/E2ETesting/E2ETesting.targets          | 15 +++++++++------
 5 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets
index e9b43744bd..4138c08933 100644
--- a/eng/targets/Npm.Common.targets
+++ b/eng/targets/Npm.Common.targets
@@ -18,12 +18,7 @@
 
   <Target Name="Restore">
     <Message Importance="High" Text="Running yarn install on $(MSBuildProjectFullPath)" />
-    <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>
+    <Yarn Command="install $(InstallArgs)" />
   </Target>
 
   <Target Name="PrepareForBuild">
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index bf0fe32bb6..33e6e58016 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:3.0.0-build-20190408.1
-commithash:8b533cbfa5357e5785f4c4231231c1234cfc2c5f
+version:3.0.0-build-20190412.2
+commithash:0e543fb8761394491250585d3811bdbb62e350e8
diff --git a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj
index 72b68ba13e..e7ba91bc8e 100644
--- a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj
+++ b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj
@@ -21,12 +21,15 @@
 
   <Target Name="YarnInstall">
     <Message Text="Running yarn install on $(MSBuildProjectFile)" Importance="High" />
-    <Yarn Command="install" ContinueOnError="true">
-      <Output TaskParameter="ExitCode" PropertyName="_YarnExitCode"/>
-    </Yarn>
-    <Yarn Command="install" Condition="'$(_YarnExitCode)' != '0'">
-      <Output TaskParameter="ExitCode" PropertyName="_YarnExitCode"/>
-    </Yarn>
+    <Yarn Command="install" />
+  </Target>
+
+  <Target Name="_IsCustomRestoreTargetSupported" Returns="@(CustomRestoreTargets)" Condition="'$(BuildNodeJs)' == 'true'">
+    <ItemGroup>
+      <CustomRestoreTargets Include="$(MSBuildProjectFullPath)">
+        <Targets>YarnInstall</Targets>
+      </CustomRestoreTargets>
+    </ItemGroup>
   </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 6a1e5fce3f..8987a271df 100644
--- a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj
+++ b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj
@@ -25,12 +25,15 @@
 
   <Target Name="YarnInstall">
     <Message Text="Running yarn install on $(MSBuildProjectFile)" Importance="High" />
-    <Yarn Command="install" ContinueOnError="true">
-      <Output TaskParameter="ExitCode" PropertyName="_YarnExitCode"/>
-    </Yarn>
-    <Yarn Command="install" Condition="'$(_YarnExitCode)' != '0'">
-      <Output TaskParameter="ExitCode" PropertyName="_YarnExitCode"/>
-    </Yarn>
+    <Yarn Command="install" />
+  </Target>
+
+  <Target Name="_IsCustomRestoreTargetSupported" Returns="@(CustomRestoreTargets)" Condition="'$(BuildNodeJs)' == 'true'">
+    <ItemGroup>
+      <CustomRestoreTargets Include="$(MSBuildProjectFullPath)">
+        <Targets>YarnInstall</Targets>
+      </CustomRestoreTargets>
+    </ItemGroup>
   </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 96d1bb0a15..88d77ebf73 100644
--- a/src/Shared/E2ETesting/E2ETesting.targets
+++ b/src/Shared/E2ETesting/E2ETesting.targets
@@ -11,12 +11,15 @@
       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" ContinueOnError="true">
-      <Output TaskParameter="ExitCode" PropertyName="_YarnExitCode"/>
-    </Yarn>
-    <Yarn Command="install" Condition="'$(_YarnExitCode)' != '0'">
-      <Output TaskParameter="ExitCode" PropertyName="_YarnExitCode"/>
-    </Yarn>
+    <Yarn Command="install" />
+  </Target>
+
+  <Target Name="_IsCustomRestoreTargetSupported" Returns="@(CustomRestoreTargets)" Condition="'$(BuildNodeJs)' == 'true'">
+    <ItemGroup>
+      <CustomRestoreTargets Include="$(MSBuildProjectFullPath)">
+        <Targets>EnsureNodeJSRestored</Targets>
+      </CustomRestoreTargets>
+    </ItemGroup>
   </Target>
 
   <Target