Update publish.yml to universal build matrix

Author: jonthysell

.ado/publish.yml

@@ -71,6 +71,57 @@ parameters:
       BuildPlatform: x86
       UseFabric: true
 
+- name: universalBuildMatrix
+  type: object
+  default:
+    - Name: X64Release:
+      BuildConfiguration: Release
+      BuildPlatform: x64
+      UseFabric: false
+    - Name: X86Release:
+      BuildConfiguration: Release
+      BuildPlatform: x86
+      UseFabric: false
+    - Name: Arm64Release:
+      BuildConfiguration: Release
+      BuildPlatform: ARM64
+      UseFabric: false
+    - Name: X64Debug:
+      BuildConfiguration: Debug
+      BuildPlatform: x64
+      UseFabric: false
+    - Name: X86Debug:
+      BuildConfiguration: Debug
+      BuildPlatform: x86
+      UseFabric: false
+    - Name: Arm64Debug:
+      BuildConfiguration: Debug
+      BuildPlatform: ARM64
+      UseFabric: false
+    - Name: X64ReleaseFabric:
+      BuildConfiguration: Release
+      BuildPlatform: x64
+      UseFabric: true
+    - Name: X86ReleaseFabric:
+      BuildConfiguration: Release
+      BuildPlatform: x86
+      UseFabric: true
+    - Name: Arm64ReleaseFabric:
+      BuildConfiguration: Release
+      BuildPlatform: ARM64
+      UseFabric: true
+    - Name: X64DebugFabric:
+      BuildConfiguration: Debug
+      BuildPlatform: x64
+      UseFabric: true
+    - Name: X86DebugFabric:
+      BuildConfiguration: Debug
+      BuildPlatform: x86
+      UseFabric: true
+    - Name: Arm64DebugFabric:
+      BuildConfiguration: Debug
+      BuildPlatform: ARM64
+      UseFabric: true
 
 variables:
   - template: variables/windows.yml
@@ -267,144 +318,97 @@ extends:
                   artifactName: Desktop.${{matrix.buildPlatform}}.${{matrix.buildConfiguration}}
                   targetPath: $(Build.StagingDirectory)/NuGet/Desktop/${{matrix.buildPlatform}}/${{matrix.buildConfiguration}}
 
-        - job: RnwNativeBuildUniversal
-          displayName: Build Universal
-          dependsOn: RnwNpmPublish
-          strategy:
-            matrix:
-              X64Release:
-                BuildConfiguration: Release
-                BuildPlatform: x64
-                UseFabric: false
-              X86Release:
-                BuildConfiguration: Release
-                BuildPlatform: x86
-                UseFabric: false
-              Arm64Release:
-                BuildConfiguration: Release
-                BuildPlatform: ARM64
-                UseFabric: false
-              X64Debug:
-                BuildConfiguration: Debug
-                BuildPlatform: x64
-                UseFabric: false
-              X86Debug:
-                BuildConfiguration: Debug
-                BuildPlatform: x86
-                UseFabric: false
-              Arm64Debug:
-                BuildConfiguration: Debug
-                BuildPlatform: ARM64
-                UseFabric: false
-              X64ReleaseFabric:
-                BuildConfiguration: Release
-                BuildPlatform: x64
-                UseFabric: true
-              X86ReleaseFabric:
-                BuildConfiguration: Release
-                BuildPlatform: x86
-                UseFabric: true
-              Arm64ReleaseFabric:
-                BuildConfiguration: Release
-                BuildPlatform: ARM64
-                UseFabric: true
-              X64DebugFabric:
-                BuildConfiguration: Debug
-                BuildPlatform: x64
-                UseFabric: true
-              X86DebugFabric:
-                BuildConfiguration: Debug
-                BuildPlatform: x86
-                UseFabric: true
-              Arm64DebugFabric:
-                BuildConfiguration: Debug
-                BuildPlatform: ARM64
-                UseFabric: true
-          pool: ${{ parameters.AgentPool.Large }}
-          timeoutInMinutes: 360 # CodeQL requires 3x usual build timeout
+        - ${{ each matrix in parameters.universalBuildMatrix }}:
+          - job: RnwNativeBuildUniversal${{ matrix.Name }}
+            displayName: Build Universal ${{ matrix.Name }}
+            pool: ${{ parameters.AgentPool.Large }}
+            timeoutInMinutes: 360 # CodeQL requires 3x usual build timeout
+            steps:
+            - template: .ado/templates/prepare-js-env.yml@self
 
