From 42d047d9f66dad5ed503839fa0460583d1be9696 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 5 Dec 2023 15:08:27 +0100
Subject: [PATCH] Use Directory.Build.props only (#17910)

---
 src/SourceBuild/content/src/Directory.Build.props    | 9 ++++++---
 src/SourceBuild/content/src/Directory.Build.targets  | 7 -------
 src/SourceBuild/content/test/Directory.Build.props   | 9 ++++++---
 src/SourceBuild/content/test/Directory.Build.targets | 7 -------
 4 files changed, 12 insertions(+), 20 deletions(-)
 delete mode 100644 src/SourceBuild/content/src/Directory.Build.targets
 delete mode 100644 src/SourceBuild/content/test/Directory.Build.targets

diff --git a/src/SourceBuild/content/src/Directory.Build.props b/src/SourceBuild/content/src/Directory.Build.props
index 5bec34ce2..ae5a2637d 100644
--- a/src/SourceBuild/content/src/Directory.Build.props
+++ b/src/SourceBuild/content/src/Directory.Build.props
@@ -1,7 +1,10 @@
 <Project>
 
-  <!--
-    Prevent repo src automatic Directory.Build imports from finding source-build infra.
-  -->
+  <!-- This is an empty Directory.Build.props file to prevent projects which reside
+       under this directory to use any of the repository local settings. -->
+  <PropertyGroup>
+    <ImportDirectoryPackagesProps>false</ImportDirectoryPackagesProps>
+    <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
+  </PropertyGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/src/Directory.Build.targets b/src/SourceBuild/content/src/Directory.Build.targets
deleted file mode 100644
index 5bec34ce2..000000000
--- a/src/SourceBuild/content/src/Directory.Build.targets
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-
-  <!--
-    Prevent repo src automatic Directory.Build imports from finding source-build infra.
-  -->
-
-</Project>
diff --git a/src/SourceBuild/content/test/Directory.Build.props b/src/SourceBuild/content/test/Directory.Build.props
index 5bec34ce2..ae5a2637d 100644
--- a/src/SourceBuild/content/test/Directory.Build.props
+++ b/src/SourceBuild/content/test/Directory.Build.props
@@ -1,7 +1,10 @@
 <Project>
 
-  <!--
-    Prevent repo src automatic Directory.Build imports from finding source-build infra.
-  -->
+  <!-- This is an empty Directory.Build.props file to prevent projects which reside
+       under this directory to use any of the repository local settings. -->
+  <PropertyGroup>
+    <ImportDirectoryPackagesProps>false</ImportDirectoryPackagesProps>
+    <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
+  </PropertyGroup>
 
 </Project>
diff --git a/src/SourceBuild/content/test/Directory.Build.targets b/src/SourceBuild/content/test/Directory.Build.targets
deleted file mode 100644
index 5bec34ce2..000000000
--- a/src/SourceBuild/content/test/Directory.Build.targets
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-
-  <!--
-    Prevent repo src automatic Directory.Build imports from finding source-build infra.
-  -->
-
-</Project>