From 4a6d5a94d04db01c2f10b872d0c38a78779bd086 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Wed, 30 Aug 2017 15:19:41 -0700
Subject: [PATCH 1/3] The enumeration of the nupkg packages depends on that the
 creation of packages has already occurred.

---
 build/Publish.targets | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/build/Publish.targets b/build/Publish.targets
index 4003e181c..89d41afb6 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -26,8 +26,11 @@
                              UploadChecksumsToAzure;
                              PublishDebFilesToDebianRepo;
                              PublishCliVersionBadge" />
-
-  <Target Name="GatherItemsForPattern">
+          
+          
+  <Target Name="GatherItemsForPattern"
+           DependsOnTargets="GenerateSdkNupkg;
+                             GenerateSdkMSBuildExtensionsNupkg" >
     <ItemGroup>
       <ForPublishing Include="@(GeneratedInstallers)"
                      Condition=" '$(IslinuxPortable)' != 'true' "/>

From fd8f3e7ebe73e3789e4a44e1bbc0cc7c69b2e633 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Wed, 30 Aug 2017 16:14:15 -0700
Subject: [PATCH 2/3] Turning on the NuPkg publishing from Win x86

---
 build/Publish.targets | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/build/Publish.targets b/build/Publish.targets
index 89d41afb6..446996b31 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -28,16 +28,14 @@
                              PublishCliVersionBadge" />
           
           
-  <Target Name="GatherItemsForPattern"
-           DependsOnTargets="GenerateSdkNupkg;
-                             GenerateSdkMSBuildExtensionsNupkg" >
+  <Target Name="GatherItemsForPattern">
     <ItemGroup>
       <ForPublishing Include="@(GeneratedInstallers)"
                      Condition=" '$(IslinuxPortable)' != 'true' "/>
       <ForPublishing Include="%(GenerateArchivesInputsOutputs.Outputs)"
                      Condition=" '$(IsLinuxDistroSpecific)' != 'true' "/>
       <ForPublishing Include="$(PackagesDirectory)/Microsoft*.nupkg"
-                     Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' != '' AND '$(IsLinuxDistroSpecific)' != 'true'"/>
+                     Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' != '' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/>
       <ForPublishing Include="$(PackagesDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture)*.nupkg"
                      Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' != '' AND '$(OS)' == 'Windows_NT' "/>
       <ForPublishing Include="$(PackagesDirectory)/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions*.nupkg"

From 81003e13c3b172ee112e9b3f56f3be97c25fa30d Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Wed, 30 Aug 2017 16:16:08 -0700
Subject: [PATCH 3/3] Removing extra line feeds...

---
 build/Publish.targets | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build/Publish.targets b/build/Publish.targets
index 446996b31..bc9a387b6 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -26,8 +26,7 @@
                              UploadChecksumsToAzure;
                              PublishDebFilesToDebianRepo;
                              PublishCliVersionBadge" />
-          
-          
+
   <Target Name="GatherItemsForPattern">
     <ItemGroup>
       <ForPublishing Include="@(GeneratedInstallers)"