Skip to content

fix(net8): Adjust WinUI property detection#13700

Merged
jeromelaban merged 1 commit intomasterfrom
dev/jela/net8-rc1-compat
Sep 20, 2023
Merged

fix(net8): Adjust WinUI property detection#13700
jeromelaban merged 1 commit intomasterfrom
dev/jela/net8-rc1-compat

Conversation

@jeromelaban
Copy link
Member

@jeromelaban jeromelaban commented Sep 20, 2023

GitHub Issue (If applicable): closes #13678

PR Type

What kind of change does this PR introduce?

  • Bugfix

What is the new behavior?

.NET 8 changes the ordering of nuget defined props files, This change makes WinUI detection independent of nuget props import and rely on .targets evaluation.

Copilot Summary

🤖 Generated by Copilot at 591797b

Moved the import of uno.winui.common.props to the targets file and added a check for WinAppSDK projects. This fixes a bug where WinUI projects using WinAppSDK were not recognized by Uno.

PR Checklist

Please check if your PR fulfills the following requirements:

Other information

Internal Issue (If applicable):

.NET 8 changes the ordering of nuget defined props files, This change makes WinUI detection independent of nuget props import and rely on .targets evaluation.
@github-actions github-actions bot added the area/build Categorizes an issue or PR as relevant to build infrastructure label Sep 20, 2023
@nventive-devops
Copy link
Contributor

The build 94727 found UI Test snapshots differences: android-28-net7: 0, android-28-net7-Snap: 61, ios: 38, ios-Snap: 112, skia-gtk-screenshots: 17, skia-wpf-screenshots: 16, wasm: 39, wasm-automated-net7.0-UWP-Benchmarks: 0, wasm-automated-net7.0-UWP-Default: 40, wasm-automated-net7.0-UWP-RuntimeTests: 0, wasm-automated-net7.0-WinUI-RuntimeTests: 0

