From 3965da0720f1644161ffb01e3df4250eb0f8435a Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Mon, 11 Nov 2019 16:26:45 -0600
Subject: [PATCH 1/3] Add servicing build targeting pack skip config

---
 eng/Versions.props                              | 17 +++++++++++++++++
 .../tests/WindowsDesktopNupkgTests.cs           |  6 +++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index d4881519e..0a6f46248 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -19,6 +19,23 @@
     <NETCoreAppFrameworkVersion>$(MajorVersion).$(MinorVersion)</NETCoreAppFrameworkVersion>
     <NETCoreAppFramework>netcoreapp$(NETCoreAppFrameworkVersion)</NETCoreAppFramework>
   </PropertyGroup>
+  <!--
+    Servicing build settings.
+
+    * To enable a package build for the current patch release, set PatchVersion to match the current
+      patch version of that package. (major.minor.patch)
+
+    * Do not delete these lines to disable the package build. When PatchVersion is incremented at
+      the beginning of the next servicing release, the package automatically stops building because
+      the version no longer matches.
+
+    * These items also keep track of the last time each package was patched, enabling source-build
+      to produce the correct old version number using current sources.
+  -->
+  <ItemGroup Condition="'$(StabilizePackageVersion)' == 'true'">
+    <ProjectServicingConfiguration Include="Microsoft.WindowsDesktop.App.Ref" PatchVersion="0" />
+  </ItemGroup>
+
   <PropertyGroup>
     <MicrosoftDotNetMaestroTasksVersion>1.0.0-beta.18619.4</MicrosoftDotNetMaestroTasksVersion>
   </PropertyGroup>
diff --git a/src/windowsdesktop/tests/WindowsDesktopNupkgTests.cs b/src/windowsdesktop/tests/WindowsDesktopNupkgTests.cs
index dcf5fb973..b31763ed0 100644
--- a/src/windowsdesktop/tests/WindowsDesktopNupkgTests.cs
+++ b/src/windowsdesktop/tests/WindowsDesktopNupkgTests.cs
@@ -25,7 +25,11 @@ public void WindowsDesktopTargetingPackIsValid()
             {
                 if (CurrentRidShouldCreateNupkg)
                 {
-                    Assert.NotNull(tester);
+                    // Allow no targeting pack for servicing builds.
+                    if (tester == null)
+                    {
+                        return;
+                    }
 
                     tester.IsTargetingPackForPlatform();
                     tester.HasOnlyTheseDataFiles(

From e0941365e2300986cceca864b3559302cc09f844 Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Mon, 11 Nov 2019 17:07:17 -0600
Subject: [PATCH 2/3] Remove source-build mention, not applicable

---
 eng/Versions.props | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 0a6f46248..669dcfa43 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -28,9 +28,6 @@
     * Do not delete these lines to disable the package build. When PatchVersion is incremented at
       the beginning of the next servicing release, the package automatically stops building because
       the version no longer matches.
-
-    * These items also keep track of the last time each package was patched, enabling source-build
-      to produce the correct old version number using current sources.
   -->
   <ItemGroup Condition="'$(StabilizePackageVersion)' == 'true'">
     <ProjectServicingConfiguration Include="Microsoft.WindowsDesktop.App.Ref" PatchVersion="0" />

From 7e35ddfb7cb49b81bf3482b11caa2cdd4d0b65ce Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Mon, 11 Nov 2019 17:07:45 -0600
Subject: [PATCH 3/3] Add reference to nupkg existence test gap issue

---
 src/windowsdesktop/tests/WindowsDesktopNupkgTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/windowsdesktop/tests/WindowsDesktopNupkgTests.cs b/src/windowsdesktop/tests/WindowsDesktopNupkgTests.cs
index b31763ed0..a8c60c82a 100644
--- a/src/windowsdesktop/tests/WindowsDesktopNupkgTests.cs
+++ b/src/windowsdesktop/tests/WindowsDesktopNupkgTests.cs
@@ -25,7 +25,7 @@ public void WindowsDesktopTargetingPackIsValid()
             {
                 if (CurrentRidShouldCreateNupkg)
                 {
-                    // Allow no targeting pack for servicing builds.
+                    // Allow no targeting pack for servicing builds. This is a minor test gap: https://github.com/dotnet/core-setup/issues/8830
                     if (tester == null)
                     {
                         return;