From 8ad116f0232958d8065897c0b92dd66b9e6e4b06 Mon Sep 17 00:00:00 2001
From: chcosta <chcosta@microsoft.com>
Date: Fri, 4 Aug 2017 14:58:30 -0700
Subject: [PATCH] Enable retries for the nuget push command used during
 publishing (dotnet/core-setup#2980)

* Enable retries for the nuget push command used during publishing

* Alphabetize usingtask list in publish.proj


Commit migrated from https://github.com/dotnet/core-setup/commit/14627e34be86271759ffdd5ea8692a51e2b7f4fe
---
 src/installer/BuildToolsVersion.txt |  2 +-
 src/installer/publish/dir.props     | 12 ++++++++++++
 src/installer/publish/publish.proj  | 12 ++++++++----
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/installer/BuildToolsVersion.txt b/src/installer/BuildToolsVersion.txt
index 6314566..1f8c009 100644
--- a/src/installer/BuildToolsVersion.txt
+++ b/src/installer/BuildToolsVersion.txt
@@ -1 +1 @@
-2.0.0-prerelease-01805-01
+2.0.0-prerelease-01903-01
diff --git a/src/installer/publish/dir.props b/src/installer/publish/dir.props
index 0c2b287..0b3bddf 100644
--- a/src/installer/publish/dir.props
+++ b/src/installer/publish/dir.props
@@ -14,6 +14,18 @@
     <ProductMoniker>$(DistroRid).$(SharedFrameworkNugetVersion)</ProductMoniker>
     <HostResolverVersionMoniker>$(DistroRid).$(HostResolverVersion)</HostResolverVersionMoniker>
   </PropertyGroup>
+
+  <ItemGroup>
+    <!-- IgnorableErrorMessages applies to the "ExectWithRetriesForNuGetPush" task.
+          There's a very special failure scenario that we want to ignore.  That scenario is
+          when NuGet hits a timeout on one "push" attempt, and then gets a "Forbidden" response
+          because the package "already exists" on the next response.  This indicates that the
+          timeout occurred, but the push was actually successful.
+    -->
+    <IgnorableErrorMessages Include="Overwriting existing packages is forbidden according to the package retention settings for this feed.">
+      <ConditionalErrorMessage>Pushing took too long</ConditionalErrorMessage>
+    </IgnorableErrorMessages>
+  </ItemGroup>
   
   <ItemGroup>
     <CompressedFile Include="$(PackagesOutDir)**/*$(CompressedFileExtension)">
diff --git a/src/installer/publish/publish.proj b/src/installer/publish/publish.proj
index f0b7889..24de5dc 100644
--- a/src/installer/publish/publish.proj
+++ b/src/installer/publish/publish.proj
@@ -2,6 +2,7 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <UsingTask TaskName="DownloadFromAzure" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.CloudTestTasks.dll" />
+  <UsingTask TaskName="ExecWithRetriesForNuGetPush" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" />
   <UsingTask TaskName="FinalizeBuild" AssemblyFile="$(LocalBuildToolsTaskDir)core-setup.tasks.dll" />
   <UsingTask TaskName="ListAzureBlobs" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.CloudTestTasks.dll" />
   <UsingTask TaskName="UploadToAzure" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.CloudTestTasks.dll" />
@@ -216,11 +217,13 @@
       <NuGetPushSymbolsCommand>$(DotnetToolCommand) nuget push --source $(NuGetSymbolsFeedUrl) --api-key $(NuGetApiKey) --timeout $(NuGetPushTimeoutSeconds)</NuGetPushSymbolsCommand>
     </PropertyGroup>
 
-      <!-- ToDo: look at moving this to an msbuild task so that we can include retry logic, parallelize it, and hide the api key -->
-    <Exec Command="$(NuGetPushCommand) %(_DownloadedStandardPackages.Identity)" />
+    <ExecWithRetriesForNuGetPush Command="$(NuGetPushCommand) %(_DownloadedStandardPackages.Identity)"
+                                 IgnoredErrorMessagesWithConditional="@(IgnorableErrorMessages)" />
 
     <Message Condition="'@(_DownloadedSymbolsPackages)' != ''" Text="Pushing CoreHost symbols packages to $(NuGetSymbolsFeedUrl)" />
-    <Exec Condition="'@(_DownloadedSymbolsPackages)' != ''" Command="$(NuGetPushSymbolsCommand) %(_DownloadedSymbolsPackages.Identity)" />
+    <ExecWithRetriesForNuGetPush Condition="'@(_DownloadedSymbolsPackages)' != ''"
+                                 Command="$(NuGetPushSymbolsCommand) %(_DownloadedSymbolsPackages.Identity)"
+                                 IgnoredErrorMessagesWithConditional="@(IgnorableErrorMessages)" />
   </Target>
 
   <Target Name="PublishDebToolPackageToFeed"
@@ -233,7 +236,8 @@
     <PropertyGroup>
       <NuGetPushCommand>$(DotnetToolCommand) nuget push --source $(CliNuGetFeedUrl) --api-key $(CliNuGetApiKey) --timeout $(NuGetPushTimeoutSeconds)</NuGetPushCommand>
     </PropertyGroup>
-    <Exec Command="$(NuGetPushCommand) %(DebToolPackages.Identity)" />
+    <ExecWithRetriesForNuGetPush Command="$(NuGetPushCommand) %(DebToolPackages.Identity)"
+                                 IgnoredErrorMessagesWithConditional="@(IgnorableErrorMessages)" />
   </Target>
   
   <Import Project="$(ToolsDir)VersionTools.targets" Condition="Exists('$(ToolsDir)VersionTools.targets')" />
-- 
2.7.4