Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 44 additions & 5 deletions eng/pipelines/common/ui-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ parameters:
androidApiLevels: [ 30 ]
iosVersions: [ 'latest' ]
provisionatorChannel: 'latest'
timeoutInMinutes: 120
skipProvisioning: true
agentPoolAccessToken: ''
categoryGroupsToTest:
Expand Down Expand Up @@ -143,7 +144,7 @@ stages:
${{ each categoryGroup in parameters.categoryGroupsToTest }}:
${{ categoryGroup }}:
CATEGORYGROUP: ${{ categoryGroup }}
timeoutInMinutes: 240 # how long to run the job before automatically cancelling
timeoutInMinutes: ${{ parameters.timeoutInMinutes }} # how long to run the job before automatically cancelling
workspace:
clean: all
displayName: ${{ coalesce(project.desc, project.name) }} (v${{ version }})
Expand Down Expand Up @@ -180,7 +181,7 @@ stages:
- ${{ each version in parameters.iosVersions }}:
- ${{ if not(containsValue(project.iosVersionsExclude, version)) }}:
- job: CV2_ios_ui_tests_mono_${{ project.name }}_${{ replace(version, '.', '_') }}
timeoutInMinutes: 240 # how long to run the job before automatically cancelling
timeoutInMinutes: ${{ parameters.timeoutInMinutes }} # how long to run the job before automatically cancelling
workspace:
clean: all
displayName: ${{ coalesce(project.desc, project.name) }} (v${{ version }})
Expand Down Expand Up @@ -209,6 +210,44 @@ stages:
testConfigurationArgs: "CollectionView2"
skipProvisioning: ${{ parameters.skipProvisioning }}

- stage: ios_ui_tests_mono_carv2
displayName: iOS UITests Mono CarouselView2
dependsOn: build_ui_tests
jobs:
- ${{ each project in parameters.projects }}:
- ${{ if ne(project.ios, '') }}:
- ${{ each version in parameters.iosVersions }}:
- ${{ if not(containsValue(project.iosVersionsExclude, version)) }}:
- job: CARV2_ios_ui_tests_mono_${{ project.name }}_${{ replace(version, '.', '_') }}
timeoutInMinutes: ${{ parameters.timeoutInMinutes }} # how long to run the job before automatically cancelling
workspace:
clean: all
displayName: ${{ coalesce(project.desc, project.name) }} (v${{ version }})
pool: ${{ parameters.iosPool }}
variables:
REQUIRED_XCODE: $(DEVICETESTS_REQUIRED_XCODE)
APPIUM_HOME: $(System.DefaultWorkingDirectory)/.appium/
steps:
- template: ui-tests-steps.yml
parameters:
platform: ios
${{ if eq(version, 'latest') }}:
version: 16.4
${{ if ne(version, 'latest') }}:
version: ${{ version }}
path: ${{ project.ios }}
app: ${{ project.app }}
${{ if eq(version, 'latest') }}:
device: ios-simulator-64
${{ if ne(version, 'latest') }}:
device: ios-simulator-64_${{ version }}
provisionatorChannel: ${{ parameters.provisionatorChannel }}
agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
runtimeVariant : "Mono"
testFilter: "CarouselView"
testConfigurationArgs: "CollectionView2"
skipProvisioning: ${{ parameters.skipProvisioning }}

- ${{ if or(parameters.BuildEverything, and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'devdiv'))) }}:
- stage: ios_ui_tests_nativeaot
displayName: iOS UITests NativeAOT
Expand All @@ -224,7 +263,7 @@ stages:
${{ each categoryGroup in parameters.categoryGroupsToTest }}:
${{ categoryGroup }}:
CATEGORYGROUP: ${{ categoryGroup }}
timeoutInMinutes: 240 # how long to run the job before automatically cancelling
timeoutInMinutes: ${{ parameters.timeoutInMinutes }} # how long to run the job before automatically cancelling
workspace:
clean: all
displayName: ${{ coalesce(project.desc, project.name) }} (v${{ version }})
Expand Down Expand Up @@ -264,7 +303,7 @@ stages:
${{ each categoryGroup in parameters.categoryGroupsToTest }}:
${{ categoryGroup }}:
CATEGORYGROUP: ${{ categoryGroup }}
timeoutInMinutes: 240 # how long to run the job before automatically cancelling
timeoutInMinutes: ${{ parameters.timeoutInMinutes }} # how long to run the job before automatically cancelling
workspace:
clean: all
displayName: ${{ coalesce(project.desc, project.name) }}
Expand Down Expand Up @@ -296,7 +335,7 @@ stages:
${{ each categoryGroup in parameters.categoryGroupsToTest }}:
${{ categoryGroup }}:
CATEGORYGROUP: ${{ categoryGroup }}
timeoutInMinutes: 240 # how long to run the job before automatically cancelling
timeoutInMinutes: ${{ parameters.timeoutInMinutes }} # how long to run the job before automatically cancelling
workspace:
clean: all
displayName: ${{ coalesce(project.desc, project.name) }}
Expand Down
14 changes: 8 additions & 6 deletions src/Controls/tests/TestCases.HostApp/Issues/Issue28930.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:Maui.Controls.Sample"
x:Class="Maui.Controls.Sample.Issues.Issue28930">
<VerticalStackLayout>
<Border Stroke="Violet"
Expand All @@ -10,22 +11,23 @@
<VerticalStackLayout Spacing="10">
<Label Text="CAROUSEL"
TextTransform="Uppercase" />
<CarouselView x:Name="MyCarousel"
<!--https://github.com/dotnet/maui/issues/29402 -->
<local:CarouselView1 x:Name="MyCarousel"
AutomationId="MyCarousel"
HorizontalOptions="Fill"
VerticalOptions="Start"
MinimumHeightRequest="120"
HeightRequest="140"
HorizontalScrollBarVisibility="Never"
EmptyView="No data">
<CarouselView.ItemsSource>
<local:CarouselView1.ItemsSource>
<x:Array Type="{x:Type x:String}">
<x:String>Item 1</x:String>
<x:String>Item 2</x:String>
<x:String>Item 3</x:String>
</x:Array>
</CarouselView.ItemsSource>
<CarouselView.ItemTemplate>
</local:CarouselView1.ItemsSource>
<local:CarouselView1.ItemTemplate>
<DataTemplate>
<Grid ColumnDefinitions="*,*,*,*"
RowDefinitions="*,Auto">
Expand Down Expand Up @@ -138,8 +140,8 @@
</Grid>
</Grid>
</DataTemplate>
</CarouselView.ItemTemplate>
</CarouselView>
</local:CarouselView1.ItemTemplate>
</local:CarouselView1>
</VerticalStackLayout>
</Border>
</VerticalStackLayout>
Expand Down
Loading