Upgraded to dotnetcore 3.1

as per migration recommendations
This commit is contained in:
David Barker
2020-01-24 10:21:11 +08:00
4 changed files with 19 additions and 29 deletions
@@ -2,14 +2,15 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<UserSecretsId>aspnet-MongoIdentitySample.Mvc-95B15D82-54F6-4001-B4B0-6ADF4B1BB00E</UserSecretsId> <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel> <AspNetCoreModuleName>AspNetCoreModule</AspNetCoreModuleName>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.13.0-beta1" /> <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.13.0-beta1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.1" /> <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="3.1.1" /> <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="3.1.1" /> <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="3.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
+1 -5
View File
@@ -1,8 +1,4 @@
using System; using System.IO;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
+13 -19
View File
@@ -1,15 +1,15 @@
using System; using AspNetCore.Identity.MongoDbCore.Infrastructure;
using AspNetCore.Identity.MongoDbCore.Models;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using MongoIdentitySample.Mvc.Models; using MongoIdentitySample.Mvc.Models;
using MongoIdentitySample.Mvc.Services; using MongoIdentitySample.Mvc.Services;
using AspNetCore.Identity.MongoDbCore.Models; using Microsoft.Extensions.Logging;
using Microsoft.AspNetCore.Identity; using System;
using AspNetCore.Identity.MongoDbCore.Infrastructure;
using Microsoft.Extensions.Hosting;
namespace MongoIdentitySample.Mvc namespace MongoIdentitySample.Mvc
{ {
@@ -24,12 +24,6 @@ namespace MongoIdentitySample.Mvc
//per user config that is not committed to repo, use this to override settings (e.g. connection string) based on your local environment. //per user config that is not committed to repo, use this to override settings (e.g. connection string) based on your local environment.
.AddJsonFile($"appsettings.local.json", optional: true); .AddJsonFile($"appsettings.local.json", optional: true);
if (env.IsDevelopment())
{
// For more details on using the user secret store see https://go.microsoft.com/fwlink/?LinkID=532709
builder.AddUserSecrets<Startup>();
}
builder.AddEnvironmentVariables(); builder.AddEnvironmentVariables();
Configuration = builder.Build(); Configuration = builder.Build();
} }
@@ -44,8 +38,10 @@ namespace MongoIdentitySample.Mvc
var settings = Configuration.GetSection(nameof(MongoDbSettings)).Get<MongoDbSettings>(); var settings = Configuration.GetSection(nameof(MongoDbSettings)).Get<MongoDbSettings>();
services.AddSingleton<MongoDbSettings>(settings); services.AddSingleton<MongoDbSettings>(settings);
services.AddIdentity<ApplicationUser, MongoIdentityRole>() services.AddIdentity<ApplicationUser, MongoIdentityRole>()
.AddMongoDbStores<ApplicationUser, MongoIdentityRole, Guid>(settings.ConnectionString, settings.DatabaseName) .AddMongoDbStores<ApplicationUser, MongoIdentityRole, Guid>(settings.ConnectionString, settings.DatabaseName)
.AddSignInManager()
.AddDefaultTokenProviders(); .AddDefaultTokenProviders();
services.AddMvc(); services.AddMvc();
@@ -58,11 +54,8 @@ namespace MongoIdentitySample.Mvc
} }
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline. // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IWebHostEnvironment env) //, ILoggerFactory loggerFactory) public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
{ {
//loggerFactory.AddConsole(Configuration.GetSection("Logging"));
//loggerFactory.AddDebug();
if (env.IsDevelopment()) if (env.IsDevelopment())
{ {
app.UseDeveloperExceptionPage(); app.UseDeveloperExceptionPage();
@@ -73,16 +66,17 @@ namespace MongoIdentitySample.Mvc
app.UseExceptionHandler("/Home/Error"); app.UseExceptionHandler("/Home/Error");
} }
app.UseRouting();
app.UseStaticFiles(); app.UseStaticFiles();
app.UseRouting();
app.UseAuthentication(); app.UseAuthentication();
app.UseAuthorization(); app.UseAuthorization();
// Add external authentication middleware below. To configure them please see https://go.microsoft.com/fwlink/?LinkID=532715
app.UseEndpoints(endpoints => app.UseEndpoints(endpoints =>
{ {
endpoints.MapDefaultControllerRoute(); endpoints.MapDefaultControllerRoute();
endpoints.MapRazorPages();
}); });
} }
} }
@@ -1,8 +1,7 @@
using System; using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using Microsoft.AspNetCore.Identity.Test;
using Microsoft.Extensions.Logging;
namespace AspNetCore.Identity.MongoDbCore.IntegrationTests namespace AspNetCore.Identity.MongoDbCore.IntegrationTests
{ {