Skip to content

Merge | Merge TdsParserStateObject, cleanup TdsParser files #3647

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.

Sign up for GitHub

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

Open
wants to merge 26 commits into
base: main
Choose a base branch
from
+1,036 −2,129
Open

Merge | Merge TdsParserStateObject, cleanup TdsParser files #3647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f777bd8
Move TdsParserStateObjectManaged.cs
edwardneal Oct 1, 2025
06060c9
Merge netfx-only variables
edwardneal Oct 1, 2025
1c73f13
Merge constructor
edwardneal Oct 1, 2025
b8bfc28
netfx: sync trace string
edwardneal Oct 1, 2025
3779e3b
Merge DecrementPendingCallbacks
edwardneal Oct 1, 2025
1910cb8
Merge ValidateSNIConnection
edwardneal Oct 1, 2025
0228eb3
netfx, netcore: sync TransparentNetworkIPResolution error handling
edwardneal Oct 1, 2025
8d82f4d
Merge ReadSniError
edwardneal Oct 1, 2025
920601a
Merge GetSniPacket
edwardneal Oct 1, 2025
2648e63
Merge TrySetBufferSecureStrings
edwardneal Oct 1, 2025
5229c0e
netcore, netfx: sync debug assertion in ReadAsyncCallback
edwardneal Oct 1, 2025
6810ba9
Merge ReadAsyncCallback
edwardneal Oct 1, 2025
85a0a71
Merge WriteAsyncCallback
edwardneal Oct 1, 2025
b748a3a
Merge WritePacket
edwardneal Oct 1, 2025
ed716ff
Merge SNIWritePacket
edwardneal Oct 1, 2025
edf61c7
Merge WriteSni
edwardneal Oct 1, 2025
cafbd02
Merge SendAttention
edwardneal Oct 1, 2025
3defa6f
netfx, netcore: sync SniWriteStatisticsAndTracing
edwardneal Oct 1, 2025
cfd5d5b
Merge SniWriteStatisticsAndTracing
edwardneal Oct 1, 2025
b2a6996
Remove now-unused target-specific TdsParserStateObject.cs files
edwardneal Oct 1, 2025
70e34cd
TdsParser: Move variable to shared file
edwardneal Oct 1, 2025
ea20e46
TdsParser: Move TdsLogin
edwardneal Oct 1, 2025
c8be76e
TdsParser: Move ProcessSSPI
edwardneal Oct 1, 2025
a2b56f6
Remove now-unused TdsParser.SSPI.cs
edwardneal Oct 1, 2025
b9b10ba
Remove now-unused stub files
edwardneal Oct 1, 2025
530b208
Merge main
edwardneal Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,9 +771,6 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParser.cs">
<Link>Microsoft\Data\SqlClient\TdsParser.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParser.SSPI.cs">
<Link>Microsoft\Data\SqlClient\TdsParser.SSPI.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserHelperClasses.cs">
<Link>Microsoft\Data\SqlClient\TdsParserHelperClasses.cs</Link>
</Compile>
Expand All @@ -783,6 +780,9 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObject.Multiplexer.cs">
<Link>Microsoft\Data\SqlClient\TdsParserStateObject.Multiplexer.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObjectManaged.netcore.cs">
<Link>Microsoft\Data\SqlClient\TdsParserStateObjectManaged.netcore.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStaticMethods.cs">
<Link>Microsoft\Data\SqlClient\TdsParserStaticMethods.cs</Link>
</Compile>
Expand Down Expand Up @@ -834,8 +834,6 @@

<Compile Include="Microsoft\Data\SqlClient\SqlCommand.netcore.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObject.netcore.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectManaged.cs" />
<Compile Include="Microsoft.Data.SqlClient.TypeForwards.cs" />
</ItemGroup>

Expand Down
806 changes: 0 additions & 806 deletions ...osoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObject.netcore.cs
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,9 +444,6 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParser.cs">
<Link>Microsoft\Data\SqlClient\TdsParser.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParser.SSPI.cs">
<Link>Microsoft\Data\SqlClient\TdsParser.SSPI.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumerator.cs">
<Link>Microsoft\Data\Sql\SqlDataSourceEnumerator.cs</Link>
</Compile>
Expand Down Expand Up @@ -1011,7 +1008,6 @@

<Compile Include="Microsoft\Data\SqlClient\SqlCommand.netfx.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObject.netfx.cs" />
</ItemGroup>
<!-- Resources -->
<ItemGroup>
Expand Down
843 changes: 0 additions & 843 deletions ...Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObject.netfx.cs
View file
Open in desktop

This file was deleted.

96 changes: 0 additions & 96 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.stub.cs
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReaderSmi.stub.cs
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInternalConnectionSmi.stub.cs
View file
Open in desktop

This file was deleted.

Loading
Loading