[automated] Merge branch 'main' => 'net11.0'

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -42,7 +42,9 @@ body:
       label: Version with bug
       description: In what version do you see this issue? Run `dotnet workload list` to find your version.
       options:
+        - 11.0.0-preview2
         - 11.0.0-preview.1
+        - 10.0.50
         - 10.0.40
         - 10.0.30
         - 10.0.20
@@ -162,7 +164,9 @@ body:
         - 10.0.20   
         - 10.0.30
         - 10.0.40
-        - 11.0.0-preview.1
+        - 10.0.50
+        - 11.0.0-preview.1        
+        - 11.0.0-preview.2
     validations:
       required: true
   - type: dropdown

.github/README-AI.md

@@ -4,8 +4,8 @@ This folder contains instructions and configurations for AI coding assistants wo
 
 ## Available Agents
 
-### PR Agent
-The PR agent is a unified 4-phase workflow for investigating issues and reviewing/working on PRs. It handles everything from context gathering through test verification, fix exploration, and creating PRs or review reports.
+### PR Review Agent
+The pr-review skill is a 4-phase orchestrator for investigating issues and reviewing/working on PRs. It invokes dedicated phase skills (pr-preflight, pr-gate, try-fix, pr-report) for context gathering, test verification, fix exploration, and review reports.
 
 ### Sandbox Agent
 The sandbox agent is your general-purpose tool for working with the .NET MAUI Sandbox app. Use it for manual testing, PR validation, issue reproduction, and experimentation with MAUI features.
@@ -84,13 +84,13 @@ copilot
 please write UI tests for issue #12345
 ```
 
-**PR Agent:**
+**Try-Fix-Validate Agent:**
 ```bash
 # Start GitHub Copilot CLI with agent support
 copilot
 
-# Invoke the pr agent
-/agent pr
+# Invoke the pr-review skill
+/skill pr-review
 
 # Fix an issue or review a PR
 please fix issue #12345
@@ -112,7 +112,7 @@ please review https://github.com/dotnet/maui/pull/XXXXX
 3. **Choose your agent** from the dropdown:
    - `sandbox-agent` for manual testing and experimentation
    - `write-tests-agent` for writing tests (invokes appropriate skill)
-   - `pr` for reviewing and working on existing PRs
+   - `pr-review skill` for reviewing and working on existing PRs
 
 4. **Enter a task** in the text box:
    - For sandbox testing: `Please test PR #32479`
@@ -146,9 +146,9 @@ Automated testing specialist for the .NET MAUI test suite:
 4. **Cross-Platform** - Tests on iOS, Android, Windows, and MacCatalyst
 5. **Automated Workflow** - Uses `BuildAndRunHostApp.ps1` to handle building, deployment, and logging to `CustomAgentLogsTmp/UITests/`
 
-### PR Agent
+### PR Review Agent
 
-Unified 4-phase workflow for issue investigation and PR work:
+Unified 4-phase orchestrator for issue investigation and PR work:
 
 1. **Pre-Flight** - Context gathering from issues/PRs
 2. **Gate** - Verify tests exist and catch the issue (mandatory checkpoint)
@@ -199,18 +199,18 @@ Agents work with **time budgets as estimates for planning**, not hard deadlines:
 
 ## File Structure
 
-### Agent Definitions
-- **`agents/pr.md`** - PR workflow phases 1-2 (Pre-Flight, Gate)
-- **`agents/pr/post-gate.md`** - PR workflow phases 3-4 (Fix, Report)
+### Agent & Skill Definitions
+- **`skills/pr-review/SKILL.md`** - PR Review orchestrator (invokes phase docs and try-fix skill)
+- **`pr-review/pr-preflight.md`** - Phase 1: Context gathering (phase doc, not a standalone skill)
+- **`pr-review/pr-gate.md`** - Phase 2: Test verification (phase doc, not a standalone skill)
+- **`pr-review/pr-report.md`** - Phase 4: Final recommendation (phase doc, not a standalone skill)
 - **`agents/sandbox-agent.md`** - Sandbox agent for testing and experimentation
 - **`agents/write-tests-agent.md`** - Test writing agent (dispatches to skills like write-ui-tests)
 
 ### Agent Files
 
 Agent files in the `.github/agents/` directory:
 
