From 1db9776b24b38a2e68d688ec1a86606dc20a5f86 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Wed, 15 Mar 2017 09:05:53 -0700
Subject: [PATCH] Fix publishing packages to the volatile feed

Fixes #488
---
 build/RepositoryBuild.targets | 9 +++++++--
 build/repo.targets            | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets
index 3d3faefd5b..d18a4c5265 100644
--- a/build/RepositoryBuild.targets
+++ b/build/RepositoryBuild.targets
@@ -64,15 +64,20 @@
 
     <ItemGroup>
       <RepositoryArtifacts Include="$(RepositoryArtifactsDirectory)*" />
+      <RepositorySymbolNupkgs Include="$(RepositoryArtifactsDirectory)*.symbols.nupkg" />
+      <RepositoryNupkgs Include="$(RepositoryArtifactsDirectory)*.nupkg" Exclude="@(RepositorySymbolNupkgs)" />
     </ItemGroup>
 
     <Copy
        SourceFiles="@(RepositoryArtifacts)"
        DestinationFolder="$(UniverseBuildDir)" />
 
+    <Message Text="Publishing the following packages to the volatile feed: @(RepositoryNupkgs -> '%(Filename)%(Extension)', ', ')"
+      Condition="'$(PublishPackages)'=='true'" />
+
     <Exec
-      Command="$(DotNetPath) nuget push &quot;%(RepositoryArtifacts.Identity)&quot; -s $(NuGetPublishVolatileFeed) -k $(APIKEY)"
-      Condition="'$(PublishPackages)'=='true' AND '%(RepositoryArtifacts.Extension)'=='.nupkg'" />
+      Command="$(DotNetPath) nuget push &quot;%(RepositoryNupkgs.Identity)&quot; -s $(NuGetPublishVolatileFeed) -k $(APIKEY)"
+      Condition="'$(PublishPackages)'=='true'" />
 
     <Message Text="============ Done building $(RepositoryToBuild) ============" Importance="High" />
   </Target>
diff --git a/build/repo.targets b/build/repo.targets
index 0228877720..b222c8a5c6 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -122,7 +122,7 @@
 
       <_BuildRepositoryProperties Condition="'$(PublishPackages)'=='true'">
         $(_BuildRepositoryProperties);
-        APIKey=$(APIKey)
+        APIKey=$(APIKey);
         NuGetPublishVolatileFeed=$(NuGetPublishVolatileFeed);
         PublishPackages=$(PublishPackages)
       </_BuildRepositoryProperties>