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

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

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 20, 2023

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

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 94875 found UI Test snapshots differences: android-28-xamarin: 41, android-28-xamarin-Snap: 89, ios: 32, ios-Snap: 242, macOS-screenshots: 19, skia-gtk-screenshots: 20, skia-wpf-screenshots: 13, wasm: 40, 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: 41 changed over 832

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ComboBoxTests_VisibleBounds_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_VisibleBounds
    • CommandTest_UITests_Microsoft_UI_Xaml_Controls_SplitButtonTests_SplitButtonPage
    • ContentDialog_Simple_NotLightDismissible_UITests_Shared_Windows_UI_Xaml_Controls_ContentDialogTests_ContentDialog_Simple
    • DecimalFormatterTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • FocusManager_GetFocusedElement_Border_Validation_Uno_UI_Samples_Content_UITests_FocusTests_FocusManager_GetFocus_Automated
    • FocusManager_GetFocusedElement_TextBoxMultiLine_Validation_FocusManager_-_GetFocusedElement_-_TextBoxMultiLine_-_2_-_After_Selection
    • FocusManager_GetFocusedElement_TextBoxSingleLine_LostFocus_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_ExpandableItem_ExpandMultipleItems_Expanded_State
    • ListView_ListViewWithHeader_InitializesTest_SamplesApp_Windows_UI_Xaml_Controls_ListView_HorizontalListViewGrouped
    • ListView_SelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • LoadEmptyContentControl_CContentControl
    • Keyboard_Textbox_NoScrollViewer_Validation_5_-_Remove_Focus_on_numberTextBox
    • ListView_ExpandableItemLarge_ExpandHeaderWithMultipleItems_Validation_Expanded_State
    • NativeCommandBar_Size_Uno_UI_Samples_Content_UITests_CommandBar_CommandBar_Dynamic
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • ScrollViewer_Removed_And_Added_Initial-Scrolled
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • UpDownTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
  • android-28-xamarin-Snap: 89 changed over 1044

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Animations_DoubleAnimationTestsControl_Uno_UI_Samples_Content_UITests_DoubleAnimationTestsControl
    • Automation_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_Name_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_Name
    • Border_Border_CornerRadius_BorderThickness_UITests_Windows_UI_Xaml_Controls_BorderTests_Border_CornerRadius_BorderThickness
    • Animations_DoubleAnimationUsingKeyFrames_TranslateX_GenericApp_Views_Content_UITests_Animations_DoubleAnimationUsingKeyFrames_TranslateX
    • Brushes_BorderImageBrush_Uno_UI_Samples_UITests_ImageBrushTestControl_BorderImageBrush
    • Brushes_ImageBrushWithCompositeTransform_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushWithCompositeTransform
    • Brushes_ImageBrushWithLateSource_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushWithLateSource
    • Brushes_ImageBrushWithRotateTransform_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushWithRotateTransform
    • 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_ColorPickerSample_UITests_Microsoft_UI_Xaml_Controls_ColorPickerTests_ColorPickerSample
    • ComboBox_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_VisibleBounds_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_VisibleBounds
    • DragAndDrop_UITests_Windows_UI_Xaml_DragAndDrop_DragDrop_ListView_Custom_States_UITests_Windows_UI_Xaml_DragAndDrop_DragDrop_ListView_Custom_States
    • Default_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected
    • GridView_Uno_UI_Samples_Content_UITests_GridView_GridViewVariableItemHeight_Uno_UI_Samples_Content_UITests_GridView_GridViewVariableItemHeight
    • Flyouts_MenuFlyoutItem_Click_UITests_Shared_Windows_UI_Xaml_Controls_MenuFlyoutTests_MenuFlyoutItem_Click
    • Flyouts_MenuFlyoutItem_Hierarchy_UITests_Shared_Windows_UI_Xaml_Controls_MenuFlyoutTests_MenuFlyoutItem_Hierarchy
    • Flyouts_Namescope_UITests_Shared_Windows_UI_Xaml_Controls_FlyoutTests_Flyout_Namescope
    • Gesture_Recognizer_Pointer_Events_test_bench_UITests_Shared_Windows_UI_Input_GestureRecognizer_PointersEvents
    • ItemsRepeater_UITests_Windows_UI_Xaml_Controls_Repeater_UniformGridLayout_Simple_UITests_Windows_UI_Xaml_Controls_Repeater_UniformGridLayout_Simple
  • ios: 32 changed over 291

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Keyboard_Textbox_NoScrollViewer_Validation_2_-_Remove_Focus_on_placeholderTextTextBox
    • Keyboard_Textbox_NoScrollViewer_Validation_4_-_Remove_Focus_on_multilineTextBox
    • Keyboard_Textbox_NoScrollViewer_Validation_5_-_Remove_Focus_on_numberTextBox
    • ListView_ChangingText_Validation_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Changing_Text
    • ListView_ObservableCollection_Creation_Count_Added
    • ListView_ObservableCollection_Creation_Count_Added_above
    • ListView_ObservableCollection_Creation_Count_Removed_above
    • ListView_ObservableCollection_Creation_Count_Scrolled1
    • PasswordBox_RevealInScrollViewer_Uno_UI_Samples_Content_UITests_TextBoxControl_PasswordBox_Reveal_Scroll
    • BasicExpressionTest_UITests_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBox_ExpressionTest
    • ContentPresenter_Template_Uno_UI_Samples_Content_UITests_ContentPresenter_ContentPresenter_Template
    • Keyboard_Textbox_NoScrollViewer_Validation_0_-_Remove_Focus_on_normalTextBox
    • Keyboard_Textbox_NoScrollViewer_Validation_1_-_Remove_Focus_on_filledTextBox
    • ListView_ObservableCollection_Creation_Count_Scrolled2
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • Screenshots_Image_Stretch_Alignment_Equal_Mode-0
    • Screenshots_Image_Stretch_Alignment_Equal_Mode-1
    • Screenshots_Image_Stretch_Alignment_Taller_Mode-2
    • Screenshots_Image_Stretch_Alignment_Wider_Mode-0
    • Screenshots_Image_Stretch_Alignment_Wider_Mode-1
  • ios-Snap: 242 changed over 1035

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • 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
    • Buttons_Button_Opacity_Automated_Uno_UI_Samples_Content_UITests_ButtonTestsControl_Button_Opacity_Automated
    • Animations_DoubleAnimation_TranslateX_GenericApp_Views_Content_UITests_Animations_DoubleAnimation_TranslateX
    • Brushes_ImageBrushWithCompositeTransform_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushWithCompositeTransform
    • Brushes_ImageBrushWithRotateTransform_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushWithRotateTransform
    • 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
    • Clipping_SamplesApp_Windows_UI_Xaml_Clipping_XamlButtonWithClipping_SamplesApp_Windows_UI_Xaml_Clipping_XamlButtonWithClipping
    • ComboBox_ComboBox_Disabled_UITests_Windows_UI_Xaml_Controls_ComboBox_ComboBox_Disabled
    • ComboBox_ComboBox_ItemsSource_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ComboBox_ComboBox_ItemsSource
    • ComboBox_ComboBox_MaxDropdownHeight_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_MaxDropdownHeight
    • ComboBox_ComboBox_NoDataContext_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_NoDataContext
    • ComboBox_ComboBox_Picker_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ComboBox_ComboBox_Picker
    • ComboBox_ComboBox_PlaceholderText_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ComboBox_ComboBox_PlaceholderText
    • ComboBox_ComboBox_ScrollViewer_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ComboBox_ComboBox_ScrollViewer
    • ComboBox_ComboBox_SelectedIndex_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_SelectedIndex
    • ComboBox_ComboBox_SelectedItem_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ComboBox_ComboBox_SelectedItem
    • ComboBox_ComboBox_ToggleDisabled_UITests_Windows_UI_Xaml_Controls_ComboBox_ComboBox_ToggleDisabled
    • CommandBar_CommandBar_BackButtonImage_UITests_Windows_UI_Xaml_Controls_CommandBar_BackButtonImage_CommandBar_Frame
  • macOS-screenshots: 19 changed over 1122

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Grid-CenteredGridinGridwiththreefixedsizechildren.png
    • Image-Image_Stretch.png
    • Image-Image_Fixed_Size_Alignment.png
    • MediaPlayerElement-Using .avi.png
    • MediaPlayerElement-Using .mkv.png
    • Image-SvgImageSource_FromMsAppData.png
    • ListView-ListView_IsSelected.png
    • ListView-ListView_Weird_Measure.png
    • MUX-NavigationViewPage.png
    • MUX-WinUIProgressRingPage.png
    • MUX-WinUIProgressRing_CustomSources.png
    • NavigationView-NavigationViewPage.png
    • Progress-ProgressRingHeightTest.png
    • Progress-WindowsProgressRing_GH1220.png
    • Progress-WinUIProgressRingPage.png
    • Progress-WinUIProgressRing_CustomSources.png
    • Progress-WinUIProgressRing_Features.png
    • Windows.Security-AuthenticationBroker_Demo.png
    • WebView-WebView2_NavigationProperties.png
  • skia-gtk-screenshots: 20 changed over 1120

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Brushes-ImageBrushChangingCornerRadius.png
    • DragAndDrop-DragDrop_TestPage.png
    • Image-ImageSourceStream.png
    • Image-Image_Stretch.png
    • Image-UniformToFill100x100.png
    • ListView-ListViewSelectedItems.png
    • MUX-NavigationViewPage.png
    • ListView-ListView_Selection_Pointers.png
    • MUX-WinUIProgressRingPage.png
    • MUX-WinUIProgressRing_CustomSources.png
    • NavigationView-NavigationViewPage.png
    • Pickers-CalendarView_Theming.png
    • PipsPager-PipsPagerExamples.png
    • Progress-ProgressRingHeightTest.png
    • NavigationView-NavigationViewRS4Page.png
    • Progress-WindowsProgressRing_GH1220.png
    • Progress-WinUIProgressRingPage.png
    • Progress-WinUIProgressRing_CustomSources.png
    • Progress-WinUIProgressRing_Features.png
    • WinUI-PipsPagerExamples.png
  • skia-wpf-screenshots: 13 changed over 1120

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ListView-ListViewSelectedItems.png
    • ListView-ListView_Selection_Pointers.png
    • MUX-WinUIProgressRingPage.png
    • MUX-WinUIProgressRing_CustomSources.png
    • Pickers-CalendarView_Theming.png
    • Progress-ProgressRingHeightTest.png
    • PipsPager-PipsPagerExamples.png
    • Progress-WindowsProgressRing_GH1220.png
    • Progress-WinUIProgressRingPage.png
    • Progress-WinUIProgressRing_CustomSources.png
    • Progress-WinUIProgressRing_Features.png
    • TabView-TabViewPage.png
    • WinUI-PipsPagerExamples.png
  • wasm: 40 changed over 1041

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • MUXControlsTestApp.NavigationViewMenuItemStretchPage
    • MUXControlsTestApp.NavigationViewTopNavOnlyPage
    • MUXControlsTestApp.PipsPagerExamples
    • SamplesApp.Samples.Windows_UI_Xaml_Controls.NavigationViewTests.NavigationView_BasicNavigation
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ListView.ListView_IsSelected
    • MUXControlsTestApp.NavigationViewAnimationPage
    • MUXControlsTestApp.NavigationViewRS4Page
    • SamplesApp.Samples.NavigationViewSample.NavigationViewSample
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewSelectedItems
    • 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.Shared.Windows_Devices.Midi.MidiDeviceEnumerationTests
    • UITests.Shared.Windows_UI_Xaml.ViusalStateTests.VisualState_AdaptiveTrigger_Storyboard
    • UITests.Shared.Windows_UI_Xaml_Controls.ListView.ListView_With_ListViews_Count_Measure
    • UITests.Shared.Windows_UI_Xaml_Controls.MediaPlayerElement.MediaPlayerElement_3gp_Extension
    • UITests.Shared.Windows_UI_Xaml_Controls.MediaPlayerElement.MediaPlayerElement_Avi_Extension
    • UITests.Shared.Windows_UI_Xaml_Controls.MediaPlayerElement.MediaPlayerElement_Flv_Extension
    • UITests.Shared.Windows_UI_Xaml_Controls.MediaPlayerElement.MediaPlayerElement_Minimal
  • wasm-automated-net7.0-UWP-Benchmarks: 0 changed over 1

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

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ListView_SelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • MinMaxTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • Screenshots_Image_Stretch_Alignment_Smaller_Mode-2
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • SubMenuTest_UITests_Shared_Microsoft_UI_Xaml_Controls_RadioMenuFlyoutItemTests_RadioMenuFlyoutItemPage
    • 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

.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 the area/build Categorizes an issue or PR as relevant to build infrastructure label 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 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) Sep 21, 2023
@jeromelaban jeromelaban merged commit 55fc1d6 into release/stable/4.10 Sep 21, 2023
70 of 75 checks passed
@jeromelaban jeromelaban deleted the mergify/bp/release/stable/4.10/pr-13698 branch September 21, 2023 13:44
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 conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants