From 543fff4247c05fa93ac7ba7b22e43ddb5b148dda Mon Sep 17 00:00:00 2001
From: Adam Yoblick <Adam.Yoblick@microsoft.com>
Date: Tue, 12 May 2020 16:09:36 -0500
Subject: [PATCH 1/3] port change from
 https://github.com/dotnet/core-setup/pull/8426

---
 Directory.Build.targets        |  1 -
 eng/stages/publish.yml         | 17 ++--------------
 publish/prepare-artifacts.proj | 36 +++++++++++++++++++++++++++++-----
 3 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index c6dd4f565..3f766110c 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -47,7 +47,6 @@
 
       <NuGetVersion>$(SharedFrameworkNugetVersion)</NuGetVersion>
 
-      <BinariesRelativePath>WindowsDesktop/$(SharedFrameworkNugetVersion)/</BinariesRelativePath>
       <InstallersRelativePath>WindowsDesktop/$(SharedFrameworkNugetVersion)/</InstallersRelativePath>
     </PropertyGroup>
 
diff --git a/eng/stages/publish.yml b/eng/stages/publish.yml
index bff4a31ad..990f6495d 100644
--- a/eng/stages/publish.yml
+++ b/eng/stages/publish.yml
@@ -3,25 +3,11 @@ parameters:
 
 stages:
 
-# Create extra stage per BAR channel that needs extra publish steps.
-- ${{ each dependency in parameters.dependsOnPublishStages }}:
-  - stage: PublishBlob_${{ dependency.dependsOn }}
-    displayName: '${{ dependency.channel.name }} Blob Publish'
-    dependsOn: PrepareForPublish
-    variables:
-    - template: /eng/common/templates/post-build/common-variables.yml
-    jobs:
-    - template: /eng/jobs/run-publish-project.yml
-      parameters:
-        projectName: publish-blobs
-        dependency: ${{ dependency }}
-
 # Stages-based publishing entry point
 - template: /eng/common/templates/post-build/post-build.yml
   parameters:
     validateDependsOn:
-    - ${{ each dependency in parameters.dependsOnPublishStages }}:
-      - PublishBlob_${{ dependency.dependsOn }}
+    - PrepareForPublish
     # Symbol validation is not ready yet. https://github.com/dotnet/arcade/issues/2871
     enableSymbolValidation: false
     # SourceLink validation doesn't work in dev builds: tries to pull from GitHub. https://github.com/dotnet/arcade/issues/3604
@@ -29,6 +15,7 @@ stages:
     # Allow symbol publish to emit expected warnings without failing the build. Include single
     # quotes inside the string so that it passes through to MSBuild without script interference.
     symbolPublishingAdditionalParameters: "'-warnAsError:$false'"
+    publishInstallersAndChecksums: true
 
 # Create extra stage per BAR channel that needs extra publish steps. These run after the Arcade
 # stages because they depend on Arcade's NuGet package publish being complete.
diff --git a/publish/prepare-artifacts.proj b/publish/prepare-artifacts.proj
index c99b6105f..8b54fa529 100644
--- a/publish/prepare-artifacts.proj
+++ b/publish/prepare-artifacts.proj
@@ -1,6 +1,24 @@
 <Project>
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
+	<UsingTask TaskName="GenerateChecksums" AssemblyFile="$(LocalBuildToolsTaskFile)" />
+
+  <PropertyGroup>
+    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
+  </PropertyGroup>
+
+  <Target Name="CreateChecksums">
+    <ItemGroup>
+      <ArtifactsForGeneratingChecksums
+        Include="@(UploadToBlobStorageFile)"
+        DestinationPath="%(FullPath)$(ChecksumExtension)" />
+
+      <GeneratedChecksumFile Include="@(ArtifactsForGeneratingChecksums -> '%(DestinationPath)')" />
+    </ItemGroup>
+
+    <GenerateChecksums Items="@(ArtifactsForGeneratingChecksums)" />
+  </Target>
+
   <Target Name="SignPackages"
           Condition="'$(SkipSigning)' != 'true' and '$(SignType)' != 'public'">
     <Message Importance="High" Text="Signing final packages" />
@@ -13,12 +31,17 @@
   <Target Name="UploadPreparedArtifactsToPipeline"
           DependsOnTargets="
             FindDownloadedArtifacts;
-            SignPackages">
+            SignPackages;
+            CreateChecksums">
     <PropertyGroup>
       <PreparedFileUploadDir>$(ArtifactsObjDir)PreparedFileUpload\</PreparedFileUploadDir>
     </PropertyGroup>
 
-    <Copy SourceFiles="@(UploadToBlobStorageFile)" DestinationFolder="$(PreparedFileUploadDir)">
+	  <ItemGroup>
+      <AllFilesToBlobStorage Include="@(UploadToBlobStorageFile);@(UploadToBlobStorageFile)" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(AllFilesToBlobStorage)" DestinationFolder="$(PreparedFileUploadDir)">
       <Output TaskParameter="CopiedFiles" ItemName="CopiedUploadToBlobStorageFile" />
     </Copy>
 
@@ -96,10 +119,13 @@
 
       <ItemsToPush
         Include="@(UploadToBlobStorageFile)"
-        Exclude="@(NupkgToPublishFile);@(SymbolNupkgToPublishFile)" />
-      <ItemsToPush>
-        <RelativeBlobPath>assets/windowsdesktop/$(InstallersRelativePath)%(Filename)%(Extension)</RelativeBlobPath>
+        Exclude="@(NupkgToPublishFile);@(SymbolNupkgToPublishFile)">
+        <RelativeBlobPath>$(InstallersRelativePath)%(Filename)%(Extension)</RelativeBlobPath>
       </ItemsToPush>
+
+      <ItemsToPush Include="@(GeneratedChecksumFile)">
+        <RelativeBlobPath>$(InstallersRelativePath)%(Filename)%(Extension)</RelativeBlobPath>
+        <Category>Checksum</Category>
     </ItemGroup>
 
     <!-- Push items to AzDO as build artifacts, generating the asset manifest as a side effect. -->

From 0bbbb08a85dd3b842d58703a68ab9b573d26e43b Mon Sep 17 00:00:00 2001
From: Adam Yoblick <Adam.Yoblick@microsoft.com>
Date: Tue, 12 May 2020 16:24:00 -0500
Subject: [PATCH 2/3] PR feedback: remove tabs and fix syntax error

---
 publish/prepare-artifacts.proj | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/publish/prepare-artifacts.proj b/publish/prepare-artifacts.proj
index 8b54fa529..551cd83ab 100644
--- a/publish/prepare-artifacts.proj
+++ b/publish/prepare-artifacts.proj
@@ -1,7 +1,7 @@
 <Project>
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
-	<UsingTask TaskName="GenerateChecksums" AssemblyFile="$(LocalBuildToolsTaskFile)" />
+  <UsingTask TaskName="GenerateChecksums" AssemblyFile="$(LocalBuildToolsTaskFile)" />
 
   <PropertyGroup>
     <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
@@ -37,7 +37,7 @@
       <PreparedFileUploadDir>$(ArtifactsObjDir)PreparedFileUpload\</PreparedFileUploadDir>
     </PropertyGroup>
 
-	  <ItemGroup>
+    <ItemGroup>
       <AllFilesToBlobStorage Include="@(UploadToBlobStorageFile);@(UploadToBlobStorageFile)" />
     </ItemGroup>
 
@@ -126,6 +126,7 @@
       <ItemsToPush Include="@(GeneratedChecksumFile)">
         <RelativeBlobPath>$(InstallersRelativePath)%(Filename)%(Extension)</RelativeBlobPath>
         <Category>Checksum</Category>
+      </ItemsToPush>
     </ItemGroup>
 
     <!-- Push items to AzDO as build artifacts, generating the asset manifest as a side effect. -->

From a00b168bb788c07f5ca4d17298b477351b3f2cb5 Mon Sep 17 00:00:00 2001
From: Adam Yoblick <Adam.Yoblick@microsoft.com>
Date: Tue, 12 May 2020 16:32:37 -0500
Subject: [PATCH 3/3] Missed a file deletion

