Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add WinUI 3 item templates (backport #8848) #8850

Merged
merged 3 commits into from
May 22, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 22, 2022

This is an automatic backport of pull request #8848 done by Mergify.
Cherry-pick of bcf6c1b has failed:

On branch mergify/bp/release/stable/4.3/pr-8848
Your branch is ahead of 'origin/release/stable/4.3' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit bcf6c1b2f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   doc/articles/guides/how-to-create-control-libraries.md

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot requested a review from a team May 22, 2022 15:27
@mergify mergify bot added the conflicts label May 22, 2022
@mergify mergify bot mentioned this pull request May 22, 2022
6 tasks
@gitpod-io
Copy link

gitpod-io bot commented May 22, 2022

@jeromelaban jeromelaban force-pushed the mergify/bp/release/stable/4.3/pr-8848 branch from cb76a87 to 3f7d4f0 Compare May 22, 2022 16:38
@nventive-devops
Copy link
Contributor

The build 47074 found UI Test snapshots differences: android-28-xamarin: 28, android-28-xamarin-Snap: 20, ios: 45, ios-Snap: 93, skia-gtk-screenshots: 7, wasm: 17, wasm-automated-net5.0-Benchmarks: 0, wasm-automated-net5.0-Default: 4, wasm-automated-net5.0-RuntimeTests: 0

Details
  • android-28-xamarin: 28 changed over 844

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • FocusManager_GetFocusedElement_TextBoxMultiLine_LostFocus_Validation_FocusManager_-_LostFocus_-_TextBoxMultiLine_-_2_-_Click_outside
    • ImageStretch_None_Uno_UI_Samples_UITests_ImageTestsControl_Image_Stretch_None
    • ComboBox_Dropdown_Background_ComboBox_open
    • FocusManager_GetFocusedElement_ComboBoxItem_LostFocus_Validation_FocusManager_-_LostFocus_-_ComboBoxItem_-_2_-_Click_outside
    • ComboBoxTests_Fullscreen_Popup_Generic_Closed
    • ComboBoxTests_Fullscreen_Popup_Generic_Opened
    • FocusManager_GetFocusedElement_ComboBoxItem_Validation_FocusManager_-_GetFocusedElement_-_ComboBoxItem_-_2_-_After_Selection
    • CommandBar_LongTitle_Validation_CommandBar_-_LongTitle_-_4_-_Orientation_Landscape
    • FocusManager_GetFocusedElement_ComboBox_LostFocus_Validation_FocusManager_-_LostFocus_-_ComboBox_-_2_-_Click_outside
    • FocusManager_GetFocusedElement_ComboBox_Validation_FocusManager_-_GetFocusedElement_-_ComboBox_-_2_-_After_Selection
    • FocusManager_GetFocusedElement_TextBoxMultiLine_Validation_FocusManager_-_GetFocusedElement_-_TextBoxMultiLine_-_2_-_After_Selection
    • FocusManager_GetFocusedElement_TextBoxSingleLine_Validation_FocusManager_-_GetFocusedElement_-_TextBoxSingleLine_-_2_-_After_Selection
    • Keyboard_Textbox_NoScrollViewer_Validation_5_-_Remove_Focus_on_numberTextBox
    • TestProgressRing_InitialState_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • When_Click_Outside_Dialog_Expect_No_Dismiss_AfterClicking
    • When_Click_Outside_Dialog_Expect_No_Dismiss_BeforeClicking
    • PopupWithOverlay_After
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
  • android-28-xamarin-Snap: 20 changed over 966

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Automation_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_Name_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_Name
    • ComboBox_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_DropDownPlacement_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_DropDownPlacement
    • Image_UITests_Windows_UI_Xaml_Controls_ImageTests_Image_Formats_UITests_Windows_UI_Xaml_Controls_ImageTests_Image_Formats
    • Grid_Grid_DataBound_ColumnRow_Definitions_Uno_UI_Samples_Content_UITests_GridTestsControl_Grid_DataBound_ColumnRow_Definitions
    • Mapping_MapControl_Uno_UI_Samples_Content_UITests_MapControl_MapControl
    • Image_ImageSourceStream_Uno_UI_Samples_UITests_ImageTestsControl_ImageSourceStream
    • Pickers_TimePicker_TimePickerFlyoutStyle_UITests_Windows_UI_Xaml_Controls_TimePicker_TimePicker_TimePickerFlyoutStyle
    • Pickers_UITests_Windows_UI_Xaml_Controls_TimePicker_TimePicker_Header_UITests_Windows_UI_Xaml_Controls_TimePicker_TimePicker_Header
    • MediaPlayerElement_Using_ogg_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Ogg_Extension
    • Progress_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_CustomSources_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_CustomSources
    • Progress_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features
    • Progress_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • Progress_UITests_Microsoft_UI_Xaml_Controls_ProgressBar_WinUIProgressBarSimple_UITests_Microsoft_UI_Xaml_Controls_ProgressBar_WinUIProgressBarSimple
    • Progress_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRingPage_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRingPage
    • TextBox_Uno_UI_Samples_Content_UITests_TextBoxControl_PasswordBox_Reveal_Scroll_Uno_UI_Samples_Content_UITests_TextBoxControl_PasswordBox_Reveal_Scroll
    • Windows_Devices_Geolocator_UITests_Shared_Windows_Devices_GeolocatorTests
    • WebView_WebView_Mailto_Uno_UI_Samples_Content_UITests_WebView_WebView_Mailto
    • WebView_WebView_WithHeaders_Uno_UI_Samples_Content_UITests_WebView_WebView_WithHeaders
    • Transform_TransformToVisual_Translate2d_SamplesApp_Wasm_Windows_UI_Xaml_Media_Transform_TransformToVisual_Translate2d
    • UIElement_TransformToVisual_Transform_UITests_Shared_Windows_UI_Xaml_UIElementTests_TransformToVisual_Transform
  • ios: 45 changed over 296

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Flyout_ShowAt_Window_Content_UITests_Windows_UI_Xaml_Controls_FlyoutTests_Flyout_ShowAt_Window_Content
    • Keyboard_Textbox_NoScrollViewer_Validation_5_-_Remove_Focus_on_numberTextBox
    • ListView_ObservableCollection_Creation_Count_Added
    • ListView_ObservableCollection_Creation_Count_Added_above
    • ListView_ObservableCollection_Creation_Count_Removed_above
    • PasswordBox_RevealInScrollViewer_Uno_UI_Samples_Content_UITests_TextBoxControl_PasswordBox_Reveal_Scroll
    • Screenshots_Image_Stretch_Alignment_Equal_Mode-1
    • Screenshots_Image_Stretch_Alignment_Equal_Mode-2
    • Screenshots_Image_Stretch_Alignment_Smaller_Mode-3
    • Screenshots_Image_Stretch_Alignment_Taller_Mode-1
    • Screenshots_Image_Stretch_Alignment_Taller_Mode-2
    • ContentPresenter_Template_Uno_UI_Samples_Content_UITests_ContentPresenter_ContentPresenter_Template
    • Keyboard_Textbox_NoScrollViewer_Validation_2_-_Remove_Focus_on_placeholderTextTextBox
    • ListView_ChangingText_Validation_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Changing_Text
    • ListView_ObservableCollection_Creation_Count_Scrolled1
    • ListView_ObservableCollection_Creation_Count_Scrolled2
    • Screenshots_Image_Stretch_Algmnt_Inf_Horizontal_Mode-3
    • Screenshots_Image_Stretch_Algmnt_Inf_Vertical_Mode-1
    • Screenshots_Image_Stretch_Algmnt_Inf_Vertical_Mode-2
    • Screenshots_Image_Stretch_Alignment_SizeOnControl_Mode-3
  • ios-Snap: 93 changed over 957

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Animations_DoubleAnimation_TranslateX_GenericApp_Views_Content_UITests_Animations_DoubleAnimation_TranslateX
    • AutoSuggestBox_UITests_Windows_UI_Xaml_Controls_AutoSuggestBoxTests_AutoSuggestBox_Description_UITests_Windows_UI_Xaml_Controls_AutoSuggestBoxTests_AutoSuggestBox_Description
    • Border_Border_Simple_with_non_Uniform_Thickness_Uno_UI_Samples_UITests_BorderTestsControl_Border_Simple_with_non_Uniform_Thickness
    • Brushes_ImageBrushWithRotateTransform_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushWithRotateTransform
    • Animations_UITests_Windows_UI_Xaml_Media_Animation_ColorAnimation_Background_UITests_Windows_UI_Xaml_Media_Animation_ColorAnimation_Background
    • Brushes_UITests_Windows_UI_Xaml_Media_BrushesTests_SolidColorBrush_Color_Changed_UITests_Windows_UI_Xaml_Media_BrushesTests_SolidColorBrush_Color_Changed
    • Brushes_Uno_UI_Samples_UITests_ImageBrushTestControl_DoubleImageBrushInList_Uno_UI_Samples_UITests_ImageBrushTestControl_DoubleImageBrushInList
    • ContentControl_ContentControl_Nested_TemplatedParent_Uno_UI_Samples_Content_UITests_ContentControlTestsControl_ContentControl_Nested_TemplatedParent
    • Default_UITests_Windows_UI_Xaml_Controls_ListView_ListViewTemplateRootIsContainer_UITests_Windows_UI_Xaml_Controls_ListView_ListViewTemplateRootIsContainer
    • Border_Border_Simple_with_Opacity_Uno_UI_Samples_UITests_BorderTestsControl_Border_Simple_with_Opacity
    • Brushes_ImageBrushAlignmentXY_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushAlignmentXY
    • Brushes_ImageBrushWithCompositeTransform_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushWithCompositeTransform
    • Brushes_UITests_Shared_Windows_UI_Xaml_Media_ImageBrushTests_ImageBrush_SameWithDelay_UITests_Shared_Windows_UI_Xaml_Media_ImageBrushTests_ImageBrush_SameWithDelay
    • Brushes_UITests_Windows_UI_Xaml_Media_BrushesTests_Brushes_ImplicitConvert_UITests_Windows_UI_Xaml_Media_BrushesTests_Brushes_ImplicitConvert
    • CommandBar_CommandBar_Xaml_Automated_UITests_Shared_Windows_UI_Xaml_Controls_CommandBar_CommandBar_Xaml_Automated
    • Default_UITests_Toolkit_ElevatedView_CornerRadius_UITests_Toolkit_ElevatedView_CornerRadius
    • Border_NonUniformThicknessandRadius_Uno_UI_Samples_UITests_BorderTestsControl_NonUniformThicknessandRadius
    • Default_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation
    • Flyouts_UITests_Windows_UI_Xaml_Controls_Flyout_Flyout_TemplatedParent_UITests_Windows_UI_Xaml_Controls_Flyout_Flyout_TemplatedParent
    • Flyouts_Flyout_ToggleMenu_UITests_Shared_Windows_UI_Xaml_Controls_Flyout_Flyout_ToggleMenu
  • skia-gtk-screenshots: 7 changed over 1011

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Brushes-BorderImageBrush
    • Buttons-CheckBox_Button
    • DragAndDrop-DragDrop_TestPage
    • Image-ImageSourceStream
    • Image-UniformToFill100x100
    • Progress-WindowsProgressRing_GH1220
    • Transform-TransformToVisual_Translate2d
  • wasm: 17 changed over 965

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ListView.ListView_IsSelected
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.WinUIProgressRing_Features
    • UITests.Microsoft_UI_Xaml_Controls.ColorPickerTests.ColorPickerSample
    • UITests.Uno_Web.Http.CookieManagerTests
    • UITests.Shared.Windows_UI_Xaml_Controls.ImageTests.Image_Stretch_Algmnt_Inf_Vertical
    • UITests.Windows_UI_Xaml_Shapes.Offscreen_Shapes
    • UITests.Windows_UI_Xaml_Controls.ProgressRing.WindowsProgressRing_GH1220
    • UITests.Windows_UI_Xaml.DragAndDrop.DragDrop_TestPage
    • UITests.Windows_UI_Xaml_Controls.LoopingSelectorTests.LoopingSelector_Short
    • Uno.UI.Samples.Content.UITests.TextBlockControl.TextBlock_FixedWidth_With_DataBound_Run
    • Uno.UI.Samples.UITests.Image.Image_Margin
    • Uno.UI.Samples.Content.UITests.TextBlockControl.TextBoxSizeChanging
    • Uno.UI.Samples.Samples.Shared.Content.UITests.ImageBrushInList
    • Uno.UI.Samples.UITests.Image.Image_Stretch_Alignment_Equal
    • Uno.UI.Samples.UITests.Image.Image_Stretch_Alignment_Smaller
    • Uno.UI.Samples.UITests.Image.Image_Stretch_Alignment_Taller
    • Uno.UI.Samples.UITests.Image.Image_Stretch_Alignment_Wider
  • wasm-automated-net5.0-Benchmarks: 0 changed over 1

  • wasm-automated-net5.0-Default: 4 changed over 869

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • TestProgressRing_InitialState_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features
    • When_PressOnContainerAndReleaseOnNested_Mouse_UITests_Windows_UI_Input_PointersTests_Nested_Sequence
    • When_TransformToVisual_ScrollViewer_UITests_Shared_Windows_UI_Xaml_UIElementTests_TransformToVisual_ScrollViewer
  • wasm-automated-net5.0-RuntimeTests: 0 changed over 1

@jeromelaban jeromelaban merged commit 579678b into release/stable/4.3 May 22, 2022
@jeromelaban jeromelaban deleted the mergify/bp/release/stable/4.3/pr-8848 branch May 22, 2022 19:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants