Sitelet https://github.com/unoplatform/uno/pull/18300
Skip to content

fix: Ensure wwwroot assets are copied properly - #18300

Merged
jeromelaban merged 1 commit into
masterfrom
dev/jela/wwwroot-adjust
Sep 26, 2024
Merged

fix: Ensure wwwroot assets are copied properly#18300
jeromelaban merged 1 commit into
masterfrom
dev/jela/wwwroot-adjust

Conversation

@jeromelaban

@jeromelaban jeromelaban commented Sep 25, 2024

Copy link
Copy Markdown
Member

PR Type

What kind of change does this PR introduce?

  • Bugfix

What is the new behavior?

Adjust for net9 publishing of wwwroot assets.

PR Checklist

Please check if your PR fulfills the following requirements:

Other information

Internal Issue (If applicable):

@github-actions github-actions Bot added the area/solution-templates Categorizes an issue or PR as relevant to the solution template label Sep 25, 2024
@unodevops

unodevops commented Sep 25, 2024

Copy link
Copy Markdown
Contributor

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

@jeromelaban

jeromelaban commented Sep 26, 2024

Copy link
Copy Markdown
Member Author

/azp run

@azure-pipelines

azure-pipelines Bot commented Sep 26, 2024

Copy link
Copy Markdown
Azure Pipelines successfully started running 2 pipeline(s).

@unodevops

unodevops commented Sep 26, 2024

Copy link
Copy Markdown
Contributor

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

@unodevops

unodevops commented Sep 26, 2024

Copy link
Copy Markdown
Contributor

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

@jeromelaban
jeromelaban marked this pull request as ready for review September 26, 2024 03:21
@jeromelaban

jeromelaban commented Sep 26, 2024

Copy link
Copy Markdown
Member Author

@Mergifyio backport release/stable/5.4

@mergify

mergify Bot commented Sep 26, 2024

Copy link
Copy Markdown
Contributor

backport release/stable/5.4

🟠 Waiting for conditions to match

Details
  • merged [📌 backport requirement]

@nventive-devops

nventive-devops commented Sep 26, 2024

Copy link
Copy Markdown
Contributor

