Merge | TdsParserStateObject lifetime-related methods #3394
+270
−251
Conversation
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
Also move ReadSyncOverAsync down in netcore's TdsParserStateObjectNative to aid later merge
Also reorder member in TdsParserStateObjectNative to simplify later merge
This also allows _writePacketCache to be migrated to TdsParserStateObjectNative in netfx.
|
/azp run |
|
Azure Pipelines successfully started running 2 pipeline(s). |
mdaigle
previously approved these changes
Jul 23, 2025
|
@edwardneal ahh I'm sorry I didn't look at this soon enough and now it needs a conflct resolved. I'd do it myself but then I can't approve it. |
|
Thanks @benrr101, I've just re-merged. |
|
/azp run |
|
Azure Pipelines successfully started running 2 pipeline(s). |
samsharma2700
previously approved these changes
Jul 28, 2025
src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObjectNative.cs
Show resolved
Hide resolved
mdaigle
previously approved these changes
Jul 29, 2025
|
This is now merged to address the conflicts from #3469. Could I have a CI run please? |
|
/azp run |
|
Azure Pipelines successfully started running 2 pipeline(s). |
mdaigle
previously approved these changes
Aug 26, 2025
This allows TdsParser.netfx.cs to be deleted
|
Merged to address the conflicts from #3535. This also allowed the removal of TdsParser.netfx.cs. |
|
/azp run |
|
Azure Pipelines successfully started running 2 pipeline(s). |
|
@edwardneal I'm going to kick the failing tests again, but if the macos tests keeps failing, you might need to merge from main now that #3591 is merged |
mdaigle
approved these changes
Sep 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
We're now merging the lifetime-related methods on TdsParserStateObject in netfx, making them abstract and pushing them down to the derived TdsParserStateObjectNative class. This also handles some slightly unusual logic in
CreatePhysicalSNIHandle, sincespnsis a string in netfx and a string array in netcore. I've needed to merge this type handling too.Commit 469d840 onwards moves method-by-method. I've moved:
Relates to #1261.