Details
  • android-28-net7: 0 changed over 1

  • android-28-net7-Snap: 61 changed over 1045

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ListView_UITests_Windows_UI_Xaml_Controls_ListView_ListView_DisplayMemberPath_UITests_Windows_UI_Xaml_Controls_ListView_ListView_DisplayMemberPath
    • ListView_UITests_Windows_UI_Xaml_Controls_ListView_ListView_DuplicateItem_UITests_Windows_UI_Xaml_Controls_ListView_ListView_DuplicateItem
    • Path_StretchNoneVerticalAlignmentCenter_SamplesApp_Windows_UI_Xaml_Shapes_PathTestsControl_StretchNoneVerticalAlignmentCenter
    • Gesture_Recognizer_Pointer_Events_test_bench_UITests_Shared_Windows_UI_Input_GestureRecognizer_PointersEvents
    • ListView_ListViewIncrementalLoading_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewIncrementalLoading
    • ListView_ListView_With_ListViews_Count_Measure_UITests_Shared_Windows_UI_Xaml_Controls_ListView_ListView_With_ListViews_Count_Measure
    • Icons_Uno_UI_Samples_Content_UITests_FontIconTests_FontIconControlTest_Uno_UI_Samples_Content_UITests_FontIconTests_FontIconControlTest
    • ListView_HorizontalListView_Templates_SamplesApp_Windows_UI_Xaml_Controls_ListView_HorizontalListView_Templates
    • NavigationView_MUXControlsTestApp_NavigationViewRS4Page_MUXControlsTestApp_NavigationViewRS4Page
    • PullToRefresh_UITests_Microsoft_UI_Xaml_Controls_RefreshContainerTests_RefreshContainerTheming_UITests_Microsoft_UI_Xaml_Controls_RefreshContainerTests_RefreshContainerTheming
    • RatingControl_UITests_Microsoft_UI_Xaml_Controls_RatingControlTests_RatingControlPage_UITests_Microsoft_UI_Xaml_Controls_RatingControlTests_RatingControlPage
    • Transform_Border_With_Off_Centre_RotateTransform_SamplesApp_Wasm_Windows_UI_Xaml_Media_Transform_Border_With_Off_Centre_RotateTransform
    • Image_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_Icons_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_Icons
    • ListView_ListViewLargeLegacy_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewLargeLegacy
    • ListView_ListViewResizableText_UITests_Shared_Windows_UI_Xaml_Controls_ListView_ListViewResizableText
    • MediaPlayerElement_Mini_player_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Minimal
    • MUX_UITests_Microsoft_UI_Xaml_Controls_SplitButtonTests_SplitButtonPage_UITests_Microsoft_UI_Xaml_Controls_SplitButtonTests_SplitButtonPage
    • MUX_UITests_Shared_Microsoft_UI_Xaml_Controls_TreeViewTests_TreeViewPage_UITests_Shared_Microsoft_UI_Xaml_Controls_TreeViewTests_TreeViewPage
    • NavigationView_MUXControlsTestApp_NavigationViewTopNavOnlyPage_MUXControlsTestApp_NavigationViewTopNavOnlyPage
    • NavigationView_MUXControlsTestApp_NavigationViewTopNavPage_MUXControlsTestApp_NavigationViewTopNavPage
  • ios: 38 changed over 270

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ListView_ObservableCollection_Creation_Count_Removed_above
    • Screenshots_Image_Stretch_Alignment_Taller_Mode-1
    • When_ExtendedSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • DatePicker_Flyout_DatePicker_-_Flyout
    • Keyboard_Textbox_NoScrollViewer_Validation_4_-_Remove_Focus_on_multilineTextBox
    • ListView_ObservableCollection_Creation_Count_Added
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • Screenshots_Image_Stretch_Alignment_Equal_Mode-2
    • Screenshots_Image_Stretch_Alignment_Equal_Mode-3
    • ListView_ObservableCollection_Creation_Count_Added_above
    • Screenshots_Image_Stretch_Alignment_SizeOnControl_Mode-2
    • Screenshots_Image_Stretch_Alignment_Equal_Mode-1
    • Flyout_ShowAt_Window_Content_UITests_Windows_UI_Xaml_Controls_FlyoutTests_Flyout_ShowAt_Window_Content
    • Keyboard_Textbox_NoScrollViewer_Validation_2_-_Remove_Focus_on_placeholderTextTextBox
    • ListView_ObservableCollection_Creation_Count_Scrolled2
    • Screenshots_Image_Stretch_Alignment_Bigger_Mode-2
    • Screenshots_Image_Stretch_Alignment_Bigger_Mode-1
    • Screenshots_Image_Stretch_Alignment_SizeOnControl_Mode-1
    • TextBox_Foreground_Uno_UI_Samples_Content_UITests_TextBoxControl_TextBox_Foreground
    • TextBox_UpdatedBinding_On_OneWay_Mode_UITests_Windows_UI_Xaml_Controls_TextBox_TextBox_Bindings
  • ios-Snap: 112 changed over 1036

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Brushes_UITests_Windows_UI_Xaml_Media_GradientBrushTests_LinearGradientBrush_Change_Stops_UITests_Windows_UI_Xaml_Media_GradientBrushTests_LinearGradientBrush_Change_Stops
    • Clipping_UITests_Shared_Windows_UI_Xaml_Clipping_ClippingToControlBounds_UITests_Shared_Windows_UI_Xaml_Clipping_ClippingToControlBounds
    • Grid_Grid_with_UserControl_VerticalAlignment_Variable_Width_Uno_UI_Samples_Content_UITests_GridTestsControl_Grid_with_UserControl_VerticalAlignment_Variable_Width
    • Grid_Quadrant_absolute_split_Uno_UI_Samples_Content_UITests_GridTestsControl_Quadrant_absolute_split
    • Progress_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • Animations_DoubleAnimation_TranslateX_GenericApp_Views_Content_UITests_Animations_DoubleAnimation_TranslateX
    • ComboBox_ComboBox_SelectedItem_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ComboBox_ComboBox_SelectedItem
    • Flyouts_Flyout_ButtonInContent_UITests_Shared_Windows_UI_Xaml_Controls_Flyout_Flyout_ButtonInContent
    • Grid_Grid_with_MinWidth_MinHeight_Uno_UI_Samples_Content_UITests_GridTestsControl_Grid_with_MinWidth_MinHeight
    • Image_ImageSourceStream_Uno_UI_Samples_UITests_ImageTestsControl_ImageSourceStream
    • ListView_ListViewHeaderUpdate_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewHeaderUpdate
    • ListView_ListView_Padding_All_Sides_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Padding_All_Sides
    • NavigationView_MUXControlsTestApp_NavigationViewMinimalPage_MUXControlsTestApp_NavigationViewMinimalPage
    • Path_PathVerticalOffsetAdjustable_SamplesApp_Windows_UI_Xaml_Shapes_PathTestsControl_PathVerticalOffsetAdjustable
    • TextBlock_TextBlockTimespan_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBlockTimespan
    • Border_Border_Simple_with_Opacity_Uno_UI_Samples_UITests_BorderTestsControl_Border_Simple_with_Opacity
    • Buttons_AppBarButtonTest_Uno_UI_Samples_Content_UITests_ButtonTestsControl_AppBarButtonTest
    • ComboBox_ComboBox_PlaceholderText_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ComboBox_ComboBox_PlaceholderText
    • Icons_UITests_Windows_UI_Xaml_Controls_IconSourceTests_IconSourceElementTests_UITests_Windows_UI_Xaml_Controls_IconSourceTests_IconSourceElementTests
    • Routed_Events_DoubleTappedEvent_UITests_Shared_Windows_UI_Xaml_Input_RoutedEvents_RoutedEvent_DoubleTapped
  • skia-gtk-screenshots: 17 changed over 1124

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ListView-ListViewSelectedItems.png
    • Automation-AutomationProperties_Name.png
    • MUX-WinUIProgressRingPage.png
    • MUX-WinUIProgressRing_CustomSources.png
    • Pickers-CalendarView_Theming.png
    • Progress-WindowsProgressRing_GH1220.png
    • Progress-WinUIProgressRingPage.png
    • Progress-WinUIProgressRing_CustomSources.png
    • Progress-WinUIProgressRing_Features.png
    • Image-UniformToFill100x100.png
    • Progress-ProgressRingHeightTest.png
    • PipsPager-PipsPagerExamples.png
    • MediaPlayerElement-MediaPlayerElement_Stretch_Fill.png
    • MUX-TabViewPage.png
    • NavigationView-FluentStyle_NavigationViewSample.png
    • DragAndDrop-DragDrop_TestPage.png
    • WinUI-PipsPagerExamples.png
  • skia-wpf-screenshots: 16 changed over 1124

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ListView-ListViewSelectedItems.png
    • Progress-ProgressRingHeightTest.png
    • Progress-WindowsProgressRing_GH1220.png
    • Pickers-CalendarView_Theming.png
    • DragAndDrop-DragDrop_TestPage.png
    • Progress-WinUIProgressRingPage.png
    • Progress-WinUIProgressRing_CustomSources.png
    • Progress-WinUIProgressRing_Features.png
    • Automation-AutomationProperties_Name.png
    • MUX-WinUIProgressRingPage.png
    • MUX-WinUIProgressRing_CustomSources.png
    • Image-ImageSourceStream.png
    • Image-UniformToFill100x100.png
    • PipsPager-PipsPagerExamples.png
    • WinUI-PipsPagerExamples.png
    • Transform-TransformToVisual_Translate2d.png
  • wasm: 39 changed over 1042

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • UITests.Windows_UI_Xaml_Shapes.Offscreen_Shapes
    • UITests.Windows_UI_Xaml_Shapes.PathStretchModes
    • SamplesApp.Samples.Windows_UI_Xaml_Controls.NavigationViewTests.NavigationView_BasicNavigation
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewSelectedItems
    • UITests.Windows_UI_ViewManagement.ApplicationViewSizing
    • UITests.Windows_UI_Xaml_Controls.CalendarView.CalendarView_Theming
    • Uno.UI.Samples.Content.UITests.TextBlockControl.SimpleText_MaxLines_One
    • MUXControlsTestApp.PipsPagerPage
    • UITests.Toolkit.ElevatedView_CornerRadius
    • UITests.Shared.Windows_UI_Xaml_Controls.MediaPlayerElement.MediaPlayerElement_3gp_Extension
    • UITests.Shared.Windows_UI_Xaml_Controls.MediaPlayerElement.MediaPlayerElement_Avi_Extension
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ListView.ListView_IsSelected
    • UITests.Microsoft_UI_Xaml_Controls.TabViewTests.TabViewPage
    • MUXControlsTestApp.NavigationViewBlankPage1
    • MUXControlsTestApp.PipsPagerExamples
    • SamplesApp.Samples.Microsoft_UI_Xaml_Controls.NavigationViewTests.FluentStyle.FluentStyle_NavigationViewSample
    • UITests.Windows_UI_Xaml_Controls.ProgressRing.WindowsProgressRing_GH1220
    • MUXControlsTestApp.NavigationViewMinimalPage
    • MUXControlsTestApp.PersonPicturePage
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.WinUIProgressRingPage
  • wasm-automated-net7.0-UWP-Benchmarks: 0 changed over 1

  • wasm-automated-net7.0-UWP-Default: 40 changed over 1936

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • 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
    • MediaPlayerElement_Using_3gp_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_3gp_Extension
    • LoopingSelector_UITests_Windows_UI_Xaml_Controls_LoopingSelectorTests_LoopingSelector_Short_UITests_Windows_UI_Xaml_Controls_LoopingSelectorTests_LoopingSelector_Short
    • Default_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected
    • 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
    • NavigationView_MUXControlsTestApp_NavigationViewTopNavPage_MUXControlsTestApp_NavigationViewTopNavPage
    • ColorPicker_ColorPickerSample_UITests_Microsoft_UI_Xaml_Controls_ColorPickerTests_ColorPickerSample
    • ColorPicker_WinUIColorPickerPage_UITests_Shared_Microsoft_UI_Xaml_Controls_ColorPickerTests_WinUIColorPickerPage
    • ListView_ListViewHeaderImage_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewHeaderImage
    • MinMaxTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • ListView_SelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • Brushes_Uno_UI_Samples_Samples_Shared_Content_UITests_ImageBrushInList_Uno_UI_Samples_Samples_Shared_Content_UITests_ImageBrushInList
    • ScrollBar_Vertical_initial_indicators
    • Progress_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features
    • Progress_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • When_MultipleSelectionWithoutItemClick_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

