Merge | TdsParser functional changes #3555

edwardneal · 2025-08-10T20:33:51Z

Description

This should cover all necessary functional changes to TdsParser. With these changes merged, the class as a whole should be ready to merge after TdsParserStateObject is dealt with.

Not all of these changes are functional - some are simply necessary to see the real ones clearly. Possibly impactful commits here are:

878fcd4: when TdsParser was writing ints and there was space in the packet buffer, WriteInt would write the bytes to a stackalloc'd Span<byte> and then copy into the buffer. I've eliminated the unnecessary intermediary span, and we now write directly into the buffer.
a8be2f1: netfx had more detailed error messages when the parsing of a TDS stream failed. This ports those messages over to netcore.
01b02db: netfx will currently enforce the validation of a server's SSL certificate if Trust Server Certificate is false and the connection's AccessToken or AccessTokenCallback is set, but netcore doesn't currently check the AccessTokenCallback property. This commit changes the behaviour of netcore to match netfx.

There's also one other commit (6d98357) which looks more impactful than it is. s_xmlMetadataSubstituteSequence and s_jsonMetadataSubstituteSequence are the same length, so there's no runtime impact here.

Issues

Relates to #1261.

Testing

Unit tests passed locally.

netcore: removed a simple WriteInt which did nothing besides call BinaryPrimitives. netcore: when there's space in the packet buffer, WriteInt will now write to it directly (rather than write to a stack-allocated span and copy.)

This removes the need for TdsParser.netcore.cs.

…s never referenced in the format string

Messages of the netfx exceptions are more detailed

Added mask to netcore logic. Also removed mask on _encryptionOption from netfx - this will never be outside the range of EncryptionOptions.OPTIONS_MASK.

… is set and certificate is not automatically trusted

This passed state around, but never passed enough state to remove the state machine. Sync with netcore.

…instances from WriteUnterminatedSqlValue

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs

paulmedynski · 2025-08-27T14:44:56Z

/azp run

azure-pipelines · 2025-08-27T14:45:19Z

Azure Pipelines successfully started running 2 pipeline(s).

paulmedynski

Looks good, with a few questions/suggestions.

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs

Remove unnecessary conditional compilation. Add XML documentation to clarify SerializeShort, WriteShort et al.

paulmedynski · 2025-08-28T11:33:01Z

/azp run

azure-pipelines · 2025-08-28T11:33:23Z

Azure Pipelines successfully started running 2 pipeline(s).

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs

Both platforms will now show the TransparentNetworkIPResolution status. This is always disabled on netcore.

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs

benrr101

All looks good to me!

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs

benrr101 · 2025-09-03T18:55:47Z

/azp run

azure-pipelines · 2025-09-03T18:56:10Z

Azure Pipelines successfully started running 2 pipeline(s).

paulmedynski · 2025-09-09T10:25:33Z

@edwardneal - I think a merge from main will help clear up some of these CI failures.

edwardneal · 2025-09-09T17:17:55Z

Thanks @paulmedynski - I've just merged, can you re-run CI please?

paulmedynski · 2025-09-09T18:12:43Z

/azp run

azure-pipelines · 2025-09-09T18:13:08Z

Azure Pipelines successfully started running 2 pipeline(s).

paulmedynski · 2025-09-10T12:48:22Z

/azp run

azure-pipelines · 2025-09-10T12:48:43Z

Azure Pipelines successfully started running 2 pipeline(s).

codecov · 2025-09-10T17:38:02Z

Codecov Report

❌ Patch coverage is 18.01802% with 182 lines in your changes missing coverage. Please review.
✅ Project coverage is 61.83%. Comparing base (cd3dbd1) to head (c421d87).
⚠️ Report is 16 commits behind head on main.

Files with missing lines	Patch %	Lines
.../netcore/src/Microsoft/Data/SqlClient/TdsParser.cs	12.38%	92 Missing ⚠️
...nt/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs	23.07%	90 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #3555      +/-   ##
==========================================
- Coverage   65.48%   61.83%   -3.66%     
==========================================
  Files         275      267       -8     
  Lines       61518    61338     -180     
==========================================
- Hits        40288    37931    -2357     
- Misses      21230    23407    +2177

Flag	Coverage Δ
addons	`?`
netcore	`63.90% <12.38%> (-3.75%)`	⬇️
netfx	`63.95% <23.07%> (-5.26%)`	⬇️

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.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

benrr101

Let's gooooooooooooooooo 🚀

edwardneal added 16 commits August 9, 2025 21:46

netcore, netfx: sync declarations of TdsOperationStatus variables

cd2211a

netcore: reorder TryProcessUDTMetadata

076f87b

netfx: reorder WriteTceFeatureRequest

9499343

netfx: reorder WriteAzureSQLSupportFeatureRequest

06b292d

netcore, netfx: merge WriteInt and SerializeInt

878fcd4

netcore: removed a simple WriteInt which did nothing besides call BinaryPrimitives. netcore: when there's space in the packet buffer, WriteInt will now write to it directly (rather than write to a stack-allocated span and copy.)

