Clean up breaks from merge

PuzzleServer · Oct 11, 2018 · 2ef7329 · 2ef7329
1 parent e303017
commit 2ef7329
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 27 deletions.
diff --git a/Data/DataModel/PuzzleUser.cs b/Data/DataModel/PuzzleUser.cs
@@ -1,10 +1,6 @@
-using Microsoft.AspNetCore.Identity;
-using ServerCore.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
-using System.Threading.Tasks;
+using Microsoft.AspNetCore.Identity;
 
 namespace ServerCore.DataModel
 {
@@ -29,7 +25,7 @@ public class PuzzleUser
 
         public static PuzzleUser GetPuzzleUser(string identityUserId, PuzzleServerContext dbContext)
         {
-           return dbContext.PuzzleUsers.Where(user => user.IdentityUserId == identityUserId).FirstOrDefault();
+            return dbContext.PuzzleUsers.Where(user => user.IdentityUserId == identityUserId).FirstOrDefault();
         }
     }
 }
diff --git a/Data/Migrations/20181006013544_CreateIdentitySchema.Designer.cs b/Data/Migrations/20181006013544_CreateIdentitySchema.Designer.cs
diff --git a/Data/Migrations/20181011014025_RenameUser.Designer.cs b/Data/Migrations/20181011014025_RenameUser.Designer.cs
diff --git a/ServerCore/Areas/Identity/IdentityHostingStartup.cs b/ServerCore/Areas/Identity/IdentityHostingStartup.cs
@@ -1,12 +1,9 @@
-using System;
-using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Identity.UI;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using ServerCore.DataModel;
-using ServerCore.Models;
 
 [assembly: HostingStartup(typeof(ServerCore.Areas.Identity.IdentityHostingStartup))]
 namespace ServerCore.Areas.Identity
@@ -15,7 +12,8 @@ public class IdentityHostingStartup : IHostingStartup
     {
         public void Configure(IWebHostBuilder builder)
         {
-            builder.ConfigureServices((context, services) => {
+            builder.ConfigureServices((context, services) =>
+            {
                 services.AddDbContext<PuzzleServerContext>(options =>
                     options.UseSqlServer(
                         context.Configuration.GetConnectionString("PuzzleServerContext")));

diff --git a/ServerCore/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs b/ServerCore/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs
@@ -1,17 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
+using System.ComponentModel.DataAnnotations;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using ServerCore.DataModel;
-using ServerCore.Models;
 
 namespace ServerCore.Areas.Identity.Pages.Account
 {

diff --git a/ServerCore/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs b/ServerCore/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs
@@ -1,15 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
+using System.ComponentModel.DataAnnotations;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.UI.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using ServerCore.DataModel;
-using ServerCore.Models;
 
 namespace ServerCore.Areas.Identity.Pages.Account.Manage
 {