From 4e8469093855aa27fe595420078754082ed8a0c9 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 7 Mar 2017 22:37:58 -0800
Subject: [PATCH] Make publishing to the volatile feed work.

---
 build/RepositoryBuild.targets |  2 +-
 build/repo.targets            | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets
index 8091407481..ab293aba10 100644
--- a/build/RepositoryBuild.targets
+++ b/build/RepositoryBuild.targets
@@ -65,7 +65,7 @@
        DestinationFolder="$(UniverseBuildDir)" />
 
     <Exec
-      Command="$(DotNetPath) nuget push &quot;%(RepositoryArtifacts.Identity)&quot; -s $(NuGetFeed) -k $(APIKEY)"
+      Command="$(DotNetPath) nuget push &quot;%(RepositoryArtifacts.Identity)&quot; -s $(NuGetPublishVolatileFeed) -k $(APIKEY)"
       Condition="'$(PublishPackages)'=='true' AND '%(RepositoryArtifacts.Extension)'=='.nupkg'" />
 
     <Message Text="============ Done building $(RepositoryToBuild) ============" Importance="High" />
diff --git a/build/repo.targets b/build/repo.targets
index e409f6eeeb..5f268af2c4 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -121,21 +121,20 @@
         _RepositoryBuildTargets=$(_RepositoryBuildTargets);
         _RestoreGraphSpecsDirectory=$(_RestoreGraphSpecsDirectory)
       </_BuildRepositoryProperties>
+
+      <_BuildRepositoryProperties Condition="'$(PublishPackages)'=='true'">
+        $(_BuildRepositoryProperties);
+        APIKey=$(APIKey)
+        DotNetPath=$(DotNetPath);
+        NuGetPublishVolatileFeed=$(NuGetPublishVolatileFeed);
+        PublishPackages=$(PublishPackages)
+      </_BuildRepositoryProperties>
     </PropertyGroup>
 
     <MSBuild
       Projects="$(MSBuildThisFileDirectory)RepositoryBuild.targets"
       Targets="BuildRepositories"
       Properties="$(_BuildRepositoryProperties)" />
-
-    <MSBuild
-      Projects="$(MSBuildThisFileDirectory)PublishPackages.targets"
-      Condition="'$(PublishPackages)'=='true'"
-      Properties="
-        PackagesDirectory=$(ArtifactsDir);
-        DotNetPath=$(DotNetPath);
-        NuGetFeed=$(NuGetPublishFeed);
-        APIKey=$(APIKey)" />
   </Target>
 
   <Target Name="_GenerateRestoreGraphSpecs" DependsOnTargets="_FindDotNetPath">