[automated] Merge branch 'release/10.0' => 'main'

[github-actions]

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

This PR merges commits made on release/10.0 by the following committers:

• AndriySvyryd
• dotnet-maestro[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.

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 release/10.0
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/10.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/efcore HEAD:merge/release/10.0-to-main

or if you are using SSH

git push git@github.com:dotnet/efcore HEAD:merge/release/10.0-to-main

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/release/10.0-to-main'. 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/release/10.0-to-main origin/main
git pull https://github.com/dotnet/efcore merge/release/10.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/efcore HEAD:merge/release/10.0-to-main

or if you are using SSH

git fetch
git checkout -b merge/release/10.0-to-main origin/main
git pull git@github.com:dotnet/efcore merge/release/10.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/efcore HEAD:merge/release/10.0-to-main

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.

[github-actions]

API review baseline changes for src/EFCore/EFCore.baseline.json

Show diff

The diff below was generated by ApiChief between the base and the PR.

  static class Microsoft.EntityFrameworkCore.Diagnostics.CoreStrings
- static string ConflictingPropertyOrNavigation(object? member, object? type, object? conflictingType);
+ static string ConflictingPropertyOrNavigationOnBaseType(object? member, object? type, object? conflictingMemberKind, object? conflictingType);
+ static string ConflictingPropertyOrNavigationWithKind(object? member, object? type, object? conflictingMemberKind);