@jeromelaban jeromelaban merged commit a4af81b into master Sep 20, 2023
@jeromelaban jeromelaban deleted the dev/jela/net8-rc1-compat branch September 20, 2023 11:01
@nickrandolph
Copy link
Contributor

@jeromelaban does this need a backport?
I'm seeing breaks in backports for winappsdk1.4 in the template (https://dev.azure.com/uno-platform/Uno%20Platform/_build/results?buildId=94897&view=logs&j=335ef1ab-48ae-5186-b973-d0e3cea6d38d&t=16805c7a-e849-5ecb-82da-2506fc8b7e98).
If we do backport, we should make sure it's done after this backport is merged #13571

@tibitoth
Copy link

tibitoth commented Oct 3, 2023

@jeromelaban How can I use this fix, I tried to install preview packages but I got the same error.

@jeromelaban
Copy link
Member Author

@tibitoth this has been release in the latest build of 4.10.x. If you're still having issues, make sure to open a discussion.

@limeniye
Copy link
Contributor

limeniye commented Oct 4, 2023

this has been release in the latest build of 4.10.x.

@jeromelaban, I apologize for asking, but what about version 5.0.0-dev.****?
Not yet? Because currently is not working.

@jeromelaban
Copy link
Member Author

@limeniye can you open a discussion with more details, this is already on 5.0-dev builds. Thanks!

@limeniye
Copy link
Contributor

limeniye commented Oct 4, 2023

My bad. Was successfully fixed.


Off top

I confused it with the RuntimeIdentifiers problem.
Because I see that it was fixed and merged:
unoplatform/uno.templates@8676ee9
But still not updated on the latest release:
image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/build Categorizes an issue or PR as relevant to build infrastructure

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants