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

Merge SqlDelegatedTransaction #2861

Merged

Conversation

edwardneal
Copy link
Contributor

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:

if(Transaction?.TransactionInformation?.Status == System.Transactions.TransactionStatus.Aborted)

It's now on line 257:

if (Transaction?.TransactionInformation?.Status != TransactionStatus.Aborted)

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.

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.

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!

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

Thanks @benrr101 - branch has been brought up to date, the trace logs left as-is and the nit around GetGlobalTxnIdentifierFromToken addressed!

Copy link

codecov bot commented Nov 1, 2024

Codecov Report

Attention: Patch coverage is 56.25000% with 7 lines in your changes missing coverage. Please review.

Project coverage is 72.38%. Comparing base (87fa6dc) to head (32e8dc5).
Report is 51 commits behind head on main.

Files with missing lines Patch % Lines
...icrosoft/Data/SqlClient/SqlDelegatedTransaction.cs 56.25% 7 Missing ⚠️
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     
Flag Coverage Δ
addons 92.58% <ø> (ø)
netcore 75.41% <56.25%> (-0.01%) ⬇️
netfx 70.68% <53.33%> (-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.

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.

Not sure how I missed updating this one, but we're good!

@cheenamalhotra cheenamalhotra merged commit 5857829 into dotnet:main Nov 15, 2024
76 checks passed
@edwardneal edwardneal deleted the issue-1261-sqldelegatedtransaction branch November 15, 2024 23:14
@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.

5 participants