dotnet / SqlClient

Microsoft.Data.SqlClient provides database connectivity to SQL Server for .NET applications.
MIT License
860 stars 288 forks source link

Mark InternalException, NetEventSource & SecPkgContext_ApplicationProtocol as .NET 6.0-only #2962

Closed edwardneal closed 2 weeks ago

edwardneal commented 2 weeks ago

This picks up from the comments on #2828, to resolve the merge race between @benrr101, @mdaigle and I.

InternalException, NetEventSource and the types associated with SecPkgContext_ApplicationProtocol are only used by the old .NET 6.0 target. This PR guards these behind #if NET && !NET8_0_OR_GREATER, ready to join the rest of the .NET 6.0-only files and types when they're removed.

Is the removal of the .NET 6.0-only code already in motion, or will this happen after the SqlClient 6.0 release?

codecov[bot] commented 2 weeks ago

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 72.29%. Comparing base (9d5ca32) to head (21bebf4). Report is 9 commits behind head on main.

Additional details and impacted files ```diff @@ Coverage Diff @@ ## main #2962 +/- ## ========================================== - Coverage 72.31% 72.29% -0.02% ========================================== Files 288 288 Lines 59660 59660 ========================================== - Hits 43145 43134 -11 - Misses 16515 16526 +11 ``` | [Flag](https://app.codecov.io/gh/dotnet/SqlClient/pull/2962/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dotnet) | Coverage Δ | | |---|---|---| | [addons](https://app.codecov.io/gh/dotnet/SqlClient/pull/2962/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dotnet) | `92.58% <ø> (ø)` | | | [netcore](https://app.codecov.io/gh/dotnet/SqlClient/pull/2962/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dotnet) | `75.38% <ø> (-0.05%)` | :arrow_down: | | [netfx](https://app.codecov.io/gh/dotnet/SqlClient/pull/2962/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dotnet) | `70.69% <ø> (+0.01%)` | :arrow_up: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dotnet#carryforward-flags-in-the-pull-request-comment) to find out more.

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

cheenamalhotra commented 2 weeks ago

Is the removal of the .NET 6.0-only code already in motion, or will this happen after the SqlClient 6.0 release?

We'll take in changes as much as we can get accomplished.