-
Notifications
You must be signed in to change notification settings - Fork 293
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
Merge SqlDelegatedTransaction #2861
Merge SqlDelegatedTransaction #2861
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In general it looks good - let's get the merge conflicts resolved, take a look at the comments, make sure the build succeeds, and we'll be good to go!
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDelegatedTransaction.cs
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDelegatedTransaction.cs
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDelegatedTransaction.cs
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDelegatedTransaction.cs
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDelegatedTransaction.cs
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDelegatedTransaction.cs
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDelegatedTransaction.cs
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDelegatedTransaction.cs
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDelegatedTransaction.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDelegatedTransaction.cs
Outdated
Show resolved
Hide resolved
Thanks @benrr101 - branch has been brought up to date, the trace logs left as-is and the nit around GetGlobalTxnIdentifierFromToken addressed! |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #2861 +/- ##
==========================================
+ Coverage 72.31% 72.38% +0.06%
==========================================
Files 288 286 -2
Lines 59660 59462 -198
==========================================
- Hits 43146 43039 -107
+ Misses 16514 16423 -91
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
This reverts commit 39f1038.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure how I missed updating this one, but we're good!
Contributes to #1261.
This PR merges the SqlDelegatedTransaction class. It's slightly more complex, because it introduces a behaviour change in the .NET Framework class. I think the change is correct though.
Line 262 of the .NET Framework class was formerly:
It's now on line 257:
This changes the .NET Framework class to align with the .NET Core codebase. Historically, both conditions were identical between codebases; PR #1216 changed this to fix a bug in .NET Core, in the process swapping the condition from
!=
to==
in .NET Framework. I'm pretty sure this was just a typo, and the merge will correct that.