Update core version to 3.1

Tom-Einar Sørensen · Tom-Einar Sørensen · commit 92e74a788a9d · 2020-03-05T16:04:30.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .vs
+.idea
 Source/DemoWebApp/bin/
 Source/DemoWebApp/obj/
 Source/Saml2.Authentication.Core/obj/
diff --git a/Source/DemoWebApp/Controllers/AccountController.cs b/Source/DemoWebApp/Controllers/AccountController.cs
@@ -13,7 +13,6 @@
 using DemoWebApp.Models;
 using DemoWebApp.Models.AccountViewModels;
 using DemoWebApp.Services;
-using Microsoft.AspNetCore.Hosting.Internal;
 using Saml2.Authentication.Core.Authentication;
 
 namespace DemoWebApp.Controllers
diff --git a/Source/DemoWebApp/Controllers/HomeController.cs b/Source/DemoWebApp/Controllers/HomeController.cs
@@ -1,10 +1,6 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
+﻿using DemoWebApp.Models;
 using Microsoft.AspNetCore.Mvc;
-using DemoWebApp.Models;
+using System.Diagnostics;
 
 namespace DemoWebApp.Controllers
 {
diff --git a/Source/DemoWebApp/DemoWebApp.csproj b/Source/DemoWebApp/DemoWebApp.csproj
@@ -1,26 +1,16 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <UserSecretsId>aspnet-DemoWebApp-C260B8F3-E5A3-4A4D-B57A-771F079933AA</UserSecretsId>
   </PropertyGroup>
 
-
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Session" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.2" PrivateAssets="All" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.1" PrivateAssets="All" />
-    <PackageReference Include="Saml2.Authentication.Core" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Source/DemoWebApp/Startup.cs b/Source/DemoWebApp/Startup.cs
@@ -1,4 +1,6 @@
-﻿namespace DemoWebApp
+﻿using Microsoft.Extensions.Hosting;
+
+namespace DemoWebApp
 {
     using DemoWebApp.Data;
     using DemoWebApp.Models;
@@ -57,7 +59,7 @@ public void ConfigureServices(IServiceCollection services)
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             using (var serviceScope = app.ApplicationServices.GetService<IServiceScopeFactory>().CreateScope())
             {
@@ -75,14 +77,11 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
             }
 
             app.UseStaticFiles();
-
+            app.UseRouting();
             app.UseAuthentication();
-
-            app.UseMvc(routes =>
+            app.UseEndpoints(routes =>
             {
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
+                routes.MapControllerRoute("default", "{controller=Home}/{action=Index}/{id?}");
             });
         }
     }
diff --git a/Source/DemoWebApp/Views/Account/Login.cshtml b/Source/DemoWebApp/Views/Account/Login.cshtml
@@ -1,7 +1,7 @@
 ﻿@using System.Collections.Generic
 @using System.Linq
 @using Microsoft.AspNetCore.Http
-@using Microsoft.AspNetCore.Http.Authentication
+@*@using Microsoft.AspNetCore.Http.Authentication*@
 @model LoginViewModel
 @inject SignInManager<ApplicationUser> SignInManager
 
diff --git a/Source/Saml2.Authentication.Core/Authentication/Saml2Extensions.cs b/Source/Saml2.Authentication.Core/Authentication/Saml2Extensions.cs
@@ -24,4 +24,4 @@ public static AuthenticationBuilder AddSaml(this AuthenticationBuilder builder,
             return builder.AddScheme<Saml2Options, Saml2Handler>(authenticationScheme, displayName, configureOptions);
         }
     }
-}
+}    
diff --git a/Source/Saml2.Authentication.Core/Configuration/Saml2Options.cs b/Source/Saml2.Authentication.Core/Configuration/Saml2Options.cs
@@ -2,7 +2,6 @@
 {
     using Authentication;
     using Microsoft.AspNetCore.Authentication;
-    using Microsoft.AspNetCore.Authentication.Internal;
     using Microsoft.AspNetCore.DataProtection;
     using Microsoft.AspNetCore.Http;
     using System;
diff --git a/Source/Saml2.Authentication.Core/Saml2.Authentication.Core.csproj b/Source/Saml2.Authentication.Core/Saml2.Authentication.Core.csproj
@@ -1,7 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <IsPackable>true</IsPackable>
     <IncludeSymbols>true</IncludeSymbols>
@@ -19,12 +18,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.1.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="System.Security.Cryptography.Xml" Version="4.5.0" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.5.3" />
-    <PackageReference Include="System.ServiceModel.Primitives" Version="4.5.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`.vs`
	`2`	`+.idea`
`2`	`3`	`Source/DemoWebApp/bin/`
`3`	`4`	`Source/DemoWebApp/obj/`
`4`	`5`	`Source/Saml2.Authentication.Core/obj/`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-namespace DemoWebApp`
	`1`	`+using Microsoft.Extensions.Hosting;`
	`2`	`+`
	`3`	`+namespace DemoWebApp`
`2`	`4`	`{`
`3`	`5`	`using DemoWebApp.Data;`
`4`	`6`	`using DemoWebApp.Models;`
`@@ -57,7 +59,7 @@ public void ConfigureServices(IServiceCollection services)`
`57`	`59`	`}`
`58`	`60`
`59`	`61`	`// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.`
`60`		`- public void Configure(IApplicationBuilder app, IHostingEnvironment env)`
	`62`	`+ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`
`61`	`63`	`{`
`62`	`64`	`using (var serviceScope = app.ApplicationServices.GetService<IServiceScopeFactory>().CreateScope())`
`63`	`65`	`{`
`@@ -75,14 +77,11 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)`
`75`	`77`	`}`
`76`	`78`
`77`	`79`	`app.UseStaticFiles();`
`78`		`-`
	`80`	`+ app.UseRouting();`
`79`	`81`	`app.UseAuthentication();`
`80`		`-`
`81`		`- app.UseMvc(routes =>`
	`82`	`+ app.UseEndpoints(routes =>`
`82`	`83`	`{`
`83`		`- routes.MapRoute(`
`84`		`- name: "default",`
`85`		`- template: "{controller=Home}/{action=Index}/{id?}");`
	`84`	`+ routes.MapControllerRoute("default", "{controller=Home}/{action=Index}/{id?}");`
`86`	`85`	`});`
`87`	`86`	`}`
`88`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,4 @@ public static AuthenticationBuilder AddSaml(this AuthenticationBuilder builder,`
`24`	`24`	`return builder.AddScheme<Saml2Options, Saml2Handler>(authenticationScheme, displayName, configureOptions);`
`25`	`25`	`}`
`26`	`26`	`}`
`27`		`-}`
	`27`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`{`
`3`	`3`	`using Authentication;`
`4`	`4`	`using Microsoft.AspNetCore.Authentication;`
`5`		`- using Microsoft.AspNetCore.Authentication.Internal;`
`6`	`5`	`using Microsoft.AspNetCore.DataProtection;`
`7`	`6`	`using Microsoft.AspNetCore.Http;`
`8`	`7`	`using System;`