Skip to content

Commit 1765de5

Browse files
authored
Merge | TdsParser functional changes (#3555)
* netcore, netfx: sync declarations of TdsOperationStatus variables * netcore: reorder TryProcessUDTMetadata * netfx: reorder WriteTceFeatureRequest * netfx: reorder WriteAzureSQLSupportFeatureRequest * netcore, netfx: merge WriteInt and SerializeInt 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 * netcore, netfx: refactor and sync serialization of guids * netcore, netfx: refactor and sync serialization of floats and doubles This removes the need for TdsParser.netcore.cs. * netfx: adjust TraceString - parameter was being passed to it which was never referenced in the format string * netcore: sync exception messages with netfx Messages of the netfx exceptions are more detailed * netfx, netcore: centralise masking of received server options 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 is set and certificate is not automatically trusted * netfx: add static lambda to TdsExecuteSQLBatch * netfx: remove failed attempt at static lambda 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 * netfx: pre-PR correction: match previous behaviour when writing Guid instances from WriteUnterminatedSqlValue * Flip order of debug assertion * Next round of code review Remove unnecessary conditional compilation. Add XML documentation to clarify SerializeShort, WriteShort et al. * netcore, netfx: sync TraceString Both platforms will now show the TransparentNetworkIPResolution status. This is always disabled on netcore. * Expand ParametersTest to include SqlGuid (including null value) * netfx: port RequestContinue call from netcore
1 parent 780db73 commit 1765de5

File tree

5 files changed

+575
-403
lines changed

5 files changed

+575
-403
lines changed

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,6 @@
822822
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionHelper.cs" />
823823
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
824824
<Compile Include="Microsoft\Data\SqlClient\TdsParser.cs" />
825-
<Compile Include="Microsoft\Data\SqlClient\TdsParser.netcore.cs" />
826825
<Compile Include="Microsoft\Data\SqlClient\TdsParser.RegisterEncoding.cs" />
827826
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObject.netcore.cs" />
828827
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectManaged.cs" />

0 commit comments

Comments
 (0)