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/9.0' => 'main' #35577

Merged
merged 21 commits into from
Feb 10, 2025

Conversation

github-actions[bot]
Copy link

@github-actions github-actions bot commented Feb 3, 2025

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

  • AndriySvyryd
  • dotnet-maestro[bot]
  • vseanreesermsft

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/9.0
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/9.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/9.0-to-main
or if you are using SSH
git push [email protected]:dotnet/efcore HEAD:merge/release/9.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/9.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/9.0-to-main origin/main
git pull https://github.com/dotnet/efcore merge/release/9.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/efcore HEAD:merge/release/9.0-to-main
or if you are using SSH
git fetch
git checkout -b merge/release/9.0-to-main origin/main
git pull [email protected]:dotnet/efcore merge/release/9.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/efcore HEAD:merge/release/9.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.

Mirroring and others added 14 commits November 5, 2024 19:51
…ng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:922981e1-18b6-46aa-2468-08dbd53ba9ce)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 922981e1-18b6-46aa-2468-08dbd53ba9ce
- **Build**: 20241203.5
- **Date Produced**: December 3, 2024 11:28:49 PM UTC
- **Commit**: 89ef51c5d8f5239345127a1e282e11036e590c8b
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][4]
  - **Microsoft.NETCore.App.Ref**: [from 8.0.11 to 8.0.12][4]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.11 to 8.0.12][4]
  - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][4]

[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5&targetVersion=GC89ef51c5d8f5239345127a1e282e11036e590c8b&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:922981e1-18b6-46aa-2468-08dbd53ba9ce)
…Null for Joined Entities

Fixes #35393

Description
In EF9 we refactored some optimizations we performed on generated SQL - we are now applying them earlier (as part of SqlExpressionFactory. However, one of those optimizations is only correct for non-nullable arguments, and at the time we apply them we don't have full nullability information. Fix is to only apply this optimization when we know the argument is non-nullable.

Customer impact
Data corruption. Queries comparing nullable boolean property to a constant (true/false) produced incorrect results (data corruption). Workaround is to rewrite the query to add missing null checks, but this is not intuitive at all.

How found
Customer report on 9.0.0

Regression
Yes, from 8.0.

Testing
Added tests for the scenarios affected as well as test that brute-forces all combinations of comparisons between nullable arguments in variety of scenarios.

Risk
Low, we are just removing the optimization that was incorrect. After removal, the queries produced are the same as in EF8. Quirk added, just in case.
…110.1 (#35470)

[release/8.0] Update dependencies from dotnet/arcade


 - Merge branch 'release/8.0' into darc-release/8.0-e16f5af9-e571-4f04-9194-af7b3abc77a5
…115.2 (#35498)

[release/9.0] Update dependencies from dotnet/arcade
…127.4 (#35572)

[release/9.0] Update dependencies from dotnet/arcade
@github-actions github-actions bot requested a review from a team as a code owner February 10, 2025 19:18
@AndriySvyryd AndriySvyryd force-pushed the merge/release/9.0-to-main branch from cbced29 to 1177a3b Compare February 10, 2025 20:12
@AndriySvyryd AndriySvyryd merged commit 3b5648d into main Feb 10, 2025
7 checks passed
@AndriySvyryd AndriySvyryd deleted the merge/release/9.0-to-main branch February 10, 2025 21:36
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.

3 participants