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.

Sign up for GitHub

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

Jump to bottom

fix: Avoid type conflicts in SamplesApp.Windows #18553

Merged
merged 1 commit into from
Oct 25, 2024
Merged

fix: Avoid type conflicts in SamplesApp.Windows #18553

merged 1 commit into from
Oct 25, 2024

Conversation

MartinZikmund
Copy link
Member

GitHub Issue (If applicable): closes #

PR Type

What kind of change does this PR introduce?

What is the current behavior?

What is the new behavior?

PR Checklist

Please check if your PR fulfills the following requirements:

Other information

Internal Issue (If applicable):

@MartinZikmund MartinZikmund self-assigned this Oct 23, 2024
@github-actions github-actions bot added the area/automation Categorizes an issue or PR as relevant to project automation label Oct 23, 2024
@unodevops
Copy link
Contributor

🤖 Your WebAssembly Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-18553/index.html

@unodevops
Copy link
Contributor

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-18553/index.html

@MartinZikmund MartinZikmund force-pushed the dev/mazi/mux-colors-fix branch from 9280f9f to 2143af3 Compare October 23, 2024 20:42
@unodevops
Copy link
Contributor

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-18553/index.html

@unodevops
Copy link
Contributor

🤖 Your WebAssembly Sample App stage site is ready! Visit it here: https://unowasmprstaging.z20.web.core.windows.net/pr-18553/index.html

@nventive-devops
Copy link
Contributor

The build 144693 found UI Test snapshots differences: android-28-net8: 24, android-28-net8-Snap: 48, ios: 8, ios-Snap: 49, skia-gtk-screenshots: 70, skia-linux-screenshots: 64, skia-windows-screenshots: 68, wasm: 470, wasm-automated-net9.0-UWP-Default-automated: 26, wasm-automated-net9.0-UWP-RuntimeTests-0: 0, wasm-automated-net9.0-UWP-RuntimeTests-1: 0, wasm-automated-net9.0-UWP-RuntimeTests-2: 0, wasm-automated-net9.0-WinUI-Benchmarks-automated: 0, wasm-automated-net9.0-WinUI-RuntimeTests-0: 0, wasm-automated-net9.0-WinUI-RuntimeTests-1: 0, wasm-automated-net9.0-WinUI-RuntimeTests-2: 0

