Force azure pipelines

dotnet · Aug 22, 2024 · 214ccc7 · 214ccc7
1 parent ce5e945
commit 214ccc7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 28 deletions.
diff --git a/eng/pipelines/common/maui-templates.yml b/eng/pipelines/common/maui-templates.yml
@@ -22,23 +22,23 @@ parameters:
     type: object
     default:
     - name: Windows
-      poolName: $(windowsVmPool)
-      vmImage: $(windowsVmImage)
+      poolName: Azure Pipelines
+      vmImage: macOS-14
       artifact: templates-windows
     - name: macOS
-      poolName: $(macOSXVmPool)
-      vmImage: $(macOSXVmImage)
+      poolName: Azure Pipelines
+      vmImage: macOS-14
       artifact: templates-macos
 
   - name: RunPlatforms
     type: object
     default:
-    - name: $(androidTestsVmPool)
-      vmImage: $(androidTestsVmImage)
+    - name: Azure Pipelines
+      vmImage: macOS-14
       testName: RunOnAndroid
       artifact: templates-run-android
-    - name: $(iosTestsVmPool)
-      vmImage: $(iosTestsVmImage)
+    - name: Azure Pipelines
+      vmImage: macOS-14
       testName: RunOniOS
       artifact: templates-run-ios
 

diff --git a/eng/pipelines/handlers.yml b/eng/pipelines/handlers.yml
@@ -71,8 +71,8 @@ parameters:
         vmImage: $(windowsVmImage)
         artifact: build-windows
       - name: macOS
-        poolName: $(macOSXVmPool)
-        vmImage: $(macOSXVmImage)
+        poolName: Azure Pipelines
+        vmImage: macOS-14
         artifact: build-macos
 
   - name: PackPlatforms
@@ -83,8 +83,8 @@ parameters:
         vmImage: $(windowsVmImage)
         artifact: nuget
       - name: macOS
-        poolName: $(macOSXVmPool)
-        vmImage: $(macOSXVmImage)
+        poolName: Azure Pipelines
+        vmImage: macOS-14
         artifact: nuget-macos
 
   - name: BuilTemplatePlatforms
@@ -95,19 +95,19 @@ parameters:
         vmImage: $(windowsVmImage)
         artifact: build-windows
       - name: macOS
-        poolName: $(macOSXVmPool)
-        vmImage: $(macOSXVmImage)
+        poolName: Azure Pipelines
+        vmImage: macOS-14
         artifact: build-macos
 
   - name: RunTemplatePlatforms
     type: object
     default:
-    - name: $(androidTestsVmPool)
-      vmImage: $(androidTestsVmImage)
+    - name: Azure Pipelines
+      vmImage: macOS-14
       testName: RunOnAndroid
       artifact: templates-run-android
-    - name: $(iosTestsVmPool)
-      vmImage: $(iosTestsVmImage)
+    - name: Azure Pipelines
+      vmImage:  macOS-14
       testName: RunOniOS
       artifact: templates-run-ios
 

diff --git a/eng/pipelines/ui-tests.yml b/eng/pipelines/ui-tests.yml
@@ -94,20 +94,14 @@ parameters:
   - name: androidCompatibilityPool
     type: object
     default:
-      name: $(androidTestsVmPool)
-      vmImage: $(androidTestsVmImage)
-      demands:
-        - macOS.Name -equals Sonoma
-        - macOS.Architecture -equals x64
+      name: $(macosTestsVmPool)
+      vmImage: macOS-14
 
   - name: iosCompatibilityPool
     type: object
     default:
-      name: $(androidTestsVmPool)
-      vmImage: $(androidTestsVmImage)
-      demands:
-        - macOS.Name -equals Sonoma
-        - macOS.Architecture -equals x64
+      name: $(macosTestsVmPool)
+      vmImage: macOS-14
 
 resources:
   repositories: