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

.config/dotnet-tools.json

@@ -24,7 +24,7 @@
       "rollForward": false
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "11.0.0-prerelease.26064.3",
+      "version": "11.0.0-prerelease.26230.4",
       "commands": [
         "xharness"
       ],

.gitattributes

@@ -18,3 +18,5 @@
 
 # avoid overriding GitInfo.txt on merge
 GitInfo.txt merge=ours
+
+.github/workflows/*.lock.yml linguist-generated=true merge=ours

.github/DEVELOPMENT.md

@@ -47,7 +47,7 @@ As a general rule:
 
 Use ‘main’ for bug fixes that don’t require API changes. For new features and changes to public APIs, you must use the branch of the next .NET version.
 
-- [net10.0](https://github.com/dotnet/maui/tree/net10.0)
+- [net11.0](https://github.com/dotnet/maui/tree/net11.0)
 
 ## Sample projects
 

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -42,6 +42,17 @@ 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-preview.5
+        - 11.0.0-preview.4
+        - 11.0.0-preview.3
+        - 11.0.0-preview.2
+        - 11.0.0-preview.1
+        - 10.0.80
+        - 10.0.71
+        - 10.0.70
+        - 10.0.60
+        - 10.0.50
+        - 10.0.40
         - 10.0.30
         - 10.0.20
         - 10.0.11
@@ -159,6 +170,17 @@ body:
         - 10.0.11
         - 10.0.20   
         - 10.0.30
+        - 10.0.40
+        - 10.0.50
+        - 10.0.60
+        - 10.0.70
+        - 10.0.71
+        - 10.0.80
+        - 11.0.0-preview.1        
+        - 11.0.0-preview.2   
+        - 11.0.0-preview.3
+        - 11.0.0-preview.4
+        - 11.0.0-preview.5
     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 5-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,15 +146,14 @@ 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 5-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. **Tests** - Create or verify reproduction tests exist
-3. **Gate** - Verify tests catch the issue (mandatory checkpoint)
-4. **Fix** - Explore fix alternatives using `try-fix` skill, compare approaches
-5. **Report** - Create PR or write review report
+2. **Gate** - Verify tests exist and catch the issue (mandatory checkpoint)
+3. **Fix** - Explore fix alternatives using `try-fix` skill, compare approaches
+4. **Report** - Create PR or write review report
 
 ### When Agents Pause
 
@@ -200,20 +199,22 @@ Agents work with **time budgets as estimates for planning**, not hard deadlines:
 
 ## File Structure
 
-### Agent Definitions
-- **`agents/pr.md`** - PR workflow phases 1-3 (Pre-Flight, Tests, Gate)
-- **`agents/pr/post-gate.md`** - PR workflow phases 4-5 (Fix, Report)
-- **`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 & 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.agent.md`** - Sandbox agent for testing and experimentation
+- **`agents/write-tests-agent.agent.md`** - Test writing agent (dispatches to skills like write-ui-tests)
+- **`agents/learn-from-pr.agent.md`** - Extracts lessons from PRs and applies improvements
 
 ### Agent Files
 
 Agent files in the `.github/agents/` directory:
 
-- **`agents/pr.md`** - PR workflow phases 1-3 (Pre-Flight, Tests, Gate)
-- **`agents/pr/post-gate.md`** - PR workflow phases 4-5 (Fix, Report)
-- **`agents/sandbox-agent.md`** - Sandbox app testing and experimentation
-- **`agents/write-tests-agent.md`** - Test writing (invokes skills like write-ui-tests)
+- **`agents/sandbox-agent.agent.md`** - Sandbox app testing and experimentation
+- **`agents/write-tests-agent.agent.md`** - Test writing (invokes skills like write-ui-tests)
+- **`agents/learn-from-pr.agent.md`** - Extracts PR lessons and applies repo improvements
 
 ### Shared Instruction Files
 
@@ -251,12 +252,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 5-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
@@ -365,8 +366,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)
+- 3 agent files (sandbox-agent.agent.md, write-tests-agent.agent.md, learn-from-pr.agent.md)
+- 15 skills (pr-review, try-fix, verify-tests-fail-without-fix, write-ui-tests, write-xaml-tests, azdo-build-investigator, code-review, evaluate-pr-tests, find-reviewable-pr, issue-triage, learn-from-pr, pr-finalize, run-device-tests, run-helix-tests, run-integration-tests) + 3 phase docs (pr-preflight, pr-gate, pr-report)
 - All validated and consistent with consolidated structure
 
 **Automation**:
@@ -384,4 +385,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 5-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!