Merged
Conversation
benrr101
requested review from
David-Engel,
VladimirReshetnikov,
cheenamalhotra,
mdaigle,
samsharma2700 and
saurabh500
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #2898 +/- ##
==========================================
+ Coverage 71.92% 72.24% +0.32%
==========================================
Files 294 291 -3
Lines 60342 59769 -573
==========================================
- Hits 43398 43180 -218
+ Misses 16944 16589 -355
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
Outdated
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
Outdated
Show resolved
Hide resolved
Seems like a lot of hassle for little benefit :/
* Fix annoyance with failing unit test setup
* Use variable versions * Remove output type from common project
* Normalize the path *once*
* Fix method signatures (modifier order, argument formatting) * Touching up comments
benrr101
force-pushed
the
common-sqlfilestream-smallercleanup
branch
from
9e157a5 to
efad644
Compare
mdaigle
reviewed
Oct 18, 2024
src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlTypes/SqlFileStream.Windows.cs
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlTypes/SqlFileStream.Windows.cs
Show resolved
Hide resolved
mdaigle
approved these changes
Oct 24, 2024
Member
|
Can you please take a look at conflicts, thanks! |
cheenamalhotra
approved these changes
Oct 25, 2024
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Description: This PR aims to merge
SqlFileStreamfrom the netfx and netcore projects. The strategy for this merge is to use the Interop.* libraries from the netcore project to enable merging the classes. Therefore, the code for this class is mostly based on the netcore implementation with a handful of#if NETFRAMEWORKblocks to add overrides for netfx behavior.The commits are broken up into fairly digestible chunks that explain each step along the process. I'd recommend reviewing the PR by stepping through the commits and seeing if you agree with the changes. Nevertheless, this PR has a lot of code cleanup changes at the end that make the overall PR fairly large. In anticipation of pushback on this, I will offer a separate PR that only contains the merge changes. If that one is accepted, I'll still send out the cleanup change on a separate PR. But, I think this option would be faster overall.
Testing: The existing manual tests for SqlFileStream were used to validate behavior.