[ci] Build public

eng/pipelines/common/device-tests.yml

@@ -38,7 +38,7 @@ stages:
         clean: all
       displayName: "Android"
       pool: ${{ parameters.androidPool }}
-      timeoutInMinutes: 60
+      timeoutInMinutes: 120
       strategy:
         matrix:
           # create all the variables used for the matrix

eng/pipelines/common/maui-templates.yml

@@ -20,7 +20,28 @@ parameters:
 
   - name: BuildPlatforms
     type: object
+    default:
+    - name: Windows
+      poolName: Azure Pipelines
+      vmImage: macOS-14
+      artifact: templates-windows
+    - name: macOS
+      poolName: Azure Pipelines
+      vmImage: macOS-14
+      artifact: templates-macos
 
+  - name: RunPlatforms
+    type: object
+    default:
+    - name: Azure Pipelines
+      vmImage: macOS-14
+      testName: RunOnAndroid
+      artifact: templates-run-android
+    - name: Azure Pipelines
+      vmImage: macOS-14
+      testName: RunOniOS
+      artifact: templates-run-ios
+
   - name: BuildCategories
     type: object
     default:
@@ -30,10 +51,7 @@ parameters:
     - Blazor
     - MultiProject
     - AOT
-
-  - name: RunPlatforms
-    type: object
-
+
   - name: prepareSteps
     type: stepList
     default: []
@@ -57,9 +75,7 @@ jobs:
     pool:
       name: $(POOL_NAME)
       vmImage: $(POOL_VIMAGE)
-      demands:
-        - macOS.Name -equals Sonoma
-        - macOS.Architecture -equals x64
+
     steps:
 
     - ${{ each step in parameters.prepareSteps }}:

eng/pipelines/common/provision.yml

@@ -82,7 +82,6 @@ steps:
   - bash: |
       echo "##vso[task.setvariable variable=JI_JAVA_HOME]$(JAVA_HOME_17_X64)"
       echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_17_X64)"
-    #  brew install --cask microsoft-openjdk@17
     displayName: 'Setup JDK Paths'
     condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))  
 

eng/pipelines/device-tests.yml

@@ -63,35 +63,26 @@ parameters:
   - name: androidPool
     type: object
     default:
-      name: $(androidTestsVmPool)
-      vmImage: $(androidTestsVmImage)
-      demands:
-        - macOS.Name -equals Sonoma
-        - macOS.Architecture -equals x64
+      name: $(macosTestsVmPool)
+      vmImage: $(macosTestsVmImage)
 
   - name: iosPool
     type: object
     default:
-      name: $(iosDeviceTestsVmPool)
-      vmImage: $(iosDeviceTestsVmImage)
-      demands:
-        - Agent.OSVersion -equals 14.5
-        - Agent.OSArchitecture -equals ARM64
+      name: $(macosTestsVmPool)
+      vmImage: $(macosTestsVmImage)
 
   - name: catalystPool
     type: object
     default:
-      name: $(iosDeviceTestsVmPool)
-      vmImage: $(iosDeviceTestsVmImage)
-      demands:
-        - Agent.OSVersion -equals 14.5
-        - Agent.OSArchitecture -equals ARM64
+      name: $(macosTestsVmPool)
+      vmImage: $(macosTestsVmImage)
 
   - name: windowsPool
     type: object
     default:
-      name: $(windowsTestsVmPool)
-      vmImage: $(windowsTestsVmImage)
+      name: $(windowsVmPool)
+      vmImage: $(windowsVmImage)
 
   - name: targetFrameworkVersions
     type: object

eng/pipelines/handlers.yml

@@ -72,8 +72,8 @@ parameters:
         vmImage: $(windowsVmImage)
         artifact: build-windows
       - name: macOS
-        poolName: $(macOSXVmPool)
-        vmImage: $(macOSXVmImage)
+        poolName: $(macosTestsVmPool)
+        vmImage: $(macosTestsVmImage)
         artifact: build-macos
 
   - name: PackPlatforms
