[net10.0] Merge main net10 .0 #30522
Merged
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
…#29825) * [iOS][Shell]Tab becomes blank after specific navigation pattern * Added UI Test * CR changes * Update ShellItemRenderer.cs * - fix long press back navigation * Update ShellSectionRenderer.cs * Update ShellSectionRenderer.cs * Update ShellItemRenderer.cs * Update ShellItemRenderer.cs * Update ShellSectionRenderer.cs * Update src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRenderer.cs Co-authored-by: Rui Marinho <me@ruimarinho.net> * Update src/Controls/src/Core/Shell/ShellSection.cs Co-authored-by: Rui Marinho <me@ruimarinho.net> * - apply review updates --------- Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: Rui Marinho <me@ruimarinho.net>
* MauiScrollView resets ContentOffset on first layout pass - fix * Update MauiScrollView.cs
…#30508) This pull request makes a minor adjustment to the `Geocoding_Tests` in `src/Essentials/test/DeviceTests/Tests/Geocoding_Tests.cs`. It temporarily disables a test on Windows due to consistent CI failures, with a tracking issue provided for re-enablement. Build Link: https://dev.azure.com/xamarin/public/_build/results?buildId=145786&view=ms.vss-test-web.build-test-results-tab&runId=4490667&resultId=100050&paneView=history Testing adjustments: * [`src/Essentials/test/DeviceTests/Tests/Geocoding_Tests.cs`](diffhunk://#diff-f6378c55d0b9bc84b5a05db56a2f85f69039e81472b7e72ed60a85687887951bL18-R21): Updated the conditional compilation directive to exclude Windows from running the `Get_Placemarks_LatLong` test, along with a comment explaining the temporary change and linking to the tracking issue.
…SECURITY_NOREVOCATIONCHECKBYDEFAULT (#30514) * Initial plan * Add DOTNET_SYSTEM_NET_SECURITY_NOREVOCATIONCHECKBYDEFAULT environment variable Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com> * Update copilot-setup-steps.yml --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
# Conflicts: # eng/Version.Details.xml # eng/Versions.props # eng/common/core-templates/job/job.yml # global.json
rmarinho
added
the
area-infrastructure
There was a problem hiding this comment.
Pull Request Overview
This PR merges the latest changes from the main branch into the net10.0 branch, synchronizing tests, platform renderers, and config updates.
- Disabled a flaky Geocoding test on Windows CI
- Refined layout direction check in
MauiScrollView - Added UI tests and host app pages for Issue 29798
- Introduced
SyncStackDownToinShellSectionand refactored popup logic in iOS renderers - Updated NuGet.config with an empty
<packageSourceMapping>
Reviewed Changes
Copilot reviewed 8 out of 9 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| src/Essentials/test/DeviceTests/Tests/Geocoding_Tests.cs | Temporarily disable Windows test for geocoding CI failures |
| src/Core/src/Platform/iOS/MauiScrollView.cs | Added null-check for previous layout direction |
| src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue29798.cs | New shared UI test verifying tab navigation behavior |
| src/Controls/tests/TestCases.HostApp/Issues/Issue29798.cs | New host app pages & routing for Issue 29798 navigation scenario |
| src/Controls/src/Core/Shell/ShellSection.cs | Added SyncStackDownTo to rebuild nav stack on pop |
| src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRenderer.cs | Refactored DidPopItem to sync stack instead of _popRequested flag |
| src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs | Minor null-pattern update (r is not null) |
| eng/common/internal/NuGet.config | Introduced <packageSourceMapping> with a <clear /> |
Comments suppressed due to low confidence (1)
src/Controls/src/Core/Shell/ShellSection.cs:114
- New
SyncStackDownTologic mutates the nav stack and lifecycle; adding unit tests to cover different stack states (single, middle, root) would help ensure correctness.
internal void SyncStackDownTo(Page page)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
Description of Change
Bring latest changes from main to net10.0 branch