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(hr): Use SDK version to run the dev server #14170

Merged
merged 1 commit into from
Oct 30, 2023
Merged

fix(hr): Use SDK version to run the dev server #14170

merged 1 commit into from
Oct 30, 2023

Conversation

jeromelaban
Copy link
Member

@jeromelaban jeromelaban commented Oct 30, 2023 •
edited by ghost
Loading

PR Type

What kind of change does this PR introduce?

  • Bugfix

What is the new behavior?

Properly start the appropriate devserver version based on the installed .NET SDK, not the selected TargetFramework.

Copilot Summary

🤖 Generated by Copilot at e4326f1

Use BundledNETCoreAppTargetFrameworkVersion to select Uno Remote Control Host version. This fixes a potential mismatch between the app's runtime and the host's SDK version.

PR Checklist

Please check if your PR fulfills the following requirements:

Other information

Internal Issue (If applicable):

@nventive-devops
Copy link
Contributor

The build 99688 found UI Test snapshots differences: android-28-net7: 0, android-28-net7-Snap: 67, ios: 213, ios-Snap: 463, skia-gtk-screenshots: 22, skia-wpf-screenshots: 22, wasm: 29, wasm-automated-net7.0-UWP-Benchmarks: 0, wasm-automated-net7.0-UWP-Default: 29, 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: 67 changed over 1048

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Image_Image_Stretch_Full_Taller_Uno_UI_Samples_UITests_Image_Image_Stretch_Full_Taller
    • Pointers_Touch_Uno_UI_Samples_Content_UITests_TouchEventsTests_Touch
    • LoopingSelector_UITests_Windows_UI_Xaml_Controls_LoopingSelectorTests_LoopingSelector_Items_UITests_Windows_UI_Xaml_Controls_LoopingSelectorTests_LoopingSelector_Items
    • LoopingSelector_UITests_Windows_UI_Xaml_Controls_LoopingSelectorTests_LoopingSelector_Short_UITests_Windows_UI_Xaml_Controls_LoopingSelectorTests_LoopingSelector_Short
    • Brushes_BorderImageBrush_Uno_UI_Samples_UITests_ImageBrushTestControl_BorderImageBrush
    • ColorPicker_WinUIColorPickerPage_UITests_Shared_Microsoft_UI_Xaml_Controls_ColorPickerTests_WinUIColorPickerPage
    • ListView_HorizontalListView_Templates_SamplesApp_Windows_UI_Xaml_Controls_ListView_HorizontalListView_Templates
    • ListView_ListViewGroupedVariableHeightComplexTemplate_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewGroupedVariableHeightComplexTemplate
    • MediaPlayerElement_MediaPlayerElement_Stretch_Fill_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Stretch_Fill
    • MUX_UITests_Shared_Microsoft_UI_Xaml_Controls_TreeViewTests_TreeViewPage_UITests_Shared_Microsoft_UI_Xaml_Controls_TreeViewTests_TreeViewPage
    • MUX_UITests_Microsoft_UI_Xaml_Controls_SplitButtonTests_SplitButtonPage_UITests_Microsoft_UI_Xaml_Controls_SplitButtonTests_SplitButtonPage
    • Pickers_UITests_Windows_UI_Xaml_Controls_CalendarView_CalendarView_Theming_UITests_Windows_UI_Xaml_Controls_CalendarView_CalendarView_Theming
    • Pointers_UITests_Windows_UI_Input_PointersTests_ScrollViewer_PointerMoved_UITests_Windows_UI_Input_PointersTests_ScrollViewer_PointerMoved
    • Icons_UITests_Shared_Windows_UI_Xaml_Controls_BitmapIconTests_BitmapIcon_Generic_UITests_Shared_Windows_UI_Xaml_Controls_BitmapIconTests_BitmapIcon_Generic
    • Image_Uno_UI_Samples_UITests_ImageTests_Image_Invalid_Uno_UI_Samples_UITests_ImageTests_Image_Invalid
    • Shapes_UITests_Windows_UI_Xaml_Shapes_Offscreen_Shapes_UITests_Windows_UI_Xaml_Shapes_Offscreen_Shapes
    • TextBlock_TextBlock_Visibility_Arrange_UITests_Shared_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_Visibility_Arrange
    • Image_Uno_UI_Samples_UITests_ImageTestsControl_ImageUniformWithinScrollViewer_Uno_UI_Samples_UITests_ImageTestsControl_ImageUniformWithinScrollViewer
    • Image_Uno_UI_Samples_UITests_ImageTestsControl_Image_Fixed_Size_Alignment_Uno_UI_Samples_UITests_ImageTestsControl_Image_Fixed_Size_Alignment
    • NavigationView_NavigationView_BasicNavigation_SamplesApp_Samples_Windows_UI_Xaml_Controls_NavigationViewTests_NavigationView_BasicNavigation

  • ios: 213 changed over 267

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • FocusManager_FocusDirection_Left_Validation_Uno_UI_Samples_Content_UITests_FocusTests_FocusManager_FocusDirection
    • Image_Source_Nullify_image_source_nullify_loaded
    • Keyboard_Textbox_NoScrollViewer_Validation_3_-_Remove_Focus_on_disabledTextBox
    • ListView_ExpandableItemLarge_ExpandHeader_Validation_Collapsed_State
    • ListView_ExpandableItem_ExpandSingleItem_Initial_State
    • ListView_VirtualizePanelAdaptaterIdCache_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_VirtualizePanelAdaptaterIdCache
    • Screenshots_Image_Stretch_Algmnt_Inf_Horizontal_Mode-0
    • Screenshots_Image_Stretch_Alignment_Wider_Mode-2
    • Screenshots_Image_Stretch_Alignment_Wider_Mode-3
    • When_ExtendedSelectionWithoutItemClick_Then_PointersEvents_UITests_Windows_UI_Xaml_Controls_ListView_ListView_Selection_Pointers
    • Check_ListView_Swallows_Measure_after_scroll
    • Flyout_ShowAt_Window_Content_UITests_Windows_UI_Xaml_Controls_FlyoutTests_Flyout_ShowAt_Window_Content
    • Image_Source_Nullify_image_source_nullify_cleared
    • Keyboard_Textbox_NoScrollViewer_Validation_1_-_Remove_Focus_on_filledTextBox
    • ListView_ExpandableItemLarge_ExpandHeaderWithSingleItem_Validation_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Expandable_Item_Large
    • ListView_ListViewVariableItemHeightLong_InitializesTest_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewVariableItemHeightLong
    • Screenshots_Image_Stretch_Algmnt_Inf_Horizontal_Mode-3
    • Screenshots_Image_Stretch_Algmnt_Inf_Vertical_Mode-0
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • StaticResource_Converter_Validation_UITests_Shared_Resources_StaticResource_StaticResource_Simple

  • ios-Snap: 463 changed over 1039

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Border_BorderLeftwithmargins_Uno_UI_Samples_UITests_BorderTestsControl_BorderLeftwithmargins
    • Border_UITests_Windows_UI_Xaml_Controls_BorderTests_PanelWithNullBrushAndNonZeroThickness_UITests_Windows_UI_Xaml_Controls_BorderTests_PanelWithNullBrushAndNonZeroThickness
    • Brushes_ImageBrushStretch2_Uno_UI_Samples_UITests_ImageBrushTestControl_ImageBrushStretch2
    • Brushes_Uno_UI_Samples_Samples_Shared_Content_UITests_ImageBrushInList_Uno_UI_Samples_Samples_Shared_Content_UITests_ImageBrushInList
    • Clipping_SamplesApp_Windows_UI_Xaml_Clipping_DoubleAnimationClipping_SamplesApp_Windows_UI_Xaml_Clipping_DoubleAnimationClipping
    • ColorPicker_WinUIColorPickerPage_UITests_Shared_Microsoft_UI_Xaml_Controls_ColorPickerTests_WinUIColorPickerPage
    • Dialogs_UITests_Windows_UI_Xaml_Controls_ContentDialogTests_ContentDialog_Dialogs_UITests_Windows_UI_Xaml_Controls_ContentDialogTests_ContentDialog_Dialogs
    • Flyouts_MenuFlyout_Simple_Uno_UI_Samples_Content_UITests_MenuFlyout_MenuFlyout_Simple
    • Flyouts_Namescope_UITests_Shared_Windows_UI_Xaml_Controls_FlyoutTests_Flyout_Namescope
    • ListView_ListViewGroupedVariableHeightComplexTemplate_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewGroupedVariableHeightComplexTemplate
    • ListView_ListViewGrouped_ItemContainerStyleSelector_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewGrouped_ItemContainerStyleSelector
    • ListView_ListViewGrouped_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewGrouped
    • ListView_ListViewHeaderFooterOnly_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewHeaderFooterOnly
    • ListView_ListView_ItemClick_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_ItemClick
    • ListView_ListView_ItemContainerStyleSelector_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_ItemContainerStyleSelector
    • ListView_ListView_ItemTemplateSelector_And_ItemContainerStyleSelector_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_ItemTemplateSelector_And_ItemContainerStyleSelector
    • ListView_ListView_TextBox_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_TextBox
    • ListView_ListView_WithFlipView_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_WithFlipView
    • ListView_ListView_WithScrollViewer_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_WithScrollViewer
    • NavigationView_MUXControlsTestApp_NavigationViewCompactPaneLengthTestPage_MUXControlsTestApp_NavigationViewCompactPaneLengthTestPage

  • skia-gtk-screenshots: 22 changed over 1136

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ListView-ListViewSelectedItems.png
    • MUX-TabViewPage.png
    • PipsPager-PipsPagerExamples.png
    • Brushes-DoubleImageBrushInList.png
    • MediaPlayerElement-Using .3gp.png
    • MUX-WinUIProgressRingPage.png
    • MUX-WinUIProgressRing_CustomSources.png
    • Progress-ProgressRingHeightTest.png
    • Pickers-CalendarView_Theming.png
    • TextBlock-TextBlockMultilineInStarStackPanel.png
    • TextBlock-TextBoxSizeChanging.png
    • DragAndDrop-DragDrop_TestPage.png
    • MUX-NavigationViewRS4Page.png
    • Windows.UI.Composition-CompositionMaskBrush.png
    • Windows.UI.Composition-CompositionVisualSurface.png
    • Windows.UI.Composition-RedirectVisual.png
    • Windows.Graphics.Display-DisplayInformation.png
    • Progress-WindowsProgressRing_GH1220.png
    • Progress-WinUIProgressRingPage.png
    • Progress-WinUIProgressRing_CustomSources.png

  • skia-wpf-screenshots: 22 changed over 1136

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Brushes-ImageBrush_StreamSource.png
    • Progress-ProgressRingHeightTest.png
    • ListView-ListViewSelectedItems.png
    • MediaPlayerElement-Using .mp3 (Audio only).png
    • Pickers-CalendarView_Theming.png
    • Progress-WindowsProgressRing_GH1220.png
    • DragAndDrop-DragDrop_TestPage.png
    • Image-Image_Stretch.png
    • Image-UniformToFill100x100.png
    • Brushes-ImageBrushChangingCornerRadius.png
    • MUX-WinUIProgressRingPage.png
    • MUX-WinUIProgressRing_CustomSources.png
    • Windows.UI.Composition-CompositionMaskBrush.png
    • Windows.UI.Composition-CompositionVisualSurface.png
    • Windows.UI.Composition-RedirectVisual.png
    • WinUI-PipsPagerExamples.png
    • Transform-TransformToVisual_Translate2d.png
    • Progress-WinUIProgressRingPage.png
    • Progress-WinUIProgressRing_CustomSources.png
    • Progress-WinUIProgressRing_Features.png

  • wasm: 29 changed over 1044

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • UITests.Windows_UI_Xaml_Controls.ProgressRing.WindowsProgressRing_GH1220
    • MUXControlsTestApp.NavigationViewBlankPage1
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.WinUIProgressRing_Features
    • UITests.Shared.Windows_UI_Xaml_Controls.MediaPlayerElement.MediaPlayerElement_Stretch_Fill
    • MUXControlsTestApp.PipsPagerExamples
    • SamplesApp.Windows_UI_Xaml_Controls.ListView.ListViewSelectedItems
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.ProgressRingHeightTest
    • UITests.Windows_UI_Xaml_Controls.CalendarView.CalendarView_Theming
    • MUXControlsTestApp.NavigationViewStretchPage
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ListView.ListView_IsSelected
    • UITests.Windows_UI_ViewManagement.ApplicationViewSizing
    • UITests.Shared.Windows_UI_Xaml_Controls.ListView.ListView_TransformsOnList
    • UITests.Windows_Media.MediaPlayerTests
    • initial_state
    • MUXControlsTestApp.NavigationViewRS4Page
    • UITests.Uno_Web.Http.CookieManagerTests
    • SamplesApp.Samples.Windows_UI_Xaml_Controls.NavigationViewTests.NavigationView_BasicNavigation
    • UITests.Shared.Windows_UI_Xaml_Controls.MediaPlayerElement.MediaPlayerElement_Avi_Extension
    • UITests.Shared.Windows_UI_Xaml_Controls.MediaPlayerElement.MediaPlayerElement_Mov_Extension
    • UITests.Shared.Windows_UI_Xaml_Controls.MediaPlayerElement.MediaPlayerElement_Flv_Extension

  • wasm-automated-net7.0-UWP-Benchmarks: 0 changed over 1

  • wasm-automated-net7.0-UWP-Default: 29 changed over 1937

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ListView_SelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • ListView_ListViewSelectedItems_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewSelectedItems
    • 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
    • MediaPlayerElement_Using_flv_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Flv_Extension
    • MediaPlayerElement_Using_mkv_UITests_Shared_Windows_UI_Xaml_Controls_MediaPlayerElement_MediaPlayerElement_Mkv_Extension
    • 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
    • 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
    • Pickers_UITests_Windows_UI_Xaml_Controls_CalendarView_CalendarView_Theming_UITests_Windows_UI_Xaml_Controls_CalendarView_CalendarView_Theming
    • PipsPager_MUXControlsTestApp_PipsPagerExamples_MUXControlsTestApp_PipsPagerExamples
    • Default_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ListView_ListView_IsSelected
    • Progress_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features
    • ScrollBar_Vertical_initial_indicators
    • When_Theme_Changed_No_Crash_UITests_Windows_UI_Xaml_Controls_CalendarView_CalendarView_Theming
    • Progress_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRingPage_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRingPage
    • 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 marked this pull request as ready for review October 30, 2023 11:25