@@ -84,8 +84,8 @@ parameters:
         vmImage: $(windowsVmImage)
         artifact: nuget
       - name: macOS
-        poolName: $(macOSXVmPool)
-        vmImage: $(macOSXVmImage)
+        poolName: $(macosTestsVmPool)
+        vmImage: $(macosTestsVmImage)
         artifact: nuget-macos
 
   - name: BuildTemplatePlatforms
@@ -96,8 +96,8 @@ parameters:
         vmImage: $(windowsVmImage)
         artifact: build-windows
       - name: macOS
-        poolName: $(macOSXVmPool)
-        vmImage: $(macOSXVmImage)
+        poolName: Azure Pipelines
+        vmImage: macOS-14
         artifact: build-macos
 
   - name: RunTemplatePlatforms
@@ -108,13 +108,12 @@ parameters:
       demands:
         - macOS.Name -equals Sonoma
         - macOS.Architecture -equals x64
-      testName: RunOnAndroid
       artifact: templates-run-android
-    - name: $(iosTestsVmPool)
-      vmImage: $(iosTestsVmImage)
+    - name: $(androidTestsVmPool)
+      vmImage: $(androidTestsVmImage)
       demands:
         - macOS.Name -equals Sonoma
-        - macOS.Architecture -equals x64
+          macOS.Architecture -equals x64
       testName: RunOniOS
       artifact: templates-run-ios
 
@@ -159,9 +158,6 @@ stages:
             pool:
               name: ${{ BuildPlatform.poolName }}
               vmImage: ${{ BuildPlatform.vmImage }}
-              demands:
-                - macOS.Name -equals Sonoma
-                - macOS.Architecture -equals x64
             steps:
               - template: common/provision.yml
                 parameters:
@@ -206,9 +202,6 @@ stages:
           pool:
             name: ${{ PackPlatform.poolName }}
             vmImage: ${{ PackPlatform.vmImage }}
-            demands:
-              - macOS.Name -equals Sonoma
-              - macOS.Architecture -equals x64
           variables:
             - name: _buildScript
               value: $(Build.SourcesDirectory)/build.cmd -ci

eng/pipelines/ui-tests.yml

@@ -64,20 +64,14 @@ parameters:
   - name: androidPool
     type: object
     default:
-      name: $(androidTestsVmPool)
-      vmImage: $(androidTestsVmImage)
-      demands:
-        - macOS.Name -equals Sonoma
-        - macOS.Architecture -equals x64
+      name: $(macosTestsVmPool)
+      vmImage: $(macosTestsVmImage)
 
   - name: iosPool
     type: object
     default:
-      name: $(iosTestsVmPool)
-      vmImage: $(iosTestsVmImage)
-      demands:
-        - macOS.Name -equals Sonoma
-        - macOS.Architecture -equals x64
+      name: $(macosTestsVmPool)
+      vmImage: $(macosTestsVmImage)
 
   - name: windowsBuildPool
     type: object
@@ -94,26 +88,20 @@ parameters:
   - name: macosPool
     type: object
     default:
-      name: Azure Pipelines
-      vmImage: macOS-14
+      name: $(macosTestsVmPool)
+      vmImage: $(macosTestsVmImage)
 
   - name: androidCompatibilityPool
     type: object
     default:
-      name: $(androidTestsVmPool)
-      vmImage: $(androidTestsVmImage)
-      demands:
-        - macOS.Name -equals Sonoma
-        - macOS.Architecture -equals x64
+      name: $(macosTestsVmPool)
+      vmImage: $(macosTestsVmImage)
 
   - name: iosCompatibilityPool
     type: object
     default:
-      name: $(androidTestsVmPool)
-      vmImage: $(androidTestsVmImage)
-      demands:
-        - macOS.Name -equals Sonoma
-        - macOS.Architecture -equals x64
+      name: $(macosTestsVmPool)
+      vmImage: $(macosTestsVmImage)
 
 resources:
   repositories: