huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/2.1' into dev

This commit is contained in:
Hao Kung 2018-03-26 12:19:52 -07:00
parent f64aae0f41 e1cb3f25ac
commit 7388b09b23
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Startup.cs
View File

@ -64,10 +64,8 @@ namespace Company.WebApplication1
options.UseSqlite( options.UseSqlite(
Configuration.GetConnectionString("DefaultConnection"))); Configuration.GetConnectionString("DefaultConnection")));
#endif #endif
services.AddIdentity<IdentityUser, IdentityRole>(options => options.Stores.MaxLengthForKeys = 128) services.AddDefaultIdentity<IdentityUser>()
.AddEntityFrameworkStores<ApplicationDbContext>() .AddEntityFrameworkStores<ApplicationDbContext>();
.AddDefaultUI()
.AddDefaultTokenProviders();
#elif (OrganizationalAuth || IndividualB2CAuth) #elif (OrganizationalAuth || IndividualB2CAuth)
services.AddAuthentication(sharedOptions => services.AddAuthentication(sharedOptions =>

6
src/Microsoft.DotNet.Web.ProjectTemplates/content/StarterWeb-CSharp/Startup.cs
View File

@ -52,10 +52,8 @@ namespace Company.WebApplication1
Configuration.GetConnectionString("DefaultConnection"))); Configuration.GetConnectionString("DefaultConnection")));
#endif #endif
services.AddIdentity<IdentityUser, IdentityRole>(options => options.Stores.MaxLengthForKeys = 128) services.AddDefaultIdentity<IdentityUser>()
.AddEntityFrameworkStores<ApplicationDbContext>() .AddEntityFrameworkStores<ApplicationDbContext>();
.AddDefaultUI()
.AddDefaultTokenProviders();
#elif (OrganizationalAuth || IndividualB2CAuth) #elif (OrganizationalAuth || IndividualB2CAuth)
services.AddAuthentication(sharedOptions => services.AddAuthentication(sharedOptions =>