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

Include Svg/**/*.svg as Content #16593

Merged
merged 2 commits into from
May 7, 2024
Merged

Include Svg/**/*.svg as Content #16593

merged 2 commits into from
May 7, 2024

Conversation

dansiegel
Copy link
Contributor

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.

@dansiegel dansiegel enabled auto-merge May 6, 2024 19:00
@dansiegel
Copy link
Contributor Author

@Mergifyio backport release/stable/5.2

@mergify Mergify
Copy link
Contributor

mergify bot commented May 6, 2024 •
edited

backport release/stable/5.2

✅ Backports have been created

@pedrojesus-work pedrojesus-work mentioned this pull request May 6, 2024
Merged
7 tasks
@unodevops
Copy link
Contributor

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

@dansiegel dansiegel disabled auto-merge May 6, 2024 20:03
@dansiegel dansiegel mentioned this pull request May 6, 2024
Closed
@github-actions github-actions bot added the area/solution-templates Categorizes an issue or PR as relevant to the solution template label May 6, 2024
@unodevops
Copy link
Contributor

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

@jeromelaban jeromelaban enabled auto-merge May 7, 2024 02:13
@nventive-devops
Copy link
Contributor

The build 124036 found UI Test snapshots differences: android-28-net7: 16, android-28-net7-Snap: 47, ios: 54, ios-Snap: 220, skia-gtk-screenshots: 25, skia-linux-screenshots: 42, skia-windows-screenshots: 8, wasm: 62, wasm-automated-net7.0-UWP-Default-automated: 30, 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: 16 changed over 829

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • CommandBar_LongTitle_Validation_CommandBar_-_LongTitle_-_4_-_Orientation_Landscape
    • Detereminate_ProgressRing_Validation75_[#FF0000_#008000_#008000_#008000]_Progress-Ring-Value-75
    • ImageStretch_None_Uno_UI_Samples_UITests_ImageTestsControl_Image_Stretch_None
    • ListView_SelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • When_InScrollViewer_after_scroll
    • UpDownEnabledTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • UpDownTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • SelectionTest_UITests_Microsoft_UI_Xaml_Controls_RadioButtonsTests_RadioButtonsPage
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • Detereminate_ProgressRing_Validation25_[#FF0000_#008000_#FF0000_#FF0000]_Progress-Ring-Value-25
    • Detereminate_ProgressRing_Validation50_[#FF0000_#008000_#008000_#FF0000]_Progress-Ring-Value-50
    • When_InListView_after_scroll
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • When_Parent_PointerMoved_After_drag_on_non-scrolling_ScrollViewer
    • When_Parent_PointerMoved_After_drag_on_ScrollViewer_-_touch

  • android-28-net7-Snap: 47 changed over 1064

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Image_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_Icons_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_Icons
    • TextBox_TextBox_HorizontalAlignment_Uno_UI_Samples_Content_UITests_TextBoxControl_TextBox_HorizontalAlignment
    • TextBlock_UITests_Windows_UI_Xaml_Media_GradientBrushTests_LinearGradientBrush_Width_UITests_Windows_UI_Xaml_Media_GradientBrushTests_LinearGradientBrush_Width
    • TextBlock_Uno_UI_Samples_Content_UITests_TextBlockControl_SimpleText_MaxLines_Multiple_Containers_Uno_UI_Samples_Content_UITests_TextBlockControl_SimpleText_MaxLines_Multiple_Containers
    • Default_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected
    • Default_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation
    • MediaPlayerElement_MediaPlayerElement_Stretch_Fill_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Stretch_Fill
    • MediaPlayerElement_Mini_player_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Minimal
    • MediaPlayerElement_Sources_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Sources
    • TextBlock_Attributed_text_Supserscript_Uno_UI_Samples_Content_UITests_TextBlockControl_Attributed_text_Supserscript
    • TextBlock_ForcedTextWithCarriageReturn_MaxLines_Two_Uno_UI_Samples_Content_UITests_TextBlockControl_ForcedTextWithCarriageReturn_MaxLines_Two
    • TextBlock_Progressing_TextBlock_Uno_UI_Samples_Content_UITests_TextBlockControl_Progressing_TextBlock
    • Automation_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_Name_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_Name
    • Image_ImageSourceStream_Uno_UI_Samples_UITests_ImageTestsControl_ImageSourceStream
    • NavigationView_MUXControlsTestApp_NavigationViewTopNavOnlyPage_MUXControlsTestApp_NavigationViewTopNavOnlyPage
    • TextBlock_TextBlock_ConstrainedByContainer_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBlock_ConstrainedByContainer
    • TextBlock_TextBlock_FixedWidth_With_DataBound_Run_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBlock_FixedWidth_With_DataBound_Run
    • ListView_ListView_With_ListViews_Count_Measure_UITests_Shared_Windows_UI_Xaml_Controls_ListView_ListView_With_ListViews_Count_Measure
    • MediaPlayerElement_Using_mov_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Mov_Extension
    • MediaPlayerElement_Using_mp3_Audio_only_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Mp3_Extension

  • ios: 54 changed over 271

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ListView_ExpandableItemLarge_ExpandHeaderWithMultipleItems_Validation_Expanded_State
    • ListView_ExpandableItem_ExpandMultipleItems_Initial_State
    • ListView_ExpandableItem_ExpandMultipleItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Expandable_Item
    • Check_CornerRadius_Border_UITests_Shared_Windows_UI_Xaml_Controls_BorderTests_Border_CornerRadius_Toggle
    • ListView_ChangingText_Validation_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Changing_Text
    • ListView_ExpandableItemLarge_ExpandHeader_Validation_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Expandable_Item_Large
    • ListView_ExpandableItemLarge_ExpandHeader_Validation_Expanded_State
    • ListView_Weird_Measure_During_Arrange_after_layout
    • ListView_ExpandableItem_ExpandSingleItem_Expanded_State
    • ListView_SelectedItem_Both_Selection_Changed
    • Screenshots_Image_Stretch_Alignment_Wider_Mode-1
    • Screenshots_Image_Stretch_Alignment_Wider_Mode-2
    • When_ExtendedSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • Screenshots_Image_Stretch_Alignment_Equal_Mode-0
    • Screenshots_Image_Stretch_Alignment_Wider_Mode-3
    • TextBox_UpdatedBinding_On_OneWay_Mode_UITests_Windows_UI_Xaml_Controls_TextBox_TextBox_Bindings
    • Check_CornerRadius_Border_CornerRadius=5
    • ListView_ExpandableItemLarge_ExpandHeaderWithMultipleItems_Validation_Collapsed_State
    • ListView_ExpandableItemLarge_ExpandHeaderWithMultipleItems_Validation_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Expandable_Item_Large
    • ListView_ExpandableItemLarge_ExpandHeader_Validation_Initial_State

  • ios-Snap: 220 changed over 1055

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Brushes_ImageBrushStretch_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushStretch
    • 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
    • ContentControl_ContentControl_DefaultText_Uno_UI_Samples_Content_UITests_ContentControlTestsControl_ContentControl_DefaultText
    • ContentControl_ContentControl_FindName_Uno_UI_Samples_Content_UITests_ContentControlTestsControl_ContentControl_FindName
    • GridView_Uno_UI_Samples_Content_UITests_GridView_GridView_Vertical_MaxItemWidth_Uno_UI_Samples_Content_UITests_GridView_GridView_Vertical_MaxItemWidth
    • ListView_ListViewGroupedEmptyHeader_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewGroupedEmptyHeader
    • ComboBox_ComboBox_Disabled_UITests_Windows_UI_Xaml_Controls_ComboBox_ComboBox_Disabled
    • ComboBox_ComboBox_ToggleDisabled_UITests_Windows_UI_Xaml_Controls_ComboBox_ComboBox_ToggleDisabled
    • ContentControl_ContentControl_SelectorInheritance_Uno_UI_Samples_Content_UITests_ContentControlTestsControl_ContentControl_SelectorInheritance
    • ContentControl_ContentControl_SetNull_Uno_UI_Samples_Content_UITests_ContentControlTestsControl_ContentControl_SetNull
    • GridView_GenericApp_Views_Samples_Shared_Content_UITests_GridViewGrouped_GenericApp_Views_Samples_Shared_Content_UITests_GridViewGrouped
    • Image_ImagesInlineInFlipView_Uno_UI_Samples_UITests_ImageTestsControl_ImagesInlineInFlipView
    • NavigationView_MUXControlsTestApp_NavigationViewStretchPage_MUXControlsTestApp_NavigationViewStretchPage
    • NavigationView_MUXControlsTestApp_NavigationViewTopNavOnlyPage_MUXControlsTestApp_NavigationViewTopNavOnlyPage
    • NavigationView_MUXControlsTestApp_NavigationViewTopNavOverflowButtonPage_MUXControlsTestApp_NavigationViewTopNavOverflowButtonPage
    • NavigationView_MUXControlsTestApp_NavigationViewTopNavPage_MUXControlsTestApp_NavigationViewTopNavPage
    • Path_StretchUniform_SamplesApp_Windows_UI_Xaml_Shapes_PathTestsControl_StretchUniform
    • Path_Stroke2FillYellow_SamplesApp_Windows_UI_Xaml_Shapes_PathTestsControl_Stroke2FillYellow
    • Path_StrokeThickness10_SamplesApp_Windows_UI_Xaml_Shapes_PathTestsControl_StrokeThickness10

  • skia-gtk-screenshots: 25 changed over 2196

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • WinUIColorPickerPage.png-dark
    • WinUIColorPickerPage.png
    • ImageBrush_SameWithDelay.png-dark
    • ImageBrush_SameWithDelay.png
    • Mini player.png-dark
    • Mini player.png
    • Ellipse.png-dark
    • Ellipse.png
    • PathImageBrushfill.png
    • ImageInStackPanel.png-dark
    • ImageInStackPanel.png
    • XamlRoot_Properties.png-dark
    • XamlRoot_Properties.png
    • ColorPickerSample.png-dark
    • ColorPickerSample.png
    • SvgImageSource_Icons.png-dark
    • SvgImageSource_Icons.png
    • Image_Stretch_None_ScrollViewer.png-dark
    • Image_Stretch_None_ScrollViewer.png
    • TransformToVisual_Transform.png-dark

  • skia-linux-screenshots: 42 changed over 2196

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • DoubleImageBrushInList.png-dark
    • DoubleImageBrushInList.png
    • BorderImageBrushRelativeTransform.png-dark
    • BorderImageBrush.png-dark
    • BorderImageBrush.png
    • Image_UseTargetSize.png-dark
    • Image_UseTargetSize.png
    • ImageBrush_SameWithDelay.png-dark
    • ImageBrush_SameWithDelay.png
    • BorderImageBrushRelativeTransform.png
    • ImageInStackPanel.png-dark
    • ImageInStackPanel.png
    • Image_Stretch_None.png-dark
    • Image_Stretch_None.png
    • ImageBrushInList.png-dark
    • ImageBrushInList.png
    • CompositionEffectBrush.png-dark
    • CompositionEffectBrush.png
    • Rectangle.png-dark
    • Rectangle.png

  • skia-windows-screenshots: 8 changed over 2196

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • CompositionEffectBrush.png-dark
    • CompositionEffectBrush.png
    • Using .flv.png-dark
    • Using .flv.png
    • Using .avi.png-dark
    • Using .avi.png
    • XamlRoot_Properties.png-dark
    • XamlRoot_Properties.png

  • wasm: 62 changed over 1046

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • GenericApp.Views.Samples.Shared.Content.UITests.GridViewMultipleSelectionMode
    • UITests.Microsoft_UI_Xaml_Controls.NumberBoxTests.NumberBox_Header
    • UITests.Toolkit.ElevatedViewTests
    • UITests.Windows_UI_Xaml_Controls.TextBox.TextBox_IsTabStop
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewSelectedItems
    • UITests.Microsoft_UI_Xaml_Controls.RefreshContainerTests.RefreshContainerHorizontalScroll
    • UITests.Shared.Microsoft_UI_Xaml_Controls.TwoPaneViewTests.TwoPaneViewPage
    • UITests.Shared.Windows_UI_Xaml_Controls.CommandBar.CommandBar_Xaml_Automated
    • UITests.Shared.Windows_UI_Xaml_Controls.ImageTests.Image_Stretch_Algmnt_Inf_Vertical
    • MUXControlsTestApp.NavigationViewMenuItemStretchPage
    • MUXControlsTestApp.NavigationViewStretchPage
    • UITests.Windows_ApplicationModel.Contacts.PickContact
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.HorizontalListViewGrouped
    • UITests.Windows_UI_Xaml_Shapes.PathStretchModes
    • 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
    • UITests.Shared.Windows_UI_Xaml_Controls.TextBoxTests.TextBox_Selection
    • UITests.Windows_UI_Xaml_Controls.ListView.ListView_Selection_Events
    • UITests.Windows_UI_Xaml_Controls.TextBox.TextBox_SelectionHighlightColor

  • wasm-automated-net7.0-UWP-Default-automated: 30 changed over 1963

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Default_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected
    • ColorPicker_WinUIColorPickerPage_UITests_Shared_Microsoft_UI_Xaml_Controls_ColorPickerTests_WinUIColorPickerPage
    • ListView_SelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • MediaPlayerElement_Sources_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Sources
    • MediaPlayerElement_Using_3gp_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_3gp_Extension
    • Pickers_UITests_Windows_UI_Xaml_Controls_CalendarView_CalendarView_Theming_UITests_Windows_UI_Xaml_Controls_CalendarView_CalendarView_Theming
    • MinMaxTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • Path_UITests_Shared_Windows_UI_Xaml_Shapes_PathTestsControl_SVG_Path_UITests_Shared_Windows_UI_Xaml_Shapes_PathTestsControl_SVG_Path
    • Path_UITests_Windows_UI_Xaml_Shapes_PathTestsControl_Path_Dynamic_Geometries_UITests_Windows_UI_Xaml_Shapes_PathTestsControl_Path_Dynamic_Geometries
    • Path_UITests_Windows_UI_Xaml_Shapes_PathTestsControl_Path_EllipseGeometry_UITests_Windows_UI_Xaml_Shapes_PathTestsControl_Path_EllipseGeometry
    • Path_UITests_Windows_UI_Xaml_Shapes_PathTestsControl_Path_FillRule_UITests_Windows_UI_Xaml_Shapes_PathTestsControl_Path_FillRule
    • Path_UITests_Windows_UI_Xaml_Shapes_PathTestsControl_Path_Geometries_UITests_Windows_UI_Xaml_Shapes_PathTestsControl_Path_Geometries
    • Path_UITests_Windows_UI_Xaml_Shapes_PathTestsControl_Path_LineGeometry_UITests_Windows_UI_Xaml_Shapes_PathTestsControl_Path_LineGeometry
    • Performance_Dopes_UITests_Windows_UI_Xaml_Performance_Performance_Dopes
    • Pickers_TimePicker_Flyout_Automated_UITests_Shared_Windows_UI_Xaml_Controls_TimePicker_TimePicker_Flyout_Automated
    • TestProgressRing_InitialState_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features
    • 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_ExtendedSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • TextBlock_TextBlock_Progressing_Trim_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBlock_Progressing_Trim

  • 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 56f15f5 into master May 7, 2024
103 checks passed
@jeromelaban jeromelaban deleted the dev/ds/resizetizer-svgs branch May 7, 2024 02:50
@mergify mergify bot mentioned this pull request May 7, 2024
Merged
jeromelaban added a commit that referenced this pull request May 7, 2024
@jeromelaban
Merge pull request #16600 from unoplatform/mergify/bp/release/stable/…
df88553 
…5.2/pr-16593

Include Svg/**/*.svg as Content (backport #16593)
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

@pedrojesus-work pedrojesus-work pedrojesus-work approved these changes

Assignees
No one assigned
Labels
area/solution-templates Categorizes an issue or PR as relevant to the solution template
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Assets/**/Svg/**/*.svg included as None
5 participants
@dansiegel @unodevops @nventive-devops @jeromelaban @pedrojesus-work