Skip to content

Commit 75ad730

Browse files
authored
[automated] Merge branch 'net11.0' => 'release/11.0.1xx-rc1' (#37816)
I detected changes in the net11.0 branch which have not been merged yet to release/11.0.1xx-rc1. I'm a robot and am configured to help you automatically keep release/11.0.1xx-rc1 up to date, so I've opened this PR. This PR merges commits made on net11.0 by the following committers: * jfversluis * kubaflo * kevin68 * github-actions[bot] ## 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. <img alt="merge button instructions" src="https://i.imgur.com/GepcNJV.png" width="300" /> 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. ``` sh git fetch git checkout net11.0 git pull --ff-only git checkout release/11.0.1xx-rc1 git pull --ff-only git merge --no-ff net11.0 # 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/net11.0-to-release/11.0.1xx-rc1 ``` <details> <summary>or if you are using SSH</summary> ``` git push git@github.com:dotnet/maui HEAD:merge/net11.0-to-release/11.0.1xx-rc1 ``` </details> After PR checks are complete push the branch ``` git push ``` ## Instructions for resolving conflicts :warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this [using GitHub][resolve-github] or using the [command line][resolve-cli]. [resolve-github]: https://help.github.com/articles/resolving-a-merge-conflict-on-github/ [resolve-cli]: https://help.github.com/articles/resolving-a-merge-conflict-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/net11.0-to-release/11.0.1xx-rc1'. 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/net11.0-to-release/11.0.1xx-rc1 origin/release/11.0.1xx-rc1 git pull https://github.com/dotnet/maui merge/net11.0-to-release/11.0.1xx-rc1 (make changes) git commit -m "Updated PR with my changes" git push https://github.com/dotnet/maui HEAD:merge/net11.0-to-release/11.0.1xx-rc1 ``` <details> <summary>or if you are using SSH</summary> ``` git fetch git checkout -b merge/net11.0-to-release/11.0.1xx-rc1 origin/release/11.0.1xx-rc1 git pull git@github.com:dotnet/maui merge/net11.0-to-release/11.0.1xx-rc1 (make changes) git commit -m "Updated PR with my changes" git push git@github.com:dotnet/maui HEAD:merge/net11.0-to-release/11.0.1xx-rc1 ``` </details> 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.
2 parents e7fb5ec + c2fa941 commit 75ad730

52 files changed

Lines changed: 1253 additions & 49 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/agentic-labeler.lock.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/aw-actions-update.lock.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/aw-version-update.lock.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/aw.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"maintenance": {
3+
"action_failure_issue_expires": 168
4+
}
5+
}

.github/workflows/backport.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ permissions:
1414

1515
jobs:
1616
backport:
17-
if: github.repository_owner == 'dotnet'
17+
if: github.repository == 'dotnet/maui'
1818
uses: dotnet/arcade/.github/workflows/backport-base.yml@main

.github/workflows/ci-scan-lock-issues.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ permissions:
1919
jobs:
2020
lock:
2121
runs-on: ubuntu-latest
22-
if: ${{ github.repository_owner == 'dotnet' }}
22+
if: ${{ github.repository == 'dotnet/maui' }}
2323
steps:
2424
- name: Lock scanner issue
2525
env:

.github/workflows/ci-status-fix-net11.lock.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/ci-status-fix.lock.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/ci-status-main.lock.yml

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/ci-status-main.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ on:
3434
default: true
3535
permissions: {}
3636

37+
if: github.repository == 'dotnet/maui'
38+
3739
model: gpt-5.6-sol
3840
engine:
3941
id: copilot

0 commit comments

Comments
 (0)