-          steps:
-          - template: .ado/templates/prepare-js-env.yml@self
+            - template: .ado/templates/prepare-build-env.yml@self
+              parameters:
+                platform: ${{ matrix.BuildPlatform }}
+                configuration: ${{ matrix.BuildConfiguration }}
+                buildEnvironment: Publish
 
-          - template: .ado/templates/prepare-build-env.yml@self
-            parameters:
-              platform: $(BuildPlatform)
-              configuration: $(BuildConfiguration)
-              buildEnvironment: Publish
+            - template: .ado/templates/apply-published-version-vars.yml@self
 
-          - template: .ado/templates/apply-published-version-vars.yml@self
+            - ${{ if eq(matrix.UseFabric, true) }}:
+              - template: .ado/templates/enable-fabric-experimental-feature.yml@self
 
-          - ${{ if eq(variables['UseFabric'], 'true') }}:
-            - template: .ado/templates/enable-fabric-experimental-feature.yml@self
+            - template: .ado/templates/msbuild-sln.yml@self
+              parameters:
+                solutionDir: vnext
+                ${{ if eq(matrix.UseFabric, true) }}:
+                  solutionName: Microsoft.ReactNative.CppOnly.slnf
+                ${{ else }}:
+                  solutionName: Microsoft.ReactNative.sln
+                buildPlatform: ${{ matrix.BuildPlatform }}
+                buildConfiguration: ${{ matrix.BuildConfiguration }}
+                oneESMode: true ## Files are only copied to staging, not published
 
-          - template: .ado/templates/msbuild-sln.yml@self
-            parameters:
-              solutionDir: vnext
-              solutionName: Microsoft.ReactNative.sln
-              buildPlatform: $(BuildPlatform)
-              buildConfiguration: $(BuildConfiguration)
-              oneESMode: true ## Files are only copied to staging, not published
-
-          - task: PowerShell@2
-            displayName: Make AnyCPU Reference Assemblies
-            inputs:
-              filePath: vnext/Scripts/Tfs/Make-AnyCPU-RefAssemblies.ps1
-              arguments: -TargetRoot $(Build.SourcesDirectory)\vnext\target -BuildRoot $(Build.SourcesDirectory)\vnext\target
+            - task: PowerShell@2
+              displayName: Make AnyCPU Reference Assemblies
+              inputs:
+                filePath: vnext/Scripts/Tfs/Make-AnyCPU-RefAssemblies.ps1
+                arguments: -TargetRoot $(Build.SourcesDirectory)\vnext\target -BuildRoot $(Build.SourcesDirectory)\vnext\target
 
-          - template: .ado/templates/publish-build-artifacts.yml@self
-            parameters:
-              oneESMode: true ## Files are only copied to staging, not published
-              ${{ if eq(variables['UseFabric'], 'true') }}:
-                artifactName: ReactWindowsFabric
-              ${{ else }}:
-                artifactName: ReactWindows
-              buildPlatform: $(BuildPlatform)
-              buildConfiguration: $(BuildConfiguration)
-              contents: |
-                Microsoft.ReactNative\**
-                Microsoft.ReactNative.Managed\**
-                Microsoft.ReactNative.Managed.CodeGen\**
-
-          - template: .ado/templates/component-governance.yml@self
-
-          # Make symbols available through http://symweb.
-          - task: PublishSymbols@2
-            displayName: Publish symbols
-            inputs:
-              SearchPattern: vnext/target/**/*.pdb
-              SymbolServerType: TeamServices
-          
-          templateContext:
+            - template: .ado/templates/publish-build-artifacts.yml@self
+              parameters:
+                oneESMode: true ## Files are only copied to staging, not published
+                ${{ if eq(matrix.UseFabric, true) }}:
+                  artifactName: ReactWindowsFabric
+                ${{ else }}:
+                  artifactName: ReactWindows
+                buildPlatform: ${{ matrix.BuildPlatform }}
+                buildConfiguration: ${{ matrix.BuildConfiguration }}
+                contents: |
+                  Microsoft.ReactNative\**
+                  Microsoft.ReactNative.Managed\**
+                  Microsoft.ReactNative.Managed.CodeGen\**
+
+            - template: .ado/templates/component-governance.yml@self
+
+            # Make symbols available through http://symweb.
+            - task: PublishSymbols@2
+              displayName: Publish symbols
+              inputs:
+                SearchPattern: vnext/target/**/*.pdb
+                SymbolServerType: TeamServices
+
+            templateContext:
             sdl:
               binskim:
