Filter out nuget packages for the file publish list.

Add extra logging for uploading and downloading packages

Commit migrated from https://github.com/dotnet/core-setup/commit/426871f00c417c8edad84fe221abb015f00dc024

diff --git a/src/installer/publish/publish-type.proj b/src/installer/publish/publish-type.proj
index 3754ca8..ce55583 100644 (file)
--- a/src/installer/publish/publish-type.proj
+++ b/src/installer/publish/publish-type.proj
@@ -56,6 +56,8 @@
     </PropertyGroup>
     <MakeDir Directories="$(DownloadDirectory)" Condition="!Exists('$(DownloadDirectory)')" />
 
+    <Messsage Text="Downloading files from $(AzureAccountName)/$(ContainerName)/$(BinariesRelativePath) into $(DownloadDirectory)" />
+
     <DownloadFromAzure AccountName="$(AzureAccountName)"
                        AccountKey="$(AzureAccessToken)"
                        ContainerName="$(ContainerName)"
@@ -68,7 +70,7 @@
 
       <!-- Setup item groups for PublishPackagesToBlobFeed and PublishFilesToBlobFeed -->
       <PackagesToPublish Include="$(DownloadDirectory)**\*.nupkg" />
-      <FilesToPublish Include="$(DownloadDirectory)**\*.*" Exclude="$(PackagesToPublish)" />
+      <FilesToPublish Include="$(DownloadDirectory)**\*.*" Exclude="@(PackagesToPublish)" />
     </ItemGroup>
   </Target>
 

diff --git a/src/installer/publish/publish.proj b/src/installer/publish/publish.proj
index 9e1ae38..cc6acb1 100644 (file)
--- a/src/installer/publish/publish.proj
+++ b/src/installer/publish/publish.proj
@@ -88,6 +88,9 @@
         <RelativeBlobPath>$(RelativeBlobPath)/%(Filename)%(Extension)</RelativeBlobPath>
       </ItemsToPublish>
     </ItemGroup>
+
+    <Messsage Text="Uploading files to $(AzureAccountName)/$(ContainerName)/$(RelativeBlobPath)" />
+
     <UploadToAzure AccountName="$(AzureAccountName)"
                    AccountKey="$(AzureAccessToken)"
                    ContainerName="$(ContainerName)"
@@ -108,6 +111,9 @@
         <RelativeBlobPath>$(RelativeBlobPath)/%(Filename)%(Extension)</RelativeBlobPath>
       </ItemsToPublish>
     </ItemGroup>
+
+    <Messsage Text="Uploading checksum files to $(ChecksumAzureAccountName)/$(ChecksumContainerName)/$(RelativeBlobPath)" />
+
     <UploadToAzure AccountName="$(ChecksumAzureAccountName)"
                    AccountKey="$(ChecksumAzureAccessToken)"
                    ContainerName="$(ChecksumContainerName)"