From 7652fb6f06789f1ccc025bd7b163bc7682483668 Mon Sep 17 00:00:00 2001 From: Gerald Versluis Date: Fri, 20 Mar 2026 09:54:04 +0100 Subject: [PATCH 1/8] Remove stale PR note from Copilot instructions (#34566) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description Remove the "Are you waiting for the changes in this PR to be merged?" note from all Copilot instruction files. This note was previously required at the top of every PR description so users could find instructions on how to test PR artifacts. We now have a **dogfooding comment bot** that automatically posts testing instructions under each PR, making this manual note redundant. Copilot agents were still prepending this note to every PR description because it was hardcoded in: - `.github/copilot-instructions.md` (main instructions) - `.github/skills/pr-finalize/SKILL.md` (PR finalization skill) - `.github/skills/pr-finalize/references/complete-example.md` (example PR) ### Issues Fixed N/A — instruction cleanup only. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/copilot-instructions.md | 14 -------------- .github/skills/pr-finalize/SKILL.md | 15 ++------------- .../pr-finalize/references/complete-example.md | 4 ---- 3 files changed, 2 insertions(+), 31 deletions(-) diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 934fe7623e1db..c2d342fc8af4a 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -200,20 +200,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: - -``` - -> [!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 diff --git a/.github/skills/pr-finalize/SKILL.md b/.github/skills/pr-finalize/SKILL.md index 28ba6916dd8b6..9932ac6534c5f 100644 --- a/.github/skills/pr-finalize/SKILL.md +++ b/.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 - -> [!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 - -> [!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] diff --git a/.github/skills/pr-finalize/references/complete-example.md b/.github/skills/pr-finalize/references/complete-example.md index 034da2e3d09d5..6f8ff08d10068 100644 --- a/.github/skills/pr-finalize/references/complete-example.md +++ b/.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. From b4dad751906e865863bdf05a9f7f38b4cee0b552 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Fri, 20 Mar 2026 18:40:04 -0500 Subject: [PATCH 2/8] Fix artifact upload collision in maui-pr-uitests pipeline (#34478) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Problem The `maui-pr-uitests` pipeline has 98+ test jobs that all publish artifacts using `PublishBuildArtifacts@1` with **no artifact name**, defaulting to `drop`. When multiple jobs upload the same file to the same container simultaneously, AzDO blob storage encounters write conflicts: ``` Blob is incomplete (missing block). Blob: 29adda685a1ff1119a49000d3a9183a5, Expected Offset: 0, Actual Offset: 8388608 ##[error]File upload failed even after retry. ``` ### Recent failures - [Build 1334980](https://dev.azure.com/dnceng-public/public/_build/results?buildId=1334980): 3 jobs failed (Controls CollectionView, Controls (vlatest), Controls (vlatest) CollectionView) - [Build 1334245](https://dev.azure.com/dnceng-public/public/_build/results?buildId=1334245): 1 job failed (Controls (vlatest)) The specific collision: both "Controls (vlatest)" and "Controls (vlatest) CollectionView" upload `drop/logs/appium_ios_Controls.TestCases.iOS.Tests-Release-ios-CollectionView.log` — same blob ID, concurrent writes. ## Fix Add a unique artifact name per job using `$(System.StageName)-$(System.JobName)-$(System.JobAttempt)` in `eng/pipelines/common/ui-tests-steps.yml`. This matches the pattern already used by snapshot diff artifacts in `ui-tests-collect-snapshot-diffs.yml`. Fixes #34477 Ref: dotnet/dnceng#1916 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- eng/pipelines/common/ui-tests-steps.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/common/ui-tests-steps.yml b/eng/pipelines/common/ui-tests-steps.yml index e3c1186e329cc..b5b2a8f79a8a0 100644 --- a/eng/pipelines/common/ui-tests-steps.yml +++ b/eng/pipelines/common/ui-tests-steps.yml @@ -186,6 +186,8 @@ steps: - task: PublishBuildArtifacts@1 condition: always() displayName: publish artifacts + inputs: + artifactName: drop-$(System.StageName)-$(System.JobName)-$(System.JobAttempt) # Enable Notification Center re-enabled only for catalyst - ${{ if eq(parameters.platform, 'catalyst')}}: From 5c244140a9c309f3c0d3aa96b69eccfea0faf2d6 Mon Sep 17 00:00:00 2001 From: NirmalKumarYuvaraj <97871636+NirmalKumarYuvaraj@users.noreply.github.com> Date: Thu, 23 Jan 2025 13:12:04 +0530 Subject: [PATCH 3/8] Fixed NRE when grouping changed --- .../ItemTemplateContextEnumerable.cs | 7 +- .../TestCases.HostApp/Issues/Issue17864.xaml | 31 +++++ .../Issues/Issue17864.xaml.cs | 112 ++++++++++++++++++ .../Tests/Issues/Issue17864.cs | 28 +++++ 4 files changed, 176 insertions(+), 2 deletions(-) create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue17864.xaml create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue17864.xaml.cs create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17864.cs diff --git a/src/Controls/src/Core/Platform/Windows/CollectionView/ItemTemplateContextEnumerable.cs b/src/Controls/src/Core/Platform/Windows/CollectionView/ItemTemplateContextEnumerable.cs index cffd0c4d9e6b8..d632915d6d943 100644 --- a/src/Controls/src/Core/Platform/Windows/CollectionView/ItemTemplateContextEnumerable.cs +++ b/src/Controls/src/Core/Platform/Windows/CollectionView/ItemTemplateContextEnumerable.cs @@ -32,9 +32,12 @@ public ItemTemplateContextEnumerable(IEnumerable itemsSource, DataTemplate forms public IEnumerator GetEnumerator() { - foreach (var item in _itemsSource) + if(_itemsSource is not null) { - yield return new ItemTemplateContext(_formsDataTemplate, item, _container, _itemHeight, _itemWidth, _itemSpacing, _mauiContext); + foreach (var item in _itemsSource) + { + yield return new ItemTemplateContext(_formsDataTemplate, item, _container, _itemHeight, _itemWidth, _itemSpacing, _mauiContext); + } } } } diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue17864.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue17864.xaml new file mode 100644 index 0000000000000..bc4517b184834 --- /dev/null +++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue17864.xaml @@ -0,0 +1,31 @@ + + + + + + + + +