Details

  • android-28-net8: 24 changed over 829

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Detereminate_ProgressRing_Validation50_[#FF0000_#008000_#008000_#FF0000]_Progress-Ring-Value-50
    • Detereminate_ProgressRing_Validation75_[#FF0000_#008000_#008000_#008000]_Progress-Ring-Value-75
    • FlyoutTest_DataBoundButton_CommandExecutes_UITests_Shared_Windows_UI_Xaml_Controls_Flyout_Flyout_ButtonInContent
    • ImageStretch_None_Uno_UI_Samples_UITests_ImageTestsControl_Image_Stretch_None
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • When_ExtendedSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_SingleSelectionWithItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • UpDownEnabledTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • When_SingleSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_Parent_PointerMoved_After_drag_on_ScrollViewer_-_touch
    • When_Parent_PointerMoved_After_drag_on_non-scrolling_ScrollViewer
    • When_Native_View_UITests_Shared_Windows_UI_Xaml_UIElementTests_UIElement_Native_Child
    • When_NoSelectionWithItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • DecimalFormatterTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • Pivot_Non_PivotItem_Items_UITests_Shared_Windows_UI_Xaml_Controls_Pivot_Pivot_CustomContent_Automated
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • Detereminate_ProgressRing_Validation25_[#FF0000_#008000_#FF0000_#FF0000]_Progress-Ring-Value-25
    • When_Clip_Is_Set_On_Child_Element_original
    • WebView_NavigateToAnchor_Initial
    • ListView_SelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems

  • android-28-net8-Snap: 48 changed over 1066

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • RatingControl_UITests_Microsoft_UI_Xaml_Controls_RatingControlTests_RatingControlPage_UITests_Microsoft_UI_Xaml_Controls_RatingControlTests_RatingControlPage
    • SwipeControl_MUXControlsTestApp_SwipeControlPage2_MUXControlsTestApp_SwipeControlPage2
    • TextBox_TextBox_HorizontalAlignment_Uno_UI_Samples_Content_UITests_TextBoxControl_TextBox_HorizontalAlignment
    • TextBox_TextBox_Keyboard_Dismiss_Uno_UI_Samples_Content_UITests_TextBoxControl_TextBox_Keyboard_Dismiss
    • Icons_UITests_Microsoft_UI_Xaml_Controls_ImageIconTests_ImageIconPage_UITests_Microsoft_UI_Xaml_Controls_ImageIconTests_ImageIconPage
    • ListView_ListViewSelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • TextBlock_UITests_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_RelativeTextSize_UITests_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_RelativeTextSize
    • TextBlock_UITests_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_TextTrimming_UITests_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_TextTrimming
    • Image_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Taller_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Taller
    • TextBox_TextBox_Padding_In_ScrollViewer_Uno_UI_Samples_Content_UITests_TextBoxControl_TextBox_Padding_In_ScrollViewer
    • TextBox_TextBox_Padding_In_Style_Uno_UI_Samples_Content_UITests_TextBoxControl_TextBox_Padding_In_Style
    • Transform_Border_With_Off_Centre_RotateTransform_SamplesApp_Wasm_Windows_UI_Xaml_Media_Transform_Border_With_Off_Centre_RotateTransform
    • Transform_Border_With_Off_Centre_ScaleTransform_SamplesApp_Wasm_Windows_UI_Xaml_Media_Transform_Border_With_Off_Centre_ScaleTransform
    • Transform_Border_With_RotateTransform_SamplesApp_Wasm_Windows_UI_Xaml_Media_Transform_Border_With_RotateTransform
    • Transform_Border_With_ScaleTransform_SamplesApp_Wasm_Windows_UI_Xaml_Media_Transform_Border_With_ScaleTransform
    • MediaPlayerElement_Using_3gp_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_3gp_Extension
    • MediaPlayerElement_Using_mp3_Audio_only_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Mp3_Extension
    • MediaPlayerElement_Using_ogg_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Ogg_Extension
    • TextBlock_SimpleText_MaxWidth_Wrap_Uno_UI_Samples_Controls_SimpleText_MaxWidth_Wrap
    • MUX_NumberBox_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage

  • ios: 8 changed over 267

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • When_NoSelection_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • ListView_ListViewWithHeader_InitializesTest_SamplesApp_Windows_UI_Xaml_Controls_ListView_HorizontalListViewGrouped
    • When_SingleSelectionWithoutItemClick_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
    • TextBox_UpdatedBinding_On_OneWay_Mode_UITests_Windows_UI_Xaml_Controls_TextBox_TextBox_Bindings

  • ios-Snap: 49 changed over 1057

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ContentControl_ContentControl_UnsetContent_GenericApp_Views_Content_UITests_ContentControlTestsControl_ContentControl_UnsetContent
    • Grid_Grid_DataBound_ColumnRow_Definitions_Uno_UI_Samples_Content_UITests_GridTestsControl_Grid_DataBound_ColumnRow_Definitions
    • ListView_ListViewVariableHeightButton_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewVariableHeightButton
    • TextBlock_TextBlockMultilineInStarStackPanel_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBlockMultilineInStarStackPanel
    • Brushes_ImageBrushStretch2_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushStretch2
    • SwipeControl_MUXControlsTestApp_SwipeControlPage2_MUXControlsTestApp_SwipeControlPage2
    • Image_Image_Stretch_None_ScrollViewer_Uno_UI_Samples_UITests_ImageTestsControl_Image_Stretch_None_Containers
    • ListView_ListView_Image_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Image
    • NavigationView_FluentStyle_NavigationViewSample_SamplesApp_Samples_Microsoft_UI_Xaml_Controls_NavigationViewTests_FluentStyle_FluentStyle_NavigationViewSample
    • ColorPicker_WinUIColorPickerPage_UITests_Shared_Microsoft_UI_Xaml_Controls_ColorPickerTests_WinUIColorPickerPage
    • Image_UITests_Windows_UI_Xaml_Controls_ImageTests_ImageAlignment2541_UITests_Windows_UI_Xaml_Controls_ImageTests_ImageAlignment2541
    • Image_Uno_UI_Samples_UITests_Image_Image_Stretch_Uno_UI_Samples_UITests_Image_Image_Stretch
    • Brushes_Uno_UI_Samples_Samples_Shared_Content_UITests_ImageBrushInList_Uno_UI_Samples_Samples_Shared_Content_UITests_ImageBrushInList
    • Icons_UITests_Microsoft_UI_Xaml_Controls_ImageIconTests_ImageIconPage_UITests_Microsoft_UI_Xaml_Controls_ImageIconTests_ImageIconPage
    • ListView_ListViewResizable_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewResizable
    • Image_UITests_Windows_UI_Xaml_Controls_ImageTests_Image_Formats_UITests_Windows_UI_Xaml_Controls_ImageTests_Image_Formats
    • Brushes_RectangleStretchFill_Uno_UI_Samples_UITests_ImageBrushTestControl_RectangleStretchFill
    • Image_EmptyImageFixedWidth_Uno_UI_Samples_UITests_ImageTestsControl_EmptyImageFixedWidth
    • Icons_UITests_Shared_Windows_UI_Xaml_Controls_BitmapIconTests_BitmapIcon_Foreground_UITests_Shared_Windows_UI_Xaml_Controls_BitmapIconTests_BitmapIcon_Foreground
    • ListView_HorizontalListView_Padding_SamplesApp_Windows_UI_Xaml_Controls_ListView_HorizontalListView_Padding

  • skia-gtk-screenshots: 70 changed over 2222

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • DropDownButtonPage.png
    • TextBlock_IsTextSelectionEnabled.png-dark
    • ImageIconPage.png-dark
    • ImageIconPage.png
    • ImageInStackPanel.png-dark
    • ImageInStackPanel.png
    • RepeatButton_Automated.png-dark
    • RepeatButton_Automated.png
    • ExpanderColorValidationPage.png-dark
    • SplitButtonTestsPage.png-dark
    • Ellipse.png-dark
    • ContentPresenter_NativeEmbedding.png-dark
    • ContentPresenter_NativeEmbedding.png
    • UIElement_Layout_Bug2879.png-dark
    • UIElement_Layout_Bug2879.png
    • Ellipse.png
    • ClipboardTests.png-dark
    • ClipboardTests.png
    • DisplayInformation.png-dark
    • DisplayInformation.png

  • skia-linux-screenshots: 64 changed over 2222

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • CalendarView_Theming.png-dark
    • CalendarView_Theming.png
    • Gamepad_CurrentReading.png-dark
    • Gamepad_Enumeration.png-dark
    • ClipboardTests.png-dark
    • DisplayInformation.png-dark
    • DisplayInformation.png
    • Ellipse.png-dark
    • Ellipse.png
    • DropDownButtonPage.png-dark
    • DropDownButtonPage.png
    • Focus_FocusVisual_Properties.png-dark
    • Focus_FocusVisual_Properties.png
    • BorderImageBrush.png-dark
    • BorderImageBrushRelativeTransform.png
    • Buttons.png-dark
    • ContentControl_ComboBoxSetNull.png-dark
    • ContentControl_ComboBoxSetNull.png
    • DoubleImageBrushInList.png-dark
    • DoubleImageBrushInList.png

  • skia-windows-screenshots: 68 changed over 2222

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • AppWindowPositionAndSize.png
    • BorderImageBrush.png-dark
    • BorderImageBrush.png
    • DisplayInformation.png-dark
    • DisplayInformation.png
    • Gamepad_Enumeration.png-dark
    • Gamepad_Enumeration.png
    • Buttons.png
    • AppWindowPositionAndSize.png-dark
    • ButtonClippingTestsControl.png-dark
    • FlipView_Background.png-dark
    • FlipView_Background.png
    • CalendarView_Theming.png-dark
    • CalendarView_Theming.png
    • Image_UseTargetSize.png-dark
    • Image_UseTargetSize.png
    • Examples.png
    • ImageBrush_UniformToFill.png-dark
    • ImageBrush_UniformToFill.png
    • ImageIconPage.png-dark

  • wasm: 470 changed over 1044

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • GenericApp.Views.Content.UITests.ImageBrushTestControl.ImageBrush_UniformToFill
    • MUXControlsTestApp.InfoBarPage
    • MUXControlsTestApp.PipsPagerPage
    • SamplesApp.Microsoft_UI_Xaml_Controls.WebView2Tests.WebView2_Static
    • SamplesApp.Microsoft_UI_Xaml_Controls.WebView2Tests.WebView2_WithHeaders
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ComboBox.ComboBox_Legacy
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ComboBox.ComboBox_NativePopup
    • SamplesApp.Windows_UI_Xaml.Clipping.ButtonWithClippingAndOffset
    • SamplesApp.Windows_UI_Xaml.Clipping.DoubleAnimationClipping
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewIncrementalLoading
    • SamplesApp.Windows_UI_Xaml_Shapes.PathTestsControl.Path_Dynamic
    • UITests.Lottie.LottieProgressPage
    • UITests.Shared.Windows_ApplicationModel.Calls.PhoneCallHistoryEntryReaderTests
    • UITests.Shared.Windows_ApplicationModel.Calls.PhoneCallManagerTests
    • UITests.Shared.Windows_UI_Xaml.ThemeResources.BasicThemeResources
    • UITests.Shared.Windows_UI_Xaml_Controls.GridTestsControl.Grid_MinWidth_MaxWidth
    • UITests.Shared.Windows_UI_Xaml_Controls.GridTestsControl.Grid_Spacing_Adjustable
    • UITests.Shared.Windows_UI_Xaml_Controls.GridTestsControl.Grid_with_OutOfRange_Cells
    • UITests.Shared.Windows_UI_Xaml_Controls.TextBoxTests.TextBox_IsReadOnly_AcceptsReturn
    • UITests.Shared.Windows_UI_Xaml_Controls.TextBoxTests.TextBox_TextChanged

  • wasm-automated-net9.0-UWP-Default-automated: 26 changed over 1946

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Automation_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_Name_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_Name
    • Default_StrokeThickness_MyLine
    • MediaPlayerElement_Mini_player_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Minimal
    • MediaPlayerElement_Sources_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Sources
    • Default_StrokeThickness_MyPolyline
    • Expander_WinUIExpanderPage_UITests_Shared_Microsoft_UI_Xaml_Controls_ExpanderTests_WinUIExpanderPage
    • Default_StrokeThickness_MyPolygon
    • Brushes_BorderImageBrush_Uno_UI_Samples_UITests_ImageBrushTestControl_BorderImageBrush
    • Brushes_Uno_UI_Samples_Samples_Shared_Content_UITests_ImageBrushInList_Uno_UI_Samples_Samples_Shared_Content_UITests_ImageBrushInList
    • Default_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation
    • Pickers_UITests_Windows_UI_Xaml_Controls_CalendarView_CalendarView_Theming_UITests_Windows_UI_Xaml_Controls_CalendarView_CalendarView_Theming
    • Default_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected
    • ListView_SelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • ListView_ListViewSelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • TestProgressRing_InitialState_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features
    • When_TransformToVisual_ScrollViewer_UITests_Shared_Windows_UI_Xaml_UIElementTests_TransformToVisual_ScrollViewer
    • 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
    • MediaPlayerElement_Using_3gp_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_3gp_Extension

  • wasm-automated-net9.0-UWP-RuntimeTests-0: 0 changed over 1

  • wasm-automated-net9.0-UWP-RuntimeTests-1: 0 changed over 1

  • wasm-automated-net9.0-UWP-RuntimeTests-2: 0 changed over 1

  • wasm-automated-net9.0-WinUI-Benchmarks-automated: 0 changed over 1

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

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

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

@MartinZikmund MartinZikmund merged commit 8a0e072 into master Oct 25, 2024
108 checks passed
@MartinZikmund MartinZikmund deleted the dev/mazi/mux-colors-fix branch October 25, 2024 12:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jeromelaban jeromelaban jeromelaban approved these changes

Assignees

@MartinZikmund MartinZikmund

Labels
area/automation Categorizes an issue or PR as relevant to project automation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@MartinZikmund @unodevops @nventive-devops @jeromelaban