Skip to content

fix(binding): Avoid reading source property on UpdateSource for non-DP (backport #13698 and #13521 and #13700)#13728

Merged
jeromelaban merged 11 commits intolegacy/4xfrom
mergify/bp/legacy/4x/pr-13698
Sep 21, 2023
Merged

fix(binding): Avoid reading source property on UpdateSource for non-DP (backport #13698 and #13521 and #13700)#13728
jeromelaban merged 11 commits intolegacy/4xfrom
mergify/bp/legacy/4x/pr-13698

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Sep 20, 2023

This is an automatic backport of pull request #13698 and #13521 and #13700

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

(cherry picked from commit 203609d)

# Conflicts:
#	src/Uno.UI/DataBinding/BindingPath.BindingItem.cs
(cherry picked from commit a919999)
@nventive-devops
Copy link
Contributor

The build 94877 found UI Test snapshots differences: android-28-xamarin: 42, android-28-xamarin-Snap: 91, ios: 120, ios-Snap: 73, macOS-screenshots: 14, skia-gtk-screenshots: 24, skia-wpf-screenshots: 14, wasm: 49, wasm-automated-net7.0-UWP-Benchmarks: 0, wasm-automated-net7.0-UWP-Default: 13, wasm-automated-net7.0-UWP-RuntimeTests: 0, wasm-automated-net7.0-WinUI-RuntimeTests: 0

Details
  • android-28-xamarin: 42 changed over 832

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Check_ListView_Swallows_Measure_after_scroll
    • Check_ListView_Swallows_Measure_before_scroll
    • Check_ListView_Swallows_Measure_UITests_Shared_Windows_UI_Xaml_Controls_ListView_ListView_With_ListViews_Count_Measure
    • ComboBoxTests_VisibleBounds_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_VisibleBounds
    • CommandBar_LongTitle_Validation_CommandBar_-_LongTitle_-_4_-_Orientation_Landscape
    • DecimalFormatterTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • FocusManager_GetFocusedElement_Button_Validation_FocusManager_-_GetFocusedElement_-_Button_-_1_-_Initial_State
    • FocusManager_GetFocusedElement_Button_Validation_FocusManager_-_GetFocusedElement_-_Button_-_2_-_After_Selection
    • FocusManager_GetFocusedElement_Button_Validation_Uno_UI_Samples_Content_UITests_FocusTests_FocusManager_GetFocus_Automated
    • FocusManager_GetFocusedElement_TextBoxSingleLine_LostFocus_Validation_Uno_UI_Samples_Content_UITests_FocusTests_FocusManager_GetFocus_Automated
    • Keyboard_Textbox_NoScrollViewer_Validation_5_-_Remove_Focus_on_numberTextBox
    • FocusManager_GetFocusedElement_Rectangle_Validation_FocusManager_-_GetFocusedElement_-_Rectangle_-_1_-_Initial_State
    • FocusManager_GetFocusedElement_Rectangle_Validation_FocusManager_-_GetFocusedElement_-_Rectangle_-_2_-_After_Selection
    • FocusManager_GetFocusedElement_Rectangle_Validation_Uno_UI_Samples_Content_UITests_FocusTests_FocusManager_GetFocus_Automated
    • FocusManager_GetFocusedElement_ToggleButton_LostFocus_Validation_Uno_UI_Samples_Content_UITests_FocusTests_FocusManager_GetFocus_Automated
    • ListView_ExpandableItemLarge_ExpandHeaderWithMultipleItems_Validation_Expanded_State
    • ListView_ExpandableItem_ExpandMultipleItems_Expanded_State
    • Late_With_Fixed_Dimensions_UITests_Windows_UI_Xaml_Controls_ImageTests_ImageWithLateSourceFixedDimensions
    • ListView_ListViewWithHeader_InitializesTest_SamplesApp_Windows_UI_Xaml_Controls_ListView_HorizontalListViewGrouped
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
  • android-28-xamarin-Snap: 91 changed over 1044

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • BreadcrumbBar_MUXControlsTestApp_BreadcrumbBarPage_MUXControlsTestApp_BreadcrumbBarPage
    • Border_Border_CornerRadius_BorderThickness_UITests_Windows_UI_Xaml_Controls_BorderTests_Border_CornerRadius_BorderThickness
    • Brushes_Uno_UI_Samples_Samples_Shared_Content_UITests_ImageBrushInList_Uno_UI_Samples_Samples_Shared_Content_UITests_ImageBrushInList
    • Control_BasicEnability_UITests_Shared_Windows_UI_Xaml_Enability_BasicEnability
    • Clipping_UITests_Shared_Windows_UI_Xaml_Clipping_ClippingToControlBounds_UITests_Shared_Windows_UI_Xaml_Clipping_ClippingToControlBounds
    • ColorPicker_WinUIColorPickerPage_UITests_Shared_Microsoft_UI_Xaml_Controls_ColorPickerTests_WinUIColorPickerPage
    • Default_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected
    • Dialogs_ContentDialog_Async_UITests_Shared_Windows_UI_Xaml_Controls_ContentDialogTests_ContentDialog_Async
    • Dialogs_ContentDialog_Closing_UITests_Shared_Windows_UI_Xaml_Controls_ContentDialogTests_ContentDialog_Closing
    • GridView_Uno_UI_Samples_Content_UITests_GridView_GridViewFirstVisibleIndex_Uno_UI_Samples_Content_UITests_GridView_GridViewFirstVisibleIndex
    • GridView_Uno_UI_Samples_Content_UITests_GridView_GridView_Item_TextBlock_And_Button_Uno_UI_Samples_Content_UITests_GridView_GridView_Item_TextBlock_And_Button
    • GridView_Uno_UI_Samples_Content_UITests_GridView_GridView_Vertical_MaxItemWidth_Uno_UI_Samples_Content_UITests_GridView_GridView_Vertical_MaxItemWidth
    • Grid_Grid_with_MinWidth_MinHeight_Uno_UI_Samples_Content_UITests_GridTestsControl_Grid_with_MinWidth_MinHeight
    • Gesture_Recognizer_Pointer_Events_test_bench_UITests_Shared_Windows_UI_Input_GestureRecognizer_PointersEvents
    • Gesture_Recognizer_UITests_Shared_Windows_UI_Input_GestureRecognizerTests_GestureEventsCommons_UITests_Shared_Windows_UI_Input_GestureRecognizerTests_GestureEventsCommons
    • ListView_ListViewChangeView_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewChangeView
    • ListView_ListViewGroupedChanging_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewGroupedChanging
    • ListView_ListViewGroupedEmptyHeader_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewGroupedEmptyHeader
    • ListView_ListViewGroupedEmpty_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewGroupedEmpty
    • ListView_ListViewGroupedLarge_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewGroupedLarge
  • ios: 120 changed over 291

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Button_Events_UITests_Shared_Windows_UI_Xaml_Controls_Button_Button_Events
    • Button_OverlappedButtons_UITests_Shared_Windows_UI_Xaml_Controls_Button_Overlapped_Buttons
    • CheckBox_IsEnabled_StatePreservation_Uno_UI_Samples_Content_UITests_ButtonTestsControl_CheckBox_IsEnabled_Automated
    • Check_ListView_Swallows_Measure_UITests_Shared_Windows_UI_Xaml_Controls_ListView_ListView_With_ListViews_Count_Measure
    • DatePicker_Flyout_DatePicker_-_Flyout
    • Flyout_ShowAt_Window_Content_UITests_Windows_UI_Xaml_Controls_FlyoutTests_Flyout_ShowAt_Window_Content
    • HyperlinkButton_IsEnabled_Validation_Uno_UI_Samples_Content_UITests_ButtonTestsControl_HyperlinkButton_IsEnabled_Automated
    • Keyboard_Textbox_NoScrollViewer_Validation_2_-_Remove_Focus_on_placeholderTextTextBox
    • Keyboard_Textbox_NoScrollViewer_Validation_3_-_Remove_Focus_on_disabledTextBox
    • Keyboard_Textbox_NoScrollViewer_Validation_4_-_Remove_Focus_on_multilineTextBox
    • Keyboard_Textbox_NoScrollViewer_Validation_5_-_Remove_Focus_on_numberTextBox
    • Keyboard_Textbox_NoScrollViewer_Validation_Uno_UI_Samples_Content_UITests_TextBoxControl_Input_Test_NoScrollViewer_Automated
    • ListView_ChangingText_Validation_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Changing_Text
    • ListView_ExpandableItemLarge_ExpandHeaderWithMultipleItems_Validation_Collapsed_State
    • ListView_ExpandableItemLarge_ExpandHeaderWithMultipleItems_Validation_Expanded_State
    • ListView_ExpandableItemLarge_ExpandHeaderWithMultipleItems_Validation_Initial_State
    • ListView_ExpandableItemLarge_ExpandHeaderWithMultipleItems_Validation_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Expandable_Item_Large
    • ListView_ExpandableItemLarge_ExpandHeaderWithSingleItem_Validation_Collapsed_State
    • ListView_ExpandableItemLarge_ExpandHeaderWithSingleItem_Validation_Expanded_State
    • ListView_ExpandableItemLarge_ExpandHeaderWithSingleItem_Validation_Initial_State
  • ios-Snap: 73 changed over 1035

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Animations_DoubleAnimation_Cumulative_Uno_UI_Samples_Content_UITests_Animations_DoubleAnimation_Cumulative
    • Animations_DoubleAnimation_TranslateX_GenericApp_Views_Content_UITests_Animations_DoubleAnimation_TranslateX
    • Brushes_UITests_Windows_UI_Xaml_Media_BrushesTests_SolidColorBrush_Color_Changed_UITests_Windows_UI_Xaml_Media_BrushesTests_SolidColorBrush_Color_Changed
    • Brushes_UITests_Windows_UI_Xaml_Media_GradientBrushTests_LinearGradientBrush_Change_Stops_UITests_Windows_UI_Xaml_Media_GradientBrushTests_LinearGradientBrush_Change_Stops
    • Buttons_AppBarButtonTest_Uno_UI_Samples_Content_UITests_ButtonTestsControl_AppBarButtonTest
    • Border_Border_Simple_with_Opacity_Uno_UI_Samples_UITests_BorderTestsControl_Border_Simple_with_Opacity
    • Buttons_UITests_Microsoft_UI_Xaml_Controls_RadioButtonsTests_RadioButtonsFocusPage_UITests_Microsoft_UI_Xaml_Controls_RadioButtonsTests_RadioButtonsFocusPage
    • Buttons_Uno_UI_Samples_Content_UITests_ButtonTestsControl_Custom_Button_With_ContentTemplate_And_StackPanel_Uno_UI_Samples_Content_UITests_ButtonTestsControl_Custom_Button_With_ContentTemplate_And_StackPanel
    • ComboBox_ComboBox_ToggleDisabled_UITests_Windows_UI_Xaml_Controls_ComboBox_ComboBox_ToggleDisabled
    • ContentControl_ContentControl_SetNull_Uno_UI_Samples_Content_UITests_ContentControlTestsControl_ContentControl_SetNull
    • ContentControl_ContentControl_WithPadding_Uno_UI_Samples_Content_UITests_ContentControlTestsControl_ContentControl_WithPadding
    • Buttons_Simple_TextBlockButton_Uno_UI_Samples_Content_UITests_TextBlockControl_Simple_TextBlockButton
    • Buttons_ToggleSwitch_IsEnable_Automated_Uno_UI_Samples_Content_UITests_ButtonTestsControl_ToggleSwitch_IsEnable_Automated
    • Buttons_UITests_Microsoft_UI_Xaml_Controls_RadioButtonsTests_RadioButtonsBasicPage_UITests_Microsoft_UI_Xaml_Controls_RadioButtonsTests_RadioButtonsBasicPage
    • ComboBox_UITests_Windows_UI_Xaml_Controls_ComboBox_ComboBox_Description_UITests_Windows_UI_Xaml_Controls_ComboBox_ComboBox_Description
    • ContentControl_ContentControl_FindName_Uno_UI_Samples_Content_UITests_ContentControlTestsControl_ContentControl_FindName
    • ContentControl_ContentControl_MultiLevelInheritance_Uno_UI_Samples_Content_UITests_ContentControlTestsControl_ContentControl_MultiLevelInheritance
    • GridView_Uno_UI_Samples_Content_UITests_GridView_GridView_Vertical_MaxItemWidth_Uno_UI_Samples_Content_UITests_GridView_GridView_Vertical_MaxItemWidth
    • Grid_Grid_with_three_UserControl_With_5_Margin_Uno_UI_Samples_Content_UITests_GridTestsControl_Grid_with_three_UserControl_With_5_Margin
    • Grid_Grid_with_UserControl_VerticalAlignment_Variable_Height_Uno_UI_Samples_Content_UITests_GridTestsControl_Grid_with_UserControl_VerticalAlignment_Variable_Height
  • macOS-screenshots: 14 changed over 1122

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Image-Image_Fixed_Size_Alignment.png
    • Image-SvgImageSource_FromMsAppData.png
    • ListView-ListView_IsSelected.png
    • MUX-WinUIProgressRingPage.png
    • MUX-WinUIProgressRing_CustomSources.png
    • MUX-NavigationViewPage.png
    • MUX-NavigationViewRS3Page.png
    • NavigationView-NavigationViewPage.png
    • Progress-ProgressRingHeightTest.png
    • Progress-WinUIProgressRingPage.png
    • Progress-WinUIProgressRing_CustomSources.png
    • Progress-WinUIProgressRing_Features.png
    • WebView-WebView2_NavigationProperties.png
    • Windows.Security-AuthenticationBroker_Demo.png
  • skia-gtk-screenshots: 24 changed over 1120

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Brushes-Ellipse.png
    • Brushes-ImageBrushChangingCornerRadius.png
    • DragAndDrop-DragDrop_TestPage.png
    • GridView-GridViewSelection.png
    • Image-ImageSourceStream.png
    • Image-Image_Stretch.png
    • Image-UniformToFill100x100.png
    • ListView-ListViewSelectedItems.png
    • MUX-NavigationViewRS4Page.png
    • ListView-ListView_Selection_Pointers.png
    • MediaPlayerElement-Using .3gp.png
    • MUX-WinUIProgressRingPage.png
    • MUX-WinUIProgressRing_CustomSources.png
    • Pickers-CalendarView_Theming.png
    • PipsPager-PipsPagerExamples.png
    • Pointers-ListView_Selection_Pointers.png
    • Progress-ProgressRingHeightTest.png
    • NavigationView-NavigationViewRS4Page.png
    • Progress-WindowsProgressRing_GH1220.png
    • Progress-WinUIProgressRingPage.png
  • skia-wpf-screenshots: 14 changed over 1120

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Brushes-Ellipse.png
    • DragAndDrop-DragDrop_TestPage.png
    • ListView-ListViewSelectedItems.png
    • MUX-TabViewPage.png
    • MUX-WinUIProgressRingPage.png
    • MUX-WinUIProgressRing_CustomSources.png
    • Pickers-CalendarView_Theming.png
    • PipsPager-PipsPagerExamples.png
    • Progress-ProgressRingHeightTest.png
    • Progress-WindowsProgressRing_GH1220.png
    • Progress-WinUIProgressRingPage.png
    • Progress-WinUIProgressRing_CustomSources.png
    • Progress-WinUIProgressRing_Features.png
    • WinUI-PipsPagerExamples.png
  • wasm: 49 changed over 1041

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • initial_state
    • MUXControlsTestApp.NavigationViewMinimalPage
    • MUXControlsTestApp.NavigationViewPage
    • MUXControlsTestApp.PipsPagerPage
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ListView.ListView_IsSelected
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewContainerFromItem
    • MUXControlsTestApp.PipsPagerExamples
    • SamplesApp.Samples.NavigationViewSample.NavigationViewSample
    • SamplesApp.Samples.Windows_UI_Xaml_Controls.NavigationViewTests.NavigationView_BasicNavigation
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewHeaderImage
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewLargeHeader
    • UITests.Microsoft_UI_Xaml_Controls.NavigationViewTests.NavigationViewBasicPage
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewSelectedItems
    • SamplesApp.Windows_UI_Xaml_Shapes.StretchPage
    • UITests.Microsoft_UI_Xaml_Controls.ColorPickerTests.ColorPickerSample
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.WinUIProgressRingPage
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.WinUIProgressRing_CustomSources
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.WinUIProgressRing_Features
    • UITests.Shared.Microsoft_UI_Xaml_Controls.ColorPickerTests.WinUIColorPickerPage
    • UITests.Microsoft_UI_Xaml_Controls.TabViewTests.TabViewPage
  • wasm-automated-net7.0-UWP-Benchmarks: 0 changed over 1

  • wasm-automated-net7.0-UWP-Default: 13 changed over 890

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ImageStretch_None_Uno_UI_Samples_UITests_ImageTestsControl_Image_Stretch_None
    • ListView_SelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • MinMaxTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • Screenshots_Image_Stretch_Algmnt_Inf_Vertical_Mode-0
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • TestProgressRing_InitialState_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features
    • When_ExtendedSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_MultipleSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_NoSelectionWithItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_NoSelection_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_SingleSelectionWithItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_SingleSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_Theme_Changed_No_Crash_UITests_Windows_UI_Xaml_Controls_CalendarView_CalendarView_Theming
  • wasm-automated-net7.0-UWP-RuntimeTests: 0 changed over 1

  • wasm-automated-net7.0-WinUI-RuntimeTests: 0 changed over 1

`WindowsAppSDKWinUI` has been removed in 1.4, using `UseWinUITools` until we can find a more stable property.

(cherry picked from commit 85a5aae)
(cherry picked from commit 472df6c)
(cherry picked from commit 1d89227)
(cherry picked from commit 3f40f06)

# Conflicts:
#	build/PackageDiffIgnore.xml
.NET 8 changes the ordering of nuget defined props files, This change makes WinUI detection independent of nuget props import and rely on .targets evaluation.
@github-actions github-actions bot added area/code-generation Categorizes an issue or PR as relevant to code generation area/build Categorizes an issue or PR as relevant to build infrastructure labels Sep 21, 2023
@jeromelaban jeromelaban changed the title fix(binding): Avoid reading source property on UpdateSource for non-DP (backport #13698) fix(binding): Avoid reading source property on UpdateSource for non-DP (backport #13698 and #13521) Sep 21, 2023
@jeromelaban jeromelaban merged commit 87955d6 into legacy/4x Sep 21, 2023
@jeromelaban jeromelaban deleted the mergify/bp/legacy/4x/pr-13698 branch September 21, 2023 13:45
@nickrandolph nickrandolph changed the title fix(binding): Avoid reading source property on UpdateSource for non-DP (backport #13698 and #13521) fix(binding): Avoid reading source property on UpdateSource for non-DP (backport #13698 and #13521 and #13700) Sep 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/build Categorizes an issue or PR as relevant to build infrastructure area/code-generation Categorizes an issue or PR as relevant to code generation conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants