Initial migration to 3.0

DamianEdwards · DamianEdwards · commit db334931f564 · 2019-05-11T21:21:32.000-07:00
diff --git a/src/BackEnd/BackEnd.csproj b/src/BackEnd/BackEnd.csproj
@@ -1,17 +1,17 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <UserSecretsId>aspnet-BackEnd-931E56BD-86CB-4A96-BD99-2C6A6ABB0829</UserSecretsId>
-    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="2.2.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.4" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="2.2.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview5*" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0-preview5*" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0-preview5*" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.0.0-preview5*" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.0.0-preview5*" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/BackEnd/Program.cs b/src/BackEnd/Program.cs
@@ -1,18 +1,20 @@
-﻿using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
+﻿using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 
 namespace BackEnd
 {
     public class Program
     {
         public static void Main(string[] args)
         {
-            CreateWebHostBuilder(args).Build().Run();
+            CreateHostBuilder(args).Build().Run();
         }
 
-        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>();
-
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webHostBuilder =>
+                {
+                    webHostBuilder.UseStartup<Startup>();
+                });
     }
 }
diff --git a/src/BackEnd/Startup.cs b/src/BackEnd/Startup.cs
@@ -9,8 +9,9 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Swashbuckle.AspNetCore.Swagger;
+using Microsoft.Extensions.Hosting;
 using BackEnd.Data;
+using Microsoft.OpenApi.Models;
 
 [assembly: ApiConventionType(typeof(DefaultApiConventions))]
 
@@ -39,43 +40,44 @@ public void ConfigureServices(IServiceCollection services)
                 }
             });
 
-            services.AddMvc()
-                    .SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+            services.AddControllers()
+                    .AddNewtonsoftJson()
+                    .SetCompatibilityVersion(CompatibilityVersion.Version_3_0);
 
             services.AddHealthChecks()
                     .AddDbContextCheck<ApplicationDbContext>();
 
             services.AddSwaggerGen(options =>
             {
-                options.SwaggerDoc("v1", new Info { Title = "Conference Planner API", Version = "v1" });
+                options.SwaggerDoc("v1", new OpenApiInfo { Title = "Conference Planner API", Version = "v1" });
             });
         }
 
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
                 app.UseDatabaseErrorPage();
             }
-            else
-            {
-                app.UseHsts();
-            }
 
             app.UseHttpsRedirection();
 
-            app.UseHealthChecks("/health");
-
             app.UseSwagger();
 
             app.UseSwaggerUI(options =>
             {
                 options.SwaggerEndpoint("/swagger/v1/swagger.json", "Conference Planner API v1");
             });
 
-            app.UseMvc();
+            app.UseRouting();
 
+            app.UseEndpoints(endpoints =>
+            {
+                endpoints.MapControllers();
+                endpoints.MapHealthChecks("/health");
+            });
+            
             app.Run(context =>
             {
                 context.Response.Redirect("/swagger");
diff --git a/src/ConferenceDTO/SessionResponse.cs b/src/ConferenceDTO/SessionResponse.cs
@@ -8,8 +8,8 @@ public class SessionResponse : Session
     {
         public Track Track { get; set; }
 
-        public ICollection<Speaker> Speakers { get; set; } = new List<Speaker>();
+        public List<Speaker> Speakers { get; set; } = new List<Speaker>();
 
-        public ICollection<Tag> Tags { get; set; } = new List<Tag>();
+        public List<Tag> Tags { get; set; } = new List<Tag>();
     }
 }
diff --git a/src/FrontEnd/Areas/Identity/IdentityHostingStartup.cs b/src/FrontEnd/Areas/Identity/IdentityHostingStartup.cs
@@ -38,7 +38,6 @@ public void Configure(IWebHostBuilder builder)
                     options.Password.RequireUppercase = false;
                     options.Password.RequireNonAlphanumeric = false;
                 })
-                .AddDefaultUI(UIFramework.Bootstrap4)
                 .AddEntityFrameworkStores<IdentityDbContext>()
                 .AddClaimsPrincipalFactory<ClaimsPrincipalFactory>();
             });
diff --git a/src/FrontEnd/FrontEnd.csproj b/src/FrontEnd/FrontEnd.csproj
@@ -1,16 +1,19 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <UserSecretsId>aspnet-FrontEnd-18BDC1FA-5BA8-408A-BC82-D8DB0496B86B</UserSecretsId>
-    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="2.2.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.0.0-preview5*" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="3.0.0-preview5*" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.0.0-preview5*" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0-preview5*" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0-preview5*" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.0.0-preview5*" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.Client " Version="5.2.7" />
+    <!--<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" PrivateAssets="All" />-->
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/FrontEnd/Program.cs b/src/FrontEnd/Program.cs
@@ -1,25 +1,20 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using FrontEnd.Infrastructure;
-using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
+﻿using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 
 namespace FrontEnd
 {
     public class Program
     {
         public static void Main(string[] args)
         {
-            CreateWebHostBuilder(args).Build().Run();
+            CreateHostBuilder(args).Build().Run();
         }
 
-        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup>();
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webHostBuilder =>
+                {
+                    webHostBuilder.UseStartup<Startup>();
+                });
     }
 }
diff --git a/src/FrontEnd/Properties/launchSettings.json b/src/FrontEnd/Properties/launchSettings.json
@@ -12,14 +12,12 @@
       "commandName": "IISExpress",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "AASPNETCORE_HTTPS_PORT": "44374"
+        "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
     "FrontEnd": {
       "commandName": "Project",
       "launchBrowser": true,
-      "launchUrl": "",
       "applicationUrl": "https://localhost:44374;http://localhost:55994",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/src/FrontEnd/Startup.cs b/src/FrontEnd/Startup.cs
@@ -1,14 +1,13 @@
 ﻿using System;
-using System.Security.Claims;
 using FrontEnd.Data;
 using FrontEnd.HealthChecks;
 using FrontEnd.Services;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 
 namespace FrontEnd
 {
@@ -39,15 +38,15 @@ public void ConfigureServices(IServiceCollection services)
                 client.BaseAddress = new Uri(Configuration["serviceUrl"]);
             });
 
-            services.AddMvc(options =>
+            services.AddRazorPages(options =>
             {
-                options.Filters.AddService<RequireLoginFilter>();
+                options.Conventions.AuthorizeFolder("/Admin", "Admin");
             })
-            .AddRazorPagesOptions(options =>
+            .AddMvcOptions(options =>
             {
-                options.Conventions.AuthorizeFolder("/Admin", "Admin");
+                options.Filters.AddService<RequireLoginFilter>();
             })
-            .SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+            .SetCompatibilityVersion(CompatibilityVersion.Version_3_0);
 
             services.AddHealthChecks()
                     .AddCheck<BackendHealthCheck>("backend")
@@ -56,7 +55,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddSingleton<IAdminService, AdminService>();
         }
 
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             if (env.IsDevelopment())
             {
@@ -69,21 +68,20 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
                 app.UseHsts();
             }
 
-            app.UseStatusCodePagesWithReExecute("/Status/{0}");
+            //app.UseStatusCodePagesWithReExecute("/Status/{0}");
 
             app.UseHttpsRedirection();
-
             app.UseStaticFiles();
 
-            app.UseAuthentication();
+            app.UseRouting();
 
-            app.UseHealthChecks("/health");
+            app.UseAuthentication();
+            app.UseAuthorization();
 
-            app.UseMvc(routes =>
+            app.UseEndpoints(endpoints =>
             {
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
+                endpoints.MapRazorPages();
+                endpoints.MapHealthChecks("/health");
             });
         }
     }
diff --git a/src/FrontEnd/appsettings.Development.json b/src/FrontEnd/appsettings.Development.json
@@ -4,7 +4,7 @@
     "LogLevel": {
       "Default": "Debug",
       "System": "Information",
-      "Microsoft": "Information"
+      "Microsoft": "Debug"
     }
   }
 }
diff --git a/src/FrontEnd/appsettings.json b/src/FrontEnd/appsettings.json
@@ -1,10 +1,11 @@
 {
   "ServiceUrl": "http://localhost:56009/",
-  "Admin": "<username>",
   "Logging": {
     "IncludeScopes": false,
     "LogLevel": {
-      "Default": "Warning"
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
     }
   },
   "ConnectionStrings": {

Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,20 @@`
`1`		`-using Microsoft.AspNetCore;`
`2`		`-using Microsoft.AspNetCore.Hosting;`
	`1`	`+using Microsoft.AspNetCore.Hosting;`
	`2`	`+using Microsoft.Extensions.Hosting;`
`3`	`3`
`4`	`4`	`namespace BackEnd`
`5`	`5`	`{`
`6`	`6`	`public class Program`
`7`	`7`	`{`
`8`	`8`	`public static void Main(string[] args)`
`9`	`9`	`{`
`10`		`- CreateWebHostBuilder(args).Build().Run();`
	`10`	`+ CreateHostBuilder(args).Build().Run();`
`11`	`11`	`}`
`12`	`12`
`13`		`- public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>`
`14`		`- WebHost.CreateDefaultBuilder(args)`
`15`		`- .UseStartup<Startup>();`
`16`		`-`
	`13`	`+ public static IHostBuilder CreateHostBuilder(string[] args) =>`
	`14`	`+ Host.CreateDefaultBuilder(args)`
	`15`	`+ .ConfigureWebHostDefaults(webHostBuilder =>`
	`16`	`+ {`
	`17`	`+ webHostBuilder.UseStartup<Startup>();`
	`18`	`+ });`
`17`	`19`	`}`
`18`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ public class SessionResponse : Session`
`8`	`8`	`{`
`9`	`9`	`public Track Track { get; set; }`
`10`	`10`
`11`		`- public ICollection<Speaker> Speakers { get; set; } = new List<Speaker>();`
	`11`	`+ public List<Speaker> Speakers { get; set; } = new List<Speaker>();`
`12`	`12`
`13`		`- public ICollection<Tag> Tags { get; set; } = new List<Tag>();`
	`13`	`+ public List<Tag> Tags { get; set; } = new List<Tag>();`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,25 +1,20 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.IO;`
`4`		`-using System.Linq;`
`5`		`-using System.Threading.Tasks;`
`6`		`-using FrontEnd.Infrastructure;`
`7`		`-using Microsoft.AspNetCore;`
`8`		`-using Microsoft.AspNetCore.Hosting;`
`9`		`-using Microsoft.Extensions.Configuration;`
`10`		`-using Microsoft.Extensions.Logging;`
	`1`	`+using Microsoft.AspNetCore.Hosting;`
	`2`	`+using Microsoft.Extensions.Hosting;`
`11`	`3`
`12`	`4`	`namespace FrontEnd`
`13`	`5`	`{`
`14`	`6`	`public class Program`
`15`	`7`	`{`
`16`	`8`	`public static void Main(string[] args)`
`17`	`9`	`{`
`18`		`- CreateWebHostBuilder(args).Build().Run();`
	`10`	`+ CreateHostBuilder(args).Build().Run();`
`19`	`11`	`}`
`20`	`12`
`21`		`- public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>`
`22`		`- WebHost.CreateDefaultBuilder(args)`
`23`		`- .UseStartup<Startup>();`
	`13`	`+ public static IHostBuilder CreateHostBuilder(string[] args) =>`
	`14`	`+ Host.CreateDefaultBuilder(args)`
	`15`	`+ .ConfigureWebHostDefaults(webHostBuilder =>`
	`16`	`+ {`
	`17`	`+ webHostBuilder.UseStartup<Startup>();`
	`18`	`+ });`
`24`	`19`	`}`
`25`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"LogLevel": {`
`5`	`5`	`"Default": "Debug",`
`6`	`6`	`"System": "Information",`
`7`		`- "Microsoft": "Information"`
	`7`	`+ "Microsoft": "Debug"`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`	`}`