From ad8338577dd9569a36e0518c8783a82e841e3a85 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 15 Nov 2024 23:55:30 +0100
Subject: [PATCH 1/2] Correctly set IsPackable to false for non source projects

---
 eng/unsetispackable.targets | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eng/unsetispackable.targets b/eng/unsetispackable.targets
index 636e0eca0..2798f23ce 100644
--- a/eng/unsetispackable.targets
+++ b/eng/unsetispackable.targets
@@ -1,8 +1,9 @@
 <Project TreatAsLocalProperty="IsPackable">
 
-  <!-- Unset global IsPackable property. -->
+  <!-- Unset global IsPackable property.
+       Explicitly set to false as NuGet.targets would set an empty value to true. -->
   <PropertyGroup>
-    <IsPackable />
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
 </Project>

From c4e8c6ae0df1f856a1d106a58ffdde2a9946b04a Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 18 Nov 2024 11:13:28 +0100
Subject: [PATCH 2/2] Change switch to OverrideIsPackableForNonSourceProjects

---
 Directory.Build.targets                                     | 2 +-
 eng/{unsetispackable.targets => overrideispackable.targets} | 4 ++--
 eng/pipelines/maintenance-packages-pr.yml                   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename eng/{unsetispackable.targets => overrideispackable.targets} (71%)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 939081497..30a18bd32 100644
--- 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/unsetispackable.targets b/eng/overrideispackable.targets
similarity index 71%
rename from eng/unsetispackable.targets
rename to eng/overrideispackable.targets
index 2798f23ce..72bfc913e 100644
--- a/eng/unsetispackable.targets
+++ b/eng/overrideispackable.targets
@@ -1,7 +1,7 @@
 <Project TreatAsLocalProperty="IsPackable">
 
-  <!-- Unset global IsPackable property.
-       Explicitly set to false as NuGet.targets would set an empty value to true. -->
+  <!-- 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>
diff --git a/eng/pipelines/maintenance-packages-pr.yml b/eng/pipelines/maintenance-packages-pr.yml
index ab2be6144..b8e758937 100644
--- 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'