From 71d09dc15c4244eb463dc839986441c4741bf419 Mon Sep 17 00:00:00 2001
From: Kiran Challa <kichalla@microsoft.com>
Date: Fri, 24 Mar 2017 13:16:21 -0700
Subject: [PATCH] Using PackagePublisher tool to publish packages as it does
 retries

---
 build/RepositoryBuild.targets |  2 +-
 build/repo.targets            | 21 ++++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets
index 7c3fd43bfb..f81bc38bcc 100644
--- a/build/RepositoryBuild.targets
+++ b/build/RepositoryBuild.targets
@@ -77,7 +77,7 @@
       Condition="'$(PublishPackages)'=='true' AND '@(RepositoryNupkgs)' != ''" />
 
     <Exec
-      Command="$(DotNetPath) nuget push &quot;%(RepositoryNupkgs.Identity)&quot; -s $(NuGetPublishVolatileFeed) -k $(APIKEY)"
+      Command="$(PackagePublisherPath) -d $(RepositoryArtifactsDirectory) -f $(NuGetPublishVolatileFeed)"
       Condition="'$(PublishPackages)'=='true' AND '@(RepositoryNupkgs)' != ''" />
 
     <Message Text="============ Done building $(RepositoryToBuild) ============" Importance="High" />
diff --git a/build/repo.targets b/build/repo.targets
index da9344af5b..d72f67a1a3 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -1,4 +1,4 @@
-<Project>
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <NuGetPublishVolatileFeed>https://dotnet.myget.org/F/aspnetcore-volatile-dev/api/v2/package</NuGetPublishVolatileFeed>
 
@@ -18,6 +18,10 @@
     <BuildDependsOn>$(BuildDependsOn);CloneRepositories;BuildRepositories</BuildDependsOn>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="PackagePublisher" Version="1.0.1-*" />
+  </ItemGroup>
+
   <Import
     Project="$(_DependencyRepositoryList)"
     Condition="Exists('$(_DependencyRepositoryList)')" />
@@ -100,8 +104,18 @@
       Condition="'$(CloneRepositoryCommit)'!=''" />
   </Target>
 
+  <Target Name="_ResolvePackagePublisherPath" DependsOnTargets="RunResolvePackageDependencies">
+    <ItemGroup>
+      <PackagePublisherPath Include="%(PackageDefinitions.ResolvedPath)" Condition="'%(PackageDefinitions.Name)'=='PackagePublisher'" />
+    </ItemGroup>
+ 
+   <PropertyGroup>
+      <_PackagePublisherPath>@(PackagePublisherPath)\PackagePublisher.exe</_PackagePublisherPath>
+    </PropertyGroup>
+  </Target>
+
   <Target Name="BuildRepositories"
-     DependsOnTargets="_FilterRepositories;_FindDotNetPath;_GenerateRestoreGraphSpecs;_GenerateBuildGraph;_UpdateNuGetConfig;_CreateRepositoriesListWithCommits">
+     DependsOnTargets="_FilterRepositories;_FindDotNetPath;_ResolvePackagePublisherPath;_GenerateRestoreGraphSpecs;_GenerateBuildGraph;_UpdateNuGetConfig;_CreateRepositoriesListWithCommits">
 
     <PropertyGroup>
       <_BuildRepositoryProperties>
@@ -117,7 +131,8 @@
         _CloneRepositoryRoot=$(_CloneRepositoryRoot);
         _DependencyPackagesDirectory=$(_DependencyPackagesDirectory);
         _RepositoryBuildTargets=$(_RepositoryBuildTargets);
-        _RestoreGraphSpecsDirectory=$(_RestoreGraphSpecsDirectory)
+        _RestoreGraphSpecsDirectory=$(_RestoreGraphSpecsDirectory);
+        PackagePublisherPath=$(_PackagePublisherPath)
       </_BuildRepositoryProperties>
 
       <_BuildRepositoryProperties Condition="'$(PublishPackages)'=='true'">