Skip to content

Commit f366ec3

Browse files
committedMar 22, 2024
Pulling over changes from a different branch from before rebase
1 parent 14d118b commit f366ec3

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed
 

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

+3
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,9 @@
344344
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBatchCommand.cs">
345345
<Link>Microsoft\Data\SqlClient\SqlBatchCommand.cs</Link>
346346
</Compile>
347+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBatchCommand.Net8OrGreater.cs">
348+
<Link>Microsoft\Data\SqlClient\SqlBatchCommand.Net8OrGreater.cs</Link>
349+
</Compile>
347350
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlBatchCommandCollection.cs">
348351
<Link>Microsoft\Data\SqlClient\SqlBatchCommandCollection.cs</Link>
349352
</Compile>

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlClientFactory.NetCoreApp.cs

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
#if NET6_0_OR_GREATER
6+
57
using System.Data.Common;
68

79
namespace Microsoft.Data.SqlClient
@@ -18,3 +20,5 @@ public sealed partial class SqlClientFactory : DbProviderFactory
1820
public override DbBatchCommand CreateBatchCommand() => new SqlBatchCommand();
1921
}
2022
}
23+
24+
#endif

‎src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlBatchCommand.Net8OrGreater.cs

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
#if NET8_0_OR_GREATER
6+
57
using System.Data.Common;
68

79
namespace Microsoft.Data.SqlClient
@@ -15,3 +17,5 @@ public partial class SqlBatchCommand
1517
public override bool CanCreateParameter => true;
1618
}
1719
}
20+
21+
#endif

0 commit comments

Comments
 (0)