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

Merged DbConnectionClosed, DbConnectionFactory, SqlAuthenticationProviderManager #2410

Merged
merged 6 commits into from
Aug 26, 2024

Conversation

edwardneal
Copy link
Contributor

Contributes to #1261.

This merges the three classes above. DbConnectionFactory has a few references to the metric reporting processes (which are different between .NET Core and Framework) and I've hidden these behind conditional compilation.

@edwardneal edwardneal marked this pull request as ready for review March 17, 2024 19:55
@David-Engel David-Engel added this to the 6.0-preview1 milestone Mar 29, 2024
@DavoudEshtehari
Copy link
Member

@edwardneal Can you address the conflicts, please?

@edwardneal
Copy link
Contributor Author

Thanks @DavoudEshtehari, I've addressed the conflicts. CI is effectively done - there are a few test failures, which seem to be unrelated.

@DavoudEshtehari DavoudEshtehari added the ➕ Code Health Changes related to source code improvements label Aug 21, 2024
@DavoudEshtehari
Copy link
Member

One more conflict after merging your PR. ;)

Copy link

codecov bot commented Aug 22, 2024

Codecov Report

Attention: Patch coverage is 87.73585% with 13 lines in your changes missing coverage. Please review.

Project coverage is 72.02%. Comparing base (6d33e9d) to head (ca4e6f0).
Report is 3 commits behind head on main.

Files Patch % Lines
...Data/SqlClient/SqlAuthenticationProviderManager.cs 69.56% 7 Missing ⚠️
...Microsoft/Data/ProviderBase/DbConnectionFactory.cs 95.06% 4 Missing ⚠️
.../Microsoft/Data/ProviderBase/DbConnectionClosed.cs 0.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2410      +/-   ##
==========================================
- Coverage   72.03%   72.02%   -0.01%     
==========================================
  Files         305      299       -6     
  Lines       61804    61394     -410     
==========================================
- Hits        44522    44221     -301     
+ Misses      17282    17173     -109     
Flag Coverage Δ
addons 92.90% <ø> (ø)
netcore 75.94% <87.61%> (+0.03%) ⬆️
netfx 70.21% <83.14%> (+0.02%) ⬆️

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.

@edwardneal
Copy link
Contributor Author

Thanks - re-merged. The test failures remain unrelated

@DavoudEshtehari DavoudEshtehari merged commit bea3e67 into dotnet:main Aug 26, 2024
131 checks passed
@edwardneal edwardneal deleted the issue-1261-misc-providerbase branch August 27, 2024 04:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
➕ Code Health Changes related to source code improvements
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants