From 98b681d5643e84a37d9360e5a3636f9fda9c285f Mon Sep 17 00:00:00 2001
From: Logan Bussell <36081148+lbussell@users.noreply.github.com>
Date: Fri, 30 Jul 2021 11:59:59 -0700
Subject: [PATCH] [ArPow] Check in the empty src/Directory.Build.props and
 targets instead of generating them (#11350)

* check in directory.build.props and targets instead of generating them
* make empty build props and targets comments more reader friendly
---
 .../content/repos/Directory.Build.targets     | 22 -------------------
 .../tarball/content/src/Directory.Build.props |  7 ++++++
 .../content/src/Directory.Build.targets       |  7 ++++++
 3 files changed, 14 insertions(+), 22 deletions(-)
 create mode 100644 src/SourceBuild/tarball/content/src/Directory.Build.props
 create mode 100644 src/SourceBuild/tarball/content/src/Directory.Build.targets

diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.targets b/src/SourceBuild/tarball/content/repos/Directory.Build.targets
index bc9e6fb76..4e9c52ca9 100644
--- a/src/SourceBuild/tarball/content/repos/Directory.Build.targets
+++ b/src/SourceBuild/tarball/content/repos/Directory.Build.targets
@@ -402,28 +402,6 @@
     <WriteLinesToFile File="$(RepoCompletedSemaphorePath)CreateCombinedRestoreSourceAndVersionProps.complete" Overwrite="true" />
   </Target>
 
-  <!--
-    Generate blank directory build files above the repos, so they won't
-    automatically find the source-build directory build files ("escaping" their
-    directories and causing differences vs. ordinary build).
-  -->
-  <Target Name="PreventDirectoryBuildPropsTargetsEscape"
-          BeforeTargets="Build"
-          Inputs="$(MSBuildProjectFullPath)"
-          Outputs="$(RepoCompletedSemaphorePath)PreventDirectoryBuildPropsTargetsEscape.complete">
-    <ItemGroup>
-      <DirectoryBuildFilename Include="Directory.Build.targets" />
-      <DirectoryBuildFilename Include="Directory.Build.props" />
-    </ItemGroup>
-
-    <WriteLinesToFile
-      Lines="&lt;Project /&gt;"
-      File="$([MSBuild]::NormalizePath('$(SubmoduleDirectory)', '%(DirectoryBuildFilename.Identity)'))"
-      Overwrite="True" />
-
-    <WriteLinesToFile File="$(RepoCompletedSemaphorePath)PreventDirectoryBuildPropsTargetsEscape.complete" Overwrite="true" />
-  </Target>
-
   <Target Name="Build"
           DependsOnTargets="BuildRepoReferences"
           Inputs="$(MSBuildProjectFullPath)"
diff --git a/src/SourceBuild/tarball/content/src/Directory.Build.props b/src/SourceBuild/tarball/content/src/Directory.Build.props
new file mode 100644
index 000000000..5bec34ce2
--- /dev/null
+++ b/src/SourceBuild/tarball/content/src/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project>
+
+  <!--
+    Prevent repo src automatic Directory.Build imports from finding source-build infra.
+  -->
+
+</Project>
diff --git a/src/SourceBuild/tarball/content/src/Directory.Build.targets b/src/SourceBuild/tarball/content/src/Directory.Build.targets
new file mode 100644
index 000000000..5bec34ce2
--- /dev/null
+++ b/src/SourceBuild/tarball/content/src/Directory.Build.targets
@@ -0,0 +1,7 @@
+<Project>
+
+  <!--
+    Prevent repo src automatic Directory.Build imports from finding source-build infra.
+  -->
+
+</Project>