Update to use Azure pipelines

Update maui-templates.yml Bump devicetests timeout on android Force azure pipelines Update JDK I left pack using 17 since that's what ships with VS. The other step I moved to 21 since we seem to be using newer cmdline-tools which require it. Update provision.yml Fix Catalyst on azure pipelines like this
dotnet · Oct 23, 2024 · 2e97850 · 2e97850
1 parent ea0e7bb
commit 2e97850
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 47 deletions.
diff --git a/eng/pipelines/common/device-tests.yml b/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

diff --git a/eng/pipelines/common/maui-templates.yml b/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 }}:

diff --git a/eng/pipelines/common/pack.yml b/eng/pipelines/common/pack.yml
@@ -89,8 +89,8 @@ steps:
         ${{ pair.key }}: ${{ pair.value }}
 
   - pwsh: |
-      if ($env:JAVA_HOME_11_X64) {
-        $env:JAVA_HOME = $env:JAVA_HOME_11_X64
+      if ($env:JAVA_HOME_17_X64) {
+        $env:JAVA_HOME = $env:JAVA_HOME_17_X64
       } else {
         $path = (Get-ChildItem $env:ProgramFiles\Microsoft\jdk-11.*\bin\java.exe) | Select-Object -First 1
         if ($path -and (Test-Path $path)) {

diff --git a/eng/pipelines/common/provision.yml b/eng/pipelines/common/provision.yml
@@ -66,7 +66,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'))  
   # Configure VS Mac for Xcode

diff --git a/eng/pipelines/device-tests.yml b/eng/pipelines/device-tests.yml
@@ -81,11 +81,8 @@ parameters:
   - name: catalystPool
     type: object
     default:
-      name: $(androidTestsVmPool)
-      vmImage: $(androidTestsVmImage)
-      demands:
-        - macOS.Name -equals Sonoma
-        - macOS.Architecture -equals x64
+      name: $(macosTestsVmPool)
+      vmImage: $(macosTestsVmImage)
 
   - name: windowsPool
     type: object

diff --git a/eng/pipelines/handlers.yml b/eng/pipelines/handlers.yml
@@ -72,8 +72,8 @@ parameters:
         vmImage: $(windowsVmImage)
         artifact: build-windows
       - name: macOS
-        poolName: $(macOSXVmPool)
-        vmImage: $(macOSXVmImage)
+        name: $(macosTestsVmPool)
+        vmImage: $(macosTestsVmImage)
         artifact: build-macos
 
   - name: PackPlatforms
@@ -84,8 +84,8 @@ parameters:
         vmImage: $(windowsVmImage)
         artifact: nuget
       - name: macOS
-        poolName: $(macOSXVmPool)
-        vmImage: $(macOSXVmImage)
+        name: $(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:
@@ -204,9 +200,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
@@ -254,9 +247,6 @@ stages:
           pool:
             name: ${{ BuildPlatform.poolName }}
             vmImage: ${{ BuildPlatform.vmImage }}
-            demands:
-              - macOS.Name -equals Sonoma
-              - macOS.Architecture -equals x64
           steps:
             - template: common/provision.yml
               parameters:

diff --git a/eng/pipelines/ui-tests.yml b/eng/pipelines/ui-tests.yml
@@ -88,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: