From f2e626060836091c573b4c6d52d5676cc5ef33d6 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Wed, 18 Mar 2020 09:38:05 -0700
Subject: [PATCH 1/4] Exclude packages from checksum generation

---
 src/installer/publish/prepare-artifacts.proj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/installer/publish/prepare-artifacts.proj b/src/installer/publish/prepare-artifacts.proj
index 582fffa756307..ff23694d2feca 100644
--- a/src/installer/publish/prepare-artifacts.proj
+++ b/src/installer/publish/prepare-artifacts.proj
@@ -7,10 +7,13 @@
     <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
   </PropertyGroup>
 
+  <!-- Create all the checksum files. Exclude anything that ends
+       in .nupkg (symbol and regular packages). -->
   <Target Name="CreateChecksums">
     <ItemGroup>
       <ArtifactsForGeneratingChecksums
         Include="@(UploadToBlobStorageFile)"
+        Excldude="*.nupkg"
         DestinationPath="%(FullPath)$(ChecksumExtension)" />
 
       <GeneratedChecksumFile Include="@(ArtifactsForGeneratingChecksums -> '%(DestinationPath)')" />

From a122f16648c2512143509ae6cf1e9a0b9f6735c9 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Wed, 18 Mar 2020 12:19:24 -0700
Subject: [PATCH 2/4] Rework to remove prepared artifacts

---
 src/installer/publish/Directory.Build.targets |  4 ---
 src/installer/publish/prepare-artifacts.proj  | 28 ++-----------------
 2 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/src/installer/publish/Directory.Build.targets b/src/installer/publish/Directory.Build.targets
index ba28465f8359b..76bebb473a562 100644
--- a/src/installer/publish/Directory.Build.targets
+++ b/src/installer/publish/Directory.Build.targets
@@ -70,8 +70,6 @@
 
       <NupkgToPublishFile Include="@(RuntimeNupkgFile);@(RidAgnosticNupkgToPublishFile)" />
 
-      <UploadToBlobStorageFile Include="@(NupkgToPublishFile)" />
-
       <!--
         Assuming all symbol packages ship and can be found by turning .nupkg => .symbols.nupkg, find
         them. Don't check for missing symbol packages here: some nupkgs don't have them for valid
@@ -91,8 +89,6 @@
       <SymbolNupkgToPublishFile
         Include="@(PotentialSymbolNupkgToPublishFile)"
         Condition="Exists('%(Identity)')" />
-
-      <UploadToBlobStorageFile Include="@(SymbolNupkgToPublishFile)" />
     </ItemGroup>
 
     <Error
diff --git a/src/installer/publish/prepare-artifacts.proj b/src/installer/publish/prepare-artifacts.proj
index ff23694d2feca..8445112740f32 100644
--- a/src/installer/publish/prepare-artifacts.proj
+++ b/src/installer/publish/prepare-artifacts.proj
@@ -13,7 +13,6 @@
     <ItemGroup>
       <ArtifactsForGeneratingChecksums
         Include="@(UploadToBlobStorageFile)"
-        Excldude="*.nupkg"
         DestinationPath="%(FullPath)$(ChecksumExtension)" />
 
       <GeneratedChecksumFile Include="@(ArtifactsForGeneratingChecksums -> '%(DestinationPath)')" />
@@ -31,29 +30,6 @@
       Properties="DownloadDirectory=$(DownloadDirectory)" />
   </Target>
 
-  <Target Name="UploadPreparedArtifactsToPipeline"
-          DependsOnTargets="
-            FindDownloadedArtifacts;
-            SignPackages;
-            CreateChecksums">
-    <PropertyGroup>
-      <PreparedFileUploadDir>$(ArtifactsObjDir)PreparedFileUpload\</PreparedFileUploadDir>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <AllFilesToBlobStorage Include="@(UploadToBlobStorageFile);@(UploadToBlobStorageFile)" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(AllFilesToBlobStorage)" DestinationFolder="$(PreparedFileUploadDir)">
-      <Output TaskParameter="CopiedFiles" ItemName="CopiedUploadToBlobStorageFile" />
-    </Copy>
-
-    <Message Importance="High" Text="Uploading PreparedArtifacts to pipeline" />
-    <Message
-      Text="##vso[artifact.upload containerfolder=PreparedArtifacts;artifactname=PreparedArtifacts]%(CopiedUploadToBlobStorageFile.Identity)"
-      Importance="High" />
-  </Target>
-
   <Target Name="PreparePublishToAzureBlobFeed">
     <Error Condition="'$(PackagesUrl)'==''" Text="Missing property PackagesUrl" />
 
@@ -162,7 +138,9 @@
   -->
   <Target Name="Build"
           DependsOnTargets="
-            UploadPreparedArtifactsToPipeline;
+            FindDownloadedArtifacts;
+            SignPackages;
+            CreateChecksums
             PreparePublishToAzureBlobFeed;
             PreparePublishFilesToAzureBlobFeed">
     <Message Importance="High" Text="Complete!" />

From 1f626cb31e587417accbad556a96024a70379436 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Wed, 18 Mar 2020 12:21:16 -0700
Subject: [PATCH 3/4] Remove obselete comment

---
 src/installer/publish/prepare-artifacts.proj | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/installer/publish/prepare-artifacts.proj b/src/installer/publish/prepare-artifacts.proj
index 8445112740f32..c7060b3ee061d 100644
--- a/src/installer/publish/prepare-artifacts.proj
+++ b/src/installer/publish/prepare-artifacts.proj
@@ -7,8 +7,6 @@
     <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
   </PropertyGroup>
 
-  <!-- Create all the checksum files. Exclude anything that ends
-       in .nupkg (symbol and regular packages). -->
   <Target Name="CreateChecksums">
     <ItemGroup>
       <ArtifactsForGeneratingChecksums

From 05376ab3d9068acb00250d471ff39ee9a010c210 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Wed, 18 Mar 2020 15:59:19 -0700
Subject: [PATCH 4/4] Fix missing semicolon

---
 src/installer/publish/prepare-artifacts.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/installer/publish/prepare-artifacts.proj b/src/installer/publish/prepare-artifacts.proj
index c7060b3ee061d..599388672ced6 100644
--- a/src/installer/publish/prepare-artifacts.proj
+++ b/src/installer/publish/prepare-artifacts.proj
@@ -138,7 +138,7 @@
           DependsOnTargets="
             FindDownloadedArtifacts;
             SignPackages;
-            CreateChecksums
+            CreateChecksums;
             PreparePublishToAzureBlobFeed;
             PreparePublishFilesToAzureBlobFeed">
     <Message Importance="High" Text="Complete!" />