only support Microsoft.Data.SqlClient (#414)

SimonCropp · web-flow · commit d9d5f5fbfa75 · 2021-11-22T13:44:27.000+11:00
diff --git a/pages/directory-and-name-resolution.md b/pages/directory-and-name-resolution.md
@@ -114,7 +114,7 @@ public Task<SqlDatabase> Build(
         string? databaseSuffix = null,
         [CallerMemberName] string memberName = "")
 ```
-<sup><a href='/src/LocalDb/SqlInstance.cs#L56-L76' title='Snippet source file'>snippet source</a> | <a href='#snippet-conventionbuildsignature' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/LocalDb/SqlInstance.cs#L55-L75' title='Snippet source file'>snippet source</a> | <a href='#snippet-conventionbuildsignature' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 With these parameters the database name is the derived as follows:
@@ -150,7 +150,7 @@ If full control over the database name is required, there is an overload that ta
 /// </summary>
 public async Task<SqlDatabase> Build(string dbName)
 ```
-<sup><a href='/src/LocalDb/SqlInstance.cs#L89-L94' title='Snippet source file'>snippet source</a> | <a href='#snippet-explicitbuildsignature' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/LocalDb/SqlInstance.cs#L88-L93' title='Snippet source file'>snippet source</a> | <a href='#snippet-explicitbuildsignature' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Which can be used as follows:
diff --git a/pages/ef-classic-usage.md b/pages/ef-classic-usage.md
@@ -22,15 +22,15 @@ The snippets use a DbContext of the following form:
 <!-- snippet: EfClassicLocalDb.Tests/Snippets/TheDbContext.cs -->
 <a id='snippet-EfClassicLocalDb.Tests/Snippets/TheDbContext.cs'></a>
 ```cs
-using System.Data.Common;
 using System.Data.Entity;
+using Microsoft.Data.SqlClient;
 
 public class TheDbContext :
     DbContext
 {
     public DbSet<TheEntity> TestEntities { get; set; } = null!;
 
-    public TheDbContext(DbConnection connection) :
+    public TheDbContext(SqlConnection connection) :
         base(connection, false)
     {
     }
diff --git a/pages/raw-usage.md b/pages/raw-usage.md
@@ -22,11 +22,11 @@ The snippets use the following helper class:
 <!-- snippet: TestDbBuilder.cs -->
 <a id='snippet-TestDbBuilder.cs'></a>
 ```cs
-using System.Data.Common;
+using Microsoft.Data.SqlClient;
 
 public static class TestDbBuilder
 {
-    public static async Task CreateTable(DbConnection connection)
+    public static async Task CreateTable(SqlConnection connection)
     {
         await using var command = connection.CreateCommand();
         command.CommandText = "create table MyTable (Value int);";
@@ -35,7 +35,7 @@ public static class TestDbBuilder
 
     static int intData = 0;
 
-    public static async Task<int> AddData(DbConnection connection)
+    public static async Task<int> AddData(SqlConnection connection)
     {
         await using var command = connection.CreateCommand();
         var addData = intData;
@@ -47,7 +47,7 @@ values ({addData});";
         return addData;
     }
 
-    public static async Task<List<int>> GetData(DbConnection connection)
+    public static async Task<List<int>> GetData(SqlConnection connection)
     {
         List<int> values = new();
         await using var command = connection.CreateCommand();
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;CA1416;CS8632</NoWarn>
-    <Version>11.0.0</Version>
+    <Version>12.0.0</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <ContinuousIntegrationBuild>false</ContinuousIntegrationBuild>
   </PropertyGroup>
diff --git a/src/EfClassicLocalDb.Tests/Contexts/DuplicateDbContext.cs b/src/EfClassicLocalDb.Tests/Contexts/DuplicateDbContext.cs
@@ -1,12 +1,12 @@
-﻿using System.Data.Common;
-using System.Data.Entity;
+﻿using System.Data.Entity;
+using Microsoft.Data.SqlClient;
 
 public class DuplicateDbContext :
     DbContext
 {
     public DbSet<TestEntity> TestEntities { get; set; } = null!;
 
-    public DuplicateDbContext(DbConnection connection) :
+    public DuplicateDbContext(SqlConnection connection) :
         base(connection, false)
     {
     }
diff --git a/src/EfClassicLocalDb.Tests/Contexts/TestDbContext.cs b/src/EfClassicLocalDb.Tests/Contexts/TestDbContext.cs
@@ -1,12 +1,12 @@
-﻿using System.Data.Common;
-using System.Data.Entity;
+﻿using System.Data.Entity;
+using Microsoft.Data.SqlClient;
 
 public class TestDbContext :
     DbContext
 {
     public DbSet<TestEntity> TestEntities { get; set; } = null!;
 
-    public TestDbContext(DbConnection connection) :
+    public TestDbContext(SqlConnection connection) :
         base(connection, false)
     {
     }
diff --git a/src/EfClassicLocalDb.Tests/Contexts/WithRebuildDbContext.cs b/src/EfClassicLocalDb.Tests/Contexts/WithRebuildDbContext.cs
@@ -1,12 +1,12 @@
-﻿using System.Data.Common;
-using System.Data.Entity;
+﻿using System.Data.Entity;
+using Microsoft.Data.SqlClient;
 
 public class WithRebuildDbContext :
     DbContext
 {
     public DbSet<TestEntity> TestEntities { get; set; } = null!;
 
-    public WithRebuildDbContext(DbConnection connection) :
+    public WithRebuildDbContext(SqlConnection connection) :
         base(connection, false)
     {
 
diff --git a/src/EfClassicLocalDb.Tests/EfClassicLocalDb.Tests.csproj b/src/EfClassicLocalDb.Tests/EfClassicLocalDb.Tests.csproj
@@ -14,6 +14,7 @@
 
     <PackageReference Include="EntityFramework" Version="6.4.4" />
     <PackageReference Include="XunitContext" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="4.0.0" />
     <PackageReference Include="Verify.Xunit" Version="14.4.0" />
     <PackageReference Include="Xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all" />
diff --git a/src/EfClassicLocalDb.Tests/Snippets/BuildTemplateDbContext.cs b/src/EfClassicLocalDb.Tests/Snippets/BuildTemplateDbContext.cs
@@ -1,12 +1,12 @@
-﻿using System.Data.Common;
-using System.Data.Entity;
+﻿using System.Data.Entity;
+using Microsoft.Data.SqlClient;
 
 public class BuildTemplateDbContext :
     DbContext
 {
     public DbSet<TheEntity> TestEntities { get; set; } = null!;
 
-    public BuildTemplateDbContext(DbConnection connection) :
+    public BuildTemplateDbContext(SqlConnection connection) :
         base(connection, false)
     {
     }
diff --git a/src/EfClassicLocalDb.Tests/Snippets/MyDbContext.cs b/src/EfClassicLocalDb.Tests/Snippets/MyDbContext.cs
@@ -1,12 +1,12 @@
-﻿using System.Data.Common;
-using System.Data.Entity;
+﻿using System.Data.Entity;
+using Microsoft.Data.SqlClient;
 
 public class MyDbContext :
     DbContext
 {
     public DbSet<TheEntity> TestEntities { get; set; } = null!;
 
-    public MyDbContext(DbConnection connection) :
+    public MyDbContext(SqlConnection connection) :
         base(connection, false)
     {
     }
diff --git a/src/EfClassicLocalDb.Tests/Snippets/TheDbContext.cs b/src/EfClassicLocalDb.Tests/Snippets/TheDbContext.cs
@@ -1,12 +1,12 @@
-﻿using System.Data.Common;
-using System.Data.Entity;
+﻿using System.Data.Entity;
+using Microsoft.Data.SqlClient;
 
 public class TheDbContext :
     DbContext
 {
     public DbSet<TheEntity> TestEntities { get; set; } = null!;
 
-    public TheDbContext(DbConnection connection) :
+    public TheDbContext(SqlConnection connection) :
         base(connection, false)
     {
     }
diff --git a/src/EfClassicLocalDb.Tests/Tests.cs b/src/EfClassicLocalDb.Tests/Tests.cs
@@ -106,7 +106,7 @@ public async Task SuffixedContext()
     public async Task Defined_TimeStamp()
     {
         var dateTime = DateTime.Now;
-        SqlInstance<TestDbContext> instance = new(
+        var instance = new SqlInstance<TestDbContext>(
             constructInstance: connection => new(connection),
             buildTemplate: async context => { await context.CreateOnExistingDb(); },
             timestamp: dateTime,
diff --git a/src/EfClassicLocalDb/DbContextExtensions.cs b/src/EfClassicLocalDb/DbContextExtensions.cs
@@ -1,6 +1,6 @@
-﻿using System.Data.Common;
-using System.Data.Entity;
+﻿using System.Data.Entity;
 using System.Data.Entity.Infrastructure;
+using Microsoft.Data.SqlClient;
 
 namespace EfLocalDb;
 
@@ -14,7 +14,7 @@ public static async Task CreateOnExistingDb<TDbContext>(this TDbContext context)
         {
             await context.Database.ExecuteSqlCommandAsync(script);
         }
-        catch (DbException)
+        catch (SqlException)
         {
             //swallow for already exists
         }
diff --git a/src/EfClassicLocalDb/Delegates/Callback.cs b/src/EfClassicLocalDb/Delegates/Callback.cs
@@ -1,7 +1,7 @@
-using System.Data.Common;
 using System.Data.Entity;
+using Microsoft.Data.SqlClient;
 
 namespace EfLocalDb;
 
-public delegate Task Callback<in TDbContext>(DbConnection connection, TDbContext context)
+public delegate Task Callback<in TDbContext>(SqlConnection connection, TDbContext context)
     where TDbContext : DbContext;
diff --git a/src/EfClassicLocalDb/Delegates/ConstructInstance.cs b/src/EfClassicLocalDb/Delegates/ConstructInstance.cs
@@ -1,7 +1,7 @@
-using System.Data.Common;
 using System.Data.Entity;
+using Microsoft.Data.SqlClient;
 
 namespace EfLocalDb;
 
-public delegate TDbContext ConstructInstance<out TDbContext>(DbConnection connection)
+public delegate TDbContext ConstructInstance<out TDbContext>(SqlConnection connection)
     where TDbContext : DbContext;
diff --git a/src/EfClassicLocalDb/Delegates/TemplateFromConnection.cs b/src/EfClassicLocalDb/Delegates/TemplateFromConnection.cs
@@ -1,5 +1,5 @@
-using System.Data.Common;
+using Microsoft.Data.SqlClient;
 
 namespace EfLocalDb;
 
-public delegate Task TemplateFromConnection(DbConnection connection);
+public delegate Task TemplateFromConnection(SqlConnection connection);
diff --git a/src/EfClassicLocalDb/EfClassicLocalDb.csproj b/src/EfClassicLocalDb/EfClassicLocalDb.csproj
@@ -30,6 +30,7 @@
     <Compile Include="..\LocalDb\State.cs" />
 
     <PackageReference Include="MethodTimer.Fody" Version="3.2.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="4.0.0" />
     <PackageReference Include="ConfigureAwait.Fody" Version="3.3.1" PrivateAssets="All" />
     <PackageReference Include="Fody" Version="6.6.0" PrivateAssets="all" />
     <PackageReference Include="EntityFramework" Version="6.4.4" />
diff --git a/src/EfClassicLocalDb/SqlDatabase.cs b/src/EfClassicLocalDb/SqlDatabase.cs
@@ -1,5 +1,5 @@
 ﻿using System.Data.Entity;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace EfLocalDb;
 
@@ -32,7 +32,7 @@ internal SqlDatabase(
 
     public async Task<SqlConnection> OpenNewConnection()
     {
-        SqlConnection connection = new(ConnectionString);
+        var connection = new SqlConnection(ConnectionString);
         await connection.OpenAsync();
         return connection;
     }
diff --git a/src/EfClassicLocalDb/SqlInstance.cs b/src/EfClassicLocalDb/SqlInstance.cs
@@ -1,6 +1,6 @@
-﻿using System.Data.Common;
-using System.Data.Entity;
-using System.Data.SqlClient;
+﻿using System.Data.Entity;
+using Microsoft.Data.SqlClient;
+
 // ReSharper disable RedundantCast
 
 namespace EfLocalDb;
@@ -56,7 +56,7 @@ public SqlInstance(
         var storageValue = storage.Value;
         DirectoryCleaner.CleanInstance(storageValue.Directory);
 
-        Func<DbConnection, Task>? wrapperCallback = null;
+        Func<SqlConnection, Task>? wrapperCallback = null;
         if (callback is not null)
         {
             wrapperCallback = async connection =>
@@ -66,7 +66,7 @@ public SqlInstance(
             };
         }
         Wrapper = new(
-            s => new SqlConnection(s),
+            s => new(s),
             storageValue.Name,
             storageValue.Directory,
             templateSize,
diff --git a/src/EfLocalDb/Delegates/Callback.cs b/src/EfLocalDb/Delegates/Callback.cs
@@ -1,7 +1,7 @@
-using System.Data.Common;
+using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 
 namespace EfLocalDb;
 
-public delegate Task Callback<in TDbContext>(DbConnection connection, TDbContext context)
+public delegate Task Callback<in TDbContext>(SqlConnection connection, TDbContext context)
     where TDbContext : DbContext;
diff --git a/src/EfLocalDb/Delegates/TemplateFromConnection.cs b/src/EfLocalDb/Delegates/TemplateFromConnection.cs
@@ -1,7 +1,7 @@
-using System.Data.Common;
+using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 
 namespace EfLocalDb;
 
-public delegate Task TemplateFromConnection<TDbContext>(DbConnection connection, DbContextOptionsBuilder<TDbContext> optionsBuilder)
+public delegate Task TemplateFromConnection<TDbContext>(SqlConnection connection, DbContextOptionsBuilder<TDbContext> optionsBuilder)
     where TDbContext : DbContext;
diff --git a/src/EfLocalDb/SqlInstance.cs b/src/EfLocalDb/SqlInstance.cs
@@ -1,5 +1,4 @@
-﻿using System.Data.Common;
-using Microsoft.Data.SqlClient;
+﻿using Microsoft.Data.SqlClient;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
@@ -89,14 +88,14 @@ public SqlInstance(
         var storageValue = storage.Value;
         DirectoryCleaner.CleanInstance(storageValue.Directory);
 
-        Task BuildTemplate(DbConnection connection)
+        Task BuildTemplate(SqlConnection connection)
         {
             var builder = DefaultOptionsBuilder.Build<TDbContext>();
             builder.UseSqlServer(connection, sqlOptionsBuilder);
             return buildTemplate(connection, builder);
         }
 
-        Func<DbConnection, Task>? wrapperCallback = null;
+        Func<SqlConnection, Task>? wrapperCallback = null;
         if (callback is not null)
         {
             wrapperCallback = async connection =>
@@ -109,7 +108,7 @@ Task BuildTemplate(DbConnection connection)
         }
 
         Wrapper = new(
-            s => new SqlConnection(s),
+            s => new(s),
             storageValue.Name,
             storageValue.Directory,
             templateSize,
diff --git a/src/Helpers/DbPropertyReader.cs b/src/Helpers/DbPropertyReader.cs
@@ -1,13 +1,13 @@
-﻿using System.Data.Common;
+﻿using Microsoft.Data.SqlClient;
 
 public static class DbPropertyReader
 {
-    public static DbSettings Read(DbConnection connection, string name)
+    public static DbSettings Read(SqlConnection connection, string name)
     {
         return new(ReadFileSettings(connection, name).ToList());
     }
 
-    static IEnumerable<DbFileSettings> ReadFileSettings(DbConnection connection, string name)
+    static IEnumerable<DbFileSettings> ReadFileSettings(SqlConnection connection, string name)
     {
         using var command = connection.CreateCommand();
         command.CommandText = $@"
diff --git a/src/LocalDb.Tests/DanglingLogWrapperTests.cs b/src/LocalDb.Tests/DanglingLogWrapperTests.cs
@@ -1,5 +1,4 @@
-﻿using Microsoft.Data.SqlClient;
-using Xunit;
+﻿using Xunit;
 
 public class DanglingLogWrapperTests
 {
@@ -8,7 +7,7 @@ public void Run()
     {
         var name = "DanglingLogWrapperTests";
         LocalDbApi.StopAndDelete(name);
-        Wrapper instance = new(s => new SqlConnection(s), name, DirectoryFinder.Find(name));
+        Wrapper instance = new(s => new(s), name, DirectoryFinder.Find(name));
         instance.Start(DateTime.Now, TestDbBuilder.CreateTable);
     }
 }
diff --git a/src/LocalDb.Tests/TestDbBuilder.cs b/src/LocalDb.Tests/TestDbBuilder.cs
diff --git a/src/LocalDb.Tests/WrapperTests.cs b/src/LocalDb.Tests/WrapperTests.cs
diff --git a/src/LocalDb/DbFileNameReader.cs b/src/LocalDb/DbFileNameReader.cs
diff --git a/src/LocalDb/SqlExtensions.cs b/src/LocalDb/SqlExtensions.cs
diff --git a/src/LocalDb/SqlInstance.cs b/src/LocalDb/SqlInstance.cs
diff --git a/src/LocalDb/Wrapper.cs b/src/LocalDb/Wrapper.cs

Original file line number	Diff line number	Diff line change
`@@ -22,15 +22,15 @@ The snippets use a DbContext of the following form:`
`22`	`22`	`<!-- snippet: EfClassicLocalDb.Tests/Snippets/TheDbContext.cs -->`
`23`	`23`	`<a id='snippet-EfClassicLocalDb.Tests/Snippets/TheDbContext.cs'></a>`
`24`	`24`	```cs
`25`		`-using System.Data.Common;`
`26`	`25`	`using System.Data.Entity;`
	`26`	`+using Microsoft.Data.SqlClient;`
`27`	`27`
`28`	`28`	`public class TheDbContext :`
`29`	`29`	`DbContext`
`30`	`30`	`{`
`31`	`31`	`public DbSet<TheEntity> TestEntities { get; set; } = null!;`
`32`	`32`
`33`		`- public TheDbContext(DbConnection connection) :`
	`33`	`+ public TheDbContext(SqlConnection connection) :`
`34`	`34`	`base(connection, false)`
`35`	`35`	`{`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@ The snippets use the following helper class:`
`22`	`22`	`<!-- snippet: TestDbBuilder.cs -->`
`23`	`23`	`<a id='snippet-TestDbBuilder.cs'></a>`
`24`	`24`	```cs
`25`		`-using System.Data.Common;`
	`25`	`+using Microsoft.Data.SqlClient;`
`26`	`26`
`27`	`27`	`public static class TestDbBuilder`
`28`	`28`	`{`
`29`		`- public static async Task CreateTable(DbConnection connection)`
	`29`	`+ public static async Task CreateTable(SqlConnection connection)`
`30`	`30`	`{`
`31`	`31`	`await using var command = connection.CreateCommand();`
`32`	`32`	`command.CommandText = "create table MyTable (Value int);";`
`@@ -35,7 +35,7 @@ public static class TestDbBuilder`
`35`	`35`
`36`	`36`	`static int intData = 0;`
`37`	`37`
`38`		`- public static async Task<int> AddData(DbConnection connection)`
	`38`	`+ public static async Task<int> AddData(SqlConnection connection)`
`39`	`39`	`{`
`40`	`40`	`await using var command = connection.CreateCommand();`
`41`	`41`	`var addData = intData;`
`@@ -47,7 +47,7 @@ values ({addData});";`
`47`	`47`	`return addData;`
`48`	`48`	`}`
`49`	`49`
`50`		`- public static async Task<List<int>> GetData(DbConnection connection)`
	`50`	`+ public static async Task<List<int>> GetData(SqlConnection connection)`
`51`	`51`	`{`
`52`	`52`	`List<int> values = new();`
`53`	`53`	`await using var command = connection.CreateCommand();`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`		`-using System.Data.Common;`
`2`		`-using System.Data.Entity;`
	`1`	`+using System.Data.Entity;`
	`2`	`+using Microsoft.Data.SqlClient;`
`3`	`3`
`4`	`4`	`public class DuplicateDbContext :`
`5`	`5`	`DbContext`
`6`	`6`	`{`
`7`	`7`	`public DbSet<TestEntity> TestEntities { get; set; } = null!;`
`8`	`8`
`9`		`- public DuplicateDbContext(DbConnection connection) :`
	`9`	`+ public DuplicateDbContext(SqlConnection connection) :`
`10`	`10`	`base(connection, false)`
`11`	`11`	`{`
`12`	`12`	`}`