From 00e4124aca16bcd8ccd66c88de70cbc70f53c395 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Tue, 15 Aug 2017 06:58:03 -0500 Subject: [PATCH 1/2] Round one of changes --- .../src/Contacts/Contacts.csproj | 37 ++++--------------- .../Contacts/Controllers/ManageController.cs | 2 +- .../src/Contacts/Models/ApplicationUser.cs | 6 +-- .../ManageViewModels/ManageLoginsViewModel.cs | 3 +- ASP.NET Core Basics/src/Contacts/Startup.cs | 1 + 5 files changed, 12 insertions(+), 37 deletions(-) diff --git a/ASP.NET Core Basics/src/Contacts/Contacts.csproj b/ASP.NET Core Basics/src/Contacts/Contacts.csproj index 9eb91d9..daeb03e 100644 --- a/ASP.NET Core Basics/src/Contacts/Contacts.csproj +++ b/ASP.NET Core Basics/src/Contacts/Contacts.csproj @@ -1,14 +1,14 @@  - netcoreapp1.1 + netcoreapp2.0 true Contacts Exe Contacts aspnet-Contacts-cd2c7b27-e79c-43c7-b3ef-1ecb04374b70 - 1.1.1 - $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + 2.0.0 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81 @@ -18,30 +18,7 @@ - - - - - - - - - - - All - - - - - - - - - - - - All - + @@ -52,9 +29,9 @@ - - - + + + diff --git a/ASP.NET Core Basics/src/Contacts/Controllers/ManageController.cs b/ASP.NET Core Basics/src/Contacts/Controllers/ManageController.cs index cf9b36f..e323b59 100644 --- a/ASP.NET Core Basics/src/Contacts/Controllers/ManageController.cs +++ b/ASP.NET Core Basics/src/Contacts/Controllers/ManageController.cs @@ -287,7 +287,7 @@ public async Task ManageLogins(ManageMessageId? message = null) return View("Error"); } var userLogins = await _userManager.GetLoginsAsync(user); - var otherLogins = _signInManager.GetExternalAuthenticationSchemes().Where(auth => userLogins.All(ul => auth.AuthenticationScheme != ul.LoginProvider)).ToList(); + var otherLogins = (await _signInManager.GetExternalAuthenticationSchemesAsync()).Where(auth => userLogins.All(ul => auth.Name != ul.LoginProvider)).ToList(); ViewData["ShowRemoveButton"] = user.PasswordHash != null || userLogins.Count > 1; return View(new ManageLoginsViewModel { diff --git a/ASP.NET Core Basics/src/Contacts/Models/ApplicationUser.cs b/ASP.NET Core Basics/src/Contacts/Models/ApplicationUser.cs index d6bf5a8..bb136fe 100644 --- a/ASP.NET Core Basics/src/Contacts/Models/ApplicationUser.cs +++ b/ASP.NET Core Basics/src/Contacts/Models/ApplicationUser.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; +using Microsoft.AspNetCore.Identity; namespace Contacts.Models { diff --git a/ASP.NET Core Basics/src/Contacts/Models/ManageViewModels/ManageLoginsViewModel.cs b/ASP.NET Core Basics/src/Contacts/Models/ManageViewModels/ManageLoginsViewModel.cs index 6d77f22..354821b 100644 --- a/ASP.NET Core Basics/src/Contacts/Models/ManageViewModels/ManageLoginsViewModel.cs +++ b/ASP.NET Core Basics/src/Contacts/Models/ManageViewModels/ManageLoginsViewModel.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Http.Authentication; using Microsoft.AspNetCore.Identity; @@ -11,6 +12,6 @@ public class ManageLoginsViewModel { public IList CurrentLogins { get; set; } - public IList OtherLogins { get; set; } + public IList OtherLogins { get; set; } } } diff --git a/ASP.NET Core Basics/src/Contacts/Startup.cs b/ASP.NET Core Basics/src/Contacts/Startup.cs index e8a3cbf..b791daf 100644 --- a/ASP.NET Core Basics/src/Contacts/Startup.cs +++ b/ASP.NET Core Basics/src/Contacts/Startup.cs @@ -12,6 +12,7 @@ using Contacts.Data; using Contacts.Models; using Contacts.Services; +using Microsoft.AspNetCore.Identity; namespace Contacts { From cd538ae817dee3c3948469d01455a947e2ea553e Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Wed, 16 Aug 2017 05:51:32 -0500 Subject: [PATCH 2/2] Finish migration of Contacts project to ASP.NET Core 2.0 --- .../ManageViewModels/ManageLoginsViewModel.cs | 6 +----- ASP.NET Core Basics/src/Contacts/Program.cs | 20 +++++++------------ ASP.NET Core Basics/src/Contacts/Startup.cs | 9 ++------- .../src/Contacts/Views/Account/Login.cshtml | 5 +++-- 4 files changed, 13 insertions(+), 27 deletions(-) diff --git a/ASP.NET Core Basics/src/Contacts/Models/ManageViewModels/ManageLoginsViewModel.cs b/ASP.NET Core Basics/src/Contacts/Models/ManageViewModels/ManageLoginsViewModel.cs index 354821b..e722ac7 100644 --- a/ASP.NET Core Basics/src/Contacts/Models/ManageViewModels/ManageLoginsViewModel.cs +++ b/ASP.NET Core Basics/src/Contacts/Models/ManageViewModels/ManageLoginsViewModel.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; +using System.Collections.Generic; using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Http.Authentication; using Microsoft.AspNetCore.Identity; namespace Contacts.Models.ManageViewModels diff --git a/ASP.NET Core Basics/src/Contacts/Program.cs b/ASP.NET Core Basics/src/Contacts/Program.cs index 948607d..0d00cc0 100644 --- a/ASP.NET Core Basics/src/Contacts/Program.cs +++ b/ASP.NET Core Basics/src/Contacts/Program.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; +using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; namespace Contacts @@ -11,14 +7,12 @@ public class Program { public static void Main(string[] args) { - var host = new WebHostBuilder() - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseIISIntegration() - .UseStartup() - .Build(); - - host.Run(); + BuildWebHost(args).Run(); } + + public static IWebHost BuildWebHost(string[] args) => + WebHost.CreateDefaultBuilder(args) + .UseStartup() + .Build(); } } diff --git a/ASP.NET Core Basics/src/Contacts/Startup.cs b/ASP.NET Core Basics/src/Contacts/Startup.cs index b791daf..45c8a50 100644 --- a/ASP.NET Core Basics/src/Contacts/Startup.cs +++ b/ASP.NET Core Basics/src/Contacts/Startup.cs @@ -1,10 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -79,7 +74,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF app.UseStaticFiles(); - app.UseIdentity(); + app.UseAuthentication(); app.UseCors(builder => { diff --git a/ASP.NET Core Basics/src/Contacts/Views/Account/Login.cshtml b/ASP.NET Core Basics/src/Contacts/Views/Account/Login.cshtml index d803819..6bf1bdb 100644 --- a/ASP.NET Core Basics/src/Contacts/Views/Account/Login.cshtml +++ b/ASP.NET Core Basics/src/Contacts/Views/Account/Login.cshtml @@ -1,4 +1,5 @@ @using System.Collections.Generic +@using System.Linq @using Microsoft.AspNetCore.Http @using Microsoft.AspNetCore.Http.Authentication @model LoginViewModel @@ -59,7 +60,7 @@

Use another service to log in.

@{ - var loginProviders = SignInManager.GetExternalAuthenticationSchemes().ToList(); + var loginProviders = (await SignInManager.GetExternalAuthenticationSchemesAsync()).ToList(); if (loginProviders.Count == 0) {
@@ -76,7 +77,7 @@

@foreach (var provider in loginProviders) { - + }