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

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

Merged
merged 1 commit into from
Nov 5, 2024

Conversation

edwardneal
Copy link
Contributor

@edwardneal edwardneal commented Nov 2, 2024

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?

InternalException, NetEventSource and the types associated with SecPkgContext_ApplicationProtocol are only used by the old .NET 6.0 target.
Copy link

codecov bot commented Nov 2, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

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

Additional details and impacted files
@@            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 Coverage Δ
addons 92.58% <ø> (ø)
netcore 75.38% <ø> (-0.05%) ⬇️
netfx 70.69% <ø> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@benrr101 benrr101 added this to the 6.0-preview3 milestone Nov 4, 2024
Copy link
Contributor

@benrr101 benrr101 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me 🚢
While this touches a file I've got queued up in a later PR, it won't cause many issues. I can just update that PR to delete the file with prejudice 😈

@cheenamalhotra
Copy link
Member

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.

@benrr101 benrr101 merged commit 4b28b79 into dotnet:main Nov 5, 2024
76 checks passed
@edwardneal edwardneal deleted the net60-referenced-code-cleanup branch November 5, 2024 18:21
@mdaigle mdaigle added the Common Project 🚮 Things that relate to the common project project label Nov 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Common Project 🚮 Things that relate to the common project project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants