NotificationsYou must be signed in to change notification settings
Fork311
Star927

Commit12f742d

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 parent9ac9188 commit12f742dCopy full SHA for 12f742d

File tree

11 files changed

+401

-3286

lines changed

src/Microsoft.Data.SqlClient
- netcore/src
  - Microsoft.Data.SqlClient.csproj
  - Microsoft/Data/SqlClient
    - SqlBulkCopy.cs
- netfx/src
  - Microsoft.Data.SqlClient.csproj
  - Microsoft/Data/SqlClient
    - TdsParser.netfx.cs
- src/Microsoft/Data
  - Common
    - AdapterUtil.cs
  - SqlClient

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 number	Diff line number	Diff line change
`@@ -522,6 +522,9 @@`
`522`	`522`	`<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBuffer.cs">`
`523`	`523`	`<Link>Microsoft\Data\SqlClient\SqlBuffer.cs</Link>`
`524`	`524`	`</Compile>`
	`525`	`+ <CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopy.cs">`
	`526`	`+ <Link>Microsoft\Data\SqlClient\SqlBulkCopy.cs</Link>`
	`527`	`+ </Compile>`
`525`	`528`	`<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBulkCopyColumnMapping.cs">`
`526`	`529`	`<Link>Microsoft\Data\SqlClient\SqlBulkCopyColumnMapping.cs</Link>`
`527`	`530`	`</Compile>`
`@@ -803,7 +806,6 @@`
`803`	`806`	`</Compile>`
`804`	`807`
`805`	`808`	`<CompileInclude="Microsoft\Data\SqlClient\SqlAppContextSwitchManager.NetCoreApp.cs" />`
`806`		`- <CompileInclude="Microsoft\Data\SqlClient\SqlBulkCopy.cs" />`
`807`	`809`	`<CompileInclude="Microsoft\Data\SqlClient\SqlConnectionFactory.AssemblyLoadContext.cs" />`
`808`	`810`	`<CompileInclude="Microsoft\Data\SqlClient\SqlCommand.cs" />`
`809`	`811`	`<CompileInclude="Microsoft\Data\SqlClient\SqlConnection.cs" />`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit12f742d

File tree

11 files changed

11 files changed

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

0 commit comments