From 087f1830efce5084f7f2f2fe29a1152517bb2119 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Thu, 6 Jul 2017 09:21:59 -0700
Subject: [PATCH] The 'Coherent' property needs to be available for
 'FinishBuild' and 'PublishArtifacts' targets.

---
 build/Publish.targets                  |  4 +++-
 build/publish/FinishBuild.targets      | 22 ----------------------
 build/publish/RuntimeCoherence.targets | 26 ++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 23 deletions(-)
 create mode 100644 build/publish/RuntimeCoherence.targets

diff --git a/build/Publish.targets b/build/Publish.targets
index 48c4db93d..a4c549959 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -5,12 +5,14 @@
   <Import Project="$(MSBuildThisFileDirectory)/publish/PublishDebian.targets" />
   <Import Project="$(MSBuildThisFileDirectory)/publish/Badge.targets" />
   <Import Project="$(MSBuildThisFileDirectory)/publish/Checksum.targets" />
-
+  <Import Project="$(MSBuildThisFileDirectory)/publish/RuntimeCoherence.targets" />
+  
   <!-- PUBLISH_TO_AZURE_BLOB env variable set by CI -->
   <Target Name="Publish"
           Condition=" '$(PUBLISH_TO_AZURE_BLOB)' != '' "
           DependsOnTargets="Init;
                             Package;
+                            RuntimeCoherence;
                             PublishArtifacts;
                             FinishBuild" />
 
diff --git a/build/publish/FinishBuild.targets b/build/publish/FinishBuild.targets
index 69a9170ae..8ffbe0097 100644
--- a/build/publish/FinishBuild.targets
+++ b/build/publish/FinishBuild.targets
@@ -2,7 +2,6 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Target Name="FinishBuild"
           DependsOnTargets="CheckIfAllBuildsHavePublished;
-                            EvaluateRuntimeCoherence;
                             FinalizeBuild" />
 
   <Target Name="CheckIfAllBuildsHavePublished">
@@ -14,27 +13,6 @@
       <Output TaskParameter="HaveAllBuildsPublished" PropertyName="HaveAllBuildsPublished" />
     </CheckIfAllBuildsHavePublished>
   </Target>
-
-  <Target Name="EvaluateRuntimeCoherence"
-        DependsOnTargets="ReadAspNetCoreSharedRuntimeVersionFile"
-        BeforeTargets="FinalizeBuild">
-    <PropertyGroup>
-      <Coherent>false</Coherent>
-      <Coherent Condition=" '$(CLI_SharedFrameworkVersion)' == '@(AspNetCoreSharedRuntimeVersion)' ">true</Coherent>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="ReadAspNetCoreSharedRuntimeVersionFile"
-          DependsOnTargets="DownloadHostAndSharedFxArtifacts">
-    <ItemGroup>
-      <File Include="$(AspNetCoreSharedRuntimeVersionFile)" />
-    </ItemGroup>
-    <ReadLinesFromFile File="@(File)">
-      <Output
-          TaskParameter="Lines"
-          ItemName="AspNetCoreSharedRuntimeVersion"/>
-    </ReadLinesFromFile>
-  </Target>
   
   <Target Name="FinalizeBuild"
           Condition=" '$(HaveAllBuildsPublished)' == 'True' ">
diff --git a/build/publish/RuntimeCoherence.targets b/build/publish/RuntimeCoherence.targets
new file mode 100644
index 000000000..a4249fbf0
--- /dev/null
+++ b/build/publish/RuntimeCoherence.targets
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="RuntimeCoherence"
+          DependsOnTargets="ReadAspNetCoreSharedRuntimeVersionFile;
+                            EvaluateRuntimeCoherence" />
+
+  <Target Name="ReadAspNetCoreSharedRuntimeVersionFile"
+        DependsOnTargets="DownloadHostAndSharedFxArtifacts">
+    <ItemGroup>
+      <File Include="$(AspNetCoreSharedRuntimeVersionFile)" />
+    </ItemGroup>
+    <ReadLinesFromFile File="@(File)">
+      <Output
+          TaskParameter="Lines"
+          ItemName="AspNetCoreSharedRuntimeVersion"/>
+    </ReadLinesFromFile>
+  </Target>
+  
+  <Target Name="EvaluateRuntimeCoherence"
+      DependsOnTargets="ReadAspNetCoreSharedRuntimeVersionFile">
+    <PropertyGroup>
+      <Coherent>false</Coherent>
+      <Coherent Condition=" '$(CLI_SharedFrameworkVersion)' == '@(AspNetCoreSharedRuntimeVersion)' ">true</Coherent>
+    </PropertyGroup>
+  </Target>
+</Project>