Merge pull request #22 from sfadeev/master

GonzoSpire · web-flow · commit 802ba3ad8c1b · 2020-09-30T21:33:49.000+03:00
Upgrade linq2db to version 3.1.1
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 [Oo]bj/
 [Bb]in/
 TestResults/
+.idea
 .nuget/
 _ReSharper.*/
 packages/
diff --git a/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj b/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj
@@ -39,6 +39,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/IdentitySample.Mvc/Startup.cs b/samples/IdentitySample.Mvc/Startup.cs
@@ -43,7 +43,7 @@ public void ConfigureServices(IServiceCollection services)
 				.AddConfiguration(
 					"Default",
 					Configuration["Data:DefaultConnection:ConnectionString"],
-					new SqlServerDataProvider("Default", SqlServerVersion.v2012));
+					new SqlServerDataProvider("Default", SqlServerVersion.v2012, SqlServerProvider.SystemDataSqlClient));
 
 			DataConnection.DefaultConfiguration = "Default";
 
diff --git a/src/LinqToDB.Identity/LinqToDB.Identity.csproj b/src/LinqToDB.Identity/LinqToDB.Identity.csproj
@@ -39,7 +39,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="linq2db" Version="2.1.0" />
+		<PackageReference Include="linq2db" Version="3.1.1" />
 	
 		<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.1.2" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/InMemoryEFUserStoreTest.cs b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/InMemoryEFUserStoreTest.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Linq.Expressions;
 using LinqToDB;
-using LinqToDB.Data;
 using LinqToDB.DataProvider.SQLite;
 using LinqToDB.Identity;
 using Microsoft.AspNetCore.Identity.Test;
@@ -59,7 +58,7 @@ protected override TestConnectionFactory CreateTestContext()
 		{
 			var connectionString = _storage.ConnectionString;
 
-			var factory = new TestConnectionFactory(new SQLiteDataProvider(), "InMemoryEFUserStoreTest", connectionString);
+			var factory = new TestConnectionFactory(new SQLiteDataProvider(ProviderName.SQLite), "InMemoryEFUserStoreTest", connectionString);
 			CreateTables(factory, connectionString);
 			return factory;
 		}
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/InMemoryStoreWithGenericsTest.cs b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/InMemoryStoreWithGenericsTest.cs
@@ -8,7 +8,6 @@
 using System.Security.Claims;
 using System.Threading.Tasks;
 using LinqToDB;
-using LinqToDB.Data;
 using LinqToDB.DataProvider.SQLite;
 using LinqToDB.Identity;
 using Microsoft.AspNetCore.Http;
@@ -43,7 +42,7 @@ protected override TestConnectionFactory CreateTestContext()
 		{
 			var connectionString = _storage.ConnectionString; //"Data Source=:memory:;";
 
-			var factory = new TestConnectionFactory(new SQLiteDataProvider(), "InMemoryEFUserStoreTestWithGenerics",
+			var factory = new TestConnectionFactory(new SQLiteDataProvider(ProviderName.SQLite), "InMemoryEFUserStoreTestWithGenerics",
 				connectionString);
 			CreateTables(factory, connectionString);
 			return factory;
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/RoleStoreTest.cs b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/RoleStoreTest.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Threading.Tasks;
 using LinqToDB;
-using LinqToDB.Data;
 using LinqToDB.DataProvider.SQLite;
 using LinqToDB.Identity;
 using Microsoft.AspNetCore.Identity.Test;
@@ -28,7 +27,7 @@ private IConnectionFactory GetConnectionFactory()
 		{
 			var connectionString = _storage.ConnectionString;
 
-			var factory = new TestConnectionFactory(new SQLiteDataProvider(), "RoleStoreTest", connectionString);
+			var factory = new TestConnectionFactory(new SQLiteDataProvider(ProviderName.SQLite), "RoleStoreTest", connectionString);
 			factory.CreateTables<LinqToDB.Identity.IdentityUser, LinqToDB.Identity.IdentityRole, string>();
 			return factory;
 		}
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/CustomPocoTest.cs b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/CustomPocoTest.cs
@@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test
 {
 	public class CustomPocoTest : IClassFixture<ScratchDatabaseFixture>
 	{
-		private readonly SqlServerDataProvider _dataProvider = new SqlServerDataProvider("*", SqlServerVersion.v2012);
+		private readonly SqlServerDataProvider _dataProvider = new SqlServerDataProvider("*", SqlServerVersion.v2012, SqlServerProvider.SystemDataSqlClient);
 		private readonly TestConnectionFactory _factory;
 		private readonly ScratchDatabaseFixture _fixture;
 
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/DefaultPocoTest.cs b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/DefaultPocoTest.cs
@@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test
 	public class DefaultPocoTest : IClassFixture<ScratchDatabaseFixture>
 	{
 		private readonly ApplicationBuilder _builder;
-		private readonly SqlServerDataProvider _dataProvider = new SqlServerDataProvider("*", SqlServerVersion.v2012);
+		private readonly SqlServerDataProvider _dataProvider = new SqlServerDataProvider("*", SqlServerVersion.v2012, SqlServerProvider.SystemDataSqlClient);
 
 		static DefaultPocoTest()
 		{
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj
@@ -27,6 +27,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+		<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
 		<PackageReference Include="Moq" Version="4.9.0" />
 		<PackageReference Include="xunit" Version="2.4.0" />
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/SqlStoreTestBase.cs b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/SqlStoreTestBase.cs
@@ -95,7 +95,7 @@ public TestConnectionFactory CreateContext()
 			//db.Database.EnsureCreated();
 			//return db;
 
-			var factory = new TestConnectionFactory(new SqlServerDataProvider("*", SqlServerVersion.v2012), "Test",
+			var factory = new TestConnectionFactory(new SqlServerDataProvider("*", SqlServerVersion.v2012, SqlServerProvider.SystemDataSqlClient), "Test",
 				_fixture.ConnectionString);
 
 			CreateTables(factory, _fixture.ConnectionString);
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserStoreTest.cs b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserStoreTest.cs
@@ -6,7 +6,6 @@
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using LinqToDB;
-using LinqToDB.Data;
 using LinqToDB.DataProvider.SqlServer;
 using LinqToDB.Identity;
 using Microsoft.AspNetCore.Identity.Test;
@@ -58,7 +57,7 @@ public void CanCreateUserUsingEF()
 
 		public TestConnectionFactory CreateContext(bool delete = false)
 		{
-			var factory = new TestConnectionFactory(new SqlServerDataProvider("*", SqlServerVersion.v2012), "Test",
+			var factory = new TestConnectionFactory(new SqlServerDataProvider("*", SqlServerVersion.v2012, SqlServerProvider.SystemDataSqlClient), "Test",
 				_fixture.ConnectionString);
 
 			CreateTables(factory, _fixture.ConnectionString);
diff --git a/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserStoreWithGenericsTest.cs b/test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/UserStoreWithGenericsTest.cs
@@ -7,8 +7,6 @@
 using System.Linq.Expressions;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using LinqToDB;
-using LinqToDB.Data;
 using LinqToDB.DataProvider.SqlServer;
 using LinqToDB.Identity;
 using Microsoft.AspNetCore.Identity.Test;
@@ -30,7 +28,7 @@ public UserStoreWithGenericsTest(ScratchDatabaseFixture fixture)
 
 		public TestConnectionFactory CreateContext()
 		{
-			var factory = new TestConnectionFactory(new SqlServerDataProvider("*", SqlServerVersion.v2012),
+			var factory = new TestConnectionFactory(new SqlServerDataProvider("*", SqlServerVersion.v2012, SqlServerProvider.SystemDataSqlClient),
 				"UserStoreWithGenericsTest",
 				_fixture.ConnectionString);
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test`
`16`	`16`	`{`
`17`	`17`	`public class CustomPocoTest : IClassFixture<ScratchDatabaseFixture>`
`18`	`18`	`{`
`19`		`- private readonly SqlServerDataProvider _dataProvider = new SqlServerDataProvider("*", SqlServerVersion.v2012);`
	`19`	`+ private readonly SqlServerDataProvider _dataProvider = new SqlServerDataProvider("*", SqlServerVersion.v2012, SqlServerProvider.SystemDataSqlClient);`
`20`	`20`	`private readonly TestConnectionFactory _factory;`
`21`	`21`	`private readonly ScratchDatabaseFixture _fixture;`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test`
`24`	`24`	`public class DefaultPocoTest : IClassFixture<ScratchDatabaseFixture>`
`25`	`25`	`{`
`26`	`26`	`private readonly ApplicationBuilder _builder;`
`27`		`- private readonly SqlServerDataProvider _dataProvider = new SqlServerDataProvider("*", SqlServerVersion.v2012);`
	`27`	`+ private readonly SqlServerDataProvider _dataProvider = new SqlServerDataProvider("*", SqlServerVersion.v2012, SqlServerProvider.SystemDataSqlClient);`
`28`	`28`
`29`	`29`	`static DefaultPocoTest()`
`30`	`30`	`{`