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

Set the Version (backport #16826) #16830

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 22, 2024

GitHub Issue (If applicable): closes #16618

PR Type

What kind of change does this PR introduce?

  • Bugfix

What is the current behavior?

We do not set the version based on the ApplicationDisplayVersion

What is the new behavior?

We now mimic the behavior of the Android, iOS, & MacCatalyst SDK's in their handling of the ApplicationDisplayVersion in setting the Version.


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

(cherry picked from commit 20e16f4)
@mergify mergify bot mentioned this pull request May 22, 2024
@unodevops
Copy link
Contributor

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

@unodevops
Copy link
Contributor

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

@nventive-devops
Copy link
Contributor

The build 125890 found UI Test snapshots differences: android-28-net7: 18, android-28-net7-Snap: 46, ios: 5, ios-Snap: 39, skia-gtk-screenshots: 40, skia-linux-screenshots: 80, skia-windows-screenshots: 24, wasm: 66, wasm-automated-net7.0-UWP-Default-automated: 23, 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: 18 changed over 823

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • 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
    • ListView_SelectedItem_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_SelectedItem
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • ListView_SelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • UpDownEnabledTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • UpDownTest_UITests_Shared_Microsoft_UI_Xaml_Controls_NumberBoxTests_NumberBoxPage
    • When_Parent_PointerMoved_After_drag_on_ScrollViewer_-_touch
    • Detereminate_ProgressRing_Validation50_[#FF0000_#008000_#008000_#FF0000]_Progress-Ring-Value-50
    • When_InListView_after_scroll
    • When_InScrollViewer_after_scroll
    • When_MaxLines_Changed_On_Stack_Container_Uno_UI_Samples_Content_UITests_TextBlockControl_SimpleText_MaxLines_Multiple_Containers
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • When_Tap_PressedReleasedAreHandled_UITests_Windows_UI_Xaml_Controls_ComboBox_ComboBox_Pointers
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • WebView_NavigateToLongString_AfterSuccess
    • When_MultipleSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
  • android-28-net7-Snap: 46 changed over 1061

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Image_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_Basic_UITests_Windows_UI_Xaml_Controls_ImageTests_SvgImageSource_Basic
    • TeachingTip_UITests_Microsoft_UI_Xaml_Controls_TeachingTipTests_TeachingTipPage_UITests_Microsoft_UI_Xaml_Controls_TeachingTipTests_TeachingTipPage
    • TextBlock_TextBlockMultilineInStarStackPanel_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBlockMultilineInStarStackPanel
    • TextBlock_TextBlockSimpleContrainedHorizontalCenterWrap2_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBlockSimpleContrainedHorizontalCenterWrap2
    • TextBlock_Textblocktimespancustomformat_Uno_UI_Samples_Content_UITests_TextBlockControl_Textblocktimespancustomformat
    • NavigationView_MUXControlsTestApp_NavigationViewRS4Page_MUXControlsTestApp_NavigationViewRS4Page
    • 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
    • MediaPlayerElement_Using_ogg_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Ogg_Extension
    • TextBlock_TextBlock_UpdatePerformance_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBlock_UpdatePerformance
    • TextBox_TextBox_HorizontalAlignment_Uno_UI_Samples_Content_UITests_TextBoxControl_TextBox_HorizontalAlignment
    • TextBox_TextBox_MaxLength_UITests_Shared_Windows_UI_Xaml_Controls_TextBoxTests_TextBox_MaxLength
    • Default_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected
    • 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
    • TextBox_TextBox_Formatting_Flicker_UITests_Shared_Windows_UI_Xaml_Controls_TextBoxTests_TextBox_Formatting_Flicker
    • Transform_Basics_UITests_Shared_Windows_UI_Xaml_Media_Transform_Basics
    • WebView_WebView2_NavigateToUri_SamplesApp_Microsoft_UI_Xaml_Controls_WebView2Tests_WebView2_NavigateToUri
    • WebView_WebView_ChromeClient_Uno_UI_Samples_Content_UITests_WebView_WebView_ChromeClient
  • ios: 5 changed over 265

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • ImageStretch_None_Uno_UI_Samples_UITests_ImageTestsControl_Image_Stretch_None
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • TextBox_TextAlignment_DetectFromContent_Validation_Uno_UI_Samples_Content_UITests_TextBoxControl_TextBox_TextAlignment
    • TextBox_TextAlignment_Justify_Validation_Uno_UI_Samples_Content_UITests_TextBoxControl_TextBox_TextAlignment
  • ios-Snap: 39 changed over 1052

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ListView_ListViewHeaderFooterOnly_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewHeaderFooterOnly
    • Brushes_ImageBrushStretch_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushStretch
    • ListView_ListView_With_ListViews_Count_Measure_UITests_Shared_Windows_UI_Xaml_Controls_ListView_ListView_With_ListViews_Count_Measure
    • Buttons_Custom_Button_With_ContentTemplate_Uno_UI_Samples_Content_UITests_ButtonTestsControl_Custom_Button_With_ContentTemplate
    • Progress_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRingPage_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRingPage
    • 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
    • ListView_ListView_Image_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Image
    • ColorPicker_WinUIColorPickerPage_UITests_Shared_Microsoft_UI_Xaml_Controls_ColorPickerTests_WinUIColorPickerPage
    • Image_UITests_Shared_Windows_UI_Xaml_Controls_ImageTests_Image_Stretch_Alignment_SizeOnControl_UITests_Shared_Windows_UI_Xaml_Controls_ImageTests_Image_Stretch_Alignment_SizeOnControl
    • Clipping_SamplesApp_Windows_UI_Xaml_Clipping_XamlButtonWithClipping_Scrollable_SamplesApp_Windows_UI_Xaml_Clipping_XamlButtonWithClipping_Scrollable
    • Image_UITests_Shared_Windows_UI_Xaml_Controls_ImageTests_Image_Stretch_Algmnt_Inf_Horizontal_UITests_Shared_Windows_UI_Xaml_Controls_ImageTests_Image_Stretch_Algmnt_Inf_Horizontal
    • Brushes_ImageBrushLocalAsset_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushLocalAsset
    • WebView_UITests_Microsoft_UI_Xaml_Controls_WebView2Tests_WebView2_NavigationProperties_UITests_Microsoft_UI_Xaml_Controls_WebView2Tests_WebView2_NavigationProperties
    • WebView_UITests_Microsoft_UI_Xaml_Controls_WebView2Tests_WebView2_Title_UITests_Microsoft_UI_Xaml_Controls_WebView2Tests_WebView2_Title
    • Brushes_Uno_UI_Samples_Samples_Shared_Content_UITests_ImageBrushInList_Uno_UI_Samples_Samples_Shared_Content_UITests_ImageBrushInList
    • 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
    • Scrolling_MUXControlsTestApp_ScrollViewDynamicPage_MUXControlsTestApp_ScrollViewDynamicPage
  • skia-gtk-screenshots: 40 changed over 2178

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • BorderImageBrush.png
    • Image_Stretch_None_ScrollViewer.png-dark
    • Image_Stretch_None_ScrollViewer.png
    • CalendarView_Theming.png
    • Path_Geometries.png-dark
    • Path_Geometries.png
    • SvgImageSource_Icons.png
    • UIElement_ContextFlyout.png-dark
    • UIElement_ContextFlyout.png
    • ProgressRingHeightTest.png-dark
    • ProgressRingHeightTest.png
    • Sources.png-dark
    • Sources.png
    • Ellipse.png-dark
    • Ellipse.png
    • CalendarView_Theming.png-dark
    • Mini player.png-dark
    • Mini player.png
    • MediaPlayer.png-dark
    • MediaPlayer.png
  • skia-linux-screenshots: 80 changed over 2178

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • BorderImageBrush.png-dark
    • CalendarView_Theming.png-dark
    • CalendarView_Theming.png
    • Ellipse.png-dark
    • Ellipse.png
    • DoubleImageBrushInList.png-dark
    • DoubleImageBrushInList.png
    • ImageBrush_StreamSource.png-dark
    • ImageBrush_StreamSource.png
    • ImageBrush_UniformToFill.png-dark
    • ImageBrush_UniformToFill.png
    • ImageIconPage.png-dark
    • ImageIconPage.png
    • ImageInStackPanel.png-dark
    • ImageInStackPanel.png
    • ImagesInlineInFlipView.png-dark
    • ImagesInlineInFlipView.png
    • ImageBrushInList.png-dark
    • ImageBrushInList.png
    • LargeImageList.png-dark
  • skia-windows-screenshots: 24 changed over 2178

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • CalendarView_Theming.png-dark
    • ImageBrush_SameWithDelay.png-dark
    • ImageBrush_SameWithDelay.png
    • CalendarView_Theming.png
    • ImageIconPage.png-dark
    • ImageIconPage.png
    • Image_Stretch_None.png-dark
    • Image_Stretch_None.png
    • Image_Stretch_None_ScrollViewer.png-dark
    • Image_Stretch_None_ScrollViewer.png
    • MediaPlayer.png-dark
    • MediaPlayer.png
    • ImageSourceUrlMsAppDataScheme.png-dark
    • ImageSourceUrlMsAppDataScheme.png
    • ProgressRingHeightTest.png-dark
    • ProgressRingHeightTest.png
    • SvgImageSource_Icons.png-dark
    • SvgImageSource_Icons.png
    • TransformToVisual_Translate2d.png-dark
    • TransformToVisual_Translate2d.png
  • wasm: 66 changed over 1046

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • MUXControlsTestApp.NavigationViewRS4Page
    • UITests.Microsoft_UI_Xaml_Controls.NumberBoxTests.NumberBox_Description
    • UITests.Shared.Windows_UI_Xaml_Controls.TextBoxTests.TextBox_Selection
    • UITests.Windows_Media.MediaPlayerTests
    • UITests.Windows_UI_Xaml_Controls.ScrollViewerTests.ScrollViewer_ScrollBars
    • UITests.Windows_UI_Xaml_Shapes.LineStretchModes
    • MUXControlsTestApp.NavigationViewStretchPage
    • MUXControlsTestApp.PaneLayoutTestPage
    • SamplesApp.Samples.NavigationViewSample.NavigationViewSample
    • SamplesApp.Samples.RoutedEvents.RoutedEventsPage
    • UITests.Microsoft_UI_Xaml_Controls.ProgressBar.WinUIProgressBarSimple
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.ProgressRingHeightTest
    • UITests.Shared.Windows_UI_Xaml_Controls.NavigationViewTests.NavigationView_TopNavigation
    • UITests.Shared.Windows_UI_Xaml_Controls.MediaPlayerElement.MediaPlayerElement_Stretch_Fill
    • UITests.Windows_UI_Xaml_Controls.TextBox.TextBox_IsTabStop
    • Uno.UI.Samples.Content.UITests.CommandBar.CommandBar_With_Long_Sentences
    • MUXControlsTestApp.NavigationViewSelectedItemEdgeCasePage
    • MUXControlsTestApp.NavigationViewTopNavPage
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListView_Last_Item_Large
    • UITests.Shared.Microsoft_UI_Xaml_Controls.ColorPickerTests.WinUIColorPickerPage
  • wasm-automated-net7.0-UWP-Default-automated: 23 changed over 1954

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Automation_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_Name_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_Name
    • ListView_ListViewSelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • Brushes_ImageBrushAlignmentXY_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushAlignmentXY
    • Brushes_ImageBrushStretch_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushStretch
    • Check_ListView_Swallows_Measure_after_scroll
    • MediaPlayerElement_Mini_player_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Minimal
    • Brushes_ImageBrushStretch2_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushStretch2
    • MediaPlayerElement_Using_mp3_Audio_only_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Mp3_Extension
    • 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_avi_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Avi_Extension
    • Brushes_ImageBrushAlignmentXY2_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushAlignmentXY2
    • ListView_SelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • Progress_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRingPage_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRingPage
    • 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
    • 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_MultipleSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
  • 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 d3fe216 into release/stable/5.2 May 22, 2024
100 of 101 checks passed
@jeromelaban jeromelaban deleted the mergify/bp/release/stable/5.2/pr-16826 branch May 22, 2024 11:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants