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

fix(net6): [Android] Adjust for proper assets base path #8712

Merged
merged 1 commit into from
May 9, 2022
Merged

fix(net6): [Android] Adjust for proper assets base path #8712

merged 1 commit into from
May 9, 2022

Conversation

jeromelaban
Copy link
Member

PR Type

What kind of change does this PR introduce?

  • Bugfix

What is the new behavior?

Properly sets the android base path for content files. The testing for this is implicitly done in the android runtime tests, which are currently disabled until stabilized in net6-andoid.

PR Checklist

Please check if your PR fulfills the following requirements:

Other information

Internal Issue (If applicable):

@jeromelaban jeromelaban requested a review from a team May 6, 2022 19:52
@gitpod-io
Copy link

gitpod-io bot commented May 6, 2022

@jeromelaban jeromelaban force-pushed the dev/jela/net6-android-assets2 branch from 32e3e08 to d45431d Compare May 7, 2022 01:23
@jeromelaban jeromelaban force-pushed the dev/jela/net6-android-assets2 branch from d45431d to f653bf5 Compare May 7, 2022 01:55
@nventive-devops
Copy link
Contributor

The build 45620 found UI Test snapshots differences: android-28-xamarin: 27, android-28-xamarin-Snap: 19, ios: 44, ios-Snap: 115, skia-gtk-screenshots: 8, wasm: 20, wasm-automated-net5.0-Benchmarks: 0, wasm-automated-net5.0-Default: 7, wasm-automated-net5.0-RuntimeTests: 0

Details

  • android-28-xamarin: 27 changed over 844

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ComboBox_Dropdown_Background_ComboBox_open
    • ComboBoxTests_Fullscreen_Popup_Generic_Closed
    • ComboBoxTests_Fullscreen_Popup_Generic_Opened
    • CommandBar_LongTitle_Validation_CommandBar_-_LongTitle_-_3_-_Orientation_Portrait
    • FocusManager_FocusDirection_Right_Validation_Uno_UI_Samples_Content_UITests_FocusTests_FocusManager_FocusDirection
    • FocusManager_GetFocusedElement_ComboBoxItem_LostFocus_Validation_FocusManager_-_LostFocus_-_ComboBoxItem_-_2_-_Click_outside
    • FocusManager_GetFocusedElement_ComboBoxItem_Validation_FocusManager_-_GetFocusedElement_-_ComboBoxItem_-_2_-_After_Selection
    • FocusManager_GetFocusedElement_ComboBox_LostFocus_Validation_FocusManager_-_LostFocus_-_ComboBox_-_2_-_Click_outside
    • FocusManager_GetFocusedElement_ComboBox_Validation_FocusManager_-_GetFocusedElement_-_ComboBox_-_2_-_After_Selection
    • FocusManager_GetFocusedElement_TextBoxMultiLine_LostFocus_Validation_FocusManager_-_LostFocus_-_TextBoxMultiLine_-_2_-_Click_outside
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • PopupWithOverlay_After
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • TimePicker_Header_UITests_Windows_UI_Xaml_Controls_TimePicker_TimePicker_Header
    • When_Click_Outside_Dialog_Expect_No_Dismiss_AfterClicking
    • When_Click_Outside_Dialog_Expect_No_Dismiss_BeforeClicking
    • TestManipulation_Result
    • TestProgressRing_InitialState_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features
    • WebView_NavigateToAnchor_Initial

  • android-28-xamarin-Snap: 19 changed over 966

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ColorPicker_ColorPickerSample_UITests_Microsoft_UI_Xaml_Controls_ColorPickerTests_ColorPickerSample
    • ContentControlTestsControl_ContentControl_Nested_TemplatedParent_Uno_UI_Samples_Content_UITests_ContentControlTestsControl_ContentControl_Nested_TemplatedParent
    • ComboBox_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_DropDownPlacement_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_DropDownPlacement
    • CommandBar_Native_Uno_UI_Samples_Content_UITests_CommandBar_CommandBar_Native
    • Default_UITests_Windows_UI_Xaml_DragAndDrop_DragDrop_TestPage_UITests_Windows_UI_Xaml_DragAndDrop_DragDrop_TestPage
    • Map_MapControl_Uno_UI_Samples_Content_UITests_MapControl_MapControl
    • NavigationView_MUXControlsTestApp_NavigationViewPage_MUXControlsTestApp_NavigationViewPage
    • MediaPlayerElement_Original_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Original
    • MediaPlayerElement_Using_mov_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Mov_Extension
    • Progress_UITests_Microsoft_UI_Xaml_Controls_ProgressBar_WinUIProgressBarSimple_UITests_Microsoft_UI_Xaml_Controls_ProgressBar_WinUIProgressBarSimple
    • Progress_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRingPage_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRingPage
    • Progress_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_CustomSources_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_CustomSources
    • 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
    • TextBox_Uno_UI_Samples_Content_UITests_TextBoxControl_PasswordBox_Reveal_Scroll_Uno_UI_Samples_Content_UITests_TextBoxControl_PasswordBox_Reveal_Scroll
    • TimePicker_UITests_Windows_UI_Xaml_Controls_TimePicker_TimePicker_Header_UITests_Windows_UI_Xaml_Controls_TimePicker_TimePicker_Header
    • Time_Picker_TimePicker_TimePickerFlyoutStyle_UITests_Windows_UI_Xaml_Controls_TimePicker_TimePicker_TimePickerFlyoutStyle
    • Windows_Devices_Geolocator_UITests_Shared_Windows_Devices_GeolocatorTests
    • UIElement_TransformToVisual_Simple_UITests_Shared_Windows_UI_Xaml_UIElementTests_TransformToVisual_Simple

  • ios: 44 changed over 296

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ContentPresenter_Template_Uno_UI_Samples_Content_UITests_ContentPresenter_ContentPresenter_Template
    • Keyboard_Textbox_NoScrollViewer_Validation_2_-_Remove_Focus_on_placeholderTextTextBox
    • Keyboard_Textbox_NoScrollViewer_Validation_4_-_Remove_Focus_on_multilineTextBox
    • Keyboard_Textbox_NoScrollViewer_Validation_5_-_Remove_Focus_on_numberTextBox
    • Keyboard_Textbox_NoScrollViewer_Validation_0_-_Remove_Focus_on_normalTextBox
    • Keyboard_Textbox_NoScrollViewer_Validation_1_-_Remove_Focus_on_filledTextBox
    • ListView_ChangingText_Validation_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Changing_Text
    • ListView_ObservableCollection_Creation_Count_Added
    • ListView_ObservableCollection_Creation_Count_Added_above
    • ListView_ObservableCollection_Creation_Count_Removed_above
    • ListView_ObservableCollection_Creation_Count_Scrolled1
    • ListView_ObservableCollection_Creation_Count_Scrolled2
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • Screenshots_Image_Stretch_Algmnt_Inf_Horizontal_Mode-1
    • Screenshots_Image_Stretch_Algmnt_Inf_Horizontal_Mode-2
    • Screenshots_Image_Stretch_Algmnt_Inf_Horizontal_Mode-3
    • Screenshots_Image_Stretch_Algmnt_Inf_Vertical_Mode-1
    • Screenshots_Image_Stretch_Alignment_Equal_Mode-2
    • Screenshots_Image_Stretch_Alignment_Equal_Mode-3
    • Screenshots_Image_Stretch_Alignment_SizeOnControl_Mode-1

  • ios-Snap: 115 changed over 957

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Animations_DoubleAnimation_BeginTime_Uno_UI_Samples_Content_UITests_Animations_DoubleAnimation_BeginTime
    • Animations_DoubleAnimation_Cumulative_Uno_UI_Samples_Content_UITests_Animations_DoubleAnimation_Cumulative
    • Animations_DoubleAnimation_TranslateX_GenericApp_Views_Content_UITests_Animations_DoubleAnimation_TranslateX
    • Animations_UITests_Windows_UI_Xaml_Media_Animation_ColorAnimation_Background_UITests_Windows_UI_Xaml_Media_Animation_ColorAnimation_Background
    • Animations_UITests_Windows_UI_Xaml_Media_Animation_FadeInOutThemeAnimationPage_UITests_Windows_UI_Xaml_Media_Animation_FadeInOutThemeAnimationPage
    • Automation_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_Name_UITests_Shared_Windows_UI_Xaml_Automation_AutomationProperties_Name
    • AutoSuggestBox_UITests_Windows_UI_Xaml_Controls_AutoSuggestBoxTests_AutoSuggestBox_Description_UITests_Windows_UI_Xaml_Controls_AutoSuggestBoxTests_AutoSuggestBox_Description
    • Border_AutoBorderStretchwithleftmargin_Uno_UI_Samples_UITests_BorderTestsControl_AutoBorderStretchwithleftmargin
    • Border_AutoBorderStretchwithtopmargin_Uno_UI_Samples_UITests_BorderTestsControl_AutoBorderStretchwithtopmargin
    • Border_Border_Corner_Overlap_UITests_Shared_Windows_UI_Xaml_Controls_BorderTests_Border_CornerOverlap
    • Border_NonUniformThicknessandRadius_Uno_UI_Samples_UITests_BorderTestsControl_NonUniformThicknessandRadius
    • Border_UITests_Shared_Windows_UI_Xaml_Controls_BorderTests_Border_CornerRadius_Toggle_UITests_Shared_Windows_UI_Xaml_Controls_BorderTests_Border_CornerRadius_Toggle
    • Border_Uno_UI_Samples_UITests_BorderTestsControl_Border_BorderThickness_Uno_UI_Samples_UITests_BorderTestsControl_Border_BorderThickness
    • Button_Hyperlink_Disabled_nVentive_Umbrella_Views_UI_Samples_Content_UITests_ButtonTestsControl_Hyperlink_Disabled
    • Button_Uno_UI_Samples_Content_UITests_ButtonTestsControl_Custom_Button_With_ContentTemplate_And_StackPanel_Uno_UI_Samples_Content_UITests_ButtonTestsControl_Custom_Button_With_ContentTemplate_And_StackPanel
    • Clipping_SamplesApp_Windows_UI_Xaml_Clipping_XamlButtonWithClipping_SamplesApp_Windows_UI_Xaml_Clipping_XamlButtonWithClipping
    • ComboBox_ComboBox_ScrollViewer_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ComboBox_ComboBox_ScrollViewer
    • ContentDialog_ContentDialog_ComboBox_UITests_Shared_Windows_UI_Xaml_Controls_ContentDialogTests_ContentDialog_ComboBox
    • ContentDialog_UITests_Windows_UI_Xaml_Controls_ContentDialogTests_ContentDialog_Dialogs_UITests_Windows_UI_Xaml_Controls_ContentDialogTests_ContentDialog_Dialogs
    • ComboBox_ComboBox_ItemDataContext_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_ItemDataContext

  • skia-gtk-screenshots: 8 changed over 1019

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • DragAndDrop-DragDrop_TestPage
    • GH Bugs-WindowsProgressRing_GH1220
    • Image-Image_Stretch_Alignment_Wider
    • ImageBrushTestControl-Ellipse
    • Image-UniformToFill100x100
    • ListView-ListView_IsSelected
    • Progress-WindowsProgressRing_GH1220
    • Transform-TransformToVisual_Translate2d

  • wasm: 20 changed over 966

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ListView.ListView_IsSelected
    • SamplesApp.Wasm.Windows_UI_Xaml_Media.Transform.TransformToVisual_Translate2d
    • UITests.Microsoft_UI_Xaml_Controls.ColorPickerTests.ColorPickerSample
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.WinUIProgressRingPage
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.WinUIProgressRing_Features
    • 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.ImageTests.Image_Stretch_Alignment_SizeOnControl
    • UITests.Uno_Web.Http.CookieManagerTests
    • UITests.Windows_UI_Xaml.DragAndDrop.DragDrop_TestPage
    • UITests.Windows_UI_Xaml_Controls.ProgressRing.WindowsProgressRing_GH1220
    • UITests.Windows_UI_Xaml_Shapes.Offscreen_Shapes
    • Uno.UI.Samples.Content.UITests.TextBlockControl.TextBoxSizeChanging
    • Uno.UI.Samples.Content.UITests.TextBlockControl.TextBlockMultilineInStarStackPanel
    • Uno.UI.Samples.Content.UITests.TextBlockControl.TextBlock_FixedWidth_With_DataBound_Run
    • Uno.UI.Samples.Samples.Shared.Content.UITests.ImageBrushInList
    • Uno.UI.Samples.UITests.Image.Image_Stretch
    • Uno.UI.Samples.UITests.Image.Image_Stretch_Alignment_Equal
    • Uno.UI.Samples.UITests.ImageBrushTestControl.Ellipse
    • Uno.UI.Samples.UITests.ImageBrushTestControl.ImageBrush_StreamSource

  • wasm-automated-net5.0-Benchmarks: 0 changed over 1

  • wasm-automated-net5.0-Default: 7 changed over 869

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • BitmapImage_vs_SvgImageSource_BitmapRemote_url_stream
    • ImageStretch_None_Uno_UI_Samples_UITests_ImageTestsControl_Image_Stretch_None
    • ListView_Weird_Measure_During_Arrange_UITests_Shared_Windows_UI_Xaml_Controls_ListView_ListView_Weird_Measure
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • TestProgressRing_InitialState_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features
    • Validate_Offscreen_Shapes_UITests_Windows_UI_Xaml_Shapes_Offscreen_Shapes
    • When_TransformToVisual_ScrollViewer_UITests_Shared_Windows_UI_Xaml_UIElementTests_TransformToVisual_ScrollViewer

  • wasm-automated-net5.0-RuntimeTests: 0 changed over 1

@jeromelaban jeromelaban merged commit cd24160 into master May 9, 2022
@jeromelaban jeromelaban deleted the dev/jela/net6-android-assets2 branch May 9, 2022 18:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dr1rrb dr1rrb dr1rrb approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jeromelaban @nventive-devops @dr1rrb