Merged
Conversation
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
### Description of Change ACES doesn t existing on the internal dnceng so we need to keep what we had. This pull request updates the Azure Pipelines configuration for macOS jobs to simplify pool selection and improve flexibility. The main change is the removal of the separate `MacOSPoolArm64` parameter and the introduction of conditional logic to select between internal and public macOS pools based on the build definition. This allows all macOS test and build stages to use a unified pool configuration, streamlining maintenance and making it easier to manage resources for different build scenarios. Key changes: **Pipeline Pool Configuration:** * Removed the `MacOSPoolArm64` parameter and consolidated macOS pool definitions into a single `MacOSPool` parameter with `internal` and `public` options. **Conditional Pool Selection in Stages:** * Updated all macOS-related stages (unit tests, sample tests, template tests, and iOS/Android test jobs) to use conditional logic for pool selection: if the build is for `'maui-pr'`, the `public` pool is used; otherwise, the `internal` pool is used. [[1]](diffhunk://#diff-07a82fab001c5b336d89cb64918f0a88b6b66f03d88d67e0fa13c65202455120L208-R206) [[2]](diffhunk://#diff-07a82fab001c5b336d89cb64918f0a88b6b66f03d88d67e0fa13c65202455120L229-R230) [[3]](diffhunk://#diff-07a82fab001c5b336d89cb64918f0a88b6b66f03d88d67e0fa13c65202455120L258-R262) [[4]](diffhunk://#diff-07a82fab001c5b336d89cb64918f0a88b6b66f03d88d67e0fa13c65202455120L272-R279) [[5]](diffhunk://#diff-07a82fab001c5b336d89cb64918f0a88b6b66f03d88d67e0fa13c65202455120L286-R347) [[6]](diffhunk://#diff-07a82fab001c5b336d89cb64918f0a88b6b66f03d88d67e0fa13c65202455120L331-R417)
The image is outdated, so removing that and adding the customer showcase link. --------- Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…0: Build ID 13210800 (#33807) This is the pull request automatically created by the OneLocBuild task in the build process to check-in localized files generated based upon translation source files (.lcl files) handed-back from the downstream localization pipeline. If there are issues in translations, visit https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is https://aka.ms/onelocbuild and the localization process in general is documented at https://aka.ms/AllAboutLoc.
### Description of Change This pull request introduces a targeted update to the CI release pipeline, specifically improving support for .NET 11 manifest packs. Enhancements for .NET 11 support: * Updated the logic in `eng/pipelines/ci-official-release.yml` to correctly set the workload channel and feed for manifest packs matching `.Manifest-11.0*`, ensuring that .NET 11 releases are routed to the appropriate channel and feed.
<!-- !!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING MAIN. !!!!!!! --> ### Description of Change This pull request updates test data and test code for two monkey-related UI test cases, focusing on removing dependencies on external internet resources and cleaning up test attributes and structure. The main changes include switching image sources from URLs to local files, removing internet connectivity checks, and simplifying test code and attributes. **Test Data Updates:** - Updated all `ImageUrl` fields in the `MonkeysViewModel` (used by both issues) to reference local image files instead of external URLs, eliminating the need for internet access during tests. **Test Code Cleanup and Simplification:** - Removed internet connectivity checks and related test delays from `Issue18751Test` and `Issue18896Test`, since images are now loaded locally. [[1]](diffhunk://#diff-884f7a0a32b36cbcb351a40852f872cc408b28dbd097d2b33af52b54cc2af69aL18-L32) [[2]](diffhunk://#diff-c9606dd00ec880b1ca731f4c65f7d22cecf0e3308c1ab62d4764471ebf9087abL20-L25) - Simplified screenshot verification in `Issue18896Test` by removing the retry delay parameter. **UI Test Enhancement:** - Enabled `HasUnevenRows` in the `ListView` for `Issue18896` to better support variable item heights. ### Issues Fixed Fixes #33507
#33788) <!-- !!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING MAIN. !!!!!!! --> ### Description of Change <!-- Enter description of the fix in this section --> This pull request improves how safe area insets are handled for animated views on Android, particularly during Shell navigation transitions. The changes ensure that insets are correctly applied when views are in motion (e.g., sliding in/out), preventing visual glitches and ensuring that child views receive valid inset data. Additionally, the logic has been refactored for clarity and maintainability. **Safe Area Insets Handling Improvements:** * Added detection for animated states during Shell navigation by checking view positions relative to the screen and insets, ensuring the correct application of top and left insets when views are in transition. [[1]](diffhunk://#diff-87ce5a154873af90beed753b747eb597ff054c452499562b7b519988c12ee897L145-R183) [[2]](diffhunk://#diff-87ce5a154873af90beed753b747eb597ff054c452499562b7b519988c12ee897R197-R222) * Adjusted logic to avoid resetting padding for views that are already tracked, improving efficiency and correctness in how insets are reapplied. * Refined bottom and right inset calculations to maintain consistency with the new animation-aware logic. [[1]](diffhunk://#diff-87ce5a154873af90beed753b747eb597ff054c452499562b7b519988c12ee897R197-R222) [[2]](diffhunk://#diff-87ce5a154873af90beed753b747eb597ff054c452499562b7b519988c12ee897R234-R238) **Codebase Maintenance:** * Removed outdated logic that handled views extending beyond screen bounds, replacing it with more precise animation state checks and comments for better maintainability. * Added missing `AndroidX.Core.View` import to support new inset handling features. **Test already present in Main** ### Issues Fixed <!-- Please make sure that there is a bug logged for the issue being fixed. The bug should describe the problem and how to reproduce it. --> Fixes #33034 Fixes #32941 Fixes #33038 Fixes #33731 <!-- Are you targeting main? All PRs should target the main branch unless otherwise noted. --> --------- Co-authored-by: Shane Neuville <5375137+PureWeen@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…33845) <!-- !!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING MAIN. !!!!!!! --> ### Description of Change Add a doc comment to the maui blazor template as a follow-up to #33718 (comment) ### Issues Fixed #33718 <!-- Are you targeting main? All PRs should target the main branch unless otherwise noted. --> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: akoeplinger <1376924+akoeplinger@users.noreply.github.com>
Resolved conflicts: - eng/pipelines/ci.yml: Kept net11.0 MacOSPool configuration (Xcode 26.2 workaround)
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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
Regular merge of
mainintonet11.0to keep the branches in sync.Conflict Resolutions
eng/pipelines/ci.ymlChanges Included