Correctly set IsPackable to false for non source projects (#181)

* Correctly set IsPackable to false for non source projects * Change switch to OverrideIsPackableForNonSourceProjects
dotnet · Nov 18, 2024 · cf6c8aa · cf6c8aa
1 parent a30a2fe
commit cf6c8aa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -6,7 +6,7 @@
                                 '$(IsTestUtilityProject)' != 'true'">true</IsSourceProject>
   </PropertyGroup>
 
-  <Import Project="$(RepositoryEngineeringDir)unsetispackable.targets" Condition="'$(UnsetIsPackableForNonSourceProjects)' == 'true' and '$(IsSourceProject)' != 'true'" />
+  <Import Project="$(RepositoryEngineeringDir)overrideispackable.targets" Condition="'$(OverrideIsPackableForNonSourceProjects)' == 'true' and '$(IsSourceProject)' != 'true'" />
   <Import Project="$(RepositoryEngineeringDir)resources.targets" />
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 

diff --git a/eng/overrideispackable.targets b/eng/overrideispackable.targets
@@ -0,0 +1,9 @@
+<Project TreatAsLocalProperty="IsPackable">
+
+  <!-- Treat global IsPackable property as local.
+       Explicitly set to false as NuGet.targets would set an empty value back to true. -->
+  <PropertyGroup>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+</Project>
diff --git a/eng/pipelines/maintenance-packages-pr.yml b/eng/pipelines/maintenance-packages-pr.yml
@@ -119,7 +119,7 @@ stages:
             --prepareMachine
             /p:Test=false
             /p:IsPackable=true
-            /p:UnsetIsPackableForNonSourceProjects=true
+            /p:OverrideIsPackableForNonSourceProjects=true
             $(_AdditionalBuildArgs)
             $(_InternalBuildArgs)
           displayName: 'Build and pack'

diff --git a/eng/unsetispackable.targets b/eng/unsetispackable.targets