From 1bc95daa25c96afccd61a0c07a03723c5f013309 Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Mon, 20 Dec 2021 09:54:04 -0800
Subject: [PATCH] Fix incremental build failure for package projects

These projects were expecting but not creating XML documentation files.
---
 eng/targets/PackageProject.props                   | 14 ++++++++++++++
 eng/targets/PackageProject.targets                 |  7 -------
 src/NuGet/Directory.Build.props                    |  5 +++++
 src/NuGet/Directory.Build.targets                  |  2 +-
 .../DevDivInsertionFiles/Directory.Build.props     |  5 +++++
 .../DevDivInsertionFiles/Directory.Build.targets   |  2 +-
 src/Setup/DevDivVsix/Directory.Build.props         |  5 +++++
 src/Setup/DevDivVsix/Directory.Build.targets       |  2 +-
 src/Setup/Installer/Directory.Build.props          |  5 +++++
 src/Setup/Installer/Directory.Build.targets        |  2 +-
 10 files changed, 38 insertions(+), 11 deletions(-)
 create mode 100644 eng/targets/PackageProject.props
 create mode 100644 src/NuGet/Directory.Build.props
 create mode 100644 src/Setup/DevDivInsertionFiles/Directory.Build.props
 create mode 100644 src/Setup/DevDivVsix/Directory.Build.props
 create mode 100644 src/Setup/Installer/Directory.Build.props

diff --git a/eng/targets/PackageProject.props b/eng/targets/PackageProject.props
new file mode 100644
index 0000000000000..9368ce294f65f
--- /dev/null
+++ b/eng/targets/PackageProject.props
@@ -0,0 +1,14 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
+<Project>
+  <!-- 
+    Include this props file in projects that build meta-packages.
+  -->
+
+  <PropertyGroup>
+    <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
+
+    <!-- Remove once https://github.com/NuGet/Home/issues/8583 is fixed -->
+    <NoWarn>$(NoWarn);NU5128</NoWarn>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/eng/targets/PackageProject.targets b/eng/targets/PackageProject.targets
index 4b28a318384ae..dac70a7b1a079 100644
--- a/eng/targets/PackageProject.targets
+++ b/eng/targets/PackageProject.targets
@@ -11,11 +11,4 @@
   <Target Name="CoreBuild" DependsOnTargets="ResolveProjectReferences">
     <MakeDir Directories="$(IntermediateOutputPath)" ContinueOnError="True"/>
   </Target>
-
-  <PropertyGroup>
-    <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
-
-    <!-- Remove once https://github.com/NuGet/Home/issues/8583 is fixed -->
-    <NoWarn>$(NoWarn);NU5128</NoWarn>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/NuGet/Directory.Build.props b/src/NuGet/Directory.Build.props
new file mode 100644
index 0000000000000..13fab30f50f0f
--- /dev/null
+++ b/src/NuGet/Directory.Build.props
@@ -0,0 +1,5 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+  <Import Project="$(RepositoryEngineeringDir)targets\PackageProject.props"/>
+</Project>
diff --git a/src/NuGet/Directory.Build.targets b/src/NuGet/Directory.Build.targets
index 609d4bacd63b0..e1dbd218d1d8b 100644
--- a/src/NuGet/Directory.Build.targets
+++ b/src/NuGet/Directory.Build.targets
@@ -1,5 +1,5 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
 <Project>
-  <Import Project="..\..\Directory.Build.targets" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
   <Import Project="$(RepositoryEngineeringDir)targets\PackageProject.targets" Condition="'$(TargetFramework)' != ''"/>
 </Project>
\ No newline at end of file
diff --git a/src/Setup/DevDivInsertionFiles/Directory.Build.props b/src/Setup/DevDivInsertionFiles/Directory.Build.props
new file mode 100644
index 0000000000000..13fab30f50f0f
--- /dev/null
+++ b/src/Setup/DevDivInsertionFiles/Directory.Build.props
@@ -0,0 +1,5 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+  <Import Project="$(RepositoryEngineeringDir)targets\PackageProject.props"/>
+</Project>
diff --git a/src/Setup/DevDivInsertionFiles/Directory.Build.targets b/src/Setup/DevDivInsertionFiles/Directory.Build.targets
index 59416fe039717..f4a6a73d16e4a 100644
--- a/src/Setup/DevDivInsertionFiles/Directory.Build.targets
+++ b/src/Setup/DevDivInsertionFiles/Directory.Build.targets
@@ -1,5 +1,5 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
 <Project>
-  <Import Project="..\..\..\Directory.Build.targets" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
   <Import Project="$(RepositoryEngineeringDir)targets\PackageProject.targets"/>
 </Project>
\ No newline at end of file
diff --git a/src/Setup/DevDivVsix/Directory.Build.props b/src/Setup/DevDivVsix/Directory.Build.props
new file mode 100644
index 0000000000000..13fab30f50f0f
--- /dev/null
+++ b/src/Setup/DevDivVsix/Directory.Build.props
@@ -0,0 +1,5 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+  <Import Project="$(RepositoryEngineeringDir)targets\PackageProject.props"/>
+</Project>
diff --git a/src/Setup/DevDivVsix/Directory.Build.targets b/src/Setup/DevDivVsix/Directory.Build.targets
index 72ffa0dd4aaed..f4ce9a5063717 100644
--- a/src/Setup/DevDivVsix/Directory.Build.targets
+++ b/src/Setup/DevDivVsix/Directory.Build.targets
@@ -1,5 +1,5 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
 <Project>
-  <Import Project="..\..\..\Directory.Build.targets" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
   <Import Project="$(RepositoryEngineeringDir)targets\PackageProject.targets" Condition="'$(TargetFramework)' != ''"/>
 </Project>
diff --git a/src/Setup/Installer/Directory.Build.props b/src/Setup/Installer/Directory.Build.props
new file mode 100644
index 0000000000000..13fab30f50f0f
--- /dev/null
+++ b/src/Setup/Installer/Directory.Build.props
@@ -0,0 +1,5 @@
+<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+  <Import Project="$(RepositoryEngineeringDir)targets\PackageProject.props"/>
+</Project>
diff --git a/src/Setup/Installer/Directory.Build.targets b/src/Setup/Installer/Directory.Build.targets
index e059dfd9a3af6..e1dbd218d1d8b 100644
--- a/src/Setup/Installer/Directory.Build.targets
+++ b/src/Setup/Installer/Directory.Build.targets
@@ -1,5 +1,5 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
 <Project>
-  <Import Project="..\..\..\Directory.Build.targets" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
   <Import Project="$(RepositoryEngineeringDir)targets\PackageProject.targets" Condition="'$(TargetFramework)' != ''"/>
 </Project>
\ No newline at end of file