From 7818348fc28c39b551cf107686a1b3d23ca002b0 Mon Sep 17 00:00:00 2001
From: Piotr Puszkiewicz <piotrp@microsoft.com>
Date: Thu, 23 Feb 2017 01:12:32 -0800
Subject: [PATCH] Move copying sharedfx to before publish of redist

---
 build/Compile.targets    |  9 ---------
 src/redist/redist.csproj | 11 +++++++++++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/build/Compile.targets b/build/Compile.targets
index 861cc1dc3..7e0c09663 100644
--- a/build/Compile.targets
+++ b/build/Compile.targets
@@ -15,18 +15,9 @@
                                            GetNuGetPackagesArchive;" />
 
   <Target Name="CompileCLI">
-    <ItemGroup>
-      <SharedFramework Remove="*" />
-      <SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
-    </ItemGroup>
-
     <RemoveDir Directories="$(StageDirectory)" />
     <MakeDir Directories="$(StageDirectory)"/>
 
-    <!-- CopySharedFramework -->
-    <Copy SourceFiles="@(SharedFramework)"
-          DestinationFiles="@(SharedFramework->'$(StageDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
-
     <!-- Publish DotNet -->
     <DotNetPublish ToolPath="$(Stage0Directory)"
                    Configuration="$(Configuration)"
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 463fffcd6..ca8096348 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -34,6 +34,17 @@
     <ProjectReference Include="..\tool_nuget\tool_nuget.csproj" />
   </ItemGroup>
 
+  <Target Name="PublishSharedFramework"
+          BeforeTargets="Publish">
+    <ItemGroup>
+      <SharedFramework Remove="*" />
+      <SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(SharedFramework)"
+          DestinationFiles="@(SharedFramework->'$(StageDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
+  </Target>
+
   <Target Name="GenerateCliRuntimeConfigurationFiles"
           AfterTargets="Publish">
     <RemoveAssetFromDepsPackages DepsFile="$(PublishDir)/$(TargetName).deps.json"