-                analyzeTargetGlob: '$(Build.SourcesDirectory)\vnext\target\$(BuildPlatform)\$(BuildConfiguration)\Microsoft.ReactNative\Microsoft.ReactNative.dll'
-            outputs:
-            - output: pipelineArtifact
-              displayName: 'Upload build logs'
-              condition: succeededOrFailed()
-              targetPath: $(BuildLogDirectory)
-              artifactName: Build logs - $(Agent.JobName)-$(System.JobAttempt)
-            - output: pipelineArtifact
-              displayName: 'Upload crash dumps'
-              condition: and(succeededOrFailed(), eq(variables.HasCrashDumps, 'True'))
-              targetPath: '$(CrashDumpRootPath)'
-              artifactName: Crash dumps - $(Agent.JobName)-$(System.JobAttempt)
-            - output: pipelineArtifact
-              ${{ if eq(variables['UseFabric'], 'true') }}:
-                displayName: 'Publish Artifact: ReactWindowsFabric.$(BuildPlatform).$(BuildConfiguration)'
-                artifactName: ReactWindowsFabric.$(BuildPlatform).$(BuildConfiguration)
-                targetPath: $(Build.StagingDirectory)/NuGet/ReactWindowsFabric/$(BuildPlatform)/$(BuildConfiguration)
-              ${{ else }}:
-                displayName: 'Publish Artifact: ReactWindows.$(BuildPlatform).$(BuildConfiguration)'
-                artifactName: ReactWindows.$(BuildPlatform).$(BuildConfiguration)
-                targetPath: $(Build.StagingDirectory)/NuGet/ReactWindows/$(BuildPlatform)/$(BuildConfiguration)
+                analyzeTargetGlob: '$(Build.SourcesDirectory)\vnext\target\${{ matrix.BuildPlatform }}\${{ matrix.BuildConfiguration }}\Microsoft.ReactNative\Microsoft.ReactNative.dll'
+              outputs:
+              - output: pipelineArtifact
+                displayName: 'Upload build logs'
+                condition: succeededOrFailed()
+                targetPath: $(BuildLogDirectory)
+                artifactName: Build logs - $(Agent.JobName)-$(System.JobAttempt)
+              - output: pipelineArtifact
+                displayName: 'Upload crash dumps'
+                condition: and(succeededOrFailed(), eq(variables.HasCrashDumps, 'True'))
+                targetPath: '$(CrashDumpRootPath)'
+                artifactName: Crash dumps - $(Agent.JobName)-$(System.JobAttempt)
+              - output: pipelineArtifact
+                ${{ if eq(matrix.UseFabric, true) }}:
+                  displayName: 'Publish Artifact: ReactWindowsFabric.${{ matrix.BuildPlatform }}.${{ matrix.BuildConfiguration }}'
+                  artifactName: ReactWindowsFabric.${{ matrix.BuildPlatform }}.${{ matrix.BuildConfiguration }}
+                  targetPath: $(Build.StagingDirectory)/NuGet/ReactWindowsFabric/${{ matrix.BuildPlatform }}/${{ matrix.BuildConfiguration }}
+                ${{ else }}:
+                  displayName: 'Publish Artifact: ReactWindows.${{ matrix.BuildPlatform }}.${{ matrix.BuildConfiguration }}'
+                  artifactName: ReactWindows.${{ matrix.BuildPlatform }}.${{ matrix.BuildConfiguration }}
+                  targetPath: $(Build.StagingDirectory)/NuGet/ReactWindows/${{ matrix.BuildPlatform }}/${{ matrix.BuildConfiguration }}
 
         - job: RNWNuget
           dependsOn:
             - RnwNpmPublish
             - ${{ each matrix in parameters.desktopBuildMatrix }}:
               - RnwNativeBuildDesktop${{ matrix.Name }}
-            - RnwNativeBuildUniversal
+            - ${{ each matrix in parameters.universalBuildMatrix }}:
+              - RnwNativeBuildUniversal${{ matrix.Name }}
           displayName: Sign Binaries and Publish NuGet
           pool: ${{ parameters.AgentPool.Medium }}
           timeoutInMinutes: 120 # Protect against the long CodeSign task