Skip to content

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

Closed
github-actions[bot] wants to merge 4 commits into
net11.0from
merge/main-to-net11.0
Closed

[automated] Merge branch 'main' => 'net11.0'#35952
github-actions[bot] wants to merge 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
  • akoeplinger

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.

akoeplinger and others added 4 commits June 15, 2026 22:11
)

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

Several request-interception device tests were running an
`[InlineData("https://echo.free.beeceptor.com/...")]` row on Windows and
Android Helix queues even though that external service is known to be
flaky (tracked in #33927). The sibling tests in the same files already
skip that scenario; these four were missed:

-
`BlazorWebViewTests.RequestsCanBeInterceptedAndCustomDataReturnedForDifferentHosts`
-
`BlazorWebViewTests.RequestsCanBeInterceptedAndCancelledForDifferentHosts`
-
`BlazorWebViewTests.RequestsCanBeInterceptedAndCaseInsensitiveHeadersRead`
-
`HybridWebViewTests_Interception.RequestsCanBeInterceptedAndCancelledForDifferentHosts`

Reflection on the built `Microsoft.Maui.Controls.DeviceTests.dll`
(net10.0-windows10.0.19041.0) confirmed each of these methods had a
`Microsoft.Maui.TheoryAttribute` with **no** `Skip` and the
`https://echo.free.beeceptor.com/` `InlineData` attached — they would
attempt a real outbound TLS request from the Helix worker whenever
interception did not fire.

### Fix

Split the single `[Theory]` into two: one inside the `#if !ANDROID &&
!WINDOWS` block (paired with the `app://echoservice/` row) and one
inside the `#if !IOS && !MACCATALYST` block carrying `Skip = "Flaky due
to external service dependency (echo.free.beeceptor.com). See
https://github.com/dotnet/maui/issues/33927"` (paired with the
`https://` row).

This matches the convention already used by the three other sibling
methods (`CustomDataReturned`, `HeadersAdded`,
`CaseInsensitiveHeadersRead` in `HybridWebViewTests_Interception.cs`).

Importantly, **iOS / MacCatalyst coverage is preserved** — only the
`https://` rows are skipped. The `app://echoservice/` rows are fully
self-contained (the OS cannot resolve the `app://` scheme, so the
request never touches the network — it is satisfied entirely by the
`WebResourceRequested` handler inside the test).

### Per-TFM safety check

The custom `Microsoft.Maui.TheoryAttribute` has `AllowMultiple = false`,
and the `#if` guards make the two `[Theory]` attributes mutually
exclusive across every TFM in `MauiDeviceTestsPlatforms`:

| TFM | `[Theory]` (app://) | `[Theory(Skip)]` (https://) |
|---|---|---|
| net10.0-android | excluded | included |
| net10.0-windows10.x | excluded | included |
| net10.0-ios | included | excluded |
| net10.0-maccatalyst | included | excluded |

### Issues Fixed

Related to #33927.

Co-authored-by: Copilot <223556219+Copilot@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!

### Description of Change

Restricts `/review rerun` eligibility so PRs are only queued for rerun
when there is new PR-author activity after the latest AI Summary or
previous rerun checkpoint:

- new non-command comments from the PR author
- new commits / head changes

Reviewer or maintainer reminder comments no longer satisfy the rerun
evidence check.

### Issues Fixed

Prevents `/review rerun` from applying `s/agent-ready-for-rerun` when
only a reviewer/maintainer comment was added after the latest AI
Summary.

---------

Co-authored-by: Copilot <223556219+Copilot@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!

### Description of Change

Updates the `Skill Validation Results` PR comment to match the visual
style used by AI Summary and Test Failure Review comments:

- stable marker plus `## Skill Validation Results` title
- PR author/commit context
- status badges for overall, static checks, LLM evaluation, skills, and
agents
- a single expandable session with commit metadata
- existing static-check and LLM-evaluation details preserved inside the
session

### Issues Fixed

No issue filed.

### Validation

- Extracted and syntax-checked the `actions/github-script` post-comment
JavaScript with `node --check`
- `git diff --check`

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Versions.props
- eng/common/*
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants