diff --git a/NuGet.config b/NuGet.config index 6ff8694ba..7f465c218 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,9 +2,9 @@ - + \ No newline at end of file diff --git a/samples/IdentitySample.Mvc/Startup.cs b/samples/IdentitySample.Mvc/Startup.cs index 3199b366d..9b9810a16 100644 --- 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, SqlServerProvider.SystemDataSqlClient)); + SqlServerTools.GetDataProvider(SqlServerVersion.v2012, SqlServerProvider.SystemDataSqlClient)); DataConnection.DefaultConfiguration = "Default"; diff --git a/src/LinqToDB.Identity/IdentityDataConnection.cs b/src/LinqToDB.Identity/IdentityDataConnection.cs index 3995d0d17..52b2507fb 100644 --- a/src/LinqToDB.Identity/IdentityDataConnection.cs +++ b/src/LinqToDB.Identity/IdentityDataConnection.cs @@ -1,8 +1,6 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - using System; using System.Data; +using System.Data.Common; using LinqToDB.Data; using LinqToDB.DataProvider; @@ -19,8 +17,8 @@ public class IdentityDataConnection : IdentityDataConnection /// Data provider object, see - /// Connection object - public IdentityDataConnection(IDataProvider dataProvider, IDbConnection connection) + /// Connection object + public IdentityDataConnection(IDataProvider dataProvider, DbConnection connection) : base(dataProvider, connection) { } @@ -29,8 +27,8 @@ public IdentityDataConnection(IDataProvider dataProvider, IDbConnection connecti /// Constructor /// /// Data provider object, see - /// Transdaction object - public IdentityDataConnection(IDataProvider dataProvider, IDbTransaction transaction) + /// Transdaction object + public IdentityDataConnection(IDataProvider dataProvider, DbTransaction transaction) : base(dataProvider, transaction) { } @@ -87,8 +85,8 @@ public class IdentityDataConnection : IdentityDataConnection /// Data provider object, see - /// Connection object - public IdentityDataConnection(IDataProvider dataProvider, IDbConnection connection) + /// Connection object + public IdentityDataConnection(IDataProvider dataProvider, DbConnection connection) : base(dataProvider, connection) { } @@ -97,8 +95,8 @@ public IdentityDataConnection(IDataProvider dataProvider, IDbConnection connecti /// Constructor /// /// Data provider object, see - /// Transdaction object - public IdentityDataConnection(IDataProvider dataProvider, IDbTransaction transaction) + /// Transdaction object + public IdentityDataConnection(IDataProvider dataProvider, DbTransaction transaction) : base(dataProvider, transaction) { } @@ -162,8 +160,8 @@ public class IdentityDataConnection : /// Constructor /// /// Data provider object, see - /// Connection object - public IdentityDataConnection(IDataProvider dataProvider, IDbConnection connection) + /// Connection object + public IdentityDataConnection(IDataProvider dataProvider, DbConnection connection) : base(dataProvider, connection) { } @@ -172,8 +170,8 @@ public IdentityDataConnection(IDataProvider dataProvider, IDbConnection connecti /// Constructor /// /// Data provider object, see - /// Transdaction object - public IdentityDataConnection(IDataProvider dataProvider, IDbTransaction transaction) + /// Transdaction object + public IdentityDataConnection(IDataProvider dataProvider, DbTransaction transaction) : base(dataProvider, transaction) { } @@ -245,8 +243,8 @@ public class IdentityDataConnection /// Data provider object, see - /// Connection object - public IdentityDataConnection(IDataProvider dataProvider, IDbConnection connection) + /// Connection object + public IdentityDataConnection(IDataProvider dataProvider, DbConnection connection) : base(dataProvider, connection) { } @@ -255,8 +253,8 @@ public IdentityDataConnection(IDataProvider dataProvider, IDbConnection connecti /// Constructor /// /// Data provider object, see - /// Transdaction object - public IdentityDataConnection(IDataProvider dataProvider, IDbTransaction transaction) + /// Transdaction object + public IdentityDataConnection(IDataProvider dataProvider, DbTransaction transaction) : base(dataProvider, transaction) { } @@ -304,37 +302,37 @@ public IdentityDataConnection() /// /// Gets the of Users. /// - public ITable Users => GetTable(); + public ITable Users => this.GetTable(); /// /// Gets the of User claims. /// - public ITable UserClaims => GetTable(); + public ITable UserClaims => this.GetTable(); /// /// Gets the of User logins. /// - public ITable UserLogins => GetTable(); + public ITable UserLogins => this.GetTable(); /// /// Gets the of User roles. /// - public ITable UserRoles => GetTable(); + public ITable UserRoles => this.GetTable(); /// /// Gets the of User tokens. /// - public ITable UserTokens => GetTable(); + public ITable UserTokens => this.GetTable(); /// /// Gets the of roles. /// - public ITable Roles => GetTable(); + public ITable Roles => this.GetTable(); /// /// Gets the of role claims. /// - public ITable RoleClaims => GetTable(); + public ITable RoleClaims => this.GetTable(); #endregion } diff --git a/src/LinqToDB.Identity/IdentityLinqToDbBuilderExtensions.cs b/src/LinqToDB.Identity/IdentityLinqToDbBuilderExtensions.cs index 9e55801a8..b85a5a73f 100644 --- a/src/LinqToDB.Identity/IdentityLinqToDbBuilderExtensions.cs +++ b/src/LinqToDB.Identity/IdentityLinqToDbBuilderExtensions.cs @@ -1,6 +1,3 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - using System; using LinqToDB; using LinqToDB.Data; diff --git a/src/LinqToDB.Identity/IdentityRole.cs b/src/LinqToDB.Identity/IdentityRole.cs index 74fd87f21..23639ebc5 100644 --- a/src/LinqToDB.Identity/IdentityRole.cs +++ b/src/LinqToDB.Identity/IdentityRole.cs @@ -1,6 +1,3 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - using System; using System.Collections.Generic; using LinqToDB.Mapping; diff --git a/src/LinqToDB.Identity/IdentityRoleClaim.cs b/src/LinqToDB.Identity/IdentityRoleClaim.cs index bab7bbdbf..9034d352b 100644 --- a/src/LinqToDB.Identity/IdentityRoleClaim.cs +++ b/src/LinqToDB.Identity/IdentityRoleClaim.cs @@ -1,6 +1,3 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - using System; using System.Security.Claims; diff --git a/src/LinqToDB.Identity/IdentityUser.cs b/src/LinqToDB.Identity/IdentityUser.cs index 343a91f12..acf40a214 100644 --- a/src/LinqToDB.Identity/IdentityUser.cs +++ b/src/LinqToDB.Identity/IdentityUser.cs @@ -1,6 +1,3 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - using System; using System.Collections.Generic; using LinqToDB.Mapping; diff --git a/src/LinqToDB.Identity/IdentityUserClaim.cs b/src/LinqToDB.Identity/IdentityUserClaim.cs index 7d6c2c8fc..5efbb22e3 100644 --- a/src/LinqToDB.Identity/IdentityUserClaim.cs +++ b/src/LinqToDB.Identity/IdentityUserClaim.cs @@ -1,5 +1,3 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; using System.Security.Claims; diff --git a/src/LinqToDB.Identity/IdentityUserLogin.cs b/src/LinqToDB.Identity/IdentityUserLogin.cs index fa45468ef..6ceb4cafa 100644 --- a/src/LinqToDB.Identity/IdentityUserLogin.cs +++ b/src/LinqToDB.Identity/IdentityUserLogin.cs @@ -1,6 +1,3 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - using System; namespace LinqToDB.Identity diff --git a/src/LinqToDB.Identity/IdentityUserRole.cs b/src/LinqToDB.Identity/IdentityUserRole.cs index db4a477af..e767e11b6 100644 --- a/src/LinqToDB.Identity/IdentityUserRole.cs +++ b/src/LinqToDB.Identity/IdentityUserRole.cs @@ -1,5 +1,3 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; namespace LinqToDB.Identity diff --git a/src/LinqToDB.Identity/IdentityUserToken.cs b/src/LinqToDB.Identity/IdentityUserToken.cs index e59c91e13..3d82f306d 100644 --- a/src/LinqToDB.Identity/IdentityUserToken.cs +++ b/src/LinqToDB.Identity/IdentityUserToken.cs @@ -1,6 +1,3 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - using System; namespace LinqToDB.Identity diff --git a/src/LinqToDB.Identity/LinqToDB.Identity.csproj b/src/LinqToDB.Identity/LinqToDB.Identity.csproj index b4fcc1313..aab52bc8d 100644 --- a/src/LinqToDB.Identity/LinqToDB.Identity.csproj +++ b/src/LinqToDB.Identity/LinqToDB.Identity.csproj @@ -2,9 +2,9 @@ ASP.NET Core Identity provider that uses LinqToDB. - 3.3.0 - 3.3.0 - 3.3.0 + 3.4.0 + 3.4.0 + 3.4.0 Ilya Chudin @@ -41,7 +41,7 @@ - + diff --git a/src/LinqToDB.Identity/Properties/AssemblyInfo.cs b/src/LinqToDB.Identity/Properties/AssemblyInfo.cs index 9afa460b2..98228be13 100644 --- a/src/LinqToDB.Identity/Properties/AssemblyInfo.cs +++ b/src/LinqToDB.Identity/Properties/AssemblyInfo.cs @@ -1,11 +1,8 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - using System.Reflection; using System.Resources; [assembly: AssemblyMetadata("Serviceable", "True")] [assembly: NeutralResourcesLanguage("en-us")] [assembly: AssemblyCompany("linq2db.com")] -[assembly: AssemblyCopyright("© 2011-2021 linq2db.com")] +[assembly: AssemblyCopyright("© 2011-2022 linq2db.com")] [assembly: AssemblyProduct("Linq to DB")] \ No newline at end of file diff --git a/src/LinqToDB.Identity/RoleStore.cs b/src/LinqToDB.Identity/RoleStore.cs index e6c47a103..e9b9895d7 100644 --- a/src/LinqToDB.Identity/RoleStore.cs +++ b/src/LinqToDB.Identity/RoleStore.cs @@ -1,6 +1,3 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - using System; using System.Collections.Generic; using System.ComponentModel; diff --git a/src/LinqToDB.Identity/UserStore.cs b/src/LinqToDB.Identity/UserStore.cs index 3795a3ab4..b4dc4724d 100644 --- a/src/LinqToDB.Identity/UserStore.cs +++ b/src/LinqToDB.Identity/UserStore.cs @@ -1,6 +1,3 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - using System; using System.Collections.Generic; using System.ComponentModel;