Skip to content

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

Merged
kubaflo merged 4 commits into
net11.0from
merge/main-to-net11.0
Oct 28, 2026
Merged

kubaflo merged 4 commits into
net11.0from
merge/main-to-net11.0

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

I detected changes in the main branch which have not been merged yet to net11.0. I'm a robot and am configured to help you automatically keep net11.0 up to date, so I've opened this PR.

This PR merges commits made on main by the following committers:

  • kubaflo
  • NafeelaNazhir

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout main
git pull --ff-only
git checkout net11.0
git pull --ff-only
git merge --no-ff main

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/maui HEAD:merge/main-to-net11.0
or if you are using SSH
git push git@github.com:dotnet/maui HEAD:merge/main-to-net11.0

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/main-to-net11.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

git fetch
git checkout -b merge/main-to-net11.0 origin/net11.0
git pull https://github.com/dotnet/maui merge/main-to-net11.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/maui HEAD:merge/main-to-net11.0
or if you are using SSH
git fetch
git checkout -b merge/main-to-net11.0 origin/net11.0
git pull git@github.com:dotnet/maui merge/main-to-net11.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/maui HEAD:merge/main-to-net11.0

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

NafeelaNazhir and others added 3 commits October 28, 2026 10:42
… through the gallery (#39723)

<!-- 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

Revert #39621 because the direct UI fixture launch changes introduced
increased UI test failures on Android and iOS.

This restores the previous UI testing behavior, including gallery-based
fixture navigation, existing Appium lifecycle handling, and the prior
test infrastructure. The associated direct-launch implementation,
documentation, tests, and project references are removed.

### Issues Fixed

Reverts #39621.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Jakub Florkowski <42434498+kubaflo@users.noreply.github.com>
<!-- 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!

<!--
!!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING
MAIN. !!!!!!!
-->

### Description of Change

Replace the main/net11 CI scanners' issue-publication path with direct,
branch-scoped fix PR creation and maintenance. Both workflows use a
shared protocol and the existing bounded safe-output transport: real
validated source/test fixes only, stable PR fingerprints, one PR
operation per run, same-PR follow-ups with a ten-attempt limit, and
manual dry runs enforced through staged outputs.

Preserve frozen latest-build evidence, failed-leaf coverage, and hidden
Helix device-test failures. Extend the trusted Azure DevOps dispatcher's
workflow-run allowlist so scanner-created PR heads receive validation
even when GITHUB_TOKEN suppresses PR events. Keep the old issue-driven
fixers manual-only, disable every
diagnostic/no-op/missing-data/incomplete issue reporter, and retire the
removed issue publisher/manifest validator and its coupled tests. No new
pipeline tests were added.

Operational cleanup: closed all 12 open bot-generated `ci-scan` /
`ci-scan-net11` issues, leaving the human-authored planning issue #35978
untouched. All four existing scanner/fixer workflows are currently
disabled to prevent old default-branch code from filing new issues while
this PR awaits merge. **After merge, re-enable only
`ci-status-main.lock.yml` and `ci-status-net11.lock.yml`; keep the
legacy issue-driven fixers disabled unless needed for a manual
compatibility run.**

Validation:
- `gh aw compile ci-status-main ci-status-net11 ci-status-fix
ci-status-fix-net11 --strict --no-check-update` — passed; all four lock
files regenerated, zero compiler warnings.
- `actionlint -oneline -ignore 'unexpected key "queue" for
"concurrency"' -ignore 'property "aw" is not defined' -ignore
'SC2129:style:36:1' .github/workflows/ci-status-main.lock.yml
.github/workflows/ci-status-net11.lock.yml
.github/workflows/ci-status-fix.lock.yml
.github/workflows/ci-status-fix-net11.lock.yml
.github/workflows/ci-fix-azdo-validation.yml` — passed. The three
excluded diagnostics were independently reproduced against the unchanged
base-branch compiled fixer: compiler-emitted queue/context fields
unsupported by the installed linter and an existing shared PAT-pool
shell-style warning.
- `node --check .github/scripts/Get-CiScanBuildEvidence.cjs` — passed.
- `pwsh -NoLogo -NoProfile -Command 'Import-Module Pester
-RequiredVersion 5.9.0; $r = Invoke-Pester -Path
.github/scripts/Queue-CiFixAzdoValidation.Tests.ps1,.github/scripts/Query-CiFixPRs.Tests.ps1,.github/scripts/Test-CiFixTransport.Tests.ps1,.github/scripts/Register-CiFixSafeOutputExpectation.Tests.ps1
-Output Normal -PassThru; if ($r.FailedCount -gt 0) { exit 1 }'` —
passed, 150 existing checks.
- `pwsh -NoLogo -NoProfile -Command 'Import-Module Pester
-RequiredVersion 5.9.0; $r = Invoke-Pester -Path
.github/scripts/CiScanReconcile.Core.Tests.ps1,.github/scripts/Invoke-CiScanReconcile.Tests.ps1
-Output Normal -PassThru; if ($r.FailedCount -gt 0) { exit 1 }'` —
passed, 514 retained legacy checks.
- `git diff --check` — passed.

Live PR CI:
- [PowerShell Script
Tests](https://github.com/dotnet/maui/actions/runs/40558945128): 2,217
passed / 3 failed. The failures are unchanged model-pin assertions in
`CopilotPipeline.Tests.ps1`, `Review-PR.Tests.ps1`, and
`Review-Tests.Tests.ps1`, all expecting GPT-5.6 Sol. `git diff
--exit-code b20099c HEAD --
.github/scripts/CopilotPipeline.Tests.ps1
.github/scripts/Review-PR.Tests.ps1
.github/scripts/Review-Tests.Tests.ps1 .github/scripts/Review-Tests.ps1
.github/workflows/copilot-review-tests.md
.github/workflows/copilot-review-tests.lock.yml
.github/skills/review-test-failures/tests/eval.vally.yaml` — passed,
confirming the failing tests and their model-policy inputs are identical
to the base. The base already selects `gpt-6-astra` in the local test
reviewer and `gpt-6.1-sol` in the hosted test reviewer. These unrelated
assertions were not changed.
- [Skill
Validation](https://github.com/dotnet/maui/actions/runs/40558945173):
static validation passed; the hermeticity harness stopped during
worktree creation with missing Git blob objects and `fatal: Could not
reset index file to revision 'HEAD'`, before executing the harness. The
separate ci-fix evaluation was still running when inspected; no pass is
claimed.
- [CI-fix Azure DevOps validation
dispatcher](https://github.com/dotnet/maui/actions/runs/40558945504):
passed. This maintenance PR is not an eligible bot-authored fix PR, so
this is not evidence that native validation pipelines ran.

The new scheduled agent path has not run live: activation is restricted
to the trusted main ref, so end-to-end rollout verification must follow
merge. No native MAUI code changed.

### Issues Fixed

<!-- Please make sure that there is a bug logged for the issue being
fixed. The bug should describe the problem and how to reproduce it. -->

N/A — maintainer-requested automation change; no new tracking issue. All
12 open bot-generated CI-scan findings were closed separately.

<!--
Are you targeting main? All PRs should target the main branch unless
otherwise noted.
-->

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 6d407bf0-e1aa-49de-b82c-ce735eeeaccc
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Versions.props
- eng/common/*

@dotnet-policy-service dotnet-policy-service Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approved automated inter-branch merge.

Keep net11 Shell Renderer startup arguments, gallery readiness checks and documentation while retaining the intentional main direct-launch revert.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
@github-actions

Copy link
Copy Markdown
Contributor Author

🚀 Dogfood this PR with:

⚠️ WARNING: Do not do this without first carefully reviewing the code of this PR to satisfy yourself it is safe.

curl -fsSL https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.sh | bash -s -- 39734

Or

  • Run remotely in PowerShell:
iex "& { $(irm https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.ps1) } 39734"

@kubaflo

kubaflo commented Oct 28, 2026

Copy link
Copy Markdown
Contributor

Resolved and pushed the five conflicts with net11.0 in ordinary merge commit 49f6de1b575, on the original merge/main-to-net11.0 branch. No rebase or force-push.

This incoming branch includes the intentional direct-fixture-launch revert (#39723). Preserved that revert instead of reintroducing direct launch, while retaining net11's independent Android Shell Renderer activation/configuration, gallery-ready-element checks, and corresponding documentation. All five conflicted files now exactly match the current net11 versions. The target's SDK/dependency/bootstrap configuration is also unchanged.

The resulting diff against net11 consists only of the incoming CI-fixer changes; the earlier direct-launch and revert commits cancel out. No additional CI-fixer behavior was edited as part of conflict resolution.

Validation: Android, iOS, WinUI and Mac managed UI-test assemblies compiled with zero warnings/errors, with native target frameworks disabled. All five changed YAML files parsed and git diff --check passed. No pipeline tests were written, and no CI-fixer dispatches, GitHub mutations from those scripts, native UI/device tests or XCTest were executed. YAML parsing is not workflow-semantic or runtime certification; actual workflow execution and native startup remain for CI.

@github-actions

Copy link
Copy Markdown
Contributor Author

Skill Validation Results

@github-actions[bot] — new skill validation results are available based on this last commit: 49f6de1.
To request a fresh validation after new comments or commits, comment /evaluate-skills.

Overall Passed Static Passed LLM Skipped Skills 28 Agents 7

✅ Skill Validation Results — 49f6de1 · [automated] Merge branch 'main' => 'net11.0' · 2026-10-28T13:38:46Z

✅ Static Checks Passed

Skills: 28 | Eval specs linted: 17

Full lint output
── .github/skills/agentic-labeler/tests/eval.vally.yaml
npm warn deprecated @opentelemetry/sdk-trace-node@2.12.0: Use @opentelemetry/sdk-trace package
npm warn deprecated @opentelemetry/sdk-trace-base@2.12.0: Use @opentelemetry/sdk-trace package
Vally collects pseudonymous usage telemetry (command name, version, outcome, duration, persistent device identifier (when available), and coarse OS/runtime info) to improve the product. No prompts, datasets, file paths, or arguments are collected.
Opt out any time by setting VALLY_TELEMETRY_OPTOUT=1 or DO_NOT_TRACK=1.
Learn more: https://aka.ms/vally/telemetry
✔ .github/skills/agentic-labeler/tests/eval.vally.yaml is valid
── .github/skills/analyze-sessions/tests/eval.vally.yaml
✔ .github/skills/analyze-sessions/tests/eval.vally.yaml is valid
── .github/skills/ci-fix/tests/eval.ownership.vally.yaml
✔ .github/skills/ci-fix/tests/eval.ownership.vally.yaml is valid
── .github/skills/ci-fix/tests/eval.vally.yaml
✔ .github/skills/ci-fix/tests/eval.vally.yaml is valid
── .github/skills/code-review/tests/eval.inline-findings.vally.yaml
✔ .github/skills/code-review/tests/eval.inline-findings.vally.yaml is valid
── .github/skills/code-review/tests/eval.producer-trace.vally.yaml
✔ .github/skills/code-review/tests/eval.producer-trace.vally.yaml is valid
── .github/skills/code-review/tests/eval.trim-aot.vally.yaml
✔ .github/skills/code-review/tests/eval.trim-aot.vally.yaml is valid
── .github/skills/code-review/tests/eval.vally.yaml
✔ .github/skills/code-review/tests/eval.vally.yaml is valid
── .github/skills/code-review/tests/hermeticity.vally.yaml
✔ .github/skills/code-review/tests/hermeticity.vally.yaml is valid
── .github/skills/code-review/tests/soak.capability.vally.yaml
✔ .github/skills/code-review/tests/soak.capability.vally.yaml is valid
── .github/skills/evaluate-pr-tests/tests/eval.vally.yaml
✔ .github/skills/evaluate-pr-tests/tests/eval.vally.yaml is valid
── .github/skills/pr-review/tests/eval.gh-auth.vally.yaml
✔ .github/skills/pr-review/tests/eval.gh-auth.vally.yaml is valid
── .github/skills/review-test-failures/tests/eval.vally.yaml
✔ .github/skills/review-test-failures/tests/eval.vally.yaml is valid
── .github/skills/try-fix/tests/eval.restore.vally.yaml
✔ .github/skills/try-fix/tests/eval.restore.vally.yaml is valid
── .github/skills/try-fix/tests/eval.vally.yaml
✔ .github/skills/try-fix/tests/eval.vally.yaml is valid
── .github/skills/verify-tests-fail-without-fix/tests/eval.protocol.vally.yaml
✔ .github/skills/verify-tests-fail-without-fix/tests/eval.protocol.vally.yaml is valid
── .github/skills/verify-tests-fail-without-fix/tests/eval.vally.yaml
✔ .github/skills/verify-tests-fail-without-fix/tests/eval.vally.yaml is valid

⏭️ LLM Evaluation: Skipped

💡 LLM evaluation was not run for this external PR.
A repository contributor can post /evaluate-skills on this PR to trigger full evaluation.

🔍 Full results and investigation steps

@kubaflo
kubaflo disabled auto-merge October 28, 2026 17:08
@kubaflo
kubaflo merged commit bec2f7b into net11.0 Oct 28, 2026
17 of 19 checks passed
@kubaflo
kubaflo deleted the merge/main-to-net11.0 branch October 28, 2026 17:09
@github-actions github-actions Bot added this to the .NET 11.0-rc2 milestone Oct 28, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants