[automated] Merge branch 'release/9.0' => 'main' #35932
Merged
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
#### AI description (iteration 1) #### PR Classification Code cleanup and dependency updates. #### PR Summary This pull request updates various dependencies and tool versions to ensure compatibility and leverage the latest features. - 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`. - Updated `dotnet` SDK version to `8.0.113` in `/global.json`. - Updated `xcopy-msbuild` version to `17.12.0` in `/eng/common/tools.ps1` and `/eng/common/sdk-task.ps1`. - Added new package source in `/NuGet.config`. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
#### 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/8.0 to internal/release/8.0 and resolve conflicts if necessary
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 -->
…otnet-runtime build 20250312.16 Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Formats.Asn1 From Version 8.0.14-servicing.25111.18 -> To Version 8.0.15-servicing.25162.16
…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**: [20250312.16](https://dev.azure.com/dnceng/internal/_build/results?buildId=2661775) - **Date Produced**: March 13, 2025 3:37:27 AM UTC - **Commit**: [6eee28c27213784c1f8a112df1c90113585c4111](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?_a=history&version=GC6eee28c27213784c1f8a112df1c90113585c4111) - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.14-servicing.25111.18 to 8.0.15-servicing.25162.16][1] - **Microsoft.NETCore.App.Ref**: [from 8.0.14 to 8.0.15][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.14 to 8.0.15][1] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.14-servicing.25111.18 to 8.0.15-servicing.25162.16][1] - **System.Formats.Asn1**: [from 8.0.2 to 8.0.2][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC1584e493603cfc4e9b36b77d6d4afe97de6363f9&targetVersion=GC6eee28c27213784c1f8a112df1c90113585c4111&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:922981e1-18b6-46aa-2468-08dbd53ba9ce)
Merge from public release/8.0 to internal/release/8.0 and resolve conflicts if necessary
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)
…otnet-runtime build 20250314.9 Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Formats.Asn1 From Version 8.0.15-servicing.25162.16 -> To Version 8.0.15-servicing.25164.9
…otnet-runtime build 20250314.13 Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Formats.Asn1 From Version 8.0.15-servicing.25162.16 -> To Version 8.0.15-servicing.25164.13
…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**: [20250314.13](https://dev.azure.com/dnceng/internal/_build/results?buildId=2663922) - **Date Produced**: March 15, 2025 7:00:25 AM UTC - **Commit**: [50c4cb9fc31c47f03eac865d7bc518af173b74b7](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?_a=history&version=GC50c4cb9fc31c47f03eac865d7bc518af173b74b7) - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.15-servicing.25162.16 to 8.0.15-servicing.25164.13][2] - **Microsoft.NETCore.App.Ref**: [from 8.0.15 to 8.0.15][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.15 to 8.0.15][2] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.15-servicing.25162.16 to 8.0.15-servicing.25164.13][2] - **System.Formats.Asn1**: [from 8.0.2 to 8.0.2][2] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC6eee28c27213784c1f8a112df1c90113585c4111&targetVersion=GC50c4cb9fc31c47f03eac865d7bc518af173b74b7&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:922981e1-18b6-46aa-2468-08dbd53ba9ce)
#### AI description (iteration 1) #### PR Classification Code cleanup and dependency update. #### PR Summary This pull request updates dependencies and cleans up configuration files. - Updated versions and SHAs for `Microsoft.DotNet.Arcade.Sdk`, `Microsoft.DotNet.Build.Tasks.Templating`, and `Microsoft.DotNet.Helix.Sdk` in `eng/Version.Details.xml`, `global.json`, and `eng/Versions.props`. - Removed obsolete package sources from `NuGet.config`. - Updated URLs for dotnet-install scripts in `eng/common/tools.ps1` and `eng/common/tools.sh`. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
…otnet-runtime build 20250402.8 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
…404.5 (#35912) [release/9.0] Update dependencies from dotnet/arcade
…-merge-9.0-2025-04-08-1202
* Update dependencies from https://github.com/dotnet/dotnet build 267208 * Delete eng/DotNetBuild.props * Update Publishing.props * Delete eng/Signing.props --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
…8b-ad184822db38 [main] Source code updates from dotnet/dotnet
* Extend `LocustHorde` The extended `LocustHorde` has two fields which have different types but share the same base type. This is interesting when using SQL constructs to select one of the two fields as they are compatible but have different types. * Add test for member access over conditional i.e. for issue #34589 * Fold member access into conditional Fixes #34589.
* Update dependencies from https://github.com/dotnet/dotnet build 267725 * Update dependencies from https://github.com/dotnet/dotnet build 267776 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…e multiple keywords rather than keyword array (#36000) Port of #35984 Fixes #35983 Description Reacting to Cosmos changing the signature of FullTextScore function. Customer impact TBD 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. Partner team will conduct additional testing on their end. Risk Low. Localized change to translation - method signature exposed by EF is already in place. New translation now resembles other FullText methods, so same techniques can be used for translation (essentially re-using code that has been in place for other methods and working). Full text search support is experimental on EF9. Added quirk just in case.
…-merge-8.0-2025-05-13-1457
…-merge-9.0-2025-05-13-1508
…513.4 (#36085) [release/8.0] Update dependencies from dotnet/arcade
[release/9.0] Update dependencies from dotnet/arcade
* Update dependencies from https://github.com/dotnet/dotnet build 268047 * Update dependencies from https://github.com/dotnet/dotnet build 268099 Updated Dependencies: Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.Configuration, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.App.Runtime.win-x64, System.Text.Json, System.Text.Encodings.Web, System.Formats.Asn1, System.Runtime.Caching (Version 10.0.0-preview.5.25263.104 -> 10.0.0-preview.5.25260.104) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25263.104 -> 10.0.0-beta.25260.104) * [VMR] Codeflow 362a422-ad85650 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 268384 Updated Dependencies: Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.Configuration, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.App.Runtime.win-x64, System.Text.Json, System.Text.Encodings.Web, System.Formats.Asn1, System.Runtime.Caching (Version 10.0.0-preview.5.25263.108 -> 10.0.0-preview.5.25260.104) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25263.108 -> 10.0.0-beta.25260.104) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
[release/9.0] Merge release/9.0-staging to release/9.0
AndriySvyryd
approved these changes
May 16, 2025
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.