Skip to content

Commit 1ad6fcf

Browse files
authored
Merge | SqlCommand Execute Xml (#3637)
* Add partial for XML methods * Merge ExecuteXmlReader * Merge CompleteXmlReader * Merge ExecuteXmlReaderAsync * Merge InternalExecuteXmlReaderWithRetryAsync * Merge InternalExecuteXmlReaderAsync * Merge BeginExecuteXmlReader * Merge BeginExecuteXmlReaderAsync (which seems to be completely pointless...) * Merge BeginExecuteXmlReaderInternal * Merge BeginExecuteXmlReaderInternalReadStage * Merge EndExecuteXmlReader * Merge EndExecuteXmlReaderInternal and CleanupAfterExecuteXmlReaderAsync * Merge EndExecuteXmlReaderAsync * Merge execute xml context internal class (and fix broken xml comments link) # Conflicts: # src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.netcore.cs # src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.netfx.cs * Add comment for partial
1 parent fa7132e commit 1ad6fcf

File tree

6 files changed

+625
-900
lines changed

6 files changed

+625
-900
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -588,6 +588,9 @@
588588
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Scalar.cs">
589589
<Link>Microsoft\Data\SqlClient\SqlCommand.Scalar.cs</Link>
590590
</Compile>
591+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommand.Xml.cs">
592+
<Link>Microsoft\Data\SqlClient\SqlCommand.Xml.cs</Link>
593+
</Compile>
591594
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlCommandSet.cs">
592595
<Link>Microsoft\Data\SqlClient\SqlCommandSet.cs</Link>
593596
</Compile>

0 commit comments

Comments
 (0)