Commitf366ec3

committed

Pulling over changes from a different branch from before rebase

1 parent14d118b commitf366ec3Copy full SHA for f366ec3

File tree

+11

-0

lines changed

+11

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -344,6 +344,9 @@`
`344`	`344`	`<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBatchCommand.cs">`
`345`	`345`	`<Link>Microsoft\Data\SqlClient\SqlBatchCommand.cs</Link>`
`346`	`346`	`</Compile>`
	`347`	`+ <CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBatchCommand.Net8OrGreater.cs">`
	`348`	`+ <Link>Microsoft\Data\SqlClient\SqlBatchCommand.Net8OrGreater.cs</Link>`
	`349`	`+ </Compile>`
`347`	`350`	`<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBatchCommandCollection.cs">`
`348`	`351`	`<Link>Microsoft\Data\SqlClient\SqlBatchCommandCollection.cs</Link>`
`349`	`352`	`</Compile>`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
	`5`	`+#ifNET6_0_OR_GREATER`
	`6`	`+`
`5`	`7`	`usingSystem.Data.Common;`
`6`	`8`
`7`	`9`	`namespaceMicrosoft.Data.SqlClient`
`@@ -18,3 +20,5 @@ public sealed partial class SqlClientFactory : DbProviderFactory`
`18`	`20`	`publicoverrideDbBatchCommandCreateBatchCommand()=>newSqlBatchCommand();`
`19`	`21`	`}`
`20`	`22`	`}`
	`23`	`+`
	`24`	`+#endif`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
	`5`	`+#ifNET8_0_OR_GREATER`
	`6`	`+`
`5`	`7`	`usingSystem.Data.Common;`
`6`	`8`
`7`	`9`	`namespaceMicrosoft.Data.SqlClient`
`@@ -15,3 +17,5 @@ public partial class SqlBatchCommand`
`15`	`17`	`publicoverrideboolCanCreateParameter=>true;`
`16`	`18`	`}`
`17`	`19`	`}`
	`20`	`+`
	`21`	`+#endif`

Comments

(0)