From d4ed8a7b7742a995f1f9da301e5dd97fc02086f3 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Thu, 18 Jan 2018 17:58:52 -0800
Subject: [PATCH] Prefer BeforeTargets/AfterTargets over evaluation

We can't rely on property evaluation to attach targets to the build
lifecycle, as we rely on the web sdk to set these properties and they
run after us.
---
 .../Microsoft.AspNetCore.Razor.Design.targets        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.targets b/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.targets
index cc6007f2fd..9089c4afd3 100644
--- a/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.targets
+++ b/src/Microsoft.AspNetCore.Razor.Design/build/netstandard2.0/Microsoft.AspNetCore.Razor.Design.targets
@@ -124,11 +124,6 @@
   <Target Name="RazorCompile" DependsOnTargets="$(RazorCompileDependsOn)">
   </Target>
 
-  <PropertyGroup Condition="'$(RazorCompileOnBuild)'=='true'">
-    <PrepareForRunDependsOn>RazorCompile;$(PrepareForRunDependsOn);_RazorCopyFilesToOutputDirectory</PrepareForRunDependsOn>
-    <GetCopyToOutputDirectoryItemsDependsOn>$(GetCopyToOutputDirectoryItemsDependsOn);_RazorGetCopyToOutputDirectoryItems</GetCopyToOutputDirectoryItemsDependsOn>
-  </PropertyGroup>
-
   <!--
     Gathers input source files for code generation. This is a separate target so that we can avoid
     lots of work when there are no inputs for code generation.
@@ -193,6 +188,7 @@
   -->
   <Target 
     Name="_RazorGetCopyToOutputDirectoryItems"
+    BeforeTargets="GetCopyToOutputDirectoryItems"
     DependsOnTargets="RazorCompile"
     Condition="'$(RazorCompileOnBuild)'=='true'">
 
@@ -247,7 +243,11 @@
     Called as part of CopyFilesToOutputDirectory - this target is called when building the project to copy
     files to the output directory.
   -->
-  <Target Name="_RazorCopyFilesToOutputDirectory">
+  <Target 
+    Name="_RazorCopyFilesToOutputDirectory" 
+    DependsOnTargets="RazorCompile"
+    AfterTargets="CopyFilesToOutputDirectory"
+    Condition="'$(RazorCompileOnBuild)'=='true'">
 
     <!-- Copy the Razor dll  -->
     <Copy