Skip to content

Commit

Permalink
Fix incremental build failure for package projects
Browse files Browse the repository at this point in the history
These projects were expecting but not creating XML documentation files.
  • Loading branch information
sharwell committed Dec 20, 2021
1 parent bca0522 commit 1bc95da
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 11 deletions.
14 changes: 14 additions & 0 deletions eng/targets/PackageProject.props
Original file line number Diff line number Diff line change
@@ -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>
7 changes: 0 additions & 7 deletions eng/targets/PackageProject.targets
Original file line number Diff line number Diff line change
Expand Up @@ -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>
5 changes: 5 additions & 0 deletions src/NuGet/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion src/NuGet/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -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>
5 changes: 5 additions & 0 deletions src/Setup/DevDivInsertionFiles/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion src/Setup/DevDivInsertionFiles/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -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>
5 changes: 5 additions & 0 deletions src/Setup/DevDivVsix/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion src/Setup/DevDivVsix/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -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>
5 changes: 5 additions & 0 deletions src/Setup/Installer/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion src/Setup/Installer/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit 1bc95da

Please sign in to comment.