From 5d777b2c662b1641c78022f500b7ba6e30ac7630 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Thu, 6 Dec 2018 14:06:42 -0800
Subject: [PATCH] Conditionally skip patch.zip files which way not be produced
 in servicing builds (#4481)

---
 build/Publish.targets | 8 ++++++--
 korebuild-lock.txt    | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/build/Publish.targets b/build/Publish.targets
index 54e74b31072c..9c73f75d1525 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -81,12 +81,16 @@
         <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
       </FilesToPublish>
 
-      <FilesToPublish Include="$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-$(PackageVersion).patch.zip" >
+      <!-- This file is conditionally included because it may not exist in servicing builds -->
+      <FilesToPublish Include="$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-$(PackageVersion).patch.zip"
+                      Condition="Exists('$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-$(PackageVersion).patch.zip')" >
         <RelativeBlobPath>$(BlobBasePath)nuGetPackagesArchive-ci-server-$(PackageVersion).patch.zip</RelativeBlobPath>
         <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
       </FilesToPublish>
 
-      <FilesToPublish Include="$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-compat-$(PackageVersion).patch.zip" >
+      <!-- This file is conditionally included because it may not exist in servicing builds -->
+      <FilesToPublish Include="$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-compat-$(PackageVersion).patch.zip"
+                      Condition="Exists('$(DependencyAssetsDir)nuGetPackagesArchive-ci-server-compat-$(PackageVersion).patch.zip')">
         <RelativeBlobPath>$(BlobBasePath)nuGetPackagesArchive-ci-server-compat-$(PackageVersion).patch.zip</RelativeBlobPath>
         <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
       </FilesToPublish>
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index a3f63230bd6d..6f42fdc9d843 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.1.3-rtm-15848
-commithash:2f914eafadb434837324c4b5b30f6fdbe9b70ab6
+version:2.1.3-rtm-15849
+commithash:9a772472eb5184f4fd609f6208102d3a716d5bed