From 2a26eb3f0786d7e7189b0a2059238dcf168e3b04 Mon Sep 17 00:00:00 2001
From: Jacques Eloff <joeloff@users.noreply.github.com>
Date: Thu, 11 Aug 2022 23:22:31 -0700
Subject: [PATCH] Workload promotion (#73798)

* Fix duplicate artifacts for workloads
* Consolidate publishing for VS
---
 src/installer/prepare-artifacts.proj | 14 +++-----------
 src/workloads/workloads.csproj       |  6 ++++--
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/installer/prepare-artifacts.proj b/src/installer/prepare-artifacts.proj
index e84a147..a4476a5 100644
--- a/src/installer/prepare-artifacts.proj
+++ b/src/installer/prepare-artifacts.proj
@@ -209,20 +209,12 @@
         Exclude="@(DownloadedSymbolNupkgFile)" />
 
       <!--
-        Workloads VS insertion artifacts produced by src/workloads/workloads.csproj.
-        Manually dedupe the file set for publishing since we have duplicates files in separate
-        feature band folders and Distinct() works on the actual Include value.
+        Workloads VS insertion artifacts produced by src/workloads/workloads.csproj. Only grab
+        the zip artifacts as they're grouped by SDK feature band which correlates with specific VS versions.
       -->
-      <_WorkloadsVSInsertionFile
-        Include="
-          $(DownloadDirectory)*\workloads-vs\**\*.msi;
-          $(DownloadDirectory)*\workloads-vs\**\*.json" />
-      <__WorkloadsVSInsertionFile Include="%(_WorkloadsVSInsertionFile.Filename)%(Extension)" ActualPath="%(FullPath)" />
-      <___WorkloadsVSInsertionFile Include="@(__WorkloadsVSInsertionFile->Distinct())" />
-      <WorkloadsVSInsertionFile Include="%(___WorkloadsVSInsertionFile.ActualPath)" />
       <WorkloadsVSInsertionFile
         Include="
-          $(DownloadDirectory)**\Workloads.VSDrop*.zip" />
+          $(DownloadDirectory)*\workloads-vs\**\*.zip"/>
 
       <!--
         Runtime packages associated with some identity packages. Need to exclude "runtime.native.*"
diff --git a/src/workloads/workloads.csproj b/src/workloads/workloads.csproj
index a8cfd87..bce01c4 100644
--- a/src/workloads/workloads.csproj
+++ b/src/workloads/workloads.csproj
@@ -18,6 +18,7 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
 
     <WorkloadIntermediateOutputPath>$(ArtifactsObjDir)workloads/</WorkloadIntermediateOutputPath>
+    <VSTemp>$(WorkloadIntermediateOutputPath)VS/</VSTemp>
     <WorkloadOutputPath>$(ArtifactsBinDir)workloads/</WorkloadOutputPath>
     <WorkloadOutputPath Condition="'$(workloadArtifactsPath)' != ''">$(workloadArtifactsPath)/</WorkloadOutputPath>
     <PackageSource>$(ArtifactsShippingPackagesDir)</PackageSource>
@@ -112,7 +113,7 @@
     </CreateVisualStudioWorkload>
 
     <!-- Build all the SWIX projects. This requires full framework MSBuild-->
-    <MSBuild Projects="@(SwixProjects)" Properties="SwixBuildTargets=$(SwixBuildTargets);ManifestOutputPath=$(VisualStudioSetupInsertionPath)%(SwixProjects.SdkFeatureBand)" />
+    <MSBuild Projects="@(SwixProjects)" Properties="SwixBuildTargets=$(SwixBuildTargets);ManifestOutputPath=$(VSTemp)%(SwixProjects.SdkFeatureBand)" />
 
     <!-- Create payload package for VSDROP creation -->
     <ItemGroup>
@@ -120,7 +121,8 @@
     </ItemGroup>
     
     <MakeDir Directories="$(ArtifactsNonShippingPackagesDir)" />
-    <ZipDirectory Overwrite="true" DestinationFile="$(ArtifactsNonShippingPackagesDir)Workloads.VSDrop.%(SdkFeatureBand.Identity).$(PackageVersion).zip" SourceDirectory="$(VisualStudioSetupInsertionPath)%(SdkFeatureBand.Identity)"/>
+    <MakeDir Directories="$(VisualStudioSetupInsertionPath)" />
+    <ZipDirectory Overwrite="true" DestinationFile="$(VisualStudioSetupInsertionPath)Workloads.VSDrop.%(SdkFeatureBand.Identity).$(PackageVersion).zip" SourceDirectory="$(VSTemp)%(SdkFeatureBand.Identity)"/>
 
     <!-- Gather .wixobj files for post-build signing. We'll have to batch since we generated multiple MSIs in the previous step. -->
     <MSBuild Projects="$(MSBuildProjectFile)" Properties="_WixObjDir=%(Msis.WixObj);_Msi=%(Msis.Identity)" Targets="CreateWixPack" />
-- 
2.7.4