Skip to content

Commit 12f742d

Browse files
authored
Merge | SqlBulkCopy (#3405)
* Make merge file for SqlBulkCopy - wowee, these files are pretty close together already! * Remove old SqlBulkCopy files and point projects to common project one * Addressing the easy differences * Fix broken documentation links * Stub out more methods/classes to eliminate most of the errors in SqlBulkCopy * Resolve the rest of the conflicts * Fix mistake in conflict resolution * Addressing PR feedback
1 parent 9ac9188 commit 12f742d

File tree

11 files changed

+401
-3286
lines changed

11 files changed

+401
-3286
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,9 @@
522522
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBuffer.cs">
523523
<Link>Microsoft\Data\SqlClient\SqlBuffer.cs</Link>
524524
</Compile>
525+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopy.cs">
526+
<Link>Microsoft\Data\SqlClient\SqlBulkCopy.cs</Link>
527+
</Compile>
525528
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyColumnMapping.cs">
526529
<Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnMapping.cs</Link>
527530
</Compile>
@@ -803,7 +806,6 @@
803806
</Compile>
804807

805808
<Compile Include="Microsoft\Data\SqlClient\SqlAppContextSwitchManager.NetCoreApp.cs" />
806-
<Compile Include="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />
807809
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionFactory.AssemblyLoadContext.cs" />
808810
<Compile Include="Microsoft\Data\SqlClient\SqlCommand.cs" />
809811
<Compile Include="Microsoft\Data\SqlClient\SqlConnection.cs" />

0 commit comments

Comments
 (0)