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: ThemeResource bindings are not scope-updated on Style switch (backport #13016) #13026

Merged
merged 6 commits into from
Jul 27, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 27, 2023

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

On branch mergify/bp/legacy/4x/pr-13016
Your branch is ahead of 'origin/legacy/4x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit e51e120709.
  (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)

Changes to be committed:
	new file:   src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Controls/When_ThemeResource_Style_Switch_Page.xaml
	new file:   src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Controls/When_ThemeResource_Style_Switch_Page.xaml.cs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Given_ThemeResource.cs

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 e51e120)

# Conflicts:
#	src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml/Given_ThemeResource.cs
(cherry picked from commit b97d8c5)
@MartinZikmund MartinZikmund force-pushed the mergify/bp/legacy/4x/pr-13016 branch from 67cfcf3 to 8d91513 Compare July 27, 2023 13:40
@nventive-devops
Copy link
Contributor

The build 87496 found UI Test snapshots differences: android-28-xamarin: 39, android-28-xamarin-Snap: 83, ios: 40, ios-Snap: 89, macOS-screenshots: 15, skia-gtk-screenshots: 23, skia-wpf-screenshots: 17, wasm: 36, wasm-automated-net7.0-UWP-Benchmarks: 0, wasm-automated-net7.0-UWP-Default: 11, wasm-automated-net7.0-UWP-RuntimeTests: 0, wasm-automated-net7.0-WinUI-RuntimeTests: 0

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

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • CommandBar_LongTitle_Validation_CommandBar_-_LongTitle_-_4_-_Orientation_Landscape
    • CommandTest_UITests_Microsoft_UI_Xaml_Controls_SplitButtonTests_SplitButtonPage
    • ContentDialog_Simple_NotLightDismissible_UITests_Shared_Windows_UI_Xaml_Controls_ContentDialogTests_ContentDialog_Simple
    • FocusManager_GetFocusedElement_Border_Validation_Uno_UI_Samples_Content_UITests_FocusTests_FocusManager_GetFocus_Automated
    • FocusManager_GetFocusedElement_ComboBoxItem_Validation_FocusManager_-_GetFocusedElement_-_ComboBoxItem_-_1_-_Initial_State
    • FocusManager_GetFocusedElement_ComboBoxItem_Validation_FocusManager_-_GetFocusedElement_-_ComboBoxItem_-_2_-_After_Selection
    • FocusManager_GetFocusedElement_ComboBoxItem_Validation_Uno_UI_Samples_Content_UITests_FocusTests_FocusManager_GetFocus_Automated
    • 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
    • FocusManager_GetFocusedElement_Rectangle_Validation_Uno_UI_Samples_Content_UITests_FocusTests_FocusManager_GetFocus_Automated
    • FocusManager_GetFocusedElement_ScrollViewer_Validation_FocusManager_-_GetFocusedElement_-_ScrollViewer_-_1_-_Initial_State
    • FocusManager_GetFocusedElement_ScrollViewer_Validation_FocusManager_-_GetFocusedElement_-_ScrollViewer_-_2_-_After_Selection
    • FocusManager_GetFocusedElement_ScrollViewer_Validation_Uno_UI_Samples_Content_UITests_FocusTests_FocusManager_GetFocus_Automated
    • ListView_ExpandableItemLarge_ExpandHeaderWithMultipleItems_Validation_Expanded_State
    • ListView_ExpandableItemLarge_ExpandHeaderWithSingleItem_Validation_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Expandable_Item_Large
    • ManipulateDelta_DragDown_UITests_Shared_Windows_UI_Input_GestureRecognizerTests_ManipulationEvents
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • NativeCommandBar_Size_Uno_UI_Samples_Content_UITests_CommandBar_CommandBar_Dynamic
    • SelectionTest_UITests_Microsoft_UI_Xaml_Controls_RadioButtonsTests_RadioButtonsPage
  • android-28-xamarin-Snap: 83 changed over 1041

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Brushes_BorderImageBrush_Uno_UI_Samples_UITests_ImageBrushTestControl_BorderImageBrush
    • Brushes_UITests_Windows_UI_Xaml_Media_BrushesTests_DynamicBrushes_On_Shapes_UITests_Windows_UI_Xaml_Media_BrushesTests_DynamicBrushes_On_Shapes
    • Brushes_Uno_UI_Samples_Samples_Shared_Content_UITests_ImageBrushInList_Uno_UI_Samples_Samples_Shared_Content_UITests_ImageBrushInList
    • Animations_DoubleAnimation_VisualStates_Uno_UI_Samples_Content_UITests_Animations_DoubleAnimation_VisualStates
    • 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
    • Control_BasicEnability_UITests_Shared_Windows_UI_Xaml_Enability_BasicEnability
    • Control_UITests_Shared_Windows_UI_Xaml_Controls_ControlTests_Control_IsEnabled_Inheritance_UITests_Shared_Windows_UI_Xaml_Controls_ControlTests_Control_IsEnabled_Inheritance
    • Clipping_UITests_Shared_Windows_UI_Xaml_Clipping_ClippingToControlBounds_UITests_Shared_Windows_UI_Xaml_Clipping_ClippingToControlBounds
    • ColorPicker_ColorPickerSample_UITests_Microsoft_UI_Xaml_Controls_ColorPickerTests_ColorPickerSample
    • ColorPicker_WinUIColorPickerPage_UITests_Shared_Microsoft_UI_Xaml_Controls_ColorPickerTests_WinUIColorPickerPage
    • ComboBox_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_VisibleBounds_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_VisibleBounds
    • Default_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ComboBox_ComboBox_Empty_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ComboBox_ComboBox_Empty
    • Default_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected
    • DragAndDrop_UITests_Windows_UI_Xaml_DragAndDrop_DragDrop_ListView_Custom_States_UITests_Windows_UI_Xaml_DragAndDrop_DragDrop_ListView_Custom_States
    • GridView_Uno_UI_Samples_Content_UITests_GridView_GridViewScrollIntoViewTest_Uno_UI_Samples_Content_UITests_GridView_GridViewScrollIntoViewTest
    • GridView_Uno_UI_Samples_Content_UITests_GridView_GridViewVariableItemHeight_Uno_UI_Samples_Content_UITests_GridView_GridViewVariableItemHeight
    • 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
    • Icons_Uno_UI_Samples_Content_UITests_FontIconTests_FontIconControlTest_Uno_UI_Samples_Content_UITests_FontIconTests_FontIconControlTest
  • ios: 40 changed over 291

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Check_CornerRadius_Border_No_CornerRadius
    • Check_CornerRadius_Border_UITests_Shared_Windows_UI_Xaml_Controls_BorderTests_Border_CornerRadius_Toggle
    • 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_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
    • ListView_ExpandableItemLarge_ExpandHeaderWithSingleItem_Validation_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Expandable_Item_Large
    • ListView_ExpandableItemLarge_ExpandHeader_Validation_Collapsed_State
    • ListView_ExpandableItemLarge_ExpandHeader_Validation_Expanded_State
    • ListView_ExpandableItemLarge_ExpandHeader_Validation_Initial_State
    • ListView_ObservableCollection_Creation_Count_Added
    • ListView_ObservableCollection_Creation_Count_Added_above
    • ListView_ObservableCollection_Creation_Count_Removed_above
    • ListView_ObservableCollection_Creation_Count_Scrolled1
  • ios-Snap: 89 changed over 1032

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Border_Border_Corner_Overlap_UITests_Shared_Windows_UI_Xaml_Controls_BorderTests_Border_CornerOverlap
    • Brushes_ImageBrushStretch_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushStretch
    • Brushes_UITests_Windows_UI_Xaml_Media_BrushesTests_SolidColorBrush_Color_Changed_UITests_Windows_UI_Xaml_Media_BrushesTests_SolidColorBrush_Color_Changed
    • Border_UITests_Shared_Windows_UI_Xaml_Controls_BorderTests_Border_CornerRadius_Toggle_UITests_Shared_Windows_UI_Xaml_Controls_BorderTests_Border_CornerRadius_Toggle
    • Brushes_ImageBrushAlignmentXY_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushAlignmentXY
    • Buttons_ToggleSwitch_IsEnable_Automated_Uno_UI_Samples_Content_UITests_ButtonTestsControl_ToggleSwitch_IsEnable_Automated
    • Clipping_SamplesApp_Windows_UI_Xaml_Clipping_XamlButtonWithClipping_Scrollable_SamplesApp_Windows_UI_Xaml_Clipping_XamlButtonWithClipping_Scrollable
    • ComboBox_ComboBox_MaxDropdownHeight_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_MaxDropdownHeight
    • ComboBox_ComboBox_NativePopup_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ComboBox_ComboBox_NativePopup
    • 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_Popover_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ComboBox_ComboBox_Popover
    • ComboBox_ComboBox_SelectedIndex_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_SelectedIndex
    • ComboBox_ComboBox_SelectedItem_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ComboBox_ComboBox_SelectedItem
    • ContentPresenter_ContentPresenter_LocalOverride_Uno_UI_Samples_Content_UITests_ContentPresenter_ContentPresenter_LocalOverride
    • Clipping_UITests_Shared_Windows_UI_Xaml_Clipping_ClippingToControlBounds_UITests_Shared_Windows_UI_Xaml_Clipping_ClippingToControlBounds
    • ComboBox_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_DropDownPlacement_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_DropDownPlacement
    • Default_UITests_Shared_Windows_UI_Xaml_Controls_Canvas_Canvas_With_Outer_Clip_UITests_Shared_Windows_UI_Xaml_Controls_Canvas_Canvas_With_Outer_Clip
    • Default_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation
  • macOS-screenshots: 15 changed over 1118

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Image-Image_Stretch_None_ScrollViewer.png
    • Image-Image_Fixed_Size_Alignment.png
    • ListView-ListView_IsSelected.png
    • MUX-WinUIProgressRingPage.png
    • MUX-WinUIProgressRing_CustomSources.png
    • NavigationView-NavigationViewPage.png
    • ListView-ListView_Weird_Measure.png
    • MUX-NavigationViewPage.png
    • NavigationView-NavigationViewTopNavPage.png
    • Progress-ProgressRingHeightTest.png
    • Progress-WindowsProgressRing_GH1220.png
    • Progress-WinUIProgressRingPage.png
    • Progress-WinUIProgressRing_CustomSources.png
    • Progress-WinUIProgressRing_Features.png
    • TabView-TabViewPage.png
  • skia-gtk-screenshots: 23 changed over 1116

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Brushes-Ellipse.png
    • Brushes-ImageBrushChangingCornerRadius.png
    • Automation-AutomationProperties_Name.png
    • Image-ImageSourceStream.png
    • Image-Image_Stretch.png
    • ListView-ListView_IsSelected.png
    • ListView-ListViewSelectedItems.png
    • MUX-NavigationViewPage.png
    • MUX-NavigationViewRS4Page.png
    • NavigationView-NavigationViewPage.png
    • NavigationView-NavigationViewRS4Page.png
    • MediaPlayerElement-Mini player.png
    • MediaPlayerElement-Using .avi.png
    • MUX-WinUIProgressRingPage.png
    • MUX-WinUIProgressRing_CustomSources.png
    • PipsPager-PipsPagerExamples.png
    • Pointers-ListView_Selection_Pointers.png
    • Progress-ProgressRingHeightTest.png
    • Progress-WindowsProgressRing_GH1220.png
    • Progress-WinUIProgressRingPage.png
  • skia-wpf-screenshots: 17 changed over 1116

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Automation-AutomationProperties_Name.png
    • DragAndDrop-DragDrop_TestPage.png
    • Image-Image_Stretch.png
    • Image-UniformToFill100x100.png
    • ListView-ListView_Selection_Pointers.png
    • MUX-WinUIProgressRingPage.png
    • MUX-WinUIProgressRing_CustomSources.png
    • ListView-ListViewSelectedItems.png
    • PipsPager-PipsPagerExamples.png
    • Pointers-ListView_Selection_Pointers.png
    • Progress-ProgressRingHeightTest.png
    • Progress-WindowsProgressRing_GH1220.png
    • Progress-WinUIProgressRingPage.png
    • Progress-WinUIProgressRing_CustomSources.png
    • Progress-WinUIProgressRing_Features.png
    • Transform-TransformToVisual_Translate2d.png
    • WinUI-PipsPagerExamples.png
  • wasm: 36 changed over 1038

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • initial_state
    • MUXControlsTestApp.NavigationViewMenuItemStretchPage
    • MUXControlsTestApp.NavigationViewMinimalPage
    • MUXControlsTestApp.NavigationViewRS4Page
    • MUXControlsTestApp.PipsPagerExamples
    • MUXControlsTestApp.PipsPagerPage
    • SamplesApp.Samples.Windows_UI_Xaml_Controls.NavigationViewTests.NavigationView_Pane_Automated
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ListView.ListView_IsSelected
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewLargeHeader
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewSelectedItems
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.ProgressRingHeightTest
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.WinUIProgressRingPage
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.WinUIProgressRing_CustomSources
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.WinUIProgressRing_Features
    • UITests.Microsoft_UI_Xaml_Controls.TabViewTests.TabViewPage
    • UITests.Shared.Windows_UI_Xaml.ViusalStateTests.VisualState_AdaptiveTrigger_Storyboard
    • UITests.Shared.Windows_UI_Xaml_Automation.AutomationProperties_Name
    • 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
  • wasm-automated-net7.0-UWP-Benchmarks: 0 changed over 1

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

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • DatePicker_Flyout_DatePicker_-_Flyout
    • ImageStretch_None_Uno_UI_Samples_UITests_ImageTestsControl_Image_Stretch_None
    • ListView_SelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • TestProgressRing_InitialState_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • 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
  • wasm-automated-net7.0-UWP-RuntimeTests: 0 changed over 1

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

@MartinZikmund MartinZikmund merged commit 4f69534 into legacy/4x Jul 27, 2023
@MartinZikmund MartinZikmund deleted the mergify/bp/legacy/4x/pr-13016 branch July 27, 2023 17:24
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