From 7d41e12c9db4d2fdab1e25ab6a1e89835220b1ca Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 22 Nov 2023 14:34:29 +0100
Subject: [PATCH 1/6] Fix incremental servicing condition

Makes non shipping packages always ship during servicing
---
 src/libraries/Directory.Build.props | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 32fc46a35d8d7..ad272f3417f54 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -36,8 +36,6 @@
     <!-- We can't generate an apphost without restoring the targeting pack. -->
     <UseAppHost>false</UseAppHost>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <!-- Libraries packages use the incremental servicing infrastructure. -->
-    <PackageUseIncrementalServicingVersion>true</PackageUseIncrementalServicingVersion>
   </PropertyGroup>
 
   <!-- Language configuration -->

From 05736d93b4387698dd962aa213867b4ab04437c3 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 22 Nov 2023 14:38:37 +0100
Subject: [PATCH 2/6] Update packaging.targets

---
 eng/packaging.targets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eng/packaging.targets b/eng/packaging.targets
index a1fbe07ed2a57..a894358f78c76 100644
--- a/eng/packaging.targets
+++ b/eng/packaging.targets
@@ -36,6 +36,8 @@
 
     <!-- During NoBuild pack invocations, skip project reference build. Necessary for the IncludeProjectReferencesWithPackAttributeInPackage target. -->
     <BuildProjectReferences Condition="'$(NoBuild)' == 'true'">false</BuildProjectReferences>
+    <!-- Non-shipping packages shouldn't incrementally serviced. -->
+    <PackageUseIncrementalServicingVersion Condition="'$(IsShipping)' != 'true'">false</PackageUseIncrementalServicingVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(PreReleaseVersionLabel)' == 'servicing'">

From 163ab67f954a57f923f4e346112c3f67d9ec1cd1 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 22 Nov 2023 14:39:14 +0100
Subject: [PATCH 3/6] Update Directory.Build.props

---
 src/libraries/Directory.Build.props | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index ad272f3417f54..32fc46a35d8d7 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -36,6 +36,8 @@
     <!-- We can't generate an apphost without restoring the targeting pack. -->
     <UseAppHost>false</UseAppHost>
     <EnableDefaultItems>false</EnableDefaultItems>
+    <!-- Libraries packages use the incremental servicing infrastructure. -->
+    <PackageUseIncrementalServicingVersion>true</PackageUseIncrementalServicingVersion>
   </PropertyGroup>
 
   <!-- Language configuration -->

From ae14966ed39c31b2221458ba8359fd8ddffbfd95 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 22 Nov 2023 14:39:47 +0100
Subject: [PATCH 4/6] Update
 Microsoft.Internal.Runtime.AspNetCore.Transport.proj

---
 .../Microsoft.Internal.Runtime.AspNetCore.Transport.proj    | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/libraries/Microsoft.Internal.Runtime.AspNetCore.Transport/src/Microsoft.Internal.Runtime.AspNetCore.Transport.proj b/src/libraries/Microsoft.Internal.Runtime.AspNetCore.Transport/src/Microsoft.Internal.Runtime.AspNetCore.Transport.proj
index 6fb1e563f2779..c60c05eff546e 100644
--- a/src/libraries/Microsoft.Internal.Runtime.AspNetCore.Transport/src/Microsoft.Internal.Runtime.AspNetCore.Transport.proj
+++ b/src/libraries/Microsoft.Internal.Runtime.AspNetCore.Transport/src/Microsoft.Internal.Runtime.AspNetCore.Transport.proj
@@ -13,12 +13,6 @@
     <NoWarn>$(NoWarn);NU5131</NoWarn>
   </PropertyGroup>
 
-  <!-- Always generate this package during servicing to flow the dependency to AspNetCore. -->
-  <PropertyGroup Condition="'$(PreReleaseVersionLabel)' == 'servicing'">
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <ServicingVersion>$(PatchVersion)</ServicingVersion>
-  </PropertyGroup>
-
   <ItemGroup>
     <!-- Requires Private=true to calculate ReferenceCopyLocalPaths items. -->
     <ProjectReference Include="@(AspNetCoreAppLibrary->'$(LibrariesProjectRoot)%(Identity)\src\%(Identity).csproj')"

From 133e17220ce625c998bdd4dfee29912129e35ba8 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 22 Nov 2023 14:40:12 +0100
Subject: [PATCH 5/6] Update
 Microsoft.Internal.Runtime.WindowsDesktop.Transport.proj

