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

.github/copilot-instructions.md

@@ -212,20 +212,6 @@ git commit -m "Fix: Description of the change"
 - `.github/instructions/android.instructions.md` - Android handler implementation
 - `.github/instructions/xaml-unittests.instructions.md` - XAML unit test guidelines
 
-### Opening PRs
-
-All PRs are required to have this at the top of the description:
-
-```
-<!-- Please let the below note in for people that find this PR -->
-> [!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!
-```
-
-Always put that at the top, without the block quotes. Without it, users will NOT be able to try the PR and your work will have been in vain!
-
-
 
 ## Custom Agents and Skills
 

.github/scripts/BuildAndRunHostApp.ps1

@@ -349,7 +349,8 @@ Write-Step "Collecting test artifacts (screenshots, page source)..."
 $testAssemblyDirs = @(
     (Join-Path $RepoRoot "artifacts/bin/Controls.TestCases.Android.Tests/Debug/net10.0"),
     (Join-Path $RepoRoot "artifacts/bin/Controls.TestCases.iOS.Tests/Debug/net10.0"),
-    (Join-Path $RepoRoot "artifacts/bin/Controls.TestCases.Mac.Tests/Debug/net10.0")
+    (Join-Path $RepoRoot "artifacts/bin/Controls.TestCases.Mac.Tests/Debug/net10.0"),
+    (Join-Path $RepoRoot "artifacts/bin/Controls.TestCases.WinUI.Tests/Debug/net10.0-windows10.0.19041.0")
 )
 
 $copiedCount = 0
@@ -441,6 +442,8 @@ if (Test-Path $deviceLogFile) {
         Write-Host "  iOS Simulator Logs (Last 100 lines)" -ForegroundColor Cyan
     } elseif ($Platform -eq "catalyst") {
         Write-Host "  MacCatalyst App Logs (Last 100 lines)" -ForegroundColor Cyan
+    } elseif ($Platform -eq "windows") {
+        Write-Host "  Windows App Logs (Last 100 lines)" -ForegroundColor Cyan
     }
     Write-Host "═══════════════════════════════════════════════════════" -ForegroundColor Cyan
 

.github/scripts/Review-PR.ps1

@@ -43,7 +43,7 @@ param(
     [int]$PRNumber,
 
     [Parameter(Mandatory = $false)]
-    [ValidateSet('android', 'ios', 'windows', 'maccatalyst')]
+    [ValidateSet('android', 'ios', 'windows', 'maccatalyst', 'catalyst')]
     [string]$Platform,
 
     [Parameter(Mandatory = $false)]
@@ -482,12 +482,20 @@ $summaryScriptsDir = Join-Path $RepoRoot ".github/scripts"
 $dryRunFlag = if ($DryRun) { @('-DryRun') } else { @() }
 
 # 3a: Post PR review phases (pre-flight, gate, try-fix, report)
+$aiSummaryCommentId = $null
 $reviewScript = Join-Path $summaryScriptsDir "post-ai-summary-comment.ps1"
 if (Test-Path $reviewScript) {
     try {
         Write-Host "  📝 Posting PR review summary..." -ForegroundColor Cyan
-        & $reviewScript -PRNumber $PRNumber @dryRunFlag
-        Write-Host "  ✅ PR review summary posted" -ForegroundColor Green
+        $reviewOutput = & $reviewScript -PRNumber $PRNumber @dryRunFlag
+        # Capture comment ID from script output (format: COMMENT_ID=<id>)
+        $idLine = $reviewOutput | Where-Object { $_ -match '^COMMENT_ID=' } | Select-Object -Last 1
+        if ($idLine -match '^COMMENT_ID=(\d+)$') {
+            $aiSummaryCommentId = $Matches[1]
+            Write-Host "  ✅ PR review summary posted (comment ID: $aiSummaryCommentId)" -ForegroundColor Green
+        } else {
+            Write-Host "  ✅ PR review summary posted" -ForegroundColor Green
+        }
     } catch {
         Write-Host "  ⚠️ PR review summary posting failed (non-fatal): $_" -ForegroundColor Yellow
     }
@@ -500,7 +508,11 @@ $finalizeScript = Join-Path $summaryScriptsDir "post-pr-finalize-comment.ps1"
 if (Test-Path $finalizeScript) {
     try {
         Write-Host "  📝 Posting PR finalize summary..." -ForegroundColor Cyan
-        & $finalizeScript -PRNumber $PRNumber @dryRunFlag
+        $finalizeArgs = @('-PRNumber', $PRNumber) + $dryRunFlag
+        if ($aiSummaryCommentId) {
+            $finalizeArgs += @('-ExistingCommentId', $aiSummaryCommentId)
+        }
+        & $finalizeScript @finalizeArgs
         Write-Host "  ✅ PR finalize summary posted" -ForegroundColor Green
     } catch {
         Write-Host "  ⚠️ PR finalize summary posting failed (non-fatal): $_" -ForegroundColor Yellow

.github/scripts/post-ai-summary-comment.ps1

@@ -831,19 +831,43 @@ if ($existingComment) {
     $tempFile = [System.IO.Path]::GetTempFileName()
     @{ body = $commentBody } | ConvertTo-Json -Depth 10 | Set-Content -Path $tempFile -Encoding UTF8
 
-    gh api --method PATCH "repos/dotnet/maui/issues/comments/$($existingComment.id)" --input $tempFile | Out-Null
-    Remove-Item $tempFile
+    $patchResult = $null
+    $commentId = $existingComment.id
+    try {
+        $patchResult = gh api --method PATCH "repos/dotnet/maui/issues/comments/$($existingComment.id)" --input $tempFile 2>&1
+        if ($LASTEXITCODE -ne 0) { throw "PATCH failed (exit code $LASTEXITCODE): $patchResult" }
+        Write-Host "✅ Review comment updated successfully" -ForegroundColor Green
+    } catch {
+        Write-Host "⚠️ Could not update comment (no edit permission?) — creating new comment instead: $_" -ForegroundColor Yellow
+
+        $newTempFile = [System.IO.Path]::GetTempFileName()
+        try {
+            @{ body = $commentBody } | ConvertTo-Json -Depth 10 | Set-Content -Path $newTempFile -Encoding UTF8
+            $newCommentJson = gh api --method POST "repos/dotnet/maui/issues/$PRNumber/comments" --input $newTempFile
+            $commentId = ($newCommentJson | ConvertFrom-Json).id
+            Write-Host "✅ Review comment posted as new (ID: $commentId)" -ForegroundColor Green
+        } finally {
+            Remove-Item $newTempFile -ErrorAction SilentlyContinue
+        }
+    } finally {
+        Remove-Item $tempFile -ErrorAction SilentlyContinue
+    }
 
-    Write-Host "✅ Review comment updated successfully" -ForegroundColor Green
+    # Output the comment ID so callers can pass it to subsequent scripts
+    Write-Output "COMMENT_ID=$commentId"
 } else {
     Write-Host "Creating new review comment..." -ForegroundColor Yellow
 
     # Create temp file for new comment
     $tempFile = [System.IO.Path]::GetTempFileName()
     @{ body = $commentBody } | ConvertTo-Json -Depth 10 | Set-Content -Path $tempFile -Encoding UTF8
 
-    gh api --method POST "repos/dotnet/maui/issues/$PRNumber/comments" --input $tempFile | Out-Null
+    $newCommentJson = gh api --method POST "repos/dotnet/maui/issues/$PRNumber/comments" --input $tempFile
     Remove-Item $tempFile
 
-    Write-Host "✅ Review comment posted successfully" -ForegroundColor Green
+    # Extract and output the new comment ID so callers can pass it to subsequent scripts
+    $newCommentId = ($newCommentJson | ConvertFrom-Json).id
+    Write-Host "✅ Review comment posted successfully (ID: $newCommentId)" -ForegroundColor Green
+
+    Write-Output "COMMENT_ID=$newCommentId"
 }

.github/scripts/post-pr-finalize-comment.ps1

@@ -39,6 +39,9 @@ param(
     [Parameter(Mandatory=$false)]
     [string]$SummaryFile,
 
+    [Parameter(Mandatory=$false)]
+    [string]$ExistingCommentId,
+
     [Parameter(Mandatory=$false)]
     [switch]$DryRun,
 
@@ -128,21 +131,41 @@ Write-Host "`nInjecting into AI Summary comment on #$PRNumber..." -ForegroundCol
 
 # Find existing unified comment
 $existingUnifiedComment = $null
-try {
-    $commentsJson = gh api "repos/dotnet/maui/issues/$PRNumber/comments?per_page=100" 2>$null
-    $comments = $commentsJson | ConvertFrom-Json
-    foreach ($comment in $comments) {
-        if ($comment.body -match [regex]::Escape($MAIN_MARKER)) {
-            $existingUnifiedComment = $comment
-            Write-Host "✓ Found unified AI Summary comment (ID: $($comment.id))" -ForegroundColor Green
-            break
+
+# If caller passed the comment ID (avoids GitHub API eventual-consistency race), fetch it directly
+if (-not [string]::IsNullOrWhiteSpace($ExistingCommentId)) {
+    try {
+        $commentJson = gh api "repos/dotnet/maui/issues/comments/$ExistingCommentId" 2>$null
+        $directComment = $commentJson | ConvertFrom-Json
+        if ($directComment.body -match [regex]::Escape($MAIN_MARKER)) {
+            $existingUnifiedComment = $directComment
+            Write-Host "✓ Found unified AI Summary comment via passed ID (ID: $($directComment.id))" -ForegroundColor Green
+        } else {
+            Write-Host "⚠️ Passed comment ID $ExistingCommentId does not contain AI Summary marker — falling back to search" -ForegroundColor Yellow
         }
+    } catch {
+        Write-Host "⚠️ Could not fetch comment by ID $ExistingCommentId — falling back to search" -ForegroundColor Yellow
     }
-    if (-not $existingUnifiedComment) {
-        Write-Host "✓ No existing AI Summary comment found — will create new" -ForegroundColor Yellow
+}
+
+# Fallback: search through all PR comments
+if (-not $existingUnifiedComment) {
+    try {
+        $commentsJson = gh api "repos/dotnet/maui/issues/$PRNumber/comments?per_page=100" 2>$null
+        $comments = $commentsJson | ConvertFrom-Json
+        foreach ($comment in $comments) {
+            if ($comment.body -match [regex]::Escape($MAIN_MARKER)) {
+                $existingUnifiedComment = $comment
+                Write-Host "✓ Found unified AI Summary comment (ID: $($comment.id))" -ForegroundColor Green
+                break
+            }
+        }
+        if (-not $existingUnifiedComment) {
+            Write-Host "✓ No existing AI Summary comment found — will create new" -ForegroundColor Yellow
+        }
+    } catch {
+        Write-Host "⚠️ Could not fetch comments: $_" -ForegroundColor Yellow
     }
-} catch {
-    Write-Host "⚠️ Could not fetch comments: $_" -ForegroundColor Yellow
 }
 
 # Build the final comment body
@@ -186,14 +209,38 @@ if ($DryRun) {
 $tempFile = [System.IO.Path]::GetTempFileName()
 @{ body = $finalComment } | ConvertTo-Json -Depth 10 | Set-Content -Path $tempFile -Encoding UTF8
 
-if ($existingUnifiedComment) {
-    Write-Host "Updating unified comment ID $($existingUnifiedComment.id)..." -ForegroundColor Yellow
-    $result = gh api --method PATCH "repos/dotnet/maui/issues/comments/$($existingUnifiedComment.id)" --input $tempFile --jq '.html_url'
-    Write-Host "✅ PR finalize section updated: $result" -ForegroundColor Green
-} else {
-    Write-Host "Creating new unified comment on PR #$PRNumber..." -ForegroundColor Yellow
-    $result = gh api --method POST "repos/dotnet/maui/issues/$PRNumber/comments" --input $tempFile --jq '.html_url'
-    Write-Host "✅ Unified comment posted: $result" -ForegroundColor Green
-}
+try {
+    if ($existingUnifiedComment) {
+        Write-Host "Updating unified comment ID $($existingUnifiedComment.id)..." -ForegroundColor Yellow
+        $patchResult = $null
+        try {
+            $patchResult = gh api --method PATCH "repos/dotnet/maui/issues/comments/$($existingUnifiedComment.id)" --input $tempFile --jq '.html_url' 2>&1
+            if ($LASTEXITCODE -ne 0) { throw "PATCH failed (exit code $LASTEXITCODE): $patchResult" }
+            Write-Host "✅ PR finalize section updated: $patchResult" -ForegroundColor Green
+        } catch {
+            Write-Host "⚠️ Could not update comment (no edit permission?) — creating new comment instead: $_" -ForegroundColor Yellow
+            # Rebuild the comment body as a standalone new comment (not an injection into existing)
+            $standaloneBody = @"
+$MAIN_MARKER
 
-Remove-Item $tempFile
+## 🤖 AI Summary
+
+$finalizeSection
+"@
+            $standaloneTempFile = [System.IO.Path]::GetTempFileName()
+            try {
+                @{ body = $standaloneBody } | ConvertTo-Json -Depth 10 | Set-Content -Path $standaloneTempFile -Encoding UTF8
+                $result = gh api --method POST "repos/dotnet/maui/issues/$PRNumber/comments" --input $standaloneTempFile --jq '.html_url'
+                Write-Host "✅ Unified comment posted (new): $result" -ForegroundColor Green
+            } finally {
+                Remove-Item $standaloneTempFile -ErrorAction SilentlyContinue
+            }
+        }
+    } else {
+        Write-Host "Creating new unified comment on PR #$PRNumber..." -ForegroundColor Yellow
+        $result = gh api --method POST "repos/dotnet/maui/issues/$PRNumber/comments" --input $tempFile --jq '.html_url'
+        Write-Host "✅ Unified comment posted: $result" -ForegroundColor Green
+    }
+} finally {
+    Remove-Item $tempFile -ErrorAction SilentlyContinue
+}

.github/skills/pr-finalize/SKILL.md

@@ -127,16 +127,10 @@ Examples:
 ## Description Requirements
 
 PR description should:
-1. Start with the required NOTE block (so users can test PR artifacts)
-2. Include the base sections from `.github/PULL_REQUEST_TEMPLATE.md` ("Description of Change" and "Issues Fixed"). The skill adds additional structured fields (Root cause, Fix, Key insight, etc.) as recommended enhancements for better agent context.
-3. Match the actual implementation
+1. Include the base sections from `.github/PULL_REQUEST_TEMPLATE.md` ("Description of Change" and "Issues Fixed"). The skill adds additional structured fields (Root cause, Fix, Key insight, etc.) as recommended enhancements for better agent context.
+2. Match the actual implementation
 
 ```markdown
-<!-- Please let the below note in for people that find this PR -->
-> [!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
 [Must match actual implementation]
 
@@ -229,11 +223,6 @@ Example: "Before: Safe area applied by default (opt-out). After: Only views impl
 Use structured template only when existing description is inadequate:
 
 ```markdown
-<!-- Please let the below note in for people that find this PR -->
-> [!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!
-
 ### Root Cause
 
 [Why the bug occurred - be specific about the code path]

.github/skills/pr-finalize/references/complete-example.md

@@ -9,10 +9,6 @@ This example shows a PR description optimized for future agent success.
 
 ## Description
 ```markdown
-> [!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!
-
 ### Root Cause
 
 In `MauiView.GetAdjustedSafeAreaInsets()` on iOS, views that don't implement `ISafeAreaView` or `ISafeAreaView2` (such as `ContentPresenter`, `Border`) were falling through to return `baseSafeArea`. This applied full device safe area insets to views that never opted into safe area handling, causing double-padding when used inside ControlTemplates.