Skip to content

[release/6.5] Port .NET 10 first-class span support fix#2365

Merged
AndriySvyryd merged 3 commits intorelease/6.5from
copilot/port-ef6-pull-2345
Mar 6, 2026
Merged

[release/6.5] Port .NET 10 first-class span support fix#2365
AndriySvyryd merged 3 commits intorelease/6.5from
copilot/port-ef6-pull-2345

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Mar 5, 2026

  • Update eng/Versions.props: bump DefaultNetCoreTargetFramework from net9.0 to net10.0
  • Update src/EntityFramework/Core/Objects/ELinq/LinqExpressionNormalizer.cs: add span rewriting logic for MemoryExtensions.Contains and MemoryExtensions.SequenceEqual under #if NETSTANDARD2_1
  • Update test/UnitTests/UnitTests.csproj: multi-target net462;$(DefaultNetCoreTargetFramework) with conditional compile/reference groups
  • Update test/UnitTests/Core/Objects/ELinq/LinqExpressionNormalizerTests.cs: add new span rewriting unit tests
  • Update test/FunctionalTests/Query/LinqToEntities/ContainsTests.cs: fix whitespace in existing expected SQL and add new .NET 10 span test
  • Update global.json: bump SDK and tools version to 10.0.103

🔒 GitHub Advanced Security automatically protects Copilot coding agent pull requests. You can protect all pull requests by enabling Advanced Security for your repositories. Learn more about Advanced Security.

Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com>
Copilot AI changed the title [WIP] Port changes from EF6 pull request 2345 Port .NET 10 first-class span support fix (PR #2345) Mar 5, 2026
@AndriySvyryd
Copy link
Copy Markdown
Member

@copilot Change the SDK and tools version to 10.0.103 in global.json

@AndriySvyryd AndriySvyryd changed the title Port .NET 10 first-class span support fix (PR #2345) [release/6.5] Port .NET 10 first-class span support fix (PR #2345) Mar 5, 2026
Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com>
Copy link
Copy Markdown
Contributor Author

Copilot AI commented Mar 5, 2026

@copilot Change the SDK and tools version to 10.0.103 in global.json

Done in commit 0de846c — updated both tools.dotnet and sdk.version to 10.0.103.

@AndriySvyryd AndriySvyryd marked this pull request as ready for review March 5, 2026 23:36
Chris-Wolfgang added a commit to Chris-Wolfgang/DbContextBuilder that referenced this pull request May 4, 2026
Updated [EntityFramework](https://github.com/dotnet/ef6) from 6.5.1 to
6.5.2.

<details>
<summary>Release notes</summary>

_Sourced from [EntityFramework's
releases](https://github.com/dotnet/ef6/releases)._

## 6.5.2

## What's Changed
* Update Microsoft.Data.SqlClient to 5.1.6 by @​AndriySvyryd in
dotnet/ef6#2284
* Port .NET 10 first-class span support fix by @​Copilot in
dotnet/ef6#2365
* Fix HierarchyId parsing for numbers outside Int32 range by @​Copilot
in dotnet/ef6#2362
* Allow the tools to run on the newest SDK by @​AndriySvyryd in
dotnet/ef6#2396

**Full Changelog**:
dotnet/ef6@v6.5.1...v6.5.2

Commits viewable in [compare
view](dotnet/ef6@v6.5.1...v6.5.2).
</details>

Updated
[Meziantou.Analyzer](https://github.com/meziantou/Meziantou.Analyzer)
from 3.0.58 to 3.0.61.

<details>
<summary>Release notes</summary>

_Sourced from [Meziantou.Analyzer's
releases](https://github.com/meziantou/Meziantou.Analyzer/releases)._

## 3.0.61

NuGet package:
<https://www.nuget.org/packages/Meziantou.Analyzer/3.0.61>

## What's Changed
* MA0042: suppress diagnostic for
`IDbContextFactory<TContext>.CreateDbContext()` by @​Copilot in
meziantou/Meziantou.Analyzer#1116


**Full Changelog**:
meziantou/Meziantou.Analyzer@3.0.60...3.0.61

## 3.0.60

NuGet package:
<https://www.nuget.org/packages/Meziantou.Analyzer/3.0.60>

## What's Changed
* Add global severity modes for MeziantouAnalysisMode by @​meziantou in
meziantou/Meziantou.Analyzer#1114


**Full Changelog**:
meziantou/Meziantou.Analyzer@3.0.59...3.0.60

## 3.0.59

NuGet package:
<https://www.nuget.org/packages/Meziantou.Analyzer/3.0.59>

## What's Changed
* Add MA0195 static-field initialization analyzer by @​meziantou in
meziantou/Meziantou.Analyzer#1112


**Full Changelog**:
meziantou/Meziantou.Analyzer@3.0.58...3.0.59

Commits viewable in [compare
view](meziantou/Meziantou.Analyzer@3.0.58...3.0.61).
</details>

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore <dependency name> major version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's major version (unless you unignore this specific
dependency's major version or upgrade to it yourself)
- `@dependabot ignore <dependency name> minor version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's minor version (unless you unignore this specific
dependency's minor version or upgrade to it yourself)
- `@dependabot ignore <dependency name>` will close this group update PR
and stop Dependabot creating any more for the specific dependency
(unless you unignore this specific dependency or upgrade to it yourself)
- `@dependabot unignore <dependency name>` will remove all of the ignore
conditions of the specified dependency
- `@dependabot unignore <dependency name> <ignore condition>` will
remove the ignore condition of the specified dependency and ignore
conditions


</details>
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