netcore: remove ConstructGuid method

c19a10d

netcore, netfx: refactor and sync serialization of guids

8806a93

netcore, netfx: refactor and sync serialization of floats and doubles

b9d396f

This removes the need for TdsParser.netcore.cs.

netfx: adjust TraceString - parameter was being passed to it which wa…

43e90dd

…s never referenced in the format string

netcore: sync exception messages with netfx

a8be2f1

Messages of the netfx exceptions are more detailed

netfx, netcore: centralise masking of received server options

8793af7

Added mask to netcore logic. Also removed mask on _encryptionOption from netfx - this will never be outside the range of EncryptionOptions.OPTIONS_MASK.

netcore: enforce server certificate validation if AccessTokenCallback…

01b02db

… is set and certificate is not automatically trusted

netfx: add static lambda to TdsExecuteSQLBatch

209663e

netfx: remove failed attempt at static lambda

693069f

This passed state around, but never passed enough state to remove the state machine. Sync with netcore.

netfx: sync reference to length of JSON metadata substitution sequence

6d98357

netfx: pre-PR correction: match previous behaviour when writing Guid …

1d3930a

…instances from WriteUnterminatedSqlValue

edwardneal requested a review from a team as a code owner August 10, 2025 20:33

Wraith2 reviewed Aug 11, 2025

View reviewed changes

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs Show resolved Hide resolved

Wraith2 reviewed Aug 11, 2025

View reviewed changes

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs Show resolved Hide resolved

Wraith2 reviewed Aug 11, 2025

View reviewed changes

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs Outdated Show resolved Hide resolved

Flip order of debug assertion

539b993

paulmedynski self-assigned this Aug 27, 2025

paulmedynski requested changes Aug 27, 2025

View reviewed changes

Next round of code review

ea7f728

Remove unnecessary conditional compilation. Add XML documentation to clarify SerializeShort, WriteShort et al.

edwardneal requested a review from paulmedynski August 28, 2025 06:19

paulmedynski mentioned this pull request Aug 28, 2025

Add select docs to TdsParser methods per #3555 #3584

Open

mdaigle self-assigned this Aug 28, 2025

paulmedynski previously approved these changes Aug 28, 2025

View reviewed changes

mdaigle reviewed Aug 28, 2025

View reviewed changes

mdaigle linked an issue Aug 29, 2025 that may be closed by this pull request

Inconsistent server certificate validation between .NET Core and .NET Framework #3586

Closed

edwardneal added 3 commits August 29, 2025 23:12

netcore, netfx: sync TraceString

3694fdd

Both platforms will now show the TransparentNetworkIPResolution status. This is always disabled on netcore.

Expand ParametersTest to include SqlGuid (including null value)

b475b85

Merge main

e079e09

edwardneal dismissed paulmedynski’s stale review via e079e09 August 29, 2025 23:23

mdaigle reviewed Sep 3, 2025

View reviewed changes

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs Show resolved Hide resolved

mdaigle previously approved these changes Sep 3, 2025

View reviewed changes

benrr101 previously approved these changes Sep 3, 2025

View reviewed changes

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs Outdated Show resolved Hide resolved

paulmedynski previously approved these changes Sep 4, 2025

View reviewed changes

edwardneal added 2 commits September 9, 2025 17:55

Merge branch 'main' into merge/tdsparser-pt2

3588f3c

netfx: port RequestContinue call from netcore

c421d87

edwardneal dismissed stale reviews from paulmedynski, benrr101, and mdaigle via c421d87 September 9, 2025 17:17

paulmedynski approved these changes Sep 16, 2025

View reviewed changes

benrr101 approved these changes Sep 16, 2025

View reviewed changes

benrr101 merged commit 1765de5 into dotnet:main Sep 16, 2025
236 checks passed

edwardneal deleted the merge/tdsparser-pt2 branch September 17, 2025 05:33

Merge | TdsParser functional changes #3555

Merge | TdsParser functional changes #3555

Uh oh!

Conversation

edwardneal commented Aug 10, 2025

Description

Issues

Testing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

paulmedynski commented Aug 27, 2025

Uh oh!

azure-pipelines bot commented Aug 27, 2025

Uh oh!

paulmedynski left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

paulmedynski commented Aug 28, 2025

Uh oh!

azure-pipelines bot commented Aug 28, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

benrr101 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

benrr101 commented Sep 3, 2025

Uh oh!

azure-pipelines bot commented Sep 3, 2025

Uh oh!

paulmedynski commented Sep 9, 2025

Uh oh!

edwardneal commented Sep 9, 2025

Uh oh!

paulmedynski commented Sep 9, 2025

Uh oh!

azure-pipelines bot commented Sep 9, 2025

Uh oh!

paulmedynski commented Sep 10, 2025

Uh oh!

azure-pipelines bot commented Sep 10, 2025

Uh oh!

codecov bot commented Sep 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

benrr101 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Milestone

codecov bot commented Sep 10, 2025 •

edited

Loading