From 7b78272013702e7875890f6445584b88e7680f20 Mon Sep 17 00:00:00 2001
From: Scott Jones <sjones@microsoft.com>
Date: Sat, 7 Dec 2024 21:13:01 -0800
Subject: [PATCH] Use separate folder for publishing redist files, not the
 nuget package cache (#4940)

* Remove publish of packages dir

Can't think of a good reason to publish the entire nuget cache, which adds 4GB and significant time

* publish redist files exclusively, not the entire nuget package cache

* missed redist path

* include TAEF in redist

* install TEAF from redist folder
---
 .../WindowsAppSDK-BuildFoundation-Steps.yml      | 16 ++++++++++++----
 .../WindowsAppSDK-RunTests-Steps.yml             | 11 ++++++-----
 ...WindowsAppSDK-SetupBuildEnvironment-Steps.yml |  6 +++---
 tools/DevCheck/DevCheck.ps1                      |  2 +-
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-Steps.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-Steps.yml
index 77e2b32727..be7fd986ad 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-Steps.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-Steps.yml
@@ -132,22 +132,30 @@ steps:
 # Artifacts are uploaded via ob_outputDirectory where the each vPack Push jobs downloads from
 # so the CopyFiles below are to move all the vPack files to the right locations
 - task: CopyFiles@2
-  displayName: MoveToOutputDirectory
+  displayName: Stage BuildOutput for publish
   condition: always()
   inputs:
     SourceFolder: '$(build.SourcesDirectory)\BuildOutput'
     TargetFolder: '$(ob_outputDirectory)'
 
 - task: CopyFiles@2
-  displayName: MoveToOutputDirectory
+  displayName: Stage redist files for publish
+  condition: always()
+  inputs:
+    SourceFolder: '$(build.SourcesDirectory)\redist'
+    TargetFolder: '$(ob_outputDirectory)\redist'
+
+- task: CopyFiles@2
+  displayName: Stage TAEF files for publish
   condition: always()
   inputs:
     SourceFolder: '$(build.SourcesDirectory)\packages'
-    TargetFolder: '$(ob_outputDirectory)\packages'
+    Contents: Microsoft.Taef.*\**
+    TargetFolder: '$(ob_outputDirectory)\redist'
 
 - ${{ if not( parameters.IsOneBranch ) }}:
   - task: PublishBuildArtifacts@1
     condition: always()
     inputs:
       PathtoPublish: '$(ob_outputDirectory)'
-      artifactName: '$(ob_artifactBaseName)'
\ No newline at end of file
+      artifactName: '$(ob_artifactBaseName)'
diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-RunTests-Steps.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-RunTests-Steps.yml
index 2f0f4be166..30b9864e85 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-RunTests-Steps.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-RunTests-Steps.yml
@@ -37,9 +37,10 @@ steps:
       targetPath: '$(Build.SourcesDirectory)\BuildOutput'
 
   - task: CopyFiles@2
+    displayName: Download published redist files
     inputs:
-      SourceFolder: '$(Build.SourcesDirectory)\BuildOutput\packages'
-      TargetFolder: '$(Build.SourcesDirectory)\packages'
+      SourceFolder: '$(Build.SourcesDirectory)\BuildOutput\redist'
+      TargetFolder: '$(Build.SourcesDirectory)\redist'
 
   - task: powerShell@2
     displayName: 'Enable developer mode'
@@ -72,14 +73,14 @@ steps:
     inputs:
       targetType: 'inline'
       script: |
-            $(Build.SourcesDirectory)\packages\dotnet-windowsdesktop-runtime-installer.exe /quiet /install /norestart
+            $(Build.SourcesDirectory)\redist\dotnet-windowsdesktop-runtime-installer.exe /quiet /install /norestart
 
   - task: powerShell@2
     displayName: 'Install VCLibs.Desktop'
     inputs:
       targetType: 'inline'
       script: |
-            $package = "$(Build.SourcesDirectory)\packages\Microsoft.VCLibs.${{ parameters.buildPlatform }}.14.00.Desktop.appx"
+            $package = "$(Build.SourcesDirectory)\redist\Microsoft.VCLibs.${{ parameters.buildPlatform }}.14.00.Desktop.appx"
             Add-AppxPackage $package -ErrorAction SilentlyContinue
 
   - task: powerShell@2
@@ -87,7 +88,7 @@ steps:
     inputs:
       targetType: 'inline'
       script: |
-            $(Build.SourcesDirectory)\packages\vc_redist.${{ parameters.buildPlatform }}.exe /quiet /install /norestart
+            $(Build.SourcesDirectory)\redist\vc_redist.${{ parameters.buildPlatform }}.exe /quiet /install /norestart
 
   - task: powershell@2
     displayName: 'Run TE.Service'
diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-SetupBuildEnvironment-Steps.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-SetupBuildEnvironment-Steps.yml
index 1736fa6434..12f9ef0e1c 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-SetupBuildEnvironment-Steps.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-SetupBuildEnvironment-Steps.yml
@@ -89,7 +89,7 @@ steps:
   inputs:
     targetType: filePath
     filePath: '$(Build.SourcesDirectory)\build\scripts\DownloadDotNetRuntimeInstaller.ps1'
-    arguments: -Platform "$(buildPlatform)" -OutputDirectory "$(build.SourcesDirectory)\packages"
+    arguments: -Platform "$(buildPlatform)" -OutputDirectory "$(build.SourcesDirectory)\redist"
 
 - task: PowerShell@2
   displayName: 'Download vcredist installer'
@@ -97,7 +97,7 @@ steps:
   inputs:
     targetType: filePath
     filePath: '$(Build.SourcesDirectory)\build\scripts\DownloadVCRedistInstaller.ps1'
-    arguments: -Platform "$(buildPlatform)" -OutputDirectory "$(build.SourcesDirectory)\packages"
+    arguments: -Platform "$(buildPlatform)" -OutputDirectory "$(build.SourcesDirectory)\redist"
 
 - task: PowerShell@2
   displayName: 'Download desktop bridge CRT'
@@ -105,7 +105,7 @@ steps:
   inputs:
     targetType: filePath
     filePath: '$(Build.SourcesDirectory)\build\scripts\DownloadVCLibsDesktop.ps1'
-    arguments: -Platform "$(buildPlatform)" -OutputDirectory "$(build.SourcesDirectory)\packages"
+    arguments: -Platform "$(buildPlatform)" -OutputDirectory "$(build.SourcesDirectory)\redist"
 
 - task: powershell@2
   displayName: 'Create DynamicDependencies TerminalVelocity features'
diff --git a/tools/DevCheck/DevCheck.ps1 b/tools/DevCheck/DevCheck.ps1
index e96a8e4fde..73cf9d74a7 100644
--- a/tools/DevCheck/DevCheck.ps1
+++ b/tools/DevCheck/DevCheck.ps1
@@ -1069,7 +1069,7 @@ function Install-TAEFService
     $cpu = Get-CpuArchitecture
     $taef_version = Get-TAEFPackageVersion
     $taef = "Microsoft.Taef.$($taef_version)"
-    $path = "$root\packages\$taef\build\Binaries\$cpu\Wex.Services.exe"
+    $path = "$root\redist\$taef\build\Binaries\$cpu\Wex.Services.exe"
     if (-not(Test-Path -Path $path -PathType Leaf))
     {
         Write-Host "Install TAEF service...Not Found ($path)"