Merge CoreCLR-based official builds legs into one leg per platform (#92901)

Author: jkoritzinsky

eng/pipelines/common/global-build-job.yml

@@ -237,10 +237,11 @@ jobs:
         - task: CodeQL3000Init@0
           displayName: Initialize CodeQL (manually-injected)
 
-      - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci $(_archParameter) $(_osParameter) $(crossArg) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_buildDarwinFrameworksParameter) $(_overrideTestScriptWindowsCmdParameter)
-        displayName: Build product
-        ${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
-          continueOnError: ${{ parameters.shouldContinueOnError }}
+      - template: /eng/pipelines/common/templates/global-build-step.yml
+        parameters:
+          buildArgs: ${{ parameters.buildArgs }}
+          useContinueOnErrorDuringBuild: ${{ parameters.useContinueOnErrorDuringBuild }}
+          shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
 
       - ${{ if eq(parameters.isManualCodeQLBuild, true) }}:
         - task: CodeQL3000Finalize@0

eng/pipelines/common/templates/global-build-step.yml

@@ -0,0 +1,12 @@
+parameters:
+  buildArgs: ''
+  useContinueOnErrorDuringBuild: false
+  shouldContinueOnError: false
+  archParameter: $(_archParameter)
+  displayName: Build product
+
+steps:
+  - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci ${{ parameters.archParameter }} $(_osParameter) $(crossArg) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_buildDarwinFrameworksParameter) $(_overrideTestScriptWindowsCmdParameter)
+    displayName: ${{ parameters.displayName }}
+    ${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
+      continueOnError: ${{ parameters.shouldContinueOnError }}

eng/pipelines/common/templates/runtimes/xplat-job.yml

@@ -77,15 +77,6 @@ jobs:
     - name: buildConfig
       value: ${{ parameters.buildConfig }}
 
-    - name: archType
-      value: ${{ parameters.archType }}
-
-    - name: osGroup
-      value: ${{ parameters.osGroup }}
-
-    - name: osSubgroup
-      value: ${{ parameters.osSubgroup }}
-
     - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
       - name: _HelixSource
         value: official/dotnet/runtime/$(Build.SourceBranch)

eng/pipelines/common/xplat-setup.yml

@@ -45,6 +45,15 @@ jobs:
 
       - name: _BuildConfig
         value: $(buildConfigUpper)
+        
+      - name: archType
+        value: ${{ parameters.archType }}
+
+      - name: osGroup
+        value: ${{ parameters.osGroup }}
+
+      - name: osSubgroup
+        value: ${{ parameters.osSubgroup }}
 
       - name: _runSmokeTestsOnlyArg
         value: '/p:RunSmokeTestsOnly=$(isRunSmokeTestsOnly)'

eng/pipelines/coreclr/templates/build-job.yml

@@ -231,27 +231,6 @@ jobs:
           artifactName: $(buildProductArtifactName)
           displayName: 'product build'
 
-    - ${{ if and(in(parameters.osGroup, 'windows', 'linux'), ne(parameters.archType, 'x86')) }}:
-        - template: /eng/pipelines/coreclr/templates/crossdac-build.yml
-          parameters:
-            archType: ${{ parameters.archType }}
-            osGroup: ${{ parameters.osGroup }}
-            osSubgroup: ${{ parameters.osSubgroup }}
-            isOfficialBuild: ${{ parameters.signBinaries }}
-            ${{ if eq(parameters.archType, 'arm') }}:
-              hostArchType: x86
-            ${{ else }}:
-              hostArchType: x64
-
-    - ${{ if and(in(parameters.osGroup, 'windows'), eq(parameters.archType, 'x86')) }}:
-        - template: /eng/pipelines/coreclr/templates/crossdac-build.yml
-          parameters:
-            archType: arm
-            osGroup: ${{ parameters.osGroup }}
-            osSubgroup: ${{ parameters.osSubgroup }}
-            isOfficialBuild: ${{ parameters.signBinaries }}
-            hostArchType: x86
-
     - ${{ if and(ne(parameters.testGroup, ''), ne(parameters.disableClrTest, true)) }}:
       # Publish test native components for consumption by test execution.
       - ${{ if ne(parameters.isOfficialBuild, true) }}:

eng/pipelines/coreclr/templates/crossdac-build.yml

@@ -0,0 +1,9 @@
+parameters:
+  archType: ''
+
+variables:
+  - name: crossDacHostArch
+    value: x64
+  - ${{ if eq(parameters.archType, 'arm') }}:
+    - name: crossDacHostArch
+      value: x86

eng/pipelines/coreclr/templates/crossdac-hostarch.yml

@@ -69,12 +69,6 @@ jobs:
     - name: buildProductRootFolderPath
       value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(buildConfigUpper)'
 
-    - name: buildCrossDacArtifactName
-      value: CoreCLRCrossDacArtifacts
-
-    - name: crossDacArtifactPath
-      value: $(Build.SourcesDirectory)/artifacts/$(buildCrossDacArtifactName)
-
     # We need this because both mono and coreclr build currently depends on CoreClr
     - name: coreClrProductArtifactName
       value: 'CoreCLRProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'

eng/pipelines/coreclr/templates/crossdac-pack.yml

@@ -339,32 +339,9 @@ jobs:
             df -h
           displayName: Disk Usage before Build
 
-    # Build the default subset non-MacOS platforms
-      - ${{ if ne(parameters.osGroup, 'osx') }}:
-        - script: $(BaseJobBuildCommand)
-          displayName: Build
-          continueOnError: ${{ and(eq(variables.SkipTests, false), eq(parameters.shouldContinueOnError, true)) }}
-
-      # Build corehost, sign and add entitlements to MacOS binaries
-      - ${{ if eq(parameters.osGroup, 'osx') }}:
-        - script: $(BaseJobBuildCommand) -subset host.native
-          displayName: Build CoreHost
-          continueOnError: ${{ and(eq(variables.SkipTests, false), eq(parameters.shouldContinueOnError, true)) }}
-
-        - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-          - template: /eng/pipelines/common/macos-sign-with-entitlements.yml
-            parameters:
-              filesToSign:
-              - name: dotnet
-                path: $(Build.SourcesDirectory)/artifacts/bin/osx-${{ parameters.archType }}.$(_BuildConfig)/corehost
-                entitlementsFile: $(Build.SourcesDirectory)/eng/pipelines/common/entitlements.plist
-              - name: apphost
-                path: $(Build.SourcesDirectory)/artifacts/bin/osx-${{ parameters.archType }}.$(_BuildConfig)/corehost
-                entitlementsFile: $(Build.SourcesDirectory)/eng/pipelines/common/entitlements.plist
-
-        - script: $(BaseJobBuildCommand) -subset host.pkg+host.tools+host.tests+packs
-          displayName: Build and Package
-          continueOnError: ${{ and(eq(variables.SkipTests, false), eq(parameters.shouldContinueOnError, true)) }}
+      - script: $(BaseJobBuildCommand)
+        displayName: Build
+        continueOnError: ${{ and(eq(variables.SkipTests, false), eq(parameters.shouldContinueOnError, true)) }}
 
       - ${{ if and(eq(parameters.isOfficialBuild, true), eq(parameters.osGroup, 'windows')) }}:
         - powershell: ./eng/collect_vsinfo.ps1 -ArchiveRunName postbuild_log