From 99d0f1c5a2494a9abfc4fc75d326c6bba6b3dd3c Mon Sep 17 00:00:00 2001
From: Michael Niksa <miniksa@microsoft.com>
Date: Fri, 7 May 2021 12:49:51 -0700
Subject: [PATCH] shuffle config/platform again. make test content package

---
 build/Helix/PrepareHelixPayload.ps1              |  1 +
 build/Helix/packages.config                      |  1 +
 build/pipelines/templates/build-console-pgo.yml  |  4 ++--
 build/pipelines/templates/helix-runtests-job.yml | 13 +++++++++----
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/build/Helix/PrepareHelixPayload.ps1 b/build/Helix/PrepareHelixPayload.ps1
index 45ecb224e99..28e92fce124 100644
--- a/build/Helix/PrepareHelixPayload.ps1
+++ b/build/Helix/PrepareHelixPayload.ps1
@@ -24,6 +24,7 @@ Copy-Item "$nugetPackagesDir\Microsoft.Taef.10.58.210305002\build\Binaries\$Plat
 New-Item -ItemType Directory -Force -Path "$payloadDir\.NETCoreApp2.1\"
 Copy-Item "$nugetPackagesDir\runtime.win-$Platform.microsoft.netcore.app.2.1.0\runtimes\win-$Platform\lib\netcoreapp2.1\*" "$payloadDir\.NETCoreApp2.1\"
 Copy-Item "$nugetPackagesDir\runtime.win-$Platform.microsoft.netcore.app.2.1.0\runtimes\win-$Platform\native\*" "$payloadDir\.NETCoreApp2.1\"
+Copy-Item "$nugetPackagesDir\Microsoft.Internal.Windows.Terminal.TestContent\content\*" "$payloadDir\content\"
 
 function Copy-If-Exists
 {
diff --git a/build/Helix/packages.config b/build/Helix/packages.config
index 8bf9ce1972e..68c524ec1d7 100644
--- a/build/Helix/packages.config
+++ b/build/Helix/packages.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MUXCustomBuildTasks" version="1.0.48" targetFramework="native" />
+  <package id="Microsoft.Internal.Windows.Terminal.TestContent" version="1.0.0" />
   <package id="Microsoft.Taef" version="10.58.210305002" targetFramework="native" />
   <package id="microsoft.windows.apps.test" version="1.0.181203002" targetFramework="native" />
   <package id="runtime.win-x86.microsoft.netcore.app" version="2.1.0" targetFramework="native" />
diff --git a/build/pipelines/templates/build-console-pgo.yml b/build/pipelines/templates/build-console-pgo.yml
index cd12733c962..49dcd3a6c9d 100644
--- a/build/pipelines/templates/build-console-pgo.yml
+++ b/build/pipelines/templates/build-console-pgo.yml
@@ -28,8 +28,8 @@ jobs:
     condition: succeeded()
     testSuite: 'PgoInstrumentationSuite'
     taefQuery: '@IsPgo=true'
-    buildConfiguration: ${{parameters.configuration}}
-    buildPlatform: ${{parameters.platform}}
+    configuration: ${{ parameters.configuration }}
+    platform: ${{ parameters.platform }}
     rerunPassesRequiredToAvoidFailure: ${{ parameters.rerunPassesRequiredToAvoidFailure }}
     
 - template: helix-processtestresults-job.yml
diff --git a/build/pipelines/templates/helix-runtests-job.yml b/build/pipelines/templates/helix-runtests-job.yml
index e1370ab5990..748b88b3c21 100644
--- a/build/pipelines/templates/helix-runtests-job.yml
+++ b/build/pipelines/templates/helix-runtests-job.yml
@@ -10,12 +10,16 @@ parameters:
   maxParallel: 4
   rerunPassesRequiredToAvoidFailure: 5
   taefQuery: ''
+  configuration: ''
+  platform: ''
   # if 'useBuildOutputFromBuildId' is set, we will default to using a build from this pipeline:
   useBuildOutputFromPipeline: $(System.DefinitionId)
-  buildPlatform: ''
-  buildConfiguration: ''
-  openHelixTargetQueues: 'windows.10.amd64.client19h1.open.xaml'
-  closedHelixTargetQueues: 'windows.10.amd64.client19h1.xaml'
+  matrix:
+    DoTheThing:
+      buildPlatform: '${{ parameters.platform }}'
+      buildConfiguration: '${{ parameters.configuration }}'
+      openHelixTargetQueues: 'windows.10.amd64.client19h1.open.xaml'
+      closedHelixTargetQueues: 'windows.10.amd64.client19h1.xaml'
 
 jobs:
 - job: ${{ parameters.name }}
@@ -26,6 +30,7 @@ jobs:
   timeoutInMinutes: 120
   strategy:
     maxParallel: ${{ parameters.maxParallel }}
+    matrix: ${{ parameters.matrix }}
   variables:
     artifactsDir: $(Build.SourcesDirectory)\Artifacts
     taefPath: $(Build.SourcesDirectory)\build\Helix\packages\Microsoft.Taef.10.58.210305002\build\Binaries\$(buildPlatform)