Merge branch 'release/6.0.3xx' into backport-pr-15321-to-release/6.0.3xx

Author: rolfbjarne

tools/devops/automation/build-pipeline.yml

@@ -327,6 +327,7 @@ stages:
   jobs:
     - template: templates/build/build-stage.yml
       parameters:
+        xcodeChannel: Stable
         signAndNotarize: true
         vsdropsPrefix: ${{ variables.vsdropsPrefix }}
         runTests: ${{ and(parameters.runTests, ne(variables['Build.Reason'], 'Schedule'))}}
@@ -345,6 +346,7 @@ stages:
     jobs:
       - template: templates/build/api-diff-stage.yml
         parameters:
+          xcodeChannel: Stable
           vsdropsPrefix: ${{ variables.vsdropsPrefix }}
           keyringPass: $(pass--lab--mac--builder--keychain)
           gitHubToken: ${{ variables['GitHub.Token'] }}
@@ -362,6 +364,7 @@ stages:
 - ${{ each config in parameters.simTestsConfigurations }}:
   - template: templates/tests/stage.yml
     parameters:
+      xcodeChannel: Stable
       testPrefix: ${{ config.testPrefix }} 
       stageName: ${{ config.stageName }} 
       displayName: ${{ config.displayName }} 

tools/devops/automation/build-pull-request.yml

@@ -324,6 +324,7 @@ stages:
   jobs:
     - template: templates/build/build-stage.yml
       parameters:
+        xcodeChannel: Stable
         signAndNotarize: false
         vsdropsPrefix: ${{ variables.vsdropsPrefix }}
         runTests: ${{ and(parameters.runTests, ne(variables['Build.Reason'], 'Schedule'))}}
@@ -342,6 +343,7 @@ stages:
     jobs:
       - template: templates/build/api-diff-stage.yml
         parameters:
+          xcodeChannel: Stable
           vsdropsPrefix: ${{ variables.vsdropsPrefix }}
           keyringPass: $(pass--lab--mac--builder--keychain)
           gitHubToken: ${{ variables['GitHub.Token'] }}
@@ -359,6 +361,7 @@ stages:
 - ${{ each config in parameters.simTestsConfigurations }}:
   - template: templates/tests/stage.yml
     parameters:
+      xcodeChannel: Stable
       testPrefix: ${{ config.testPrefix }} 
       stageName: ${{ config.stageName }} 
       displayName: ${{ config.displayName }} 

tools/devops/automation/templates/build/api-diff-stage.yml

@@ -21,6 +21,9 @@ parameters:
   type: string
   default: automatic
 
+- name: xcodeChannel
+  type: string
+
 jobs:
 - job: configure
   displayName: 'Configure build'
@@ -75,6 +78,7 @@ jobs:
     demands:
     - Agent.OS -equals Darwin
     - macios_image -equals v2.1     # Big Sur image with Xcode 12.4 and 12.5 installed
+    - XcodeChannel -equals ${{ parameters.xcodeChannel }}
   workspace:
     clean: all
 

tools/devops/automation/templates/build/build-stage.yml

@@ -36,6 +36,9 @@ parameters:
 - name: signAndNotarize
   type: boolean
 
+- name: xcodeChannel
+  type: string
+
 jobs:
 - job: configure
   displayName: 'Configure build'
@@ -118,6 +121,7 @@ jobs:
     demands:
     - Agent.OS -equals Darwin
     - macios_image -equals v2.1     # Big Sur image with Xcode 12.4 and 12.5 installed
+    - XcodeChannel -equals ${{ parameters.xcodeChannel }}
   workspace:
     clean: all
 

tools/devops/automation/templates/tests/stage.yml

@@ -70,6 +70,9 @@ parameters:
   type: boolean
   default: true
 
+- name: xcodeChannel
+  type: string
+
 stages:
 - stage: ${{ parameters.stageName }}
   displayName: ${{ parameters.displayName }}
@@ -118,6 +121,7 @@ stages:
       demands: 
       - Agent.OS -equals Darwin
       - macios_image -equals v2.1     # Big Sur image with Xcode 12.4 and 12.5 installed
+      - XcodeChannel -equals ${{ parameters.xcodeChannel }}
       - ${{ each demand in parameters.extraBotDemands }}:
         - demand
       workspace: