Skip to content

Commit 632b750

Browse files
committed
Merge TdsParserStateObjectNative
1 parent d1d8fa7 commit 632b750

File tree

4 files changed

+6
-510
lines changed

4 files changed

+6
-510
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
@@ -973,12 +973,13 @@
973973
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObjectFactory.Windows.cs">
974974
<Link>Microsoft\Data\SqlClient\TdsParserStateObjectFactory.Windows.cs</Link>
975975
</Compile>
976+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObjectNative.Windows.cs">
977+
<Link>Microsoft\Data\SqlClient\TdsParserStateObjectNative.Windows.cs</Link>
978+
</Compile>
976979
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.Windows.cs">
977980
<Link>Microsoft\Data\SqlTypes\SqlFileStream.Windows.cs</Link>
978981
</Compile>
979982

980-
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectNative.cs" />
981-
982983
<EmbeddedResource Include="$(CommonSourceRoot)Resources\ILLink.Substitutions.Windows.xml">
983984
<LogicalName>ILLink.Substitutions.xml</LogicalName>
984985
<Link>Resources\ILLink.Substitutions.Windows.xml</Link>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,6 +924,9 @@
924924
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObjectFactory.Windows.cs">
925925
<Link>Microsoft\Data\SqlClient\TdsParserStateObjectFactory.Windows.cs</Link>
926926
</Compile>
927+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStateObjectNative.Windows.cs">
928+
<Link>Microsoft\Data\SqlClient\TdsParserStateObjectNative.Windows.cs</Link>
929+
</Compile>
927930
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\TdsParserStaticMethods.cs">
928931
<Link>Microsoft\Data\SqlClient\TdsParserStaticMethods.cs</Link>
929932
</Compile>
@@ -996,7 +999,6 @@
996999
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
9971000
<Compile Include="Microsoft\Data\SqlClient\TdsParser.cs" />
9981001
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObject.netfx.cs" />
999-
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectNative.cs" />
10001002
</ItemGroup>
10011003
<!-- Resources -->
10021004
<ItemGroup>

0 commit comments

Comments
 (0)