Net10 main merge #31699
Draft
Net10 main merge #31699
+8,811
−2,926
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
fix the text prediction issue for android Removed unwanted codes remove unwanted codes simplified the fix Added test case Remove ui test Added a device test
Updated concerns Updated review concern Added snapshots and requested changes Modified the sample used HashSet Used FlyoutItems Count directly
Added a comment with a link to Apple docs Refactor
Revert "fix added" This reverts commit 138797f. fix added test case added snapshot added fix updated
Update issue string Added more tests related to Dispatcher Extensions and addresssed copilot suggestions
Co-authored-by: Copilot <[email protected]>
Co-authored-by: Copilot <[email protected]>
* added UI codes * Updated UI codes * updated test cases * updated test cases * added android and iOS snapshots * updated test case * added windows snapshots * added mac snapshots * added VerifyScreenshot code * updated crop top value * added windows snapshots
* Added IndicatorView Feature tests * changes updated * Added images * changes updated * Update src/Controls/tests/TestCases.HostApp/FeatureMatrix/IndicatorView/IndicatorViewOptionsPage.xaml.cs Co-authored-by: Copilot <[email protected]> * Added base images --------- Co-authored-by: Copilot <[email protected]>
* feature_matrix_TitleBar * Update TitleBarFeatureTests.cs * Update TitleBarFeatureTests.cs * Added_Properties Icon,IsVisible,ForegroundColor * Update CorePageView.cs * Updated_TitlebarFeature_Matrix * Updated TitleBar Control * Added the Issue link and Comment * Added Snapshots --------- Co-authored-by: Shane Neuville <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
<!-- Please let the below note in for people that find this PR --> > [!NOTE] > Are you waiting for the changes in this PR to be merged? > It would be very helpful if you could [test the resulting artifacts](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from this PR and let us know in a comment if this change resolves your issue. Thank you! <!-- !!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING MAIN. !!!!!!! --> ### Issues Fixed Fixes #28716 Fixes #31085 |Before|After| |--|--| |<video src="https://github.com/user-attachments/assets/f94e034a-99d4-4846-9fa0-bb8f2d547bdc" width="300px"/>|<video src="https://github.com/user-attachments/assets/797fb522-cffe-4566-a301-4a035093b0b5" width="300px"/>| ```xaml <Grid RowDefinitions="Auto, *"> <Button Text="Add Item" Clicked="Button_Clicked" HorizontalOptions="Center" VerticalOptions="Center"/> <CollectionView ItemsUpdatingScrollMode="KeepLastItemInView" Grid.Row="1" x:Name="cv"> <CollectionView.ItemTemplate> <DataTemplate> <Grid ColumnDefinitions="*,Auto"> <Label Text="{Binding Text}" HeightRequest="100" VerticalOptions="Center"/> </Grid> </DataTemplate> </CollectionView.ItemTemplate> </CollectionView> </Grid> ```
* WIP * update snapshot * update snapshots again * revert
* [ci] no yaml templates # Conflicts: # eng/pipelines/device-tests.yml * [ci] Update variables * [ci] No variables group * [ci] Enable variables again * [ci] Add arcade device tests * [ci] Add VM_IMAGE_HOST * Try use Windows pool * [ci] try fix build * [ci] Fix build parameter * [ci] Run windows device tests on azure pipelines * Build device tests * [ci] Try helix devicetests * Fix yaml * try new scripts * remove is1ESPipeline * Fxi project path * again * Remove comments * Fix proj * Fix path * [ci] Make sure build * Fix _buildScriptMacOS * Fix script * Try againsdk fix * updat again * Fix config * Call restore * update template * [ci] Add creator * Try ignore warning * [tests] Just send net9.0-ios * [testint] Remove warn as error * [testing] Add catalyst * Revert "[testing] Add catalyst" This reverts commit 5ae5bba. * ignore xcode * Revert "ignore xcode" This reverts commit e0deb36. * Try to run in anyone * Reapply "ignore xcode" This reverts commit 3f21f74. * Add timeout * Try run all device tests * try add android * try this * clean * Try 2 jobs * Try before targets * Other before targets * add TargetFrameworkVersion * remove blazor * Try build device tests * try addd dependencie * Try again * [tests] remove entitlements from Graphics * don t build essentials * [tests] Move mauidevicetests to devicetests * Try build with provision profile * run local * try again * try cleanup * cleanup * fix android * Add blazor * Use 23 and 33 * Fix naming * Try run tests on essentials * try run windows too * Fix display name * Fix Helix display name * Use as 29 queue * Fix it * Try arm64-v8a * [ci] Try new queue * try the non signed apk * Specify xcode * try build x64 * remove te bl * use old queue * update AndroidInstrumentationName * try just one project * try build x64 * Try build just controls app * try again * try again with dotnet * again * again * Add /p:EmbedAssembliesIntoApk=true * try scouting queue * Use testResults.xml casing * try release * remove instrumation * Fix config * try without assemblies * Go back to osx.15 * Try use the helix proj * Add condition for build projects * try just build once * Fix variables * Fix extra / * Add BuildInParallel="false" * we don t need provisionator * download build on iOS * try all device tests * [tests] Try again only Controls * Try new collect * Try again * Fix logic * Try cleanup tests * try again * Try skip some tests * [test] Try skip failing test for leak * Add retry * try run catalyst too on helix * Fix target maccatalyst * Specify queue * Run the other projects * Try api 33 * Cleanup * Fix extra parameter * Cleanup variables and keep old ones * Try add $(TargetFrameworkToTest) * [ci]Try fix results on existing devicetests run * fix typo * Try rename * Other fix * Apply suggestion from @Copilot Co-authored-by: Copilot <[email protected]> * Apply suggestion from @Copilot Co-authored-by: Copilot <[email protected]> * Update AssertionExtensions.cs * Update AssertionExtensions.cs * Fix merge * Revert assertion changes * fix length count on for loop * try find results better * Revert "Revert assertion changes" This reverts commit b676c31. * Allow to run filter, and wait for test result file * Update windows.cake * Add some docs for helix --------- Co-authored-by: Alexander Köplinger <[email protected]> Co-authored-by: Copilot <[email protected]> Co-authored-by: Shane Neuville (HE/HIM) <[email protected]>
Co-authored-by: GitOps <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Added null-conditional operator when accessing Handler.PlatformView in ItemsViewController and ItemsViewController2 to prevent potential null reference exceptions when updating flow direction for child views.
DependencyService.Get<ISystemResourcesProvider>() may return null if it's never set. Since the next call is a null check on ISystemResourcesProvider, we can null check the dependency service call too.
…mplate Co-authored-by: javiercn <[email protected]>
…files Co-authored-by: javiercn <[email protected]>
* Add test to MAUI Manual test runner to verfiy issue #31483 * Update src/Controls/tests/ManualTests/Tests/BugFixes/L1_TapGestureRecognizer.xaml Co-authored-by: Copilot <[email protected]> * Update src/Controls/tests/ManualTests/Tests/BugFixes/L1_TapGestureRecognizer.xaml Co-authored-by: Copilot <[email protected]> * Update src/Controls/tests/ManualTests/Tests/BugFixes/L1_TapGestureRecognizer.xaml.cs Co-authored-by: Copilot <[email protected]> --------- Co-authored-by: Copilot <[email protected]>
…View Deselection on Android (#29818) * fix code updated * updated test case # Conflicts: # src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue21375.cs * Update SelectableItemsViewAdapter.cs * Update SelectableItemsViewAdapter.cs * removed already reverted test case codes and screenshots * updated test case ignoring ios and mac. * optimised the fix
…bView FlowDirection is set correctly device test case (#31611)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…mplate (#31618) > [!NOTE] > Are you waiting for the changes in this PR to be merged? > It would be very helpful if you could [test the resulting artifacts](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from this PR and let us know in a comment if this change resolves your issue. Thank you! This PR updates the Blazor Maui Web template to use the modern ASP.NET Core `MapStaticAssets()` middleware instead of the legacy `UseStaticFiles()` middleware. ## Changes Made In `src/Templates/src/templates/maui-blazor-solution/MauiApp.1.Web/Program.cs`: - **Removed:** `app.UseStaticFiles();` call - **Added:** `app.MapStaticAssets();` call placed before `MapRazorComponents()` ```diff app.UseHttpsRedirection(); - app.UseStaticFiles(); app.UseAntiforgery(); + app.MapStaticAssets(); + #if (UseServer && UseWebAssembly) app.MapRazorComponents<App>() ``` ## Benefits `MapStaticAssets()` is the recommended approach for serving static assets in modern ASP.NET Core applications as it: - Provides better performance through optimized asset serving - Enables improved caching strategies - Offers better integration with the routing pipeline - Follows current ASP.NET Core best practices ## Testing - ✅ Template generation works correctly with `dotnet new maui-blazor-web` - ✅ Generated web projects build successfully - ✅ Static assets (CSS, JS) are served correctly at runtime - ✅ All HTTP requests to static files return expected responses Fixes #31617. ## Progress - [x] Implement the core change from UseStaticFiles() to MapStaticAssets() - [x] Revert unrelated changes to cgmanifest.json and templatestrings.json files - [x] Verify the template still works correctly <!-- START COPILOT CODING AGENT TIPS --> --- 💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click [here](https://survey3.medallia.com/?EAHeSx-AP01bZqG0Ld9QLQ) to start the survey.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note
Are you waiting for the changes in this PR to be merged?
It would be very helpful if you could test the resulting artifacts from this PR and let us know in a comment if this change resolves your issue. Thank you!
Description of Change
Issues Fixed
Fixes #