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-rc1' => 'release/9.0' #34497

Merged
merged 77 commits into from
Sep 5, 2024

Conversation

github-actions[bot]
Copy link

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

This PR merges commits made on release/9.0-rc1 by the following committers:

  • dkurepa
  • 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.

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-rc1
git pull --ff-only
git checkout release/9.0
git pull --ff-only
git merge --no-ff release/9.0-rc1

# 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-rc1-to-release/9.0
or if you are using SSH
git push git@github.com:dotnet/efcore HEAD:merge/release/9.0-rc1-to-release/9.0

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-rc1-to-release/9.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

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

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.

dotnet-bot and others added 30 commits May 1, 2024 22:40
Merge from public release/8.0 to internal/release/8.0 and resolve conflicts if necessary
…otnet-runtime build 20240520.14

Microsoft.Extensions.DependencyModel , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Text.Json
 From Version 8.0.1 -> To Version 8.0.1
…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**: 20240520.14
- **Date Produced**: May 21, 2024 1:28:40 AM UTC
- **Commit**: 63d80966a9f0d15e057d0d146702405b19c82533
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Extensions.DependencyModel**: [from 8.0.1 to 8.0.1][1]
  - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.7-servicing.24270.7 to 8.0.7-servicing.24270.14][1]
  - **Microsoft.NETCore.App.Ref**: [from 8.0.7 to 8.0.7][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.7 to 8.0.7][1]
  - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.7-servicing.24270.7 to 8.0.7-servicing.24270.14][1]
  - **System.Text.Json**: [from 8.0.4 to 8.0.4][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC6d230cdb65dee13db6779749580d02bcd413af70&targetVersion=GC63d80966a9f0d15e057d0d146702405b19c82533&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:922981e1-18b6-46aa-2468-08dbd53ba9ce)
…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**: 20240612.14
- **Date Produced**: June 13, 2024 1:29:09 PM UTC
- **Commit**: cc6880ce36d783678284d36e8397fc30fda93c8a
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Extensions.DependencyModel**: [from 8.0.1 to 8.0.1][1]
  - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.7-servicing.24311.13 to 8.0.7-servicing.24312.14][1]
  - **Microsoft.NETCore.App.Ref**: [from 8.0.7 to 8.0.7][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.7 to 8.0.7][1]
  - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.7-servicing.24311.13 to 8.0.7-servicing.24312.14][1]
  - **System.Text.Json**: [from 8.0.4 to 8.0.4][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCe0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d&targetVersion=GCcc6880ce36d783678284d36e8397fc30fda93c8a&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:922981e1-18b6-46aa-2468-08dbd53ba9ce)
…otnet-runtime build 20240613.11

Microsoft.Extensions.DependencyModel , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Text.Json
 From Version 8.0.1 -> To Version 8.0.1
…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**: 20240613.11
- **Date Produced**: June 14, 2024 12:03:48 AM UTC
- **Commit**: 2aade6beb02ea367fd97c4070a4198802fe61c03
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Extensions.DependencyModel**: [from 8.0.1 to 8.0.1][1]
  - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.7-servicing.24312.14 to 8.0.7-servicing.24313.11][1]
  - **Microsoft.NETCore.App.Ref**: [from 8.0.7 to 8.0.7][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.7 to 8.0.7][1]
  - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.7-servicing.24312.14 to 8.0.7-servicing.24313.11][1]
  - **System.Text.Json**: [from 8.0.4 to 8.0.4][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCcc6880ce36d783678284d36e8397fc30fda93c8a&targetVersion=GC2aade6beb02ea367fd97c4070a4198802fe61c03&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:922981e1-18b6-46aa-2468-08dbd53ba9ce)
…-merge-8.0-2024-07-09-1040-bfcfe8ff-bc59-4584-8765-5c81b03ac6e0
…4-07-09-1040-bfcfe8ff-bc59-4584-8765-5c81b03ac6e0

Merging internal commits for release/8.0
…710.5 (#34209)

[release/8.0] Update dependencies from dotnet/arcade
ajcvickers and others added 26 commits August 22, 2024 08:32
* Fix ESCAPE clause for Azure Synapse. (#34463)

* Use different store names for funky data tests (#34506)
…823.2 (#34533)

[release/9.0] Update dependencies from dotnet/arcade
…0823.10 (#34534)

[release/9.0] Update dependencies from dotnet/runtime
…34523)

* Add explicit casts for generated null in method calls.

Fixes #34515

* Update src/EFCore.Design/Query/Internal/LinqToCSharpSyntaxTranslator.cs

Co-authored-by: Shay Rojansky <roji@roji.org>

---------

Co-authored-by: Shay Rojansky <roji@roji.org>
* Update to LTS SqlClient

* Bump
…826.2 (#34583)

[release/8.0] Update dependencies from dotnet/arcade
…0830.5 (#34584)

[release/9.0-rc1] Update dependencies from dotnet/runtime
Fixes #34554

I also needed to fix #34511 to make this work. This was happening because we were removing the by-convention property added by property discovery. We only need to remove it when it's the computed property as well, which is handled by the other case.
…0831.7 (#34588)

[release/9.0-rc1] Update dependencies from dotnet/runtime
…829.5 (#34597)

[release/9.0] Update dependencies from dotnet/arcade
…0829.19 (#34598)

[release/9.0] Update dependencies from dotnet/runtime
…34489)

Reacquire the lock when retrying.
Execute all migrations in a single transaction.

Fixes #34439
Fixes #34569
@AndriySvyryd AndriySvyryd merged commit f2eb7db into release/9.0 Sep 5, 2024
7 checks passed
@AndriySvyryd AndriySvyryd deleted the merge/release/9.0-rc1-to-release/9.0 branch September 5, 2024 03:20
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.

9 participants