Replaced System.Data.SqlClient with Microsoft.Data.SqlClient for non-net462 targets.

Author: Esben Bach

src/NEventStore.Persistence.MsSql.Tests/NEventStore.Persistence.MsSql.Core.Tests.csproj

@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <Reference Include="System.Transactions" />

src/NEventStore.Persistence.MsSql.Tests/PersistenceEngineFixture.cs

@@ -5,7 +5,11 @@ namespace NEventStore.Persistence.AcceptanceTests
     using NEventStore.Persistence.Sql;
     using NEventStore.Persistence.Sql.SqlDialects;
     using NEventStore.Serialization;
+#if NET462
     using System.Data.SqlClient;
+#else
+    using Microsoft.Data.SqlClient;
+#endif
     using System.Transactions;
 
     public partial class PersistenceEngineFixture

src/NEventStore.Persistence.MsSql.Tests/TransactionIsolationLevelTests.cs

@@ -6,6 +6,7 @@
 using FluentAssertions;
 #if NET462
 using NEventStore.Diagnostics;
+using System.Data.SqlClient;
 #endif
 using NEventStore.Persistence.AcceptanceTests.BDD;
 using NEventStore.Persistence.Sql;
@@ -18,7 +19,6 @@
 #endif
 #if NUNIT
 using NUnit.Framework;
-using System.Data.SqlClient;
 #endif
 #if XUNIT
     using Xunit;
@@ -126,7 +126,7 @@ public IsolationLevelPersistenceEngineFixture()
 #if NET462
             _connectionFactory = new EnviromentConnectionFactory("MsSql", "System.Data.SqlClient");
 #else
-            _connectionFactory = new EnviromentConnectionFactory("MsSql", System.Data.SqlClient.SqlClientFactory.Instance);
+            _connectionFactory = new EnviromentConnectionFactory("MsSql", Microsoft.Data.SqlClient.SqlClientFactory.Instance);
 #endif
             _createPersistence = () =>
                 new SqlPersistenceFactory(_connectionFactory,

src/NEventStore.Persistence.MsSql.Tests/WireupTests.cs

@@ -10,9 +10,14 @@ namespace NEventStore.Persistence.AcceptanceTests
 #if MSTEST
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 #endif
+#if NET462
+    using System.Data.SqlClient;
+#else
+    using Microsoft.Data.SqlClient;
+#endif
 #if NUNIT
     using NUnit.Framework;
-    using System.Data.SqlClient;
+    
 #endif
 #if XUNIT
     using Xunit;
@@ -34,7 +39,7 @@ protected override void Context()
 #if NET462
                 .UsingSqlPersistence(new EnviromentConnectionFactory("MsSql", "System.Data.SqlClient"))
 #else
-                .UsingSqlPersistence(new EnviromentConnectionFactory("MsSql", System.Data.SqlClient.SqlClientFactory.Instance))
+                .UsingSqlPersistence(new EnviromentConnectionFactory("MsSql", Microsoft.Data.SqlClient.SqlClientFactory.Instance))
 #endif
                 .WithDialect(new MsSqlDialect())
                 .WithStreamIdHasher(streamId =>

src/NEventStore.Persistence.Sql/NEventStore.Persistence.Sql.Core.csproj

@@ -28,7 +28,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
-        <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
+        <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
     </ItemGroup>
     <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
         <Reference Include="System.Configuration" />

src/NEventStore.Persistence.Sql/SqlDialects/MsSqlDialect.cs

@@ -5,7 +5,11 @@
 namespace NEventStore.Persistence.Sql.SqlDialects
 {
     using System;
+#if NET462
     using System.Data.SqlClient;
+#else
+    using Microsoft.Data.SqlClient;
+#endif
 
     public class MsSqlDialect : CommonSqlDialect
     {