Skip to content

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

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

kubaflo merged 2 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

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.

kubaflo and others added 2 commits October 30, 2026 11:47
<!-- 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

<!-- Enter description of the fix in this section -->

Add .NET MAUI `10.0.130` (SR13) to both bug-report version dropdowns in
`.github/ISSUE_TEMPLATE/bug-report.yml`: before `10.0.120` in **Version
with bug**, and after `10.0.120` in **Last version that worked well**.

This is nonblocking SR13 release housekeeping: exactly two option
additions, with all existing options and form settings preserved. It
does not change product versions, cut a release branch, or create a
next-cycle milestone. The next release is .NET 11 SR1, not .NET 10 SR14.

Validation:
- `python3 -c 'import yaml;
yaml.safe_load(open(".github/ISSUE_TEMPLATE/bug-report.yml"));
print("YAML parse: PASS")'` — passed.
- `git diff --check` — passed before commit.
- `git diff --numstat -- .github/ISSUE_TEMPLATE/bug-report.yml` —
exactly two additions and zero deletions before commit.
- The pushed issue form was fetched through the GitHub Contents API,
parsed successfully, and confirmed to contain `10.0.130` once in each
intended dropdown.

Product, device, and UI tests were not run for this issue-form-only
change. No tests or tooling were added.

### 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. -->

Related to #39496; does not close the ongoing SR13 release-readiness
tracker.

<!--
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: 270acd48-0a94-48aa-b270-5b1bee345e89
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Versions.props
- eng/common/*
@azure-pipelines

This comment has been minimized.

@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.

@kubaflo
kubaflo disabled auto-merge October 31, 2026 10:09
@kubaflo
kubaflo merged commit c13dddb into net11.0 Oct 31, 2026
4 of 11 checks passed
@kubaflo
kubaflo deleted the merge/main-to-net11.0 branch October 31, 2026 10:09
@github-actions github-actions Bot added this to the .NET 11.0-rc2 milestone Oct 31, 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.

1 participant