From ee7852a7908f16cdd37c7e9bd5bb7efab706c743 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Thu, 10 Aug 2017 22:28:14 -0700
Subject: [PATCH] Copy empty Directory.Build.props to artifacts folder during
 build instead of checking it in

(cherry picked from commit 884a48372d5766fccec13d2107d3554155f1aa7f)
---
 artifacts/Directory.Build.props | 3 ---
 build/Prepare.targets           | 8 +++++++-
 2 files changed, 7 insertions(+), 4 deletions(-)
 delete mode 100644 artifacts/Directory.Build.props

diff --git a/artifacts/Directory.Build.props b/artifacts/Directory.Build.props
deleted file mode 100644
index 905549edc..000000000
--- a/artifacts/Directory.Build.props
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project>
-  <!-- Empty Directory.Build.props file to prevent test asset projects from picking up the repo's Directory.Build.props' -->
-</Project>
diff --git a/build/Prepare.targets b/build/Prepare.targets
index 214b1f78d..942ade9fb 100644
--- a/build/Prepare.targets
+++ b/build/Prepare.targets
@@ -4,7 +4,7 @@
   <Import Project="prepare/CheckPrereqs.targets" />
 
   <Target Name="Prepare"
-          DependsOnTargets="Init;DownloadHostAndSharedFxArtifacts;RestoreSrcPackages;RestoreToolsPackages" />
+          DependsOnTargets="Init;DownloadHostAndSharedFxArtifacts;RestoreSrcPackages;RestoreToolsPackages;IsolateArtifactsFromDirectoryBuildFiles" />
 
   <Target Name="Init"
           DependsOnTargets="PrintBuildInfo;
@@ -98,4 +98,10 @@
     </ItemGroup>
   </Target>
 
+  <Target Name="IsolateArtifactsFromDirectoryBuildFiles">
+    <Copy SourceFiles="$(RepoRoot)TestAssets\Directory.Build.props"
+          DestinationFolder ="$(RepoRoot)artifacts"
+          SkipUnchangedFiles="true" />
+  </Target>
+
 </Project>