Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[automated] Merge branch 'release/5.0' => 'main' #24101

Merged
merged 22 commits into from
Feb 12, 2021

Conversation

dotnet-maestro-bot
Copy link
Contributor

I detected changes in the release/5.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/5.0 by the following committers:

  • dougbu
  • dotnet-bot
  • mmitche

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 release/5.0
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/5.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-maestro-bot/EntityFrameworkCore HEAD:merge/release/5.0-to-main
or if you are using SSH
git push git@github.com:dotnet-maestro-bot/EntityFrameworkCore HEAD:merge/release/5.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/5.0-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/5.0-to-main main
git pull https://github.com/dotnet-maestro-bot/EntityFrameworkCore merge/release/5.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/EntityFrameworkCore HEAD:merge/release/5.0-to-main
or if you are using SSH
git checkout -b merge/release/5.0-to-main main
git pull git@github.com:dotnet-maestro-bot/EntityFrameworkCore merge/release/5.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet-maestro-bot/EntityFrameworkCore HEAD:merge/release/5.0-to-main

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approving branch merge.

@ghost
Copy link

ghost commented Feb 10, 2021

Hello @msftbot[bot]!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

…209.6 (dotnet#24103)

[release/5.0] Update dependencies from dotnet/arcade
@ghost ghost removed the auto-merge label Feb 10, 2021
smitpatel and others added 3 commits February 10, 2021 09:07
…or LeftJoin (dotnet#23984)

Resolves dotnet#23926

Issue:
- For TPH hierarchy, we generate conditional value read expression for derived property using ConditionalExpression
- To check the right derived type we use value comparer on discriminator column in ConditionalExpression.Test
- For enum discriminator the value comparer uses `object.Equals` methods which requires converting all args to object using UnaryExpression. (This could happen for non-enums too in some cases)
- When reading right side of properties in left join we convert all of those read access to nullable which causes operand of unary to be nullable type. The base visitor does not allow this type change

Hence we need to override the method and allow for conversion to happen since we expect it.
Fixes dotnet#23889

**Description**

AddPooledDbContextFactory (new in 5.0) has a parameter to set the pool size. This value was not being passed down to lower-level config and hence the default pool size is always used.

**Customer Impact**

The pool size cannot be changed when using the 'AddDbContext' for a factory and pooling.

**How found**

Customer reported on 5.0.

**Test coverage**

The test factoring did not test the defaults or overridden values for pool size; this has been added.

**Regression?**

No; new feature in 5.0.

**Risk**

Very low.
@pranavkm
Copy link
Contributor

@ajcvickers can you verify the contents of the merge?

roji
roji previously approved these changes Feb 12, 2021
Copy link
Member

@roji roji left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, will let @smitpatel confirm too for his stuff.

@roji roji dismissed their stale review February 12, 2021 21:14

Need to take care of quirks

@Tratcher
Copy link
Member

@roji can you merge?

@roji roji merged commit ede9db2 into dotnet:main Feb 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants