Code

Merge from dotnet/SqlClient#6

Code

Merged

karinazhou merged 11 commits intokarinazhou:masterkarinazhou/SqlClient:masterfrom dotnet:masterdotnet/SqlClient:masterCopy head branch name to clipboardOct 11, 2019

+569-430

Commits

Commits on Oct 4, 2019

• Fix | Fixing incorrect event id and opcode for the SqlEventSource. (#241)

  

  stebet

  authored and

  cheenamalhotra

  committed
  de6e901

  Copy full SHA for de6e901

• Update tooltip for SqlCommand CommandTimeout (#243)

  cheenamalhotra

  authored
  573558b

  Copy full SHA for 573558b

• Tests | Clean up test resources (#244)

  Show description for 7110853
  karinazhou

  authored
  7110853

  Copy full SHA for 7110853

• Removing filtering of SQL Command text for non-stored procs when sending the BeginExecute event. (#242)

  

  stebet

  authored and

  cheenamalhotra

  committed
  65d034e

  Copy full SHA for 65d034e

Commits on Oct 8, 2019

• Add square brackets around tablename (#246)

  Show description for 78a4ea4
  yukiwongky

  authored
  78a4ea4

  Copy full SHA for 78a4ea4

• User throw instead of throw exception (#247)

  yukiwongky

  authored
  71cbe95

  Copy full SHA for 71cbe95

• Port CoreFx PR 38266: Fix MARS timeout cancellation (Managed SNI) (#249)

  cheenamalhotra

  authored
  596ee02

  Copy full SHA for 596ee02

Commits on Oct 10, 2019

• Change error message for multiple DataReader depending on with MARS option (#250)

  Show description for 8073357
  yukiwongky

  authored
  8073357

  Copy full SHA for 8073357

• Address msbuild warnings in nuspec (#253)

  cheenamalhotra

  authored
  647d762

  Copy full SHA for 647d762

Commits on Oct 11, 2019

• Change error message from An SQLParameter to A SQLParameter (#252)

  Show description for bafd034
  yukiwongky

  authored
  bafd034

  Copy full SHA for bafd034

• Update Samples URLs to work with docset paths + fix warnings (#254)

  cheenamalhotra

  authored
  c8b60fc

  Copy full SHA for c8b60fc