diff --git a/eng/pipelines/ci-uitests.yml b/eng/pipelines/ci-uitests.yml index b7c924cbb623..c3b6ace38f43 100644 --- a/eng/pipelines/ci-uitests.yml +++ b/eng/pipelines/ci-uitests.yml @@ -166,12 +166,12 @@ stages: # BuildNativeAOT is false by default, but true in devdiv environment BuildNativeAOT: ${{ or(parameters.BuildNativeAOT, and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'devdiv'))) }} RunNativeAOT: ${{ parameters.RunNativeAOT }} - ${{ if or(parameters.BuildEverything, and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'devdiv'))) }}: + ${{ if or(parameters.BuildEverything, ne(variables['Build.Reason'], 'PullRequest')) }}: androidApiLevels: [ 30 ] - iosVersions: [ '18.4' ] + iosVersions: [ '18.5', 'latest' ] ${{ else }}: androidApiLevels: [ 30 ] - iosVersions: [ '18.4' ] + iosVersions: [ 'latest' ] projects: - name: controls desc: Controls diff --git a/eng/pipelines/common/ui-tests.yml b/eng/pipelines/common/ui-tests.yml index 88bee2ce7160..fe1231c2292c 100644 --- a/eng/pipelines/common/ui-tests.yml +++ b/eng/pipelines/common/ui-tests.yml @@ -9,6 +9,7 @@ parameters: androidApiLevelsExtended: [ 36 ] # API 36 for Material3 tests with Pixel 3 XL iosVersions: [ 'latest' ] provisionatorChannel: 'latest' + defaultiOSVersion: '26.0' timeoutInMinutes: 180 skipProvisioning: true BuildNativeAOT: false # Parameter to control whether NativeAOT artifacts should be built @@ -295,7 +296,7 @@ stages: parameters: platform: ios ${{ if eq(version, 'latest') }}: - version: 18.5 + version: ${{ parameters.defaultiOSVersion }} ${{ if ne(version, 'latest') }}: version: ${{ version }} path: ${{ project.ios }} @@ -338,7 +339,7 @@ stages: parameters: platform: ios ${{ if eq(version, 'latest') }}: - version: 18.5 + version: ${{ parameters.defaultiOSVersion }} ${{ if ne(version, 'latest') }}: version: ${{ version }} path: ${{ project.ios }} @@ -382,7 +383,7 @@ stages: parameters: platform: ios ${{ if eq(version, 'latest') }}: - version: 18.5 + version: ${{ parameters.defaultiOSVersion }} ${{ if ne(version, 'latest') }}: version: ${{ version }} path: ${{ project.ios }} @@ -432,7 +433,7 @@ stages: parameters: platform: ios ${{ if eq(version, 'latest') }}: - version: 18.5 + version: ${{ parameters.defaultiOSVersion }} ${{ if ne(version, 'latest') }}: version: ${{ version }} path: ${{ project.ios }} diff --git a/src/Controls/tests/TestCases.HostApp/Elements/StepperCoreGalleryPage.cs b/src/Controls/tests/TestCases.HostApp/Elements/StepperCoreGalleryPage.cs index 4f9222513d13..cfc056fa1e2b 100644 --- a/src/Controls/tests/TestCases.HostApp/Elements/StepperCoreGalleryPage.cs +++ b/src/Controls/tests/TestCases.HostApp/Elements/StepperCoreGalleryPage.cs @@ -12,6 +12,10 @@ public StepperCoreGalleryPage() // Default var defaultLabel = new Label { AutomationId = "DefaultLabel", Text = "Default" }; var defaultStepper = new Stepper { AutomationId = "DefaultStepper" }; + if (OperatingSystem.IsIOSVersionAtLeast(26)) + { + defaultStepper.HorizontalOptions = LayoutOptions.Center; + } var defaultLabelValue = new Label { AutomationId = "DefaultLabelValue", diff --git a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Editor/EditorControlPage.xaml b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Editor/EditorControlPage.xaml index 9bd65608d445..58c428a45721 100644 --- a/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Editor/EditorControlPage.xaml +++ b/src/Controls/tests/TestCases.HostApp/FeatureMatrix/Editor/EditorControlPage.xaml @@ -8,7 +8,12 @@ - +