The build 141240 found UI Test snapshots differences: android-28-net8: 27, android-28-net8-Snap: 58, ios: 7, ios-Snap: 44, skia-gtk-screenshots: 1865, skia-linux-screenshots: 1747, skia-windows-screenshots: 1524, wasm: 258, wasm-automated-net9.0-UWP-Default-automated: 39, 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: 27 changed over 829

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • CommandBar_LongTitle_Validation_CommandBar_-_LongTitle_-_1_-_Initial_State
    • Detereminate_ProgressRing_Validation50_[#FF0000_#008000_#008000_#FF0000]_Progress-Ring-Value-50
    • Flyout_Namescope_UITests_Shared_Windows_UI_Xaml_Controls_FlyoutTests_Flyout_Namescope
    • ItemsControl_LoadCount_UITests_Shared_Windows_UI_Xaml_FrameworkElementTests_ItemsControl_Loaded
    • FrameworkElement_NativeLayout_UITests_Shared_Windows_UI_Xaml_FrameworkElementTests_FrameworkElement_NativeLayout
    • MinMaxTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • ListView_ListViewWithHeader_InitializesTest_SamplesApp_Windows_UI_Xaml_Controls_ListView_HorizontalListViewGrouped
    • SelectionTest_UITests_Microsoft_UI_Xaml_Controls_RadioButtonsTests_RadioButtonsPage
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • UpDownEnabledTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • UpDownTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • CommandBar_LongTitle_Validation_CommandBar_-_LongTitle_-_2_-_Orientation_Landscape
    • WebView_NavigateToAnchor_Initial
    • Detereminate_ProgressRing_Validation75_[#FF0000_#008000_#008000_#008000]_Progress-Ring-Value-75
    • When_NoSelection_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • When_TextDecoration_Changed_Restored
    • When_TextDecoration_Changed_UITests_Shared_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_Decorations
    • When_TextDecoration_Changed_Updated
    • DecimalFormatterTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage

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

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Image_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_Basic_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_Basic
    • Buttons_UITests_Microsoft_UI_Xaml_Controls_RadioButtonsTests_RadioButtonsPage_UITests_Microsoft_UI_Xaml_Controls_RadioButtonsTests_RadioButtonsPage
    • Gesture_Recognizer_Pointer_Events_test_bench_UITests_Shared_Windows_UI_Input_GestureRecognizer_PointersEvents
    • Default_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation
    • ListView_ListView_FirstLastCacheIndex_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_FirstLastCacheIndex
    • TextBlock_TextBoxSizeChanging_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBoxSizeChanging
    • TextBlock_UITests_Shared_Windows_UI_Xaml_Controls_TextBlockControl_Foreground_Brushes_UITests_Shared_Windows_UI_Xaml_Controls_TextBlockControl_Foreground_Brushes
    • MediaPlayerElement_Mini_player_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Minimal
    • BreadcrumbBar_MUXControlsTestApp_BreadcrumbBarPage_MUXControlsTestApp_BreadcrumbBarPage
    • Icons_UITests_Windows_UI_Xaml_Controls_SymbolIconTests_SymbolIcon_Generic_UITests_Windows_UI_Xaml_Controls_SymbolIconTests_SymbolIcon_Generic
    • ListView_ListViewSelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • ListView_ListViewIncrementalLoading_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewIncrementalLoading
    • Scrolling_MUXControlsTestApp_ScrollViewWithScrollControllersPage_MUXControlsTestApp_ScrollViewWithScrollControllersPage
    • NavigationView_MUXControlsTestApp_NavigationViewTopNavOnlyPage_MUXControlsTestApp_NavigationViewTopNavOnlyPage
    • NavigationView_MUXControlsTestApp_NavigationViewTopNavPage_MUXControlsTestApp_NavigationViewTopNavPage
    • Transform_Basics_UITests_Shared_Windows_UI_Xaml_Media_Transform_Basics
    • Shapes_UITests_Windows_UI_Xaml_Shapes_Offscreen_Shapes_UITests_Windows_UI_Xaml_Shapes_Offscreen_Shapes
    • Shapes_UITests_Windows_UI_Xaml_Shapes_PathStretchModes_UITests_Windows_UI_Xaml_Shapes_PathStretchModes
    • Shapes_UITests_Windows_UI_Xaml_Shapes_Path_Geometries_UITests_Windows_UI_Xaml_Shapes_Path_Geometries
    • MUX_UITests_Shared_Microsoft_UI_Xaml_Controls_TreeViewTests_TreeViewPage_UITests_Shared_Microsoft_UI_Xaml_Controls_TreeViewTests_TreeViewPage

  • ios: 7 changed over 267

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • TextBox_UpdatedBinding_On_OneWay_Mode_UITests_Windows_UI_Xaml_Controls_TextBox_TextBox_Bindings
    • ListView_ListViewWithHeader_InitializesTest_SamplesApp_Windows_UI_Xaml_Controls_ListView_HorizontalListViewGrouped
    • When_SingleSelectionWithItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • When_MultipleSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • When_SingleSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers

  • ios-Snap: 44 changed over 1057

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Brushes_EllipsemaskingEllipseGrid_Uno_UI_Samples_UITests_ImageBrushTestControl_EllipsemaskingEllipseGrid
    • MediaPlayerElement_Using_ogg_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Ogg_Extension
    • Brushes_PanelImageBrush_Uno_UI_Samples_UITests_ImageBrushTestControl_PanelImageBrush
    • Default_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation
    • Image_Image_Stretch_None_ScrollViewer_Uno_UI_Samples_UITests_ImageTestsControl_Image_Stretch_None_Containers
    • TextBlock_TextBoxSizeChanging_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBoxSizeChanging
    • Brushes_BorderImageBrush_Uno_UI_Samples_UITests_ImageBrushTestControl_BorderImageBrush
    • ColorPicker_ColorPickerSample_UITests_Microsoft_UI_Xaml_Controls_ColorPickerTests_ColorPickerSample
    • Image_UITests_Shared_Windows_UI_Xaml_Controls_ImageTests_Image_Stretch_Algmnt_Inf_Vertical_UITests_Shared_Windows_UI_Xaml_Controls_ImageTests_Image_Stretch_Algmnt_Inf_Vertical
    • Image_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Bigger_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Bigger
    • Image_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Equal_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Equal
    • NavigationView_MUXControlsTestApp_NavigationViewMenuItemStretchPage_MUXControlsTestApp_NavigationViewMenuItemStretchPage
    • NavigationView_MUXControlsTestApp_NavigationViewMinimalPage_MUXControlsTestApp_NavigationViewMinimalPage
    • NavigationView_MUXControlsTestApp_NavigationViewStretchPage_MUXControlsTestApp_NavigationViewStretchPage
    • TextBlock_TextBlockMultilineInStarStackPanel_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBlockMultilineInStarStackPanel
    • Clipping_UITests_Windows_UI_Xaml_Clipping_BorderVisualClipping_UITests_Windows_UI_Xaml_Clipping_BorderVisualClipping
    • Image_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Smaller_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Smaller
    • Image_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Taller_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Taller
    • Image_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Wider_Uno_UI_Samples_UITests_Image_Image_Stretch_Alignment_Wider
    • TextBlock_UITests_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_HorizontalTextAlignment_UITests_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_HorizontalTextAlignment

  • skia-gtk-screenshots: 1865 changed over 2218

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ApplicationViewSpanningRectsPage.png-dark
    • Application_Window lifecycle events.png
    • AutoBorderStretchwithbottommargin.png-dark
    • AutoSizedTopLeft.png
    • AutoSuggestBox_Icons.png
    • BenchmarkDotNet.png-dark
    • BitmapIcon_Foreground.png
    • BorderLeftwithmargins.png-dark
    • Buttons_Native.png-dark
    • Capture with overlap.png
    • Capture.png-dark
    • ComboBox_FullScreen_Popup.png-dark
    • ContentControl_FindName.png-dark
    • ContentControl_FindName.png
    • Display.DisplayRequest.png-dark
    • Display.DisplayRequest.png
    • EmailManager.png
    • EmptyImageFixedWidth.png-dark
    • Focus_VisualStates.png-dark
    • Focus_VisualStates.png

  • skia-linux-screenshots: 1747 changed over 2218

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • AndroidWindowInsets.png-dark
    • AnimatedIconPage.png-dark
    • AnimatedIconPage.png
    • AppBarButtonTest.png-dark
    • AppBarButtonWithIconTest.png-dark
    • AppBar_KeyBoard.png
    • ApplicationViewSizing.png
    • Application_Window lifecycle events.png-dark
    • Application_Window lifecycle events.png
    • Attributed_text_Simple.png-dark
    • AutomationProperties_Name.png
    • AutoSizedPathCentered.png-dark
    • BadgeNotificationTests.png
    • BasicAcrylicBrushTest.png-dark
    • BitmapImage_vs_SvgImageSource.png
    • BorderBottomwithmargins.png-dark
    • BorderVersusPanelClipping.png-dark
    • Border_Clipped_Change_Property.png
    • Border_CornerRadius.png-dark
    • Border_CornerRadius_Toggle.png

  • skia-windows-screenshots: 1524 changed over 2218

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • AppBarButtonTest.png-dark
    • AppBarToggleButtonTest.png-dark
    • AppBar_KeyBoard.png
    • Application_Window lifecycle events.png-dark
    • AppWindowPositionAndSize.png
    • ArcSegment.png
    • Attributed_text_Simple.png
    • AutoBorderStretchwithleftmargin.png-dark
    • AutoSuggestBoxChosenSuggestion.png-dark
    • BadgeNotificationTests.png-dark
    • Basics_Automated.png-dark
    • BitmapIcon_Monochromatic.png-dark
    • BorderRightwithmargins.png
    • BorderTopwithmargins.png-dark
    • Border_CornerRadius.png-dark
    • Border_CornerRadius_Gradient.png-dark
    • Border_With_CompositeTransform.png
    • Border_With_Off_Centre_RotateTransform.png-dark
    • Border_With_Off_Centre_RotateTransform.png
    • Border_With_Off_Centre_ScaleTransform.png-dark

  • wasm: 258 changed over 1044

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • initial_state
    • GenericApp.Views.Content.UITests.ImageBrushTestControl.ImageBrush_UniformToFill
    • MUXControlsTestApp.InfoBarPage
    • GenericApp.Views.Samples.Shared.Content.UITests.GridViewMultipleSelectionMode
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ComboBox.ComboBox_Corners
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ComboBox.ComboBox_Empty
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewGroupedChanging
    • SamplesApp.Windows_UI_Xaml.Clipping.XamlButtonWithClipping
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewGroupedLarge
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_FirstLastCacheIndex
    • UITests.Shared.Windows_UI_Input.GestureRecognizerTests.Manipulation_Basics
    • UITests.Shared.Windows_UI_Input.GestureRecognizerTests.TappedTest
    • UITests.Shared.Windows_UI_Xaml_Controls.ImageTests.Image_Stretch_Algmnt_Inf_Horizontal
    • UITests.Shared.Windows_UI_Xaml_Controls.ImageTests.Image_Stretch_Algmnt_Inf_Vertical
    • UITests.Shared.Windows_UI_Xaml_Controls.CheckBoxTests.CheckBox_Automated
    • UITests.Shared.Windows_UI_Xaml_Controls.ImageTests.Image_Stretch_Alignment_SizeOnControl
    • UITests.Shared.Windows_UI_Xaml_Controls.ComboBox.ComboBox_ComboBoxItem_Selection
    • UITests.Shared.Windows_UI_Xaml_Controls.ComboBox.ComboBox_DropDownPlacement
    • UITests.Shared.Windows_UI_Xaml_Controls.RepeatButton_Automated
    • UITests.Uno_Web.Http.CookieManagerTests

  • wasm-automated-net9.0-UWP-Default-automated: 39 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_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation
    • ComboBoxTests_Kidnapping_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_ComboBoxItem_Selection
    • DatePicker_Flyout_DatePicker_-_Flyout
    • Expander_WinUIExpanderPage_UITests_Shared_Microsoft_UI_Xaml_Controls_ExpanderTests_WinUIExpanderPage
    • Default_StrokeThickness_MyPath
    • 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
    • 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
    • ListView_SelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • Default_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected
    • NavigationView_MUXControlsTestApp_NavigationViewCustomThemeResourcesPage_MUXControlsTestApp_NavigationViewCustomThemeResourcesPage
    • Screenshots_Image_Stretch_Alignment_Smaller_Mode-2
    • ListView_ListViewSelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • NavigationView_MUXControlsTestApp_NavigationViewTopNavPage_MUXControlsTestApp_NavigationViewTopNavPage
    • Default_StrokeThickness_MyLine_0_StrokeThickness
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • Pickers_UITests_Windows_UI_Xaml_Controls_CalendarView_CalendarView_Theming_UITests_Windows_UI_Xaml_Controls_CalendarView_CalendarView_Theming

  • 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

Youssef1313
Youssef1313 reviewed Sep 26, 2024
View reviewed changes
Comment thread src/Uno.Sdk/targets/Uno.Common.Wasm.targets
Youssef1313
Youssef1313 approved these changes Sep 26, 2024
View reviewed changes

@Youssef1313 Youssef1313 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with small comment/question

@jeromelaban
jeromelaban merged commit 61f62c2 into master Sep 26, 2024
@jeromelaban
jeromelaban deleted the dev/jela/wwwroot-adjust branch September 26, 2024 14:25
@jeromelaban

jeromelaban commented Sep 26, 2024

Copy link
Copy Markdown
Member Author

@Mergifyio backport release/stable/5.4

@mergify

mergify Bot commented Sep 26, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor

backport release/stable/5.4

✅ Backports have been created

Details

@mergify mergify Bot mentioned this pull request Sep 26, 2024
Merged
6 tasks
jeromelaban added a commit that referenced this pull request Sep 30, 2024
@jeromelaban
Merge pull request #18310 from unoplatform/mergify/bp/release/stable/…
97901cb 
…5.4/pr-18300

fix: Ensure wwwroot assets are copied properly (backport #18300)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Youssef1313 Youssef1313 Youssef1313 approved these changes
@MartinZikmund MartinZikmund Awaiting requested review from MartinZikmund

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.

4 participants

@jeromelaban @unodevops @nventive-devops @Youssef1313