Move matrix extraction to Build stage (#5615)

Move matrix extraction to Build stage
---------

Co-authored-by: Haonan Tang <haonantang@microsoft.com>

Author: haonanttt

build/AzurePipelinesTemplates/WindowsAppSDK-Build-Per-Platform-Stage.yml

@@ -14,6 +14,9 @@ parameters:
 - name: buildPlatform
   type: string
   default: x64
+- name: testMatrix
+  type: string
+  default: ''
 
 stages:
 - stage: ${{ format(iif(parameters.runPREfast, 'PREfast_{0}', 'Build_{0}'), parameters.buildPlatform) }}
@@ -185,3 +188,26 @@ stages:
     - script: |
         md "C:\__t\NativeCompilerPrefast"
       displayName: 'Creating C:\__t\NativeCompilerPrefast to prevent errors from Guardian PREfast'
+
+  - job: ExtractMatrix
+    pool:
+      type: windows
+      isCustom: true
+      name: 'ProjectReunionESPool-2022'
+    steps:
+    - powershell: |
+        $testMatrix = "${{ parameters.testMatrix }}" | ConvertFrom-Json
+        $targetPlatform = "${{ parameters.buildPlatform }}"
+        $filteredMatrix = @{}
+        foreach ($entry in $testMatrix.PSObject.Properties) {
+          if ($entry.Value.buildPlatform -eq $targetPlatform) {
+              $filteredMatrix[$entry.Name] = $entry.Value
+          }
+        }
+        $matrixJson = $filteredMatrix | ConvertTo-Json -Compress
+        Write-Host "##vso[task.setvariable variable=filteredTestMatrix;isOutput=true]$matrixJson"
+      name: filterByPlatformStep
+      displayName: "Extract matrix as json value filtering by build platform"
+    - script: echo $(filterByPlatformStep.filteredTestMatrix)
+      name: echoMatrix
+      displayName: "Echo filtered matrix"

build/AzurePipelinesTemplates/WindowsAppSDK-Build-Stage.yml

@@ -11,6 +11,9 @@ parameters:
 - name: runPREfast
   type: boolean
   default: false
+- name: testMatrix
+  type: string
+  default: ''
 
 stages:
 - stage: ${{ iif(parameters.runPREfast, 'PREfast_AnyCPU', 'Build_AnyCPU') }}
@@ -79,6 +82,7 @@ stages:
     runPREfast : ${{ parameters.runPREfast }}
     runApiScan : ${{ parameters.runApiScan }}
     BuildPlatform: x64
+    testMatrix: ${{ parameters.testMatrix }}
 
 - ${{ if not(parameters.runPREfast) }}:
   - template: WindowsAppSDK-Build-Per-Platform-Stage.yml@self
@@ -88,6 +92,7 @@ stages:
       runPREfast : ${{ parameters.runPREfast }}
       runApiScan : ${{ parameters.runApiScan }}
       BuildPlatform: x86
+      testMatrix: ${{ parameters.testMatrix }}
 
   - template: WindowsAppSDK-Build-Per-Platform-Stage.yml@self
     parameters:
@@ -96,3 +101,4 @@ stages:
       runPREfast : ${{ parameters.runPREfast }}
       runApiScan : ${{ parameters.runApiScan }}
       BuildPlatform: arm64
+      testMatrix: ${{ parameters.testMatrix }}

build/AzurePipelinesTemplates/WindowsAppSDK-RunTestsInPipeline-Job.yml

@@ -19,34 +19,9 @@ parameters:
   default: x64
 
 jobs:
-- job: ExtractMatrix
-  pool:
-    type: windows
-    isCustom: true
-    name: 'ProjectReunionESPool-2022'
-  steps:
-  - powershell: |
-      $testMatrix = "${{ parameters.testMatrix }}" | ConvertFrom-Json
-      $targetPlatform = "${{ parameters.buildPlatform }}"
-      $filteredMatrix = @{}
-      foreach ($entry in $testMatrix.PSObject.Properties) {
-        if ($entry.Value.buildPlatform -eq $targetPlatform) {
-            $filteredMatrix[$entry.Name] = $entry.Value
-        }
-      }
-      $matrixJson = $filteredMatrix | ConvertTo-Json -Compress
-      Write-Host "##vso[task.setvariable variable=matrixJson;isOutput=true]$matrixJson"
-    name: filterByPlatformStep
-    displayName: "Extract matrix as json value filtering by build platform and pass the extracted matrix to next job"
-  - script: echo $(filterByPlatformStep.matrixJson)
-    name: echoMatrix
-    displayName: "Echo filtered matrix"
-
-
 - job: ${{ parameters.jobName }}
-  dependsOn: ExtractMatrix
   strategy:
-    matrix: $[ dependencies.ExtractMatrix.outputs['filterByPlatformStep.matrixJson'] ]
+    matrix: ${{ parameters.TestMatrix }}
   pool:
     type: windows
     isCustom: true

build/AzurePipelinesTemplates/WindowsAppSDK-Test-Stage.yml

@@ -6,7 +6,7 @@ stages:
   - template: WindowsAppSDK-RunTestsInPipeline-Job.yml@self
     parameters:
       jobName: PipelineTests
-      testMatrix: ${{ parameters.testMatrix }} # testMatrix is supplied by WindowsAppSDKConfig/WindowsAppSDK-Foundation-TestConfig.yml
+      testMatrix: $[ stageDependencies.Build_x86.ExtractMatrix.outputs['filterByPlatformStep.filteredTestMatrix'] ] # testMatrix is supplied by WindowsAppSDKConfig/WindowsAppSDK-Foundation-TestConfig.yml
       buildPlatform: x86
 
 - stage: Test_x64
@@ -16,7 +16,7 @@ stages:
   - template: WindowsAppSDK-RunTestsInPipeline-Job.yml@self
     parameters:
       jobName: PipelineTests
-      testMatrix: ${{ parameters.testMatrix }} # testMatrix is supplied by WindowsAppSDKConfig/WindowsAppSDK-Foundation-TestConfig.yml
+      testMatrix: $[ stageDependencies.Build_x64.ExtractMatrix.outputs['filterByPlatformStep.filteredTestMatrix'] ] # testMatrix is supplied by WindowsAppSDKConfig/WindowsAppSDK-Foundation-TestConfig.yml
       buildPlatform: x64
 
 - stage: Test_arm64
@@ -26,5 +26,5 @@ stages:
   - template: WindowsAppSDK-RunTestsInPipeline-Job.yml@self
     parameters:
       jobName: PipelineTests
-      testMatrix: ${{ parameters.testMatrix }} # testMatrix is supplied by WindowsAppSDKConfig/WindowsAppSDK-Foundation-TestConfig.yml
+      testMatrix: $[ stageDependencies.Build_arm64.ExtractMatrix.outputs['filterByPlatformStep.filteredTestMatrix'] ] # testMatrix is supplied by WindowsAppSDKConfig/WindowsAppSDK-Foundation-TestConfig.yml
       buildPlatform: arm64

build/ProjectReunion-BuildFoundation.yml

@@ -32,17 +32,17 @@ stages:
     IsOneBranch: false
     runApiScan: true
     runPREFast: false
+    testMatrix: ${{ variables.PipelineTests }}
 
 - template: AzurePipelinesTemplates\WindowsAppSDK-Build-Stage.yml@self
   parameters:
     SignOutput: false
     IsOneBranch: false
     runApiScan: false
     runPREFast: true
+    testMatrix: ${{ variables.PipelineTests }}
 
 - template: AzurePipelinesTemplates\WindowsAppSDK-Test-Stage.yml@self
-  parameters:
-    testMatrix: ${{ variables.PipelineTests }}
 
 - template: AzurePipelinesTemplates\WindowsAppSDK-PackTransportPackage-Stage.yml@self
   parameters: