Tags: dotnet/maui
Tags
[release/11.0.1xx-preview1] Merge net11.0 to release preview1 (#33924) ### Description of Change This pull request introduces major improvements to the PR agent workflow documentation and process, focusing on stricter enforcement of critical rules, clearer separation of reusable rules, and enhanced guidance for multi-model fix exploration. The changes include extracting shared rules into a dedicated file, updating workflow steps to emphasize saving (not committing) state files, and providing a comprehensive reusable plan template. Additionally, the documentation for multi-model try-fix and platform selection is significantly expanded and clarified. **Key changes:** ### Shared Rules Extraction and Enforcement - Introduced `.github/agents/pr/SHARED-RULES.md` to centralize all critical rules such as phase completion protocol, template adherence, prohibition of direct git commands, strict handling of environment blockers, multi-model configuration, and platform selection. All main workflow docs now reference this file for consistency. [[1]](diffhunk://#diff-ba3c55793886d2bb8d017dd23547f45d14ae24f43c3d7ac1ce1018aa479f28b6R1-R167) [[2]](diffhunk://#diff-f68adeaf7e902d0ee39123f55180696a6c103d1631856c26a14e3cce95c82757L44-R60) [[3]](diffhunk://#diff-638499c1b015c0699708079207ad709e0428226bab9857fda0f0a7e9454cf380L18-R25) ### Improved Workflow Guidance and Templates - Added `.github/agents/pr/PLAN-TEMPLATE.md`, a reusable checklist and quick reference for the 5-phase PR agent workflow, summarizing critical rules and providing step-by-step actions and blocker responses for each phase. - Updated `.github/agents/pr.md` and `.github/agents/pr/post-gate.md` to reference shared rules, clarify steps, and emphasize saving (not committing) state files throughout the process. [[1]](diffhunk://#diff-f68adeaf7e902d0ee39123f55180696a6c103d1631856c26a14e3cce95c82757L236-R228) [[2]](diffhunk://#diff-f68adeaf7e902d0ee39123f55180696a6c103d1631856c26a14e3cce95c82757L354-R341) [[3]](diffhunk://#diff-f68adeaf7e902d0ee39123f55180696a6c103d1631856c26a14e3cce95c82757L421-R408) [[4]](diffhunk://#diff-f68adeaf7e902d0ee39123f55180696a6c103d1631856c26a14e3cce95c82757L489-R505) [[5]](diffhunk://#diff-638499c1b015c0699708079207ad709e0428226bab9857fda0f0a7e9454cf380L18-R25) ### Multi-Model Try-Fix and Platform Selection Enhancements - Expanded and clarified instructions for Phase 4 (Fix) to require sequential try-fix runs with five specified models, including a mandatory cross-pollination loop to ensure all models are queried for new ideas until exhaustion. [[1]](diffhunk://#diff-f68adeaf7e902d0ee39123f55180696a6c103d1631856c26a14e3cce95c82757L44-R60) [[2]](diffhunk://#diff-638499c1b015c0699708079207ad709e0428226bab9857fda0f0a7e9454cf380L51-L105) - Added detailed platform selection rules to ensure tests are only run on platforms both affected by the bug and available on the host, with explicit examples and host/platform mapping tables. [[1]](diffhunk://#diff-f68adeaf7e902d0ee39123f55180696a6c103d1631856c26a14e3cce95c82757R431-R466) [[2]](diffhunk://#diff-ba3c55793886d2bb8d017dd23547f45d14ae24f43c3d7ac1ce1018aa479f28b6R1-R167) ### Consistency and Clarity Improvements - Replaced all references to "commit state file" with "save state file" to match the workflow's use of a gitignored directory and avoid confusion. [[1]](diffhunk://#diff-f68adeaf7e902d0ee39123f55180696a6c103d1631856c26a14e3cce95c82757L236-R228) [[2]](diffhunk://#diff-f68adeaf7e902d0ee39123f55180696a6c103d1631856c26a14e3cce95c82757L354-R341) [[3]](diffhunk://#diff-f68adeaf7e902d0ee39123f55180696a6c103d1631856c26a14e3cce95c82757L421-R408) [[4]](diffhunk://#diff-f68adeaf7e902d0ee39123f55180696a6c103d1631856c26a14e3cce95c82757L489-R505) - Updated bash workflow snippets and instructions to clarify that the agent is always on the correct branch and should never run git checkout/switch commands. [[1]](diffhunk://#diff-f68adeaf7e902d0ee39123f55180696a6c103d1631856c26a14e3cce95c82757L245-R237) [[2]](diffhunk://#diff-f68adeaf7e902d0ee39123f55180696a6c103d1631856c26a14e3cce95c82757L259) [[3]](diffhunk://#diff-ba3c55793886d2bb8d017dd23547f45d14ae24f43c3d7ac1ce1018aa479f28b6R1-R167) ### Additional Documentation and Process Refinements - Improved documentation for environment blocker handling, retry limits, and mandatory STOP/report/ask-user protocol when blockers are encountered. [[1]](diffhunk://#diff-ba3c55793886d2bb8d017dd23547f45d14ae24f43c3d7ac1ce1018aa479f28b6R1-R167) [[2]](diffhunk://#diff-638499c1b015c0699708079207ad709e0428226bab9857fda0f0a7e9454cf380L18-R25) - Clarified the process for applying selected fixes, emphasizing that agents should apply changes but not commit them (user handles git). These changes collectively enforce stricter process discipline, improve clarity for both human and agent contributors, and ensure that the multi-model approach and environment safety protocols are followed rigorously.
Revert "[Android] Fixed Label Overlapped by Android Status Bar When U… …sing SafeAreaEdges=\"Container\" in .NET MAUI" (#33753) > [!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! ### Description of Change This reverts PR #33285 which introduced changes to SafeAreaEdges handling on Android. ### Reverted Changes - Removed test cases: Issue32941, Issue33034, Issue33038 - Reverted SafeAreaExtensions.cs changes for detecting transitional views during Shell fragment animations - Removed associated test snapshots ### Issues Re-opened This revert will re-open: - #33034 - #32941 - #33038
Revert "Update WindowsAppSDK to 1.8 (#32174)" (#33537) Reverts the Windows App SDK update from version 1.7 to 1.8 introduced in PR #32174. ## Reverted Changes **Version downgrades:** - `MicrosoftWindowsAppSDKPackageVersion`: `1.8.251106002` → `1.7.250909003` - `MicrosoftWindowsSDKBuildToolsPackageVersion`: `10.0.26100.4654` → `10.0.22621.756` **Package references removed:** - `Microsoft.WindowsAppSDK` from `Essentials.csproj`, `Graphics.Skia.csproj`, `Graphics.Win2D.csproj` **Restored configurations:** - `Controls.Xaml.csproj`: Re-added `WINDOWS` define constant and `AppxGeneratePriEnabled=false` - `Directory.Build.targets`: Removed `GetTypeScriptCopyToOutputDirectoryItems` target - `WindowsTemplateTest.cs`: Restored original RID-based asset path logic - `windows.cake`: Restored `X509KeyUsageFlags.NonRepudiation` in certificate generation This reverts commit 5a39604. > [!WARNING] > > <details> > <summary>Firewall rules blocked me from connecting to one or more addresses (expand for details)</summary> > > #### I tried to connect to the following addresses, but was blocked by firewall rules: > > - `ghcr.io` > - Triggering command: `/tmp/dependabot-cli/dependabot/dependabot /tmp/dependabot-cli/dependabot/dependabot graph nuget org/repo --local /home/REDACTED/work/maui/maui --branch main --directory src/Controls/src/Xaml --proxy-cert /home/REDACTED/work/_temp/runtime-logs/mkcert/rootCA.pem --updater-env NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/dbot-ca.crt` (dns block) > - Triggering command: `/tmp/dependabot-cli/dependabot/dependabot /tmp/dependabot-cli/dependabot/dependabot graph nuget org/repo --local /tmp/dependabot-base-edeX71/repo --branch main --directory src/Essentials/src --proxy-cert /home/REDACTED/work/_temp/runtime-logs/mkcert/rootCA.pem --updater-env NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/dbot-ca.crt` (dns block) > - Triggering command: `/tmp/dependabot-cli/dependabot/dependabot /tmp/dependabot-cli/dependabot/dependabot graph nuget org/repo --local /home/REDACTED/work/maui/maui --branch main --directory src/Essentials/src --proxy-cert /home/REDACTED/work/_temp/runtime-logs/mkcert/rootCA.pem --updater-env NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/dbot-ca.crt` (dns block) > > If you need me to access, download, or install something from one of these locations, you can either: > > - Configure [Actions setup steps](https://gh.io/copilot/actions-setup-steps) to set up my environment, which run before the firewall is enabled > - Add the appropriate URLs or hosts to the custom allowlist in this repository's [Copilot coding agent settings](https://github.com/dotnet/maui/settings/copilot/coding_agent) (admins only) > > </details> <!-- START COPILOT CODING AGENT SUFFIX --> <!-- START COPILOT ORIGINAL PROMPT --> <details> <summary>Original prompt</summary> > can you revert the following PR ? #32174 </details> <!-- START COPILOT CODING AGENT TIPS --> --- ✨ Let Copilot coding agent [set things up for you](https://github.com/dotnet/maui/issues/new?title=✨+Set+up+Copilot+instructions&body=Configure%20instructions%20for%20this%20repository%20as%20documented%20in%20%5BBest%20practices%20for%20Copilot%20coding%20agent%20in%20your%20repository%5D%28https://gh.io/copilot-coding-agent-tips%29%2E%0A%0A%3COnboard%20this%20repo%3E&assignees=copilot) — coding agent works faster and does higher quality work when set up for your repo. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
[release/10.0.1xx-sr2] [iOS, macOS] Fixed CollectionView group header… … size changes with ItemSizingStrategy (#33166) Backport of #33161 to release/10.0.1xx-sr2 /cc @PureWeen @NanthiniMahalingam --------- Co-authored-by: NanthiniMahalingam <105482474+NanthiniMahalingam@users.noreply.github.com>
[release/10.0.1xx-sr1] Fix SafeAreaEdges.SoftInput applying bottom pa… …dding when keyboard is hidden and inset consumption issue (#32448) * Initial plan * - Fix Bottom Inset when keyboard is closed * Remove CurrentSettings element checks that were causing test timeouts Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>
PreviousNext