---
 ...Microsoft.Internal.Runtime.WindowsDesktop.Transport.proj | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/libraries/Microsoft.Internal.Runtime.WindowsDesktop.Transport/src/Microsoft.Internal.Runtime.WindowsDesktop.Transport.proj b/src/libraries/Microsoft.Internal.Runtime.WindowsDesktop.Transport/src/Microsoft.Internal.Runtime.WindowsDesktop.Transport.proj
index 1be506a457ae6..3152e3abfee5a 100644
--- a/src/libraries/Microsoft.Internal.Runtime.WindowsDesktop.Transport/src/Microsoft.Internal.Runtime.WindowsDesktop.Transport.proj
+++ b/src/libraries/Microsoft.Internal.Runtime.WindowsDesktop.Transport/src/Microsoft.Internal.Runtime.WindowsDesktop.Transport.proj
@@ -12,12 +12,6 @@
     <NoWarn>$(NoWarn);NU5131;NU5128</NoWarn>
   </PropertyGroup>
 
-  <!-- Always generate this package during servicing to flow the dependency to WindowsDesktop. -->
-  <PropertyGroup Condition="'$(PreReleaseVersionLabel)' == 'servicing'">
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <ServicingVersion>$(PatchVersion)</ServicingVersion>
-  </PropertyGroup>
-
   <ItemGroup>
     <!-- Requires Private=true to calculate ReferenceCopyLocalPaths items.
          ReferringTargetFramework is set to $(NetCoreAppCurrent)-windows so that we pack the Windows specific implementation assemblies -->

From 2f11953dd6881c1295bb371e8f809ff16310a1fa Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 22 Nov 2023 14:43:44 +0100
Subject: [PATCH 6/6] Update packaging.targets

---
 eng/packaging.targets | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/eng/packaging.targets b/eng/packaging.targets
index a894358f78c76..67405cb51aeff 100644
--- a/eng/packaging.targets
+++ b/eng/packaging.targets
@@ -21,13 +21,20 @@
     <ApiCompatIgnoreTargetPlatformMoniker Condition="'$(SuppressDependenciesWhenPacking)' == 'true'">true</ApiCompatIgnoreTargetPlatformMoniker>
     <PackageDesignerMarkerFile>$(MSBuildThisFileDirectory)useSharedDesignerContext.txt</PackageDesignerMarkerFile>
     <PackageReadmeFile Condition="'$(PackageReadmeFile)' == '' and Exists('PACKAGE.md')">PACKAGE.md</PackageReadmeFile>
+    <!-- Non-shipping packages shouldn't incrementally serviced. -->
+    <PackageUseIncrementalServicingVersion Condition="'$(IsShipping)' != 'true'">false</PackageUseIncrementalServicingVersion>
     <!-- Generate packages for rid specific projects or for allconfigurations during build. -->
     <!-- A package isn't generated if in servicing or in runtimelab. Intended to be overridden at project level. -->
     <IsRIDSpecificProject Condition="$(MSBuildProjectName.StartsWith('runtime.')) and
                                      !$(MSBuildProjectName.StartsWith('runtime.native'))">true</IsRIDSpecificProject>
-    <GeneratePackageOnBuild Condition="('$(BuildAllConfigurations)' == 'true' or
-                                       '$(IsRIDSpecificProject)' == 'true') and
-                                       '$(PreReleaseVersionLabel)' != 'servicing' and
+    <GeneratePackageOnBuild Condition="(
+                                        '$(BuildAllConfigurations)' == 'true' or
+                                        '$(IsRIDSpecificProject)' == 'true'
+                                       ) and
+                                       (
+                                        '$(PreReleaseVersionLabel)' != 'servicing' or
+                                        '$(PackageUseIncrementalServicingVersion)' != 'true'
+                                       ) and
                                        '$(GitHubRepositoryName)' != 'runtimelab'">true</GeneratePackageOnBuild>
     <!-- When in source-build we need to generate all packages when building for all configurations even in servicing. -->
     <GeneratePackageOnBuild Condition="'$(GeneratePackageOnBuild)' != 'true' and
@@ -36,8 +43,6 @@
 
     <!-- During NoBuild pack invocations, skip project reference build. Necessary for the IncludeProjectReferencesWithPackAttributeInPackage target. -->
     <BuildProjectReferences Condition="'$(NoBuild)' == 'true'">false</BuildProjectReferences>
-    <!-- Non-shipping packages shouldn't incrementally serviced. -->
-    <PackageUseIncrementalServicingVersion Condition="'$(IsShipping)' != 'true'">false</PackageUseIncrementalServicingVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(PreReleaseVersionLabel)' == 'servicing'">