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

Include Svg/**/*.svg as Content (backport #16593) #16600

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 7, 2024

GitHub Issue (If applicable): closes #

PR Type

What kind of change does this PR introduce?

  • Bugfix

What is the current behavior?

Svg's are ignored within the Assets/**/Svg/**/*.svg path and are included as None on Uno targets

What is the new behavior?

Svg's are included by default as UnoImage and are included as content when under a Svg directory.


This is an automatic backport of pull request #16593 done by Mergify.

@github-actions github-actions bot added the area/solution-templates Categorizes an issue or PR as relevant to the solution template label May 7, 2024
@jeromelaban jeromelaban enabled auto-merge May 7, 2024 03:31
@unodevops
Copy link
Contributor

🤖 Your Docs stage site is ready! Visit it here: https://unodocsprstaging.z13.web.core.windows.net/pr-16600/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-16600/index.html

@nventive-devops
Copy link
Contributor

The build 124061 found UI Test snapshots differences: android-28-net7: 22, android-28-net7-Snap: 51, ios: 265, ios-Snap: 856, skia-gtk-screenshots: 32, skia-linux-screenshots: 76, skia-windows-screenshots: 24, wasm: 83, wasm-automated-net7.0-UWP-Default-automated: 20, wasm-automated-net7.0-UWP-RuntimeTests-0: 0, wasm-automated-net7.0-UWP-RuntimeTests-1: 0, wasm-automated-net7.0-UWP-RuntimeTests-2: 0, wasm-automated-net7.0-WinUI-Benchmarks-automated: 0, wasm-automated-net7.0-WinUI-RuntimeTests-0: 0, wasm-automated-net7.0-WinUI-RuntimeTests-1: 0, wasm-automated-net7.0-WinUI-RuntimeTests-2: 0

Details
  • android-28-net7: 22 changed over 823

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Detereminate_ProgressRing_Validation50_[#FF0000_#008000_#008000_#FF0000]_Progress-Ring-Value-50
    • DecimalFormatterTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • Detereminate_ProgressRing_Validation25_[#FF0000_#008000_#FF0000_#FF0000]_Progress-Ring-Value-25
    • Detereminate_ProgressRing_Validation75_[#FF0000_#008000_#008000_#008000]_Progress-Ring-Value-75
    • FocusManager_GetFocusedElement_Button_LostFocus_Validation_FocusManager_-_LostFocus_-_Button_-_1_-_Initial_State
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • ListView_SelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • SelectionTest_UITests_Microsoft_UI_Xaml_Controls_RadioButtonsTests_RadioButtonsPage
    • UpDownEnabledTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • UpDownTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • When_InListView_after_scroll
    • When_Parent_PointerMoved_After_drag_on_ScrollViewer_-_touch
    • When_Gyrometer_Is_Retrived_With_GetDefault_UITests_Shared_Windows_Devices_GyrometerTests
    • When_Reading_Is_Attached_UITests_Shared_Windows_Devices_GyrometerTests
    • FocusManager_GetFocusedElement_Button_LostFocus_Validation_FocusManager_-_LostFocus_-_Button_-_2_-_Click_outside
    • FocusManager_GetFocusedElement_Button_LostFocus_Validation_Uno_UI_Samples_Content_UITests_FocusTests_FocusManager_GetFocus_Automated
    • When_Tap_PressedReleasedAreHandled_UITests_Windows_UI_Xaml_Controls_ComboBox_ComboBox_Pointers
    • Flyout_ShowAt_Window_Content_UITests_Windows_UI_Xaml_Controls_FlyoutTests_Flyout_ShowAt_Window_Content
    • ImageStretch_None_Uno_UI_Samples_UITests_ImageTestsControl_Image_Stretch_None
  • android-28-net7-Snap: 51 changed over 1060

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Image_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_Icons_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_Icons
    • RatingControl_UITests_Microsoft_UI_Xaml_Controls_RatingControlTests_RatingControlPage_UITests_Microsoft_UI_Xaml_Controls_RatingControlTests_RatingControlPage
    • NavigationView_MUXControlsTestApp_NavigationViewRS4Page_MUXControlsTestApp_NavigationViewRS4Page
    • SwipeControl_MUXControlsTestApp_SwipeControlPage2_MUXControlsTestApp_SwipeControlPage2
    • MUX_UITests_Microsoft_UI_Xaml_Controls_SplitButtonTests_SplitButtonTestsPage_UITests_Microsoft_UI_Xaml_Controls_SplitButtonTests_SplitButtonTestsPage
    • MUX_UITests_Shared_Microsoft_UI_Xaml_Controls_TreeViewTests_TreeViewPage_UITests_Shared_Microsoft_UI_Xaml_Controls_TreeViewTests_TreeViewPage
    • Buttons_UITests_Microsoft_UI_Xaml_Controls_RadioButtonsTests_RadioButtonsPage_UITests_Microsoft_UI_Xaml_Controls_RadioButtonsTests_RadioButtonsPage
    • Progress_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRingPage_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRingPage
    • MUX_NumberBox_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • Gesture_Recognizer_Pointer_Events_test_bench_UITests_Shared_Windows_UI_Input_GestureRecognizer_PointersEvents
    • NavigationView_MUXControlsTestApp_NavigationViewTopNavPage_MUXControlsTestApp_NavigationViewTopNavPage
    • Progress_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_ProgressRingHeightTest_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_ProgressRingHeightTest
    • TextBlock_TextBlock_Progressing_Trim_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBlock_Progressing_Trim
    • TextBlock_TextBlock_TextAlignment_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBlock_TextAlignment
    • TextBlock_TextBlock_Run_Inheritance_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBlock_Run_Inheritance
    • TextBlock_TextBlock_Span_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBlock_Span
    • MediaPlayerElement_Using_flv_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Flv_Extension
    • MediaPlayerElement_Using_mkv_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Mkv_Extension
    • MediaPlayerElement_Using_mov_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Mov_Extension
    • TextBlock_UITests_Shared_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_Layout_UITests_Shared_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_Layout
  • ios: 265 changed over 265

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • BasicExpressionTest_UITests_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBox_ExpressionTest
    • Change_Manipulation_Property_Before_property_change
    • ComboBoxTests_Kidnapping_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_ComboBoxItem_Selection
    • FocusManager_FocusDirection_Up_Validation_Uno_UI_Samples_Content_UITests_FocusTests_FocusManager_FocusDirection
    • ItemsControl_AppendItem_UITests_Windows_UI_Xaml_Controls_ItemsControl_ItemsControl_AppendItem
    • Large_Image_With_Margin_UITests_Windows_UI_Xaml_Controls_ImageTests_Image_Margin_Large
    • Screenshots_Image_Stretch_Alignment_Taller_Mode-2
    • Screenshots_Image_Stretch_Alignment_Wider_Mode-2
    • TextBox_DeleteButton_UITests_Shared_Windows_UI_Xaml_Controls_TextBoxTests_TextBox_DeleteButton_Automated
    • TextBox_Disable_UITests_Shared_Windows_UI_Xaml_Controls_TextBoxTests_TextBox_Disabled
    • ThreeStates_Indeterminate
    • ThreeStates_UITests_Shared_Windows_UI_Xaml_Controls_CheckBoxTests_CheckBox_Automated
    • When_Foreground_Brush_Color_Changed_afterColor
    • When_Multiple_Controls_And_Some_Are_Collapsed_Arrange_UITests_Shared_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_LineHeight_MultipleControls
    • When_Navigated_CommandBarDisplayCustomBackButtonIcon_NativeFrame_Source_set
    • BitmapSource_PixelSize_UITests_Shared_Windows_UI_Xaml_Controls_ImageTests_Image_ImageSource_PixelSize
    • CheckBox_IsEnabled_Validation_Uno_UI_Samples_Content_UITests_ButtonTestsControl_CheckBox_IsEnabled_Automated
    • ComboBoxTests_Stretch_UITests_Windows_UI_Xaml_Controls_ComboBox_ComboBox_Stretch
    • FocusManager_FocusDirection_Right_Validation_Uno_UI_Samples_Content_UITests_FocusTests_FocusManager_FocusDirection
    • InputScope_Should_Not_Validate_Input_Uno_UI_Samples_Content_UITests_TextBoxControl_Input_InputScope_CurrencyAmount
  • ios-Snap: 856 changed over 1051

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Animations_DoubleAnimation_Opacity_TextBlock_GenericApp_Views_Content_UITests_Animations_DoubleAnimation_Opacity_TextBlock
    • Animations_DoubleAnimation_VisualStates_Uno_UI_Samples_Content_UITests_Animations_DoubleAnimation_VisualStates
    • Automation_AutomationProperties_AutomationId_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_AutomationId
    • Border_AutoBorderStretchwithrightmargin_Uno_UI_Samples_UITests_BorderTestsControl_AutoBorderStretchwithrightmargin
    • Border_Border_CornerRadius_Binding_Uno_UI_Samples_UITests_BorderTestsControl_Border_CornerRadius_Binding
    • Border_OnepxThicknessandRadiusAndTextBlock_Uno_UI_Samples_UITests_BorderTestsControl_OnepxThicknessandRadiusAndTextBlock
    • BreadcrumbBar_MUXControlsTestApp_BreadcrumbBarPage_MUXControlsTestApp_BreadcrumbBarPage
    • Brushes_ImageBrushWithScaleTransform_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushWithScaleTransform
    • Brushes_UITests_Windows_UI_Xaml_Media_AcrylicBrushTests_BasicAcrylicBrushTest_UITests_Windows_UI_Xaml_Media_AcrylicBrushTests_BasicAcrylicBrushTest
    • Brushes_UITests_Windows_UI_Xaml_Media_BrushesTests_Brushes_ImplicitConvert_UITests_Windows_UI_Xaml_Media_BrushesTests_Brushes_ImplicitConvert
    • Buttons_AppBarToggleButtonTest_Uno_UI_Samples_Content_UITests_ButtonTestsControl_AppBarToggleButtonTest
    • Buttons_AppBar_KeyBoard_Uno_UI_Samples_Content_UITests_ButtonTestsControl_AppBar_KeyBoard
    • Buttons_Nested_Buttons_nVentive_Umbrella_Views_UI_Samples_Content_UITests_ButtonTestsControl_Nested_Buttons
    • Buttons_Overlapped_Buttons_UITests_Shared_Windows_UI_Xaml_Controls_Button_Overlapped_Buttons
    • ColorPicker_ColorPickerSample_UITests_Microsoft_UI_Xaml_Controls_ColorPickerTests_ColorPickerSample
    • ColorPicker_WinUIColorPickerPage_UITests_Shared_Microsoft_UI_Xaml_Controls_ColorPickerTests_WinUIColorPickerPage
    • Default_UITests_Windows_UI_Xaml_Controls_TextBox_TextBox_CornerRadius_UITests_Windows_UI_Xaml_Controls_TextBox_TextBox_CornerRadius
    • Default_UITests_Windows_UI_Xaml_Controls_TextBox_TextBox_Focus_Programmatic_UITests_Windows_UI_Xaml_Controls_TextBox_TextBox_Focus_Programmatic
    • Flyouts_Flyout_LargeContent_UITests_Shared_Windows_UI_Xaml_Controls_Flyout_Flyout_LargeContent
    • Flyouts_Flyout_Simple_Uno_UI_Samples_Content_UITests_Flyout_Flyout_Simple
  • skia-gtk-screenshots: 32 changed over 2176

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • BorderImageBrush.png
    • SvgImageSource_Icons.png-dark
    • SvgImageSource_Icons.png
    • Window_SetBackground.png
    • MediaPlayer.png-dark
    • MediaPlayer.png
    • ImageBrushInList.png
    • ProgressRingHeightTest.png-dark
    • ProgressRingHeightTest.png
    • Using .3gp.png-dark
    • Using .3gp.png
    • ImageBrushInList.png-dark
    • RectanglemaskingRectangleGrid.png
    • Ellipse.png-dark
    • Ellipse.png
    • ImageBrush_UniformToFill.png-dark
    • ImageBrush_UniformToFill.png
    • Rectangle.png
    • DoubleImageBrushInList.png-dark
    • DoubleImageBrushInList.png
  • skia-linux-screenshots: 76 changed over 2176

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • BorderImageBrush.png
    • BorderImageBrushRelativeTransform.png-dark
    • DoubleImageBrushInList.png-dark
    • DoubleImageBrushInList.png
    • ImageBrush_SameWithDelay.png-dark
    • ImageBrush_SameWithDelay.png
    • BorderImageBrushRelativeTransform.png
    • Ellipse.png-dark
    • Ellipse.png
    • ImageInStackPanel.png-dark
    • ImageInStackPanel.png
    • ImageWithLateSourceUniformToFill.png-dark
    • ImagesInlineInFlipView.png-dark
    • ImageWithLateSourceUniformToFill.png
    • ImagesInlineInFlipView.png
    • ImageBrush_UniformToFill.png-dark
    • ImageBrush_UniformToFill.png
    • LargeImageList.png-dark
    • LargeImageList.png
    • BorderImageBrush.png-dark
  • skia-windows-screenshots: 24 changed over 2176

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Image_UseTargetSize.png-dark
    • Image_UseTargetSize.png
    • ImageSourceUrlMsAppDataScheme.png-dark
    • ImageSourceUrlMsAppDataScheme.png
    • Image_Stretch_None.png-dark
    • Image_Stretch_None.png
    • Image_Stretch_None_ScrollViewer.png-dark
    • Image_Stretch_None_ScrollViewer.png
    • TransformToVisual_Translate2d.png-dark
    • TransformToVisual_Translate2d.png
    • ProgressRingHeightTest.png-dark
    • ProgressRingHeightTest.png
    • SvgImageSource_FromStream.png-dark
    • SvgImageSource_FromStream.png
    • SvgImageSource_Icons.png-dark
    • SvgImageSource_Icons.png
    • MediaPlayer.png-dark
    • MediaPlayer.png
    • Using .3gp.png-dark
    • Using .3gp.png
  • wasm: 83 changed over 1046

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • MUXControlsTestApp.NavigationViewBlankPage1
    • MUXControlsTestApp.NavigationViewTopNavPage
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_Inside_ListView
    • UITests.Microsoft_UI_Xaml_Controls.NavigationViewTests.NavigationViewBasicPage
    • UITests.Microsoft_UI_Xaml_Controls.TabViewTests.TabViewPage
    • UITests.Windows_Media.MediaPlayerTests
    • UITests.Windows_UI_Xaml_Controls.ScrollViewerTests.ScrollViewer_Margin
    • MUXControlsTestApp.NavigationViewMenuItemStretchPage
    • MUXControlsTestApp.RefreshVisualizerPage
    • SamplesApp.Samples.Windows_UI_Xaml_Controls.NavigationViewTests.NavigationView_BasicNavigation
    • UITests.Uno_Web.Http.CookieManagerTests
    • initial_state
    • MUXControlsTestApp.NavigationViewItemTemplatePage
    • MUXControlsTestApp.NavigationViewStretchPage
    • UITests.Microsoft_UI_Xaml_Controls.RatingControlTests.RatingControlPage
    • UITests.Windows_UI_Xaml_Shapes.PathStretchModes
    • MUXControlsTestApp.NavigationViewSelectedItemEdgeCasePage
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ListView.ListView_IsSelected
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.HorizontalListViewGrouped
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.UndefinedHeightListView
  • wasm-automated-net7.0-UWP-Default-automated: 20 changed over 1953

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Default_StrokeThickness_MyLine_0_StrokeThickness
    • MediaPlayerElement_Mini_player_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Minimal
    • MediaPlayerElement_Sources_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Sources
    • MediaPlayerElement_Using_3gp_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_3gp_Extension
    • Check_ListView_Swallows_Measure_after_scroll
    • 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
    • Default_StrokeThickness_MyPolygon
    • 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
    • When_SingleSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • Windows_Media_MediaPlayer_UITests_Windows_Media_MediaPlayerTests
    • ListView_ListViewSelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • 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
    • When_MultipleSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • TestProgressRing_InitialState_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features
    • 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
    • UpDownTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
  • wasm-automated-net7.0-UWP-RuntimeTests-0: 0 changed over 1

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

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

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

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

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

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

@jeromelaban jeromelaban merged commit df88553 into release/stable/5.2 May 7, 2024
100 of 101 checks passed
@jeromelaban jeromelaban deleted the mergify/bp/release/stable/5.2/pr-16593 branch May 7, 2024 06:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/solution-templates Categorizes an issue or PR as relevant to the solution template
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants