Merge pull request #1436 from morstaine/upgrade-to-microsoft-data-sql…

…cient Replaces usage of System.Data.SqlClient with Microsoft.Data.SqlClient
fluentmigrator · May 6, 2021 · 0efa70c · 0efa70c
2 parents c4a92b3 + 488a5ea
commit 0efa70c
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 15 deletions.
diff --git a/src/FluentMigrator.Runner.SqlServer/FluentMigrator.Runner.SqlServer.csproj b/src/FluentMigrator.Runner.SqlServer/FluentMigrator.Runner.SqlServer.csproj
@@ -15,9 +15,9 @@
     <ProjectReference Include="..\FluentMigrator.Extensions.SqlServer\FluentMigrator.Extensions.SqlServer.csproj" />
     <ProjectReference Include="..\FluentMigrator.Runner.Core\FluentMigrator.Runner.Core.csproj" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="System.Data.SqlClient">
-      <Version>4.4.3</Version>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Data.SqlClient">
+      <Version>2.1.2</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/src/FluentMigrator.Runner.SqlServer/Processors/SqlServer/SqlServer2000Processor.cs b/src/FluentMigrator.Runner.SqlServer/Processors/SqlServer/SqlServer2000Processor.cs
@@ -41,7 +41,6 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
-using System.Data.SqlClient;
 using System.IO;
 
 using FluentMigrator.Expressions;
@@ -53,6 +52,7 @@
 
 using JetBrains.Annotations;
 
+using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;

diff --git a/src/FluentMigrator.Runner.SqlServer/Processors/SqlServer/SqlServer2016Processor.cs b/src/FluentMigrator.Runner.SqlServer/Processors/SqlServer/SqlServer2016Processor.cs
@@ -16,13 +16,13 @@
 
 using System;
 using System.Data.Common;
-using System.Data.SqlClient;
 
 using FluentMigrator.Runner.Generators.SqlServer;
 using FluentMigrator.Runner.Initialization;
 
 using JetBrains.Annotations;
 
+using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 

diff --git a/src/FluentMigrator.Runner.SqlServer/Processors/SqlServer/SqlServerDbFactory.cs b/src/FluentMigrator.Runner.SqlServer/Processors/SqlServer/SqlServerDbFactory.cs
@@ -18,7 +18,8 @@
 
 using System;
 using System.Data.Common;
-using System.Data.SqlClient;
+
+using Microsoft.Data.SqlClient;
 
 namespace FluentMigrator.Runner.Processors.SqlServer
 {

diff --git a/src/FluentMigrator.Runner.SqlServer/Processors/SqlServer/SqlServerProcessor.cs b/src/FluentMigrator.Runner.SqlServer/Processors/SqlServer/SqlServerProcessor.cs
@@ -18,7 +18,6 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
-using System.Data.SqlClient;
 using System.IO;
 using System.Linq;
 
@@ -33,6 +32,7 @@
 
 using JetBrains.Annotations;
 
+using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;

diff --git a/src/FluentMigrator.Runner.SqlServerCe/FluentMigrator.Runner.SqlServerCe.csproj b/src/FluentMigrator.Runner.SqlServerCe/FluentMigrator.Runner.SqlServerCe.csproj
@@ -15,7 +15,7 @@
     <ProjectReference Include="..\FluentMigrator.Runner.SqlServer\FluentMigrator.Runner.SqlServer.csproj" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="System.Security.Permissions" Version="4.4.1" />
+    <PackageReference Include="System.Security.Permissions" Version="4.7.0" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="../../lib/SQLServerCE4/amd64/**/*.*">

diff --git a/test/FluentMigrator.Tests/Helpers/SqlServerTestSequence.cs b/test/FluentMigrator.Tests/Helpers/SqlServerTestSequence.cs
@@ -1,4 +1,4 @@
-#region License
+#region License
 // Copyright (c) 2007-2018, Sean Chambers <schambers80@gmail.com>
 // 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,10 @@
 #endregion
 
 using System;
-using System.Data.SqlClient;
 using FluentMigrator.Runner.Processors.SqlServer;
 
+using Microsoft.Data.SqlClient;
+
 namespace FluentMigrator.Tests.Helpers
 {
     public class SqlServerTestSequence : IDisposable
@@ -77,4 +78,4 @@ public void Drop()
             }
         }
     }
-}
+}
diff --git a/test/FluentMigrator.Tests/Helpers/SqlServerTestTable.cs b/test/FluentMigrator.Tests/Helpers/SqlServerTestTable.cs
@@ -18,12 +18,13 @@
 
 using System;
 using System.Collections.Generic;
-using System.Data.SqlClient;
 using System.Text;
 
 using FluentMigrator.Runner.Generators;
 using FluentMigrator.Runner.Processors.SqlServer;
 
+using Microsoft.Data.SqlClient;
+
 namespace FluentMigrator.Tests.Helpers
 {
     public class SqlServerTestTable : IDisposable

diff --git a/test/FluentMigrator.Tests/Integration/ObsoleteIntegrationTestBase.cs b/test/FluentMigrator.Tests/Integration/ObsoleteIntegrationTestBase.cs
@@ -18,7 +18,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Data.SqlClient;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -40,6 +39,8 @@
 using FluentMigrator.Runner.Generators.SqlAnywhere;
 using FluentMigrator.Runner.Processors.SqlAnywhere;
 
+using Microsoft.Data.SqlClient;
+
 using MySql.Data.MySqlClient;
 
 using Npgsql;

diff --git a/test/FluentMigrator.Tests/Integration/ObsoleteMigrationRunnerTests.cs b/test/FluentMigrator.Tests/Integration/ObsoleteMigrationRunnerTests.cs
@@ -20,7 +20,6 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -44,6 +43,8 @@
 using FluentMigrator.Tests.Integration.Migrations.Tagged;
 using FluentMigrator.Tests.Unit;
 
+using Microsoft.Data.SqlClient;
+
 using Moq;
 
 using NUnit.Framework;

diff --git a/test/FluentMigrator.Tests/IssueTests/GH0911/Fixture.cs b/test/FluentMigrator.Tests/IssueTests/GH0911/Fixture.cs
@@ -16,13 +16,13 @@
 
 using System;
 using System.Data;
-using System.Data.SqlClient;
 using System.Linq;
 
 using FluentMigrator.Runner;
 using FluentMigrator.Runner.Initialization;
 using FluentMigrator.Runner.VersionTableInfo;
 
+using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.DependencyInjection;
 
 using NUnit.Framework;