Commit 75ad730
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.52 files changed
Lines changed: 1253 additions & 49 deletions
File tree
- .github/workflows
- src
- Controls
- samples/Controls.Sample
- Pages/Compatibility
- ViewModels
- src/Core
- Platform
- Android
- Windows
- TabbedPage
- PublicAPI
- net-android
- net-ios
- net-maccatalyst
- net-tizen
- net-windows
- netstandard
- net
- TabbedPage
- tests
- Core.UnitTests
- DeviceTests/Elements/TabbedPage
- Core/maps/src/Handlers/Map
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| 37 | + | |
| 38 | + | |
37 | 39 | | |
38 | 40 | | |
39 | 41 | | |
| |||
0 commit comments