-- **`agents/pr.md`** - PR workflow phases 1-2 (Pre-Flight, Gate)
-- **`agents/pr/post-gate.md`** - PR workflow phases 3-4 (Fix, Report)
 - **`agents/sandbox-agent.md`** - Sandbox app testing and experimentation
 - **`agents/write-tests-agent.md`** - Test writing (invokes skills like write-ui-tests)
 
@@ -250,12 +250,12 @@ Reusable skills in `.github/skills/` that agents can invoke:
 - **`verify-tests-fail-without-fix/`** - Verifies UI tests catch bugs (auto-detects mode based on git diff)
 - **`write-ui-tests/`** - Creates UI tests for issues following MAUI conventions
 - **`write-xaml-tests/`** - Creates XAML unit tests for parsing, XamlC, and source generation issues
-- **`pr-build-status/`** - Retrieves Azure DevOps build status for PRs
+- **`azdo-build-investigator/`** - Investigates CI failures for PRs (build errors, Helix test logs, binlog analysis) via dotnet/arcade-skills plugin
 
 ### Recent Improvements (January 2026)
 
-**PR Agent Consolidation:**
-1. **Unified PR Agent** - Replaced separate `issue-resolver` and `pr-reviewer` agents with single 4-phase `pr` agent
+**Agent Consolidation:**
+1. **Unified PR Review Orchestrator** - Replaced separate `issue-resolver` and `pr-reviewer` agents with 4-phase `pr-review` skill that orchestrates `pr-preflight`, `pr-gate`, `try-fix`, and `pr-report` phase skills
 2. **try-fix Skill** - New skill for exploring independent fix alternatives with empirical testing
 3. **Skills Integration** - Added `verify-tests-fail-without-fix` and `write-ui-tests` skills for reusable test workflows
 4. **Agent/Skills Guidelines** - New instruction files for authoring agents and skills
@@ -364,8 +364,8 @@ For issues or questions about the AI agent instructions:
 ## Metrics
 
 **Agent Files**:
-- 4 agent files (pr.md, pr/post-gate.md, sandbox-agent.md, write-tests-agent.md)
-- 5 skills (try-fix, verify-tests-fail-without-fix, write-ui-tests, write-xaml-tests, pr-build-status)
+- 4 agent files (pr-review skill.md, sandbox-agent.md, write-tests-agent.md)
+- 5 skills (pr-review, try-fix, verify-tests-fail-without-fix, write-ui-tests, write-xaml-tests, azdo-build-investigator) + 3 phase docs (pr-preflight, pr-gate, pr-report)
 - All validated and consistent with consolidated structure
 
 **Automation**:
@@ -383,4 +383,4 @@ For issues or questions about the AI agent instructions:
 
 **Last Updated**: 2026-01-07
 
-**Note**: These instructions are actively being refined based on real-world usage. PR agent consolidation completed January 2026 (unified 4-phase workflow with try-fix skill). Feedback and improvements are welcome!
+**Note**: These instructions are actively being refined based on real-world usage. Agent consolidation completed January 2026 (unified 4-phase workflow with try-fix skill). Feedback and improvements are welcome!

.github/agent-pr-session/pr-31487.md

