Moved to .netcoreapp2.0.

hikalkan · hikalkan · commit 96e25499cc67 · 2017-08-18T11:37:06.000+03:00
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.0.0.0</VersionPrefix>
-    <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
     <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
     <AssemblyName>AbpCompanyName.AbpProjectName.Application</AssemblyName>
     <PackageId>AbpCompanyName.AbpProjectName.Application</PackageId>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.0.0.0</VersionPrefix>
-    <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
     <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
     <AssemblyName>AbpCompanyName.AbpProjectName.Core</AssemblyName>
     <PackageId>AbpCompanyName.AbpProjectName.Core</PackageId>
@@ -18,12 +18,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp" Version="2.3.0" />
-    <PackageReference Include="Abp.AutoMapper" Version="2.3.0" />
-    <PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="2.3.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.1.2" />
+    <PackageReference Include="Abp" Version="2.3.1" />
+    <PackageReference Include="Abp.AutoMapper" Version="2.3.1" />
+    <PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="2.3.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.0.0" />
     <PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="2.1.1" />
   </ItemGroup>
 
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Roles/RoleManager.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Roles/RoleManager.cs
@@ -5,7 +5,6 @@
 using Abp.Runtime.Caching;
 using Abp.Zero.Configuration;
 using AbpCompanyName.AbpProjectName.Authorization.Users;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Logging;
 
@@ -19,7 +18,6 @@ public RoleManager(
             ILookupNormalizer keyNormalizer, 
             IdentityErrorDescriber errors, 
             ILogger<AbpRoleManager<Role, User>> logger,
-            IHttpContextAccessor contextAccessor, 
             IPermissionManager permissionManager, 
             ICacheManager cacheManager, 
             IUnitOfWorkManager unitOfWorkManager,
@@ -29,7 +27,6 @@ public RoleManager(
                   roleValidators, 
                   keyNormalizer, 
                   errors, logger, 
-                  contextAccessor, 
                   permissionManager,
                   cacheManager, 
                   unitOfWorkManager,
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Users/UserClaimsPrincipalFactory.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Authorization/Users/UserClaimsPrincipalFactory.cs
@@ -1,6 +1,6 @@
 ﻿using Abp.Authorization;
 using AbpCompanyName.AbpProjectName.Authorization.Roles;
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Options;
 
 namespace AbpCompanyName.AbpProjectName.Authorization.Users
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Identity/IdentityRegistrar.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Identity/IdentityRegistrar.cs
@@ -3,6 +3,7 @@
 using AbpCompanyName.AbpProjectName.Authorization.Users;
 using AbpCompanyName.AbpProjectName.Editions;
 using AbpCompanyName.AbpProjectName.MultiTenancy;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace AbpCompanyName.AbpProjectName.Identity
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Identity/SecurityStampValidator.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Identity/SecurityStampValidator.cs
@@ -2,17 +2,19 @@
 using AbpCompanyName.AbpProjectName.Authorization.Roles;
 using AbpCompanyName.AbpProjectName.Authorization.Users;
 using AbpCompanyName.AbpProjectName.MultiTenancy;
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Options;
 
 namespace AbpCompanyName.AbpProjectName.Identity
 {
     public class SecurityStampValidator : AbpSecurityStampValidator<Tenant, Role, User>
     {
         public SecurityStampValidator(
-            IOptions<IdentityOptions> options, 
-            SignInManager signInManager) 
-            : base(options, signInManager)
+            IOptions<SecurityStampValidatorOptions> options, 
+            SignInManager signInManager,
+            ISystemClock systemClock) 
+            : base(options, signInManager, systemClock)
         {
         }
     }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Identity/SignInManager.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Identity/SignInManager.cs
@@ -4,7 +4,7 @@
 using AbpCompanyName.AbpProjectName.Authorization.Roles;
 using AbpCompanyName.AbpProjectName.Authorization.Users;
 using AbpCompanyName.AbpProjectName.MultiTenancy;
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Logging;
@@ -21,15 +21,17 @@ public SignInManager(
             IOptions<IdentityOptions> optionsAccessor, 
             ILogger<SignInManager<User>> logger,
             IUnitOfWorkManager unitOfWorkManager,
-            ISettingManager settingManager
+            ISettingManager settingManager,
+            IAuthenticationSchemeProvider schemes
             ) : base(
                 userManager, 
                 contextAccessor, 
                 claimsFactory, 
                 optionsAccessor, 
                 logger,
                 unitOfWorkManager,
-                settingManager)
+                settingManager,
+                schemes)
         {
         }
     }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
     <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
     <RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -10,17 +10,21 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.1.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.0" />
   </ItemGroup>
    
   <ItemGroup>
     <ProjectReference Include="..\AbpCompanyName.AbpProjectName.Core\AbpCompanyName.AbpProjectName.Core.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0" />
+    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <Reference Include="System.Transactions" />
+  </ItemGroup>
+  
 </Project>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbContextFactory.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/AbpProjectNameDbContextFactory.cs
@@ -1,21 +1,21 @@
 ﻿using AbpCompanyName.AbpProjectName.Configuration;
 using AbpCompanyName.AbpProjectName.Web;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Design;
 using Microsoft.Extensions.Configuration;
 
 namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore
 {
     /* This class is needed to run "dotnet ef ..." commands from command line on development. Not used anywhere else */
-    public class AbpProjectNameDbContextFactory : IDbContextFactory<AbpProjectNameDbContext>
+    public class AbpProjectNameDbContextFactory : IDesignTimeDbContextFactory<AbpProjectNameDbContext>
     {
-        public AbpProjectNameDbContext Create(DbContextFactoryOptions options)
+        public AbpProjectNameDbContext CreateDbContext(string[] args)
         {
             var builder = new DbContextOptionsBuilder<AbpProjectNameDbContext>();
             var configuration = AppConfigurations.Get(WebContentDirectoryFinder.CalculateContentRootFolder());
 
             AbpProjectNameDbContextConfigurer.Configure(builder, configuration.GetConnectionString(AbpProjectNameConsts.ConnectionStringName));
-            
+
             return new AbpProjectNameDbContext(builder.Options);
         }
     }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
     <AssemblyName>AbpCompanyName.AbpProjectName.Migrator</AssemblyName>
     <OutputType>Exe</OutputType>
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.Castle.Log4Net" Version="2.3.0" />
+    <PackageReference Include="Abp.Castle.Log4Net" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <VersionPrefix>1.0.0.0</VersionPrefix>
-    <TargetFrameworks>net461;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
     <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
     <AssemblyName>AbpCompanyName.AbpProjectName.Web.Core</AssemblyName>
     <PackageId>AbpCompanyName.AbpProjectName.Web.Core</PackageId>
@@ -27,21 +27,21 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.ValueTuple" Version="4.3.1" />
+    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="1.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Owin" Version="1.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Owin" Version="2.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
-    <PackageReference Include="Abp.AspNetCore" Version="2.3.0" />
-    <PackageReference Include="Abp.ZeroCore" Version="2.3.0" />
+    <PackageReference Include="Abp.AspNetCore" Version="2.3.1" />
+    <PackageReference Include="Abp.ZeroCore" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
 
-    <PackageReference Include="Abp.Web.SignalR" Version="2.3.0" />
-    <PackageReference Include="Abp.Owin" Version="2.3.0" />
+    <PackageReference Include="Abp.Web.SignalR" Version="2.3.1" />
+    <PackageReference Include="Abp.Owin" Version="2.3.1" />
   </ItemGroup>
 
 </Project>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>AbpCompanyName.AbpProjectName.Web.Host</AssemblyName>
@@ -33,19 +33,19 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="1.1.1">
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.0">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Castle.LoggingFacility.MsLogging" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
-    <PackageReference Include="Abp.Castle.Log4Net" Version="2.3.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
+    <PackageReference Include="Abp.Castle.Log4Net" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
@@ -56,9 +56,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="1.0.0" />
-    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0" />
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.0" />
+    <DotNetCliToolReference Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" />
+    <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/AuthConfigurer.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/AuthConfigurer.cs
@@ -1,10 +1,9 @@
 ﻿using System;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using Abp.Runtime.Security;
-using AbpCompanyName.AbpProjectName.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.IdentityModel.Tokens;
@@ -13,52 +12,40 @@ namespace AbpCompanyName.AbpProjectName.Web.Host.Startup
 {
     public static class AuthConfigurer
     {
-        /// <summary>
-        /// Configures the specified application.
-        /// </summary>
-        /// <param name="app">The application.</param>
-        /// <param name="configuration">The configuration.</param>
-        public static void Configure(IApplicationBuilder app, IConfiguration configuration)
+        public static void Configure(IServiceCollection services, IConfiguration configuration)
         {
             if (bool.Parse(configuration["Authentication:JwtBearer:IsEnabled"]))
             {
-                app.UseJwtBearerAuthentication(CreateJwtBearerAuthenticationOptions(app));
-            }
-        }
-
-        private static JwtBearerOptions CreateJwtBearerAuthenticationOptions(IApplicationBuilder app)
-        {
-            var tokenAuthConfig = app.ApplicationServices.GetRequiredService<TokenAuthConfiguration>();
-            return new JwtBearerOptions
-            {
-                AutomaticAuthenticate = true,
-                AutomaticChallenge = true,
-                TokenValidationParameters = new TokenValidationParameters
-                {
-                    // The signing key must match!
-                    ValidateIssuerSigningKey = true,
-                    IssuerSigningKey = tokenAuthConfig.SecurityKey,
+                services.AddAuthentication()
+                    .AddJwtBearer(options =>
+                    {
+                        options.TokenValidationParameters = new TokenValidationParameters
+                        {
+                            // The signing key must match!
+                            ValidateIssuerSigningKey = true,
+                            IssuerSigningKey = new SymmetricSecurityKey(Encoding.ASCII.GetBytes(configuration["Authentication:JwtBearer:SecurityKey"])),
 
-                    // Validate the JWT Issuer (iss) claim
-                    ValidateIssuer = true,
-                    ValidIssuer = tokenAuthConfig.Issuer,
+                            // Validate the JWT Issuer (iss) claim
+                            ValidateIssuer = true,
+                            ValidIssuer = configuration["Authentication:JwtBearer:Issuer"],
 
-                    // Validate the JWT Audience (aud) claim
-                    ValidateAudience = true,
-                    ValidAudience = tokenAuthConfig.Audience,
+                            // Validate the JWT Audience (aud) claim
+                            ValidateAudience = true,
+                            ValidAudience = configuration["Authentication:JwtBearer:Audience"],
 
-                    // Validate the token expiry
-                    ValidateLifetime = true,
+                            // Validate the token expiry
+                            ValidateLifetime = true,
 
-                    // If you want to allow a certain amount of clock drift, set that here
-                    ClockSkew = TimeSpan.Zero
-                },
+                            // If you want to allow a certain amount of clock drift, set that here
+                            ClockSkew = TimeSpan.Zero
+                        };
 
-                Events = new JwtBearerEvents
-                {
-                    OnMessageReceived = QueryStringTokenResolver
-                }
-            };
+                        options.Events = new JwtBearerEvents
+                        {
+                            OnMessageReceived = QueryStringTokenResolver
+                        };
+                    });
+            }
         }
 
         /* This method is needed to authorize SignalR javascript client.
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/Startup.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/Startup.cs
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Controllers/AccountController.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Controllers/AccountController.cs
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/AuthConfigurer.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/AuthConfigurer.cs
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/Startup.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/Startup.cs
diff --git a/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj b/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj

Original file line number	Diff line number	Diff line change
`@@ -2,17 +2,19 @@`
`2`	`2`	`using AbpCompanyName.AbpProjectName.Authorization.Roles;`
`3`	`3`	`using AbpCompanyName.AbpProjectName.Authorization.Users;`
`4`	`4`	`using AbpCompanyName.AbpProjectName.MultiTenancy;`
`5`		`-using Microsoft.AspNetCore.Builder;`
	`5`	`+using Microsoft.AspNetCore.Authentication;`
	`6`	`+using Microsoft.AspNetCore.Identity;`
`6`	`7`	`using Microsoft.Extensions.Options;`
`7`	`8`
`8`	`9`	`namespace AbpCompanyName.AbpProjectName.Identity`
`9`	`10`	`{`
`10`	`11`	`public class SecurityStampValidator : AbpSecurityStampValidator<Tenant, Role, User>`
`11`	`12`	`{`
`12`	`13`	`public SecurityStampValidator(`
`13`		`- IOptions<IdentityOptions> options,`
`14`		`- SignInManager signInManager)`
`15`		`- : base(options, signInManager)`
	`14`	`+ IOptions<SecurityStampValidatorOptions> options,`
	`15`	`+ SignInManager signInManager,`
	`16`	`+ ISystemClock systemClock)`
	`17`	`+ : base(options, signInManager, systemClock)`
`16`	`18`	`{`
`17`	`19`	`}`
`18`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,21 @@`
`1`	`1`	`using AbpCompanyName.AbpProjectName.Configuration;`
`2`	`2`	`using AbpCompanyName.AbpProjectName.Web;`
`3`	`3`	`using Microsoft.EntityFrameworkCore;`
`4`		`-using Microsoft.EntityFrameworkCore.Infrastructure;`
	`4`	`+using Microsoft.EntityFrameworkCore.Design;`
`5`	`5`	`using Microsoft.Extensions.Configuration;`
`6`	`6`
`7`	`7`	`namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore`
`8`	`8`	`{`
`9`	`9`	`/* This class is needed to run "dotnet ef ..." commands from command line on development. Not used anywhere else */`
`10`		`- public class AbpProjectNameDbContextFactory : IDbContextFactory<AbpProjectNameDbContext>`
	`10`	`+ public class AbpProjectNameDbContextFactory : IDesignTimeDbContextFactory<AbpProjectNameDbContext>`
`11`	`11`	`{`
`12`		`- public AbpProjectNameDbContext Create(DbContextFactoryOptions options)`
	`12`	`+ public AbpProjectNameDbContext CreateDbContext(string[] args)`
`13`	`13`	`{`
`14`	`14`	`var builder = new DbContextOptionsBuilder<AbpProjectNameDbContext>();`
`15`	`15`	`var configuration = AppConfigurations.Get(WebContentDirectoryFinder.CalculateContentRootFolder());`
`16`	`16`
`17`	`17`	`AbpProjectNameDbContextConfigurer.Configure(builder, configuration.GetConnectionString(AbpProjectNameConsts.ConnectionStringName));`
`18`		`-`
	`18`	`+`
`19`	`19`	`return new AbpProjectNameDbContext(builder.Options);`
`20`	`20`	`}`
`21`	`21`	`}`