-
Notifications
You must be signed in to change notification settings - Fork 3.3k
[automated] Merge branch 'release/9.0' => 'main' #35932
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
Open
github-actions
wants to merge
20
commits into
main
Choose a base branch
from
merge/release/9.0-to-main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#### AI description (iteration 1) #### PR Classification Dependency update and internal configuration changes. #### PR Summary This pull request updates various dependencies and internal configurations to newer versions. - Updated `Microsoft.DotNet.Arcade.Sdk`, `Microsoft.DotNet.Build.Tasks.Templating`, and `Microsoft.DotNet.Helix.Sdk` versions in `/eng/Version.Details.xml`, `/global.json`, and `/eng/Versions.props`. - Added new package sources in `/NuGet.config`. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
…ng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:9dd82232-9947-4c91-873c-a50d5007af96) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 9dd82232-9947-4c91-873c-a50d5007af96 - **Build**: [20250310.22](https://dev.azure.com/dnceng/internal/_build/results?buildId=2660109) - **Date Produced**: March 11, 2025 10:14:10 AM UTC - **Commit**: [99ba03659dbd004773e2e6aacb8d44eb227f85ed](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?_a=history&version=GC99ba03659dbd004773e2e6aacb8d44eb227f85ed) - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.Caching.Memory**: [from 9.0.3 to 9.0.4][2] - **Microsoft.Extensions.Configuration**: [from 9.0.3 to 9.0.4][2] - **Microsoft.Extensions.Configuration.Abstractions**: [from 9.0.3 to 9.0.4][2] - **Microsoft.Extensions.Configuration.EnvironmentVariables**: [from 9.0.3 to 9.0.4][2] - **Microsoft.Extensions.Configuration.Json**: [from 9.0.3 to 9.0.4][2] - **Microsoft.Extensions.DependencyInjection**: [from 9.0.3 to 9.0.4][2] - **Microsoft.Extensions.DependencyModel**: [from 9.0.3 to 9.0.4][2] - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 9.0.3-servicing.25111.13 to 9.0.4-servicing.25160.22][2] - **Microsoft.Extensions.Logging**: [from 9.0.3 to 9.0.4][2] - **Microsoft.NETCore.App.Ref**: [from 9.0.3 to 9.0.4][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 9.0.3 to 9.0.4][2] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 9.0.3-servicing.25111.13 to 9.0.4-servicing.25160.22][2] - **System.Formats.Asn1**: [from 9.0.3 to 9.0.4][2] - **System.Text.Encodings.Web**: [from 9.0.3 to 9.0.4][2] - **System.Text.Json**: [from 9.0.3 to 9.0.4][2] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC831d23e56149cd59c40fc00c7feb7c5334bd19c4&targetVersion=GC99ba03659dbd004773e2e6aacb8d44eb227f85ed&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:9dd82232-9947-4c91-873c-a50d5007af96)
Merge from public release/9.0 to internal/release/9.0 and resolve conflicts if necessary ---- #### AI description (iteration 1) #### PR Classification Dependency update #### PR Summary This pull request updates various dependencies to version 9.0.3. - Updated dependency versions in `/eng/Version.Details.xml` - Updated dependency versions in `/eng/Versions.props` - Updated package sources in `/NuGet.config` <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
Merge from public release/9.0 to internal/release/9.0 and resolve conflicts if necessary
…otnet-runtime build 20250312.18 Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Logging , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Formats.Asn1 , System.Text.Encodings.Web , System.Text.Json From Version 9.0.4 -> To Version 9.0.4
…otnet-runtime build 20250313.5 Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Logging , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Formats.Asn1 , System.Text.Encodings.Web , System.Text.Json From Version 9.0.4 -> To Version 9.0.4
…ng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:9dd82232-9947-4c91-873c-a50d5007af96) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 9dd82232-9947-4c91-873c-a50d5007af96 - **Build**: [20250313.5](https://dev.azure.com/dnceng/internal/_build/results?buildId=2662739) - **Date Produced**: March 14, 2025 2:28:40 AM UTC - **Commit**: [f57e6dc747158ab7ade4e62a75a6750d16b771e8](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?_a=history&version=GCf57e6dc747158ab7ade4e62a75a6750d16b771e8) - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.Caching.Memory**: [from 9.0.4 to 9.0.4][2] - **Microsoft.Extensions.Configuration**: [from 9.0.4 to 9.0.4][2] - **Microsoft.Extensions.Configuration.Abstractions**: [from 9.0.4 to 9.0.4][2] - **Microsoft.Extensions.Configuration.EnvironmentVariables**: [from 9.0.4 to 9.0.4][2] - **Microsoft.Extensions.Configuration.Json**: [from 9.0.4 to 9.0.4][2] - **Microsoft.Extensions.DependencyInjection**: [from 9.0.4 to 9.0.4][2] - **Microsoft.Extensions.DependencyModel**: [from 9.0.4 to 9.0.4][2] - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 9.0.4-servicing.25160.22 to 9.0.4-servicing.25163.5][2] - **Microsoft.Extensions.Logging**: [from 9.0.4 to 9.0.4][2] - **Microsoft.NETCore.App.Ref**: [from 9.0.4 to 9.0.4][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 9.0.4 to 9.0.4][2] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 9.0.4-servicing.25160.22 to 9.0.4-servicing.25163.5][2] - **System.Formats.Asn1**: [from 9.0.4 to 9.0.4][2] - **System.Text.Encodings.Web**: [from 9.0.4 to 9.0.4][2] - **System.Text.Json**: [from 9.0.4 to 9.0.4][2] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC99ba03659dbd004773e2e6aacb8d44eb227f85ed&targetVersion=GCf57e6dc747158ab7ade4e62a75a6750d16b771e8&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:9dd82232-9947-4c91-873c-a50d5007af96)
…404.5 (#35912) [release/9.0] Update dependencies from dotnet/arcade
…-merge-9.0-2025-04-08-1202
…408.6 (#35931) [release/9.0] Update dependencies from dotnet/arcade
…35909) * Limited port of #35868 Fixes #35476 Fixes #35853 (need to fix this one, otherwise vector translator will try to translate full text methods and fail) Description This PR enables full-text search queries using EF Core 9 when targeting Azure Cosmos Db. This is one of the flagship new features for Cosmos and the aim here is to help with it's adoption. This is very limited port of the full feature we are adding in EF 10 Preview 4. We are only adding querying capabilities: function stubs for FullTextContains, FullTextContainsAll, FullTextContainsAny, FullTextScore and RRF as well as logic translating these signatures to built-in Cosmos functions. No model building or data manipulation - containers need to be created outside EF (using Cosmos SDK or in the Data Explorer). Customer impact Customers will be able to use the upcoming full text search capabilities when working with Azure Cosmos Db without the need to upgrade to EF 10 preview. How found Partner team ask. Regression No Testing Extensively tested on EF 10, manual testing on EF9. End-to-end testing is not possible because we can't create containers programmatically (no support for it inside EF Core itself, and the Cosmos SDK which supports it is currently only available in beta, so we can't take dependency on it). Instead, we created containers and data using EF 10, ported all the query tests from EF 10 and ran them using the EF9 bits. Risk Low. Code here is purely additive and actually localized to only a handful of places in the code: validation in ApplyOrdering/AppendOrdering, FTS method translator, parameter inliner and sql generator. Feature is marked as experimental and quirks have been added. * fix FTContainsAll/Any for constants, change TFScore signature to accept params, fixed SqlFunctionExpression to use the new ctor internally, added mandatory property overrides for FragmentExpression (vector search) fixed parameter inliner to not match parameter of type string, but only string[] when processing ContainsAll/Any
[release/9.0] Merge Cosmos full-text search support from release/9.0-staging
… hybrid search experience out of the box (#35954) bumping cosmos sdk version to improve hybrid search experience out of the box - this is a dry run, will incorporate these changes to the proper 9.0 PR once/if we have green light for the bump Continuation of #35909 Description As part of adding full text search support we realized that some scenarios (specifically hybrid search and some instances of ContainsAll) don't work with the Cosmos SDK that is currently referenced by EFCore.Cosmos 9.x package. The issues can be solved by bumping SDK version to 3.48 Customer impact Customers trying full text search will experience errors for some scenarios - cryptic exception (Syntax error near '-' for hybrid, and invalid results for some ContainsAll queries). Workaround is to manually upgrade Cosmos SDK dependency. How found Internal testing by the partner team. Regression No Testing All current Cosmos tests pass. Performed smoke test to validate that breaking change added in the SDK (requiring explicit Newtonsoft.Json dependency) doesn't have impact on the customer app. Risk Low. This can only affect customers using EFCore.Cosmos, one breaking change introduced in the SDK is benign from the perspective of customers using EFCore to communicate with Cosmos (EFCore package absorbs the breaking change).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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:
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
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.
or if you are using SSH
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.