---
 publish/publish-blobs.proj | 75 --------------------------------------
 1 file changed, 75 deletions(-)
 delete mode 100644 publish/publish-blobs.proj

diff --git a/publish/publish-blobs.proj b/publish/publish-blobs.proj
deleted file mode 100644
index ed3b2d67d..000000000
--- a/publish/publish-blobs.proj
+++ /dev/null
@@ -1,75 +0,0 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
-  <UsingTask TaskName="GenerateChecksums" AssemblyFile="$(LocalBuildToolsTaskFile)" />
-  <UsingTask TaskName="UploadToAzure" AssemblyFile="$(LocalBuildToolsTaskFile)" />
-
-  <Target Name="CreateChecksums"
-          DependsOnTargets="FindDownloadedArtifacts">
-    <ItemGroup>
-      <ArtifactsForGeneratingChecksums
-        Include="@(UploadToBlobStorageFile)"
-        DestinationPath="%(FullPath)$(ChecksumExtension)" />
-      
-      <GeneratedChecksumFile Include="@(ArtifactsForGeneratingChecksums -> '%(DestinationPath)')" />
-    </ItemGroup>
-
-    <GenerateChecksums Items="@(ArtifactsForGeneratingChecksums)" />
-  </Target>
-
-  <Target Name="UploadToAzure"
-          DependsOnTargets="
-            FindDownloadedArtifacts;
-            GetProductVersions">
-    <Error Condition="'$(AzureAccessToken)' == ''" Text="Missing required property 'AzureAccessToken'" />
-    <Error Condition="'$(AzureAccountName)' == ''" Text="Missing required property 'AzureAccountName'" />
-    <Error Condition="'$(ContainerName)' == ''" Text="Missing required property 'ContainerName'" />
-
-    <ItemGroup>
-      <FileToPublish
-        Include="@(UploadToBlobStorageFile)" 
-        RelativeBlobPath="$(BinariesRelativePath)%(Filename)%(Extension)" />
-    </ItemGroup>
-
-    <Message Importance="High" Text="Uploading files to '$(AzureAccountName)/$(ContainerName)/$(BinariesRelativePath)'" />
-    <UploadToAzure AccountName="$(AzureAccountName)"
-                   AccountKey="$(AzureAccessToken)"
-                   ContainerName="$(ContainerName)"
-                   Items="@(FileToPublish)"
-                   Overwrite="false" />
-  </Target>
-
-  <Target Name="UploadChecksumsToAzure"
-          DependsOnTargets="
-            FindDownloadedArtifacts;
-            GetProductVersions;
-            CreateChecksums">
-    <Error Condition="'$(ChecksumAzureAccessToken)' == ''" Text="Missing required property 'ChecksumAzureAccessToken'" />
-    <Error Condition="'$(ChecksumAzureAccountName)' == ''" Text="Missing required property 'ChecksumAzureAccountName'" />
-    <Error Condition="'$(ChecksumContainerName)' == ''" Text="Missing required property 'ChecksumContainerName'" />
-
-    <ItemGroup>
-      <ChecksumToPublish
-        Include="@(GeneratedChecksumFile)"
-        RelativeBlobPath="$(BinariesRelativePath)%(Filename)%(Extension)" />
-    </ItemGroup>
-
-    <Message Importance="High" Text="Uploading checksums to '$(ChecksumAzureAccountName)/$(ChecksumContainerName)/$(BinariesRelativePath)'" />
-    <UploadToAzure AccountName="$(ChecksumAzureAccountName)"
-                   AccountKey="$(ChecksumAzureAccessToken)"
-                   ContainerName="$(ChecksumContainerName)"
-                   Items="@(ChecksumToPublish)"
-                   Overwrite="false" />
-  </Target>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-
-  <!-- Perform extra publish steps that Arcade doesn't support. -->
-  <Target Name="Build"
-          DependsOnTargets="
-            UploadToAzure;
-            UploadChecksumsToAzure">
-    <Message Importance="High" Text="Complete!" />
-  </Target>
-
-</Project>