From 8fbac32ed84842fa0cb83ba812d0f5f9878863df Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Wed, 4 Oct 2017 11:57:26 -0700
Subject: [PATCH] Only attempt to publish npm when npm artifacts exist

---
 build/push.targets | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/build/push.targets b/build/push.targets
index b2a563794e..d52845fc48 100644
--- a/build/push.targets
+++ b/build/push.targets
@@ -1,35 +1,32 @@
 <Project>
   <Target Name="Push" DependsOnTargets="_PushNuGet;_PushNpm" />
 
-  <Target Name="_PushNuGet">
+  <ItemGroup>
+    <PackagesToPush Include="$(BuildDir)*.nupkg" />
+    <PackagesToPush Include="$(ArtifactsDir)mirror\*.nupkg" />
+  </ItemGroup>
+
+  <Target Name="_PushNuGet" Condition="@(PackagesToPush->Count()) != 0">
     <Error Text="Missing required property: NuGetPublishFeed"  Condition=" '$(NuGetPublishFeed)' == '' "/>
-
-    <ItemGroup>
-      <_PackagesToPush Include="$(BuildDir)*.nupkg" />
-      <_PackagesToPush Include="$(ArtifactsDir)mirror\*.nupkg" />
-    </ItemGroup>
-
     <PushNuGetPackages
-      Packages="@(_PackagesToPush)"
+      Packages="@(PackagesToPush)"
       Feed="$(NuGetPublishFeed)"
-      Condition="@(_PackagesToPush->Count()) != 0"
       ApiKey="$(APIKey)" />
   </Target>
 
-  <Target Name="_PushNpm">
+  <ItemGroup>
+    <NpmModuleArtifact Include="$(BuildDir)*.tgz" />
+  </ItemGroup>
+
+  <Target Name="_PushNpm" Condition="@(NpmModuleArtifact->Count()) != 0">
     <Error Text="Missing required property: NpmRegistry"  Condition=" '$(NpmRegistry)' == '' "/>
 
     <PropertyGroup>
       <AuthTokenSetting>$(NpmRegistry.Replace("https:", "")):_authToken</AuthTokenSetting>
     </PropertyGroup>
 
-    <ItemGroup>
-      <NpmModuleArtifact Include="$(BuildDir)*.tgz" />
-    </ItemGroup>
-
     <Exec Command="npm config set &quot;$(AuthTokenSetting)&quot; $(APIKey)" Condition=" '$(APIKey)' != '' " />
     <Exec Command="npm publish --registry $(NpmRegistry) &quot;%(NpmModuleArtifact.Identity)&quot;"
-          Condition="@(NpmModuleArtifact->Count()) != 0"
           ContinueOnError="true">
       <Output TaskParameter="ExitCode" ItemName="ExitCodes" />
     </Exec>