@@ -0,0 +1,261 @@
+# PR Review: #31487 - [Android] Fixed duplicate title icon when setting TitleIconImageSource Multiple times
+
+**Date:** 2026-01-08 | **Issue:** [#31445](https://github.com/dotnet/maui/issues/31445) | **PR:** [#31487](https://github.com/dotnet/maui/pull/31487)
+
+## ✅ Final Recommendation: APPROVE
+
+| Phase | Status |
+|-------|--------|
+| Pre-Flight | ✅ COMPLETE |
+| 🧪 Tests | ✅ COMPLETE |
+| 🚦 Gate | ✅ PASSED |
+| 🔧 Fix | ✅ COMPLETE |
+| 📋 Report | ✅ COMPLETE |
+
+---
+
+<details>
+<summary><strong>📋 Issue Summary</strong></summary>
+
+On Android, calling `NavigationPage.SetTitleIconImageSource(page, "image.png")` more than once for the same page results in the icon being rendered multiple times in the navigation bar.
+
+**Steps to Reproduce:**
+1. Launch app on Android
+2. Tap "Set TitleIconImageSource" once: icon appears
+3. Tap it again: a second identical icon appears
+
+**Expected:** Single toolbar icon regardless of how many times SetTitleIconImageSource is called.
+
+**Actual:** Each repeated call adds an additional duplicate icon.
+
+**Platforms Affected:**
+- [ ] iOS
+- [x] Android
+- [ ] Windows
+- [ ] MacCatalyst
+
+**Version:** 9.0.100 SR10
+
+</details>
+
+<details>
+<summary><strong>📁 Files Changed</strong></summary>
+
+| File | Type | Changes |
+|------|------|---------|
+| `src/Controls/src/Core/Platform/Android/Extensions/ToolbarExtensions.cs` | Fix | +17/-6 |
+| `src/Controls/tests/TestCases.HostApp/Issues/Issue31445.cs` | Test | +38 |
+| `src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue31445.cs` | Test | +23 |
+| `snapshots/android/Issue31445DuplicateTitleIconDoesNotAppear.png` | Snapshot | binary |
+| `snapshots/mac/Issue31445DuplicateTitleIconDoesNotAppear.png` | Snapshot | binary |
+| `snapshots/windows/Issue31445DuplicateTitleIconDoesNotAppear.png` | Snapshot | binary |
+| `snapshots/ios/Issue31445DuplicateTitleIconDoesNotAppear.png` | Snapshot | binary |
+
+</details>
+
+<details>
+<summary><strong>💬 PR Discussion Summary</strong></summary>
+
+**Key Comments:**
+- Issue verified by LogishaSelvarajSF4525 on MAUI 9.0.0 & 9.0.100
+- PR triggered UI tests by jsuarezruiz
+- PureWeen requested rebase
+
+**Reviewer Feedback:**
+- Copilot review: Suggested testing with different image sources or rapid succession to validate fix better
+
+**Disagreements to Investigate:**
+| File:Line | Reviewer Says | Author Says | Status |
+|-----------|---------------|-------------|--------|
+| Issue31445.cs:31 | Test with different images or rapid calls | N/A | ⚠️ INVESTIGATE |
+
+**Author Uncertainty:**
+- None noted
+
+</details>
+
+<details>
+<summary><strong>🧪 Tests</strong></summary>
+
+**Status**: ✅ COMPLETE
+
+- [x] PR includes UI tests
+- [x] Tests reproduce the issue
+- [x] Tests follow naming convention (`Issue31445`)
+
+**Test Files:**
+- HostApp: `src/Controls/tests/TestCases.HostApp/Issues/Issue31445.cs`
+- NUnit: `src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue31445.cs`
+
+**Test Behavior:**
+- Uses snapshot verification (`VerifyScreenshot()`)
+- Navigates to test page, taps button to trigger duplicate icon scenario
+- Verified to compile successfully
+
+</details>
+
+<details>
+<summary><strong>🚦 Gate - Test Verification</strong></summary>
+
+**Status**: ✅ PASSED
+
+- [x] Tests FAIL without fix (bug reproduced - duplicate icons appeared)
+- [x] Tests PASS with fix (single icon as expected)
+
+**Result:** PASSED ✅
+
+**Verification Details:**
+- Platform: Android (emulator-5554)
+- Without fix: Test FAILED (screenshot mismatch - duplicate icons)
+- With fix: Test PASSED (single icon verified)
+
+</details>
+
+<details>
+<summary><strong>🔧 Fix Candidates</strong></summary>
+
+**Status**: ✅ COMPLETE
+
+| # | Source | Approach | Test Result | Files Changed | Model | Notes |
+|---|--------|----------|-------------|---------------|-------|-------|
+| 1 | try-fix | Check for existing icon view at position 0, reuse if exists, only create new if needed | ✅ PASS | `ToolbarExtensions.cs` (+7) | Opus 4.5 | Works! Independently arrived at same solution logic as PR |
+| 2 | try-fix | Dedupe defensively by scanning all toolbar children, keep first `ToolbarTitleIconImageView`, remove extras; then reuse/create | ✅ PASS | `ToolbarExtensions.cs` (+22/-5) | GPT 5.2 | More robust if child ordering changes or duplicates already exist |
+| 3 | try-fix | Use `FindViewWithTag` to uniquely identify/retrieve the MAUI title icon | ✅ PASS | `ToolbarExtensions.cs` (+20/-6) | Gemini 2.0 Flash | Explicit identification; avoids index assumptions and iteration; most robust against external view insertions |
+| PR | PR #31487 | Check for existing ToolbarTitleIconImageView before adding new one | ✅ PASS (Gate) | `ToolbarExtensions.cs` (+17/-6) | Author | Original PR - validated by Gate |
+
+**Exhausted:** Yes (3 passing alternatives found)
+
+**Selected Fix:** PR's fix - It’s simplest and sufficient.
+- #3 (Tag) is the most "correct" for robustness but adds Tag management overhead.
+- #2 (Dedupe) is good for cleanup.
+- PR/#1 (Index 0) are standard for this codebase's patterns.
+
+**Comparison Notes:**
+- PR/try-fix #1 rely on `GetChildAt(0)` being the title icon view when present
+- try-fix #2 is more defensive: it collapses existing duplicates regardless of child index and then reuses/creates as needed
+- try-fix #3 uses explicit tagging: precise but introduces new state (Tag) to manage
+
+</details>
+
+---
+
+**Next Step:** Propose Alternative Fix #2 (Dedupe & Scan) to Author for Discussion
+
+---
+
+## 💬 Draft Comment for Author
+
+Hi @PureWeen,
+
+Reviewing the fix in this PR, it works correctly for the reported issue and tests pass.
+
+I explored a couple of alternative approaches and found one that might offer slightly better robustness against edge cases, which I wanted to run by you:
+
+**Alternative: Dedupe & Scan**
+Instead of just checking index 0, we could scan all children of the toolbar to find any `ToolbarTitleIconImageView` instances.
+
+```csharp
+// Scan all children to find existing title icons
+ToolbarTitleIconImageView? titleIcon = null;
+for (int i = 0; i < nativeToolbar.ChildCount; i++)
+{
+    var child = nativeToolbar.GetChildAt(i);
+    if (child is ToolbarTitleIconImageView icon)
+    {
+        if (titleIcon == null)
+            titleIcon = icon; // Keep the first one found
+        else
+            nativeToolbar.RemoveView(icon); // Remove any extras (self-healing)
+    }
+}
+```
+
+**Why consider this?**
+1.  **Robustness against Injection:** If another library inserts a view at index 0 (e.g., search bar), the current PR fix (checking only index 0) would fail to see the existing icon and create a duplicate.
+2.  **Self-Healing:** If the toolbar is already in a bad state (multiple icons from previous bugs), this approach cleans them up.
+
+**Trade-off:**
+It involves a loop, so O(N) instead of O(1), but for a toolbar with very few items, this is negligible.
+
+Do you think the added robustness is worth the change, or should we stick to the simpler Index 0 check (current PR) which matches the existing removal logic?
+
+---
+
+## 📋 Final Report
+
+### Summary
+
+PR #31487 correctly fixes the duplicate title icon issue on Android. The fix checks for an existing `ToolbarTitleIconImageView` at position 0 before creating a new one, preventing duplicate icons when `SetTitleIconImageSource` is called multiple times.
+
+### Root Cause
+
+The original `UpdateTitleIcon` method always created a new `ToolbarTitleIconImageView` and added it to position 0, without checking if one already existed. This caused duplicate icons when the method was called repeatedly.
+
+### Validation
+
+| Check | Result |
+|-------|--------|
+| Tests reproduce bug | ✅ Test fails without fix (duplicate icons) |
+| Tests pass with fix | ✅ Test passes with fix (single icon) |
+| Independent fix analysis | ✅ try-fix arrived at same solution |
+| Code quality | ✅ Clean, minimal change |
+
+### Regression Analysis
+
+<details>
+<summary><strong>📜 Git History Analysis</strong></summary>
+
+**Original Implementation:** `e2f3aaa222` (Oct 2021) by Shane Neuville
+- Part of "[Android] ToolbarHandler and fixes for various page nesting scenarios (#2781)"
+- The bug has existed since the original implementation - it was never designed to handle repeated calls
+
+**Key Finding:** The original code had a check for removing an existing icon when source is null/empty:
+```csharp
+if (nativeToolbar.GetChildAt(0) is ToolbarTitleIconImageView existingImageView)
+    nativeToolbar.RemoveView(existingImageView);
+```
+But this check was **only in the removal path**, not in the creation path. The fix extends this pattern to also check before adding.
+
+**Related Toolbar Issues in This File:**
+| Commit | Issue | Description |
+|--------|-------|-------------|
+| `a93e88c3de` | #7823 | Fix toolbar item icon not removed when navigating |
+| `c04b7d79cc` | #19673 | Fixed android toolbar icon change |
+| `158ed8b4f1` | #28767 | Removing outdated menu items after activity switch |
+
+**Pattern:** Multiple fixes in this file address issues where Android toolbar state isn't properly cleaned up or reused. This PR follows the same pattern.
+
+</details>
+
+<details>
+<summary><strong>🔄 Platform Comparison</strong></summary>
+
+| Platform | TitleIcon Implementation | Duplicate Prevention |
+|----------|-------------------------|---------------------|
+| **Android** | Creates `ToolbarTitleIconImageView`, adds to position 0 | ❌ Was missing (now fixed by PR) |
+| **Windows** | Sets `TitleIconImageSource` property directly | ✅ Property-based, no duplicates possible |
+| **iOS** | Uses `NavigationRenderer` with property binding | ✅ Property-based approach |
+
+**Why Android was vulnerable:** Android uses a view-based approach (adding/removing child views) while other platforms use property-based approaches. View management requires explicit duplicate checks.
+
+</details>
+
+<details>
+<summary><strong>⚠️ Risk Assessment</strong></summary>
+
+**Regression Risk: LOW**
+
+1. **Minimal change** - Only modifies the creation logic, doesn't change removal
+2. **Consistent pattern** - Uses same `GetChildAt(0)` check that already existed for removal
+3. **Well-tested** - UI test verifies the specific scenario
+4. **No side effects** - Reusing existing view is safe; `SetImageDrawable` handles updates
+
+**Potential Edge Cases (from Copilot review suggestion):**
+- Setting different image sources rapidly → Should work fine, image is updated on existing view
+- Setting same source multiple times → Explicitly tested, works correctly
+
+</details>
+
+### Recommendation
+
+**✅ APPROVE** - The PR's approach is correct and validated by independent analysis. The fix is minimal, focused, and addresses the root cause.

.github/agents/learn-from-pr.md

@@ -89,7 +89,6 @@ Present a summary:
 | Situation | Action |
 |-----------|--------|
 | PR not found | Ask user to verify PR number |
-| No session markdown | Proceed with PR diff analysis only |
 | Target file doesn't exist | Create if instruction/architecture doc, skip if code |
 | Duplicate content exists | Skip, note in report |
 | Unclear where to add | Ask user for guidance |