From 34f877eea0345c1c16ee5ddb1d1adde0ed7e0d32 Mon Sep 17 00:00:00 2001
From: Rui Marinho <me@ruimarinho.net>
Date: Tue, 25 Feb 2025 22:52:42 +0000
Subject: [PATCH] [ci] Last move sequoia (#28029)

* [ci] Move device tests to Sequoia

* [ci] Fix provisioning uitests

* [ci] Move templates to Sequoia

* [ci] Make sure to run iOS tests on 18.0 simulators
---
 eng/pipelines/common/maui-templates.yml | 8 +++-----
 eng/pipelines/device-tests.yml          | 6 +++---
 eng/pipelines/ui-tests.yml              | 2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/eng/pipelines/common/maui-templates.yml b/eng/pipelines/common/maui-templates.yml
index f913bdeb92ea..ad706222f9d9 100644
--- a/eng/pipelines/common/maui-templates.yml
+++ b/eng/pipelines/common/maui-templates.yml
@@ -90,7 +90,7 @@ jobs:
       name: $(POOL_NAME)
       vmImage: $(POOL_VIMAGE)
       demands:
-        - macOS.Name -equals Sonoma
+        - macOS.Name -equals Sequoia
         - macOS.Architecture -equals arm64
     steps:
       - template: maui-templates-steps.yml
@@ -157,15 +157,13 @@ jobs:
         DOTNET_TOKEN: $(dotnetbuilds-internal-container-read-token)
         PRIVATE_BUILD: $(PrivateBuild)
 
-    # - script: dotnet tool update Microsoft.DotNet.XHarness.CLI --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json --version "9.0.0-prerelease*" -g
-    #   displayName: install xharness
 
     - ${{ if eq(RunPlatform.testName, 'RunOniOS') }}:
       - pwsh: ./build.ps1 -Script eng/devices/ios.cake --target=Cleanup --verbosity=diagnostic
         displayName: Reset iOS simulators
         # TODO: pass properly device type/version from top-level yml
         env:
-          IOS_TEST_DEVICE: ios-simulator-64_17.2
+          IOS_TEST_DEVICE: ios-simulator-64_18.0
 
     - pwsh: ./build.ps1 --target=dotnet-integration-test --filter="Category=${{ RunPlatform.testName }}" --resultsfilename="integration-run-${{ RunPlatform.testName }}" --verbosity=diagnostic
       displayName: Run ${{ RunPlatform.testName }} templates run tests
@@ -173,7 +171,7 @@ jobs:
       # TODO: pass properly device type/version from top-level yml
       ${{ if eq(RunPlatform.testName, 'RunOniOS') }}:
         env:
-            IOS_TEST_DEVICE: ios-simulator-64_17.2
+            IOS_TEST_DEVICE: ios-simulator-64_18.0
 
     - ${{ if eq(RunPlatform.testName, 'RunOniOS') }}:
       - pwsh: ./build.ps1 --target=Cleanup -Script eng/devices/ios.cake ---results="$(TestResultsDirectory)" ${{ parameters.cakeArgs }}
diff --git a/eng/pipelines/device-tests.yml b/eng/pipelines/device-tests.yml
index 33b657706e1e..30bbbec7998d 100644
--- a/eng/pipelines/device-tests.yml
+++ b/eng/pipelines/device-tests.yml
@@ -67,7 +67,7 @@ parameters:
       name: $(androidTestsVmPool)
       vmImage: $(androidTestsVmImage)
       demands:
-        - macOS.Name -equals Sonoma
+        - macOS.Name -equals Sequoia
 
   - name: androidPoolX64
     type: object
@@ -84,7 +84,7 @@ parameters:
       name: $(iosDeviceTestsVmPool)
       vmImage: $(iosDeviceTestsVmImage)
       demands:
-        - macOS.Name -equals Sonoma
+        - macOS.Name -equals Sequoia
         
   - name: catalystPool
     type: object
@@ -92,7 +92,7 @@ parameters:
       name: $(iosDeviceTestsVmPool)
       vmImage: $(iosDeviceTestsVmImage)
       demands:
-        - macOS.Name -equals Sonoma
+        - macOS.Name -equals Sequoia
 
   - name: windowsPool
     type: object
diff --git a/eng/pipelines/ui-tests.yml b/eng/pipelines/ui-tests.yml
index 078a6442d7e1..b528434b5bc8 100644
--- a/eng/pipelines/ui-tests.yml
+++ b/eng/pipelines/ui-tests.yml
@@ -148,7 +148,7 @@ stages:
         provisionatorChannel: ${{ parameters.provisionatorChannel }}
       ${{ if parameters.CompatibilityTests }}:
         runCompatibilityTests: true
-      ${{ if or(eq(parameters.UseProvisionator, true), eq(variables['internalProvisioning'],'True') ) }}:
+      ${{ if or(parameters.UseProvisionator, eq(variables['internalProvisioning'],'true') ) }}:
         skipProvisioning: false
         gitHubToken: $(github--pat--vs-mobiletools-engineering-service2)
       ${{ else }}: