Skip to content

Commit 77c35d8

Browse files
authored
Merge | Merge TdsParserStateObject, cleanup TdsParser files (#3647)
1 parent be62e90 commit 77c35d8

File tree

12 files changed

+1036
-2129
lines changed

12 files changed

+1036
-2129
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -774,9 +774,6 @@
774774
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParser.cs">
775775
<Link>Microsoft\Data\SqlClient\TdsParser.cs</Link>
776776
</Compile>
777-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParser.SSPI.cs">
778-
<Link>Microsoft\Data\SqlClient\TdsParser.SSPI.cs</Link>
779-
</Compile>
780777
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserHelperClasses.cs">
781778
<Link>Microsoft\Data\SqlClient\TdsParserHelperClasses.cs</Link>
782779
</Compile>
@@ -786,6 +783,9 @@
786783
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObject.Multiplexer.cs">
787784
<Link>Microsoft\Data\SqlClient\TdsParserStateObject.Multiplexer.cs</Link>
788785
</Compile>
786+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObjectManaged.netcore.cs">
787+
<Link>Microsoft\Data\SqlClient\TdsParserStateObjectManaged.netcore.cs</Link>
788+
</Compile>
789789
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStaticMethods.cs">
790790
<Link>Microsoft\Data\SqlClient\TdsParserStaticMethods.cs</Link>
791791
</Compile>
@@ -837,8 +837,6 @@
837837

838838
<Compile Include="Microsoft\Data\SqlClient\SqlCommand.netcore.cs" />
839839
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
840-
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObject.netcore.cs" />
841-
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectManaged.cs" />
842840
<Compile Include="Microsoft.Data.SqlClient.TypeForwards.cs" />
843841
</ItemGroup>
844842

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

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

src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -444,9 +444,6 @@
444444
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParser.cs">
445445
<Link>Microsoft\Data\SqlClient\TdsParser.cs</Link>
446446
</Compile>
447-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParser.SSPI.cs">
448-
<Link>Microsoft\Data\SqlClient\TdsParser.SSPI.cs</Link>
449-
</Compile>
450447
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumerator.cs">
451448
<Link>Microsoft\Data\Sql\SqlDataSourceEnumerator.cs</Link>
452449
</Compile>
@@ -1014,7 +1011,6 @@
10141011

10151012
<Compile Include="Microsoft\Data\SqlClient\SqlCommand.netfx.cs" />
10161013
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
1017-
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObject.netfx.cs" />
10181014
</ItemGroup>
10191015
<!-- Resources -->
10201016
<ItemGroup>

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

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

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.stub.cs

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

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDataReaderSmi.stub.cs

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

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlInternalConnectionSmi.stub.cs

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

0 commit comments

Comments
 (0)