Add GeneratePackage property to pkgproj infra (#6728)

* Add GeneratePackage property to pkgproj infra <GeneratePackage /> controls if a package should be created when the pkgproj is invoked. This allows to filter at project level instead of at traversal. * Update Packaging.targets
dotnet · Dec 30, 2020 · a81310d · a81310d
1 parent a699761
commit a81310d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...osoft.DotNet.Build.Tasks.Packaging/src/build/Microsoft.DotNet.Build.Tasks.Packaging.props b/...osoft.DotNet.Build.Tasks.Packaging/src/build/Microsoft.DotNet.Build.Tasks.Packaging.props
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <PropertyGroup>
-    <IsPackable Condition="'$(MSBuildProjectExtension)' == '.pkgproj'">true</IsPackable>
+  <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.pkgproj'">
+    <IsPackable>true</IsPackable>
+    <!-- Additional property which no-ops the pkgproj entrypoint targets for more flexibility during servicing. -->
+    <GeneratePackage Condition="'$(GeneratePackage)' == ''">true</GeneratePackage>
   </PropertyGroup>
 </Project>
diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets
@@ -103,6 +103,7 @@
 
   <!-- Redefine build to just create the NuSpec only, we'll create the package during ArcProjects phase -->
   <Target Name="Build"
+          Condition="'$(GeneratePackage)' == 'true'"
           DependsOnTargets="$(BuildDependsOn)">
 
     <Message Condition="'$(ShouldCreatePackage)' == 'true'"