@jeromelaban
Copy link
Member Author

@Mergifyio backport release/stable/5.0

@mergify
Copy link
Contributor

mergify bot commented Oct 30, 2023 •
edited
Loading

backport release/stable/5.0

✅ Backports have been created

@nickrandolph nickrandolph merged commit 7b446f5 into master Oct 30, 2023
86 checks passed
@nickrandolph nickrandolph deleted the dev/jela/hr-sdk-version branch October 30, 2023 12:36
@mergify mergify bot mentioned this pull request Oct 30, 2023
Merged
jeromelaban added a commit that referenced this pull request Oct 30, 2023
@jeromelaban
fix(hr): Ensure that the msbuild version used is properly aligned
2312c2e 
Ensures that the MSBuild version is determined using the appropriate folder, where `dotnet --version` used the latest available SDK on the machine. With this change, the MSBuild version will be the one explicitly used by the app. Combined with #14170, the devserver now completely uses the appropriate SDK/runtime version based on the app's compilation.
@jeromelaban jeromelaban mentioned this pull request Oct 30, 2023
Merged
6 tasks
jeromelaban added a commit that referenced this pull request Oct 30, 2023
@jeromelaban
fix(hr): Ensure that the msbuild version used is properly aligned
5e20078 
Ensures that the MSBuild version is determined using the appropriate folder, where `dotnet --version` used the latest available SDK on the machine. With this change, the MSBuild version will be the one explicitly used by the app. Combined with #14170, the devserver now completely uses the appropriate SDK/runtime version based on the app's compilation.
jeromelaban added a commit that referenced this pull request Oct 30, 2023
@jeromelaban
Merge pull request #14175 from unoplatform/mergify/bp/release/stable/…
cec0125 
…5.0/pr-14170

Multiple DevServer changes (backport #14170 and #14177)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nickrandolph nickrandolph nickrandolph 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 @nickrandolph