Skip to content

Commit 33a8d53

Browse files
authored
Merge | TdsParser.cs (#3622)
1 parent 17045bc commit 33a8d53

File tree

9 files changed

+14087
-27802
lines changed

9 files changed

+14087
-27802
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,9 @@
771771
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParser.cs">
772772
<Link>Microsoft\Data\SqlClient\TdsParser.cs</Link>
773773
</Compile>
774+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParser.SSPI.cs">
775+
<Link>Microsoft\Data\SqlClient\TdsParser.SSPI.cs</Link>
776+
</Compile>
774777
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserHelperClasses.cs">
775778
<Link>Microsoft\Data\SqlClient\TdsParserHelperClasses.cs</Link>
776779
</Compile>
@@ -831,8 +834,6 @@
831834

832835
<Compile Include="Microsoft\Data\SqlClient\SqlCommand.netcore.cs" />
833836
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
834-
<Compile Include="Microsoft\Data\SqlClient\TdsParser.cs" />
835-
<Compile Include="Microsoft\Data\SqlClient\TdsParser.RegisterEncoding.cs" />
836837
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObject.netcore.cs" />
837838
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectManaged.cs" />
838839
<Compile Include="Microsoft.Data.SqlClient.TypeForwards.cs" />

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

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)