Fix

Author: jfversluis

eng/pipelines/azure-pipelines-internal.yml

@@ -1,24 +1,26 @@
-trigger:
-  branches:
-    include:
-    - main
-    - net10.0
-    - release/*
-  tags:
-    include:
-    - '*'
-  paths:
-    include:
-    - '*'
-    exclude:
-    - .github/*
-    - docs/*
-    - CODE-OF-CONDUCT.md
-    - CONTRIBUTING.md
-    - LICENSE.TXT
-    - PATENTS.TXT
-    - README.md
-    - THIRD-PARTY-NOTICES.TXT
+trigger: none
+# Original triggers disabled for staged pipeline
+# trigger:
+#   branches:
+#     include:
+#     - main
+#     - net10.0
+#     - release/*
+#   tags:
+#     include:
+#     - '*'
+#   paths:
+#     include:
+#     - '*'
+#     exclude:
+#     - .github/*
+#     - docs/*
+#     - CODE-OF-CONDUCT.md
+#     - CONTRIBUTING.md
+#     - LICENSE.TXT
+#     - PATENTS.TXT
+#     - README.md
+#     - THIRD-PARTY-NOTICES.TXT
 
 schedules:
 - cron: "0 5 * * *"

eng/pipelines/azure-pipelines-staged.yml

@@ -225,15 +225,15 @@ extends:
     # Reuses existing device-tests.yml logic with dependency on Stage 1
     # =============================================================================
     - ${{ each targetFrameworkVersion in parameters.targetFrameworkVersions }}:
-      - template: common/device-tests-staged.yml
+      - template: common/device-tests.yml
         parameters:
           androidPool: ${{ parameters.androidPool }}
           iosPool: ${{ parameters.iosPool }}
           catalystPool: ${{ parameters.catalystPool }}
           windowsPool: ${{ parameters.windowsPool }}
           targetFrameworkVersion: ${{ targetFrameworkVersion }}
-          # Add external dependency on ApiScan stage
-          externalDependencies:
+          # Add dependency on ApiScan stage
+          stageDependencies:
           - ApiScan
           ${{ if or(parameters.BuildEverything, and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'devdiv'))) }}:
             androidApiLevels: [ 33, 30, 29, 28, 27, 26, 25, 24, 23 ]
@@ -310,16 +310,16 @@ extends:
     # STAGE 3: UI Tests
     # Reuses existing ui-tests.yml logic with dependency on Stage 2
     # =============================================================================
-    - template: common/ui-tests-staged.yml
+    - template: common/ui-tests.yml
       parameters:
         androidPool: ${{ parameters.androidPool }}
         androidLinuxPool: ${{ parameters.androidPoolLinux }}
         iosPool: ${{ parameters.iosPool }}
         windowsPool: ${{ parameters.windowsPool }}
         windowsBuildPool: ${{ parameters.windowsBuildPool }}
         macosPool: ${{ parameters.macosPool }}
-        # Add external dependencies on all device test stages
-        externalDependencies:
+        # Add dependency on all device test stages
+        stageDependencies:
         - android_device_tests_net9_0
         - ios_device_tests_net9_0
         - catalyst_device_tests_net9_0

eng/pipelines/common/device-tests-staged.yml

@@ -17,6 +17,8 @@ parameters:
   targetFrameworkVersion:
     tfm: ''
     dependsOn: ''
+  # New parameter for stage dependencies
+  stageDependencies: []
   projects:
   - name: name
     desc: Human Description
@@ -34,11 +36,13 @@ stages:
 - ${{ each platform in parameters.platforms }}:
   - stage: ${{ platform }}_device_tests_${{ replace(parameters.targetFrameworkVersion.tfm, '.', '') }}
     displayName: ${{ parameters.targetFrameworkVersion.tfm }} ${{ platform }}
-    ${{ if eq(parameters.targetFrameworkVersion.dependsOn, '') }}:
+    ${{ if and(eq(parameters.targetFrameworkVersion.dependsOn, ''), eq(length(parameters.stageDependencies), 0)) }}:
       dependsOn: []
-    ${{ else }}:
+    ${{ elseif ne(parameters.targetFrameworkVersion.dependsOn, '') }}:
       dependsOn:
       - ${{ platform }}_device_tests_${{ replace(parameters.targetFrameworkVersion.dependsOn, '.', '') }}
+    ${{ elseif gt(length(parameters.stageDependencies), 0) }}:
+      dependsOn: ${{ parameters.stageDependencies }}
     jobs:
 
     - ${{ if eq(platform, 'android') }}: