[release/6.0-staging] Merge #92901

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

@@ -171,11 +171,12 @@ jobs:
         displayName: Install native dependencies
 
     # Build
-    - ${{ if eq(parameters.buildingOnSourceBuildImage, false) }}:
-      - script: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_crossBuildPropertyArg) $(_cxx11Parameter) $(_richCodeNavigationParam) $(_buildDarwinFrameworksParameter)
-        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 }}
+        archType: ${{ parameters.archType }}
 
     - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'Android') }}:
       - script: |

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

@@ -0,0 +1,12 @@
+parameters:
+  buildArgs: ''
+  useContinueOnErrorDuringBuild: false
+  shouldContinueOnError: false
+  archType: ''
+  displayName: Build product
+
+steps:
+  - script: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_crossBuildPropertyArg) $(_cxx11Parameter) $(_richCodeNavigationParam) $(_buildDarwinFrameworksParameter)
+    displayName: ${{ parameters.displayName }}
+    ${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
+      continueOnError: ${{ parameters.shouldContinueOnError }}

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

@@ -74,15 +74,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

@@ -48,6 +48,15 @@ jobs:
       - name: _BuildConfig
         value: $(buildConfigUpper)
 
+      - name: archType
+        value: ${{ parameters.archType }}
+
+      - name: osGroup
+        value: ${{ parameters.osGroup }}
+
+      - name: osSubgroup
+        value: ${{ parameters.osSubgroup }}
+
       - ${{ if or(eq(parameters.osGroup, 'windows'), eq(parameters.hostedOs, 'windows')) }}:
         - name: archiveExtension
           value: '.zip'

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

@@ -267,14 +267,6 @@ jobs:
           artifactName: $(buildProductArtifactName)
           displayName: 'product build'
 
-    - ${{ if and(in(parameters.osGroup, 'windows', 'Linux'), ne(parameters.archType, 'x86'), ne(parameters.compilerName, 'gcc'), ne(parameters.testGroup, 'clrTools')) }}:
-      - template: /eng/pipelines/coreclr/templates/crossdac-build.yml
-        parameters:
-          archType: ${{ parameters.archType }}
-          osGroup: ${{ parameters.osGroup }}
-          osSubgroup: ${{ parameters.osSubgroup }}
-          isOfficialBuild: ${{ parameters.isOfficialBuild }}
-
     - ${{ if and(ne(parameters.compilerName, 'gcc'), ne(parameters.testGroup, ''), ne(parameters.testGroup, 'clrTools')) }}:
       # Publish test native components for consumption by test execution.
       - ${{ if ne(parameters.isOfficialBuild, true) }}:

eng/pipelines/coreclr/templates/crossdac-hostarch.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/xplat-pipeline-job.yml

@@ -71,12 +71,6 @@ jobs:
     - name: buildProductRootFolderPath
       value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(buildConfigUpper)'
 
-    - name: buildCrossDacArtifactName
-      value: CoreCLRCrossDacArtifacts
-
-    - name: crossDacArtifactPath
-      value: $(Build.SourcesDirectory)/artifacts/$(buildCrossDacArtifactName)
-
     - name: buildMuslDacRootFolderPath
       value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/alpine.$(archType).$(buildConfigUpper)'
 

eng/pipelines/global-build.yml

@@ -128,9 +128,13 @@ jobs:
 - template: /eng/pipelines/common/platform-matrix.yml
   parameters:
     jobTemplate: /eng/pipelines/common/global-build-job.yml
-    buildConfig: release
+    buildConfig: Release
     platforms:
-    - SourceBuild_Linux_x64
+    - SourceBuild_linux_x64
     jobParameters:
-      nameSuffix: SourceBuild
-      timeoutInMinutes: 90
+      nameSuffix: PortableSourceBuild
+      extraStepsParameters:
+        name: SourceBuildPackages
+      timeoutInMinutes: 95
+      condition:
+          eq(dependencies.evaluate_paths.outputs['SetPathVars_non_mono_and_wasm.containsChange'], true)

eng/pipelines/installer/jobs/base-job.yml

@@ -398,32 +398,9 @@ jobs:
         env:
           Token: $(dn-bot-dnceng-artifact-feeds-rw)
 
-  # 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 in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}:
     - script: |