From 078512dc9417881ad5d2e5418eb03c4931c89efa Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Fri, 22 Jan 2016 12:25:42 -0800 Subject: [PATCH] Rename AspNet 5 file contents. See https://github.com/aspnet/Announcements/issues/144 for more information. --- Identity.sln | 14 +++--- NuGetPackageVerifier.json | 4 +- .../Controllers/AccountController.cs | 12 ++--- .../Controllers/HomeController.cs | 2 +- .../Controllers/ManageController.cs | 8 +-- .../IdentitySample.Mvc/CopyAspNetLoader.cmd | 2 +- ...000000000_CreateIdentitySchema.Designer.cs | 32 ++++++------ .../00000000000000_CreateIdentitySchema.cs | 6 +-- .../ApplicationDbContextModelSnapshot.cs | 32 ++++++------ .../AccountViewModels/SendCodeViewModel.cs | 4 +- .../Models/ApplicationDbContext.cs | 6 +-- .../Models/ApplicationUser.cs | 4 +- .../ConfigureTwoFactorViewModel.cs | 4 +- .../Models/ManageViewModels/IndexViewModel.cs | 4 +- .../ManageViewModels/ManageLoginsViewModel.cs | 6 +-- samples/IdentitySample.Mvc/Startup.cs | 12 ++--- .../Views/Account/Login.cshtml | 6 +-- .../Views/Manage/ManageLogins.cshtml | 4 +- .../Views/Shared/_LoginPartial.cshtml | 2 +- .../Views/_ViewImports.cshtml | 4 +- samples/IdentitySample.Mvc/hosting.json | 4 +- samples/IdentitySample.Mvc/project.json | 32 ++++++------ samples/Interop45/App_Start/IdentityConfig.cs | 10 ++-- samples/Interop45/App_Start/Startup.Auth.cs | 8 +-- samples/Interop45/Compat/CompatDbContext.cs | 8 +-- samples/Interop45/Compat/CompatRole.cs | 8 +-- samples/Interop45/Compat/CompatRoleClaim.cs | 4 +- samples/Interop45/Compat/CompatUser.cs | 8 +-- samples/Interop45/Compat/CompatUserLogin.cs | 6 +-- samples/Interop45/Compat/CompatUserStore.cs | 6 +-- .../Controllers/AccountController.cs | 6 +-- .../Interop45/Controllers/ManageController.cs | 6 +-- samples/Interop45/Interop45.csproj | 50 +++++++++---------- samples/Interop45/Models/IdentityModels.cs | 6 +-- samples/Interop45/Models/ManageViewModels.cs | 4 +- .../Views/Shared/_LoginPartial.cshtml | 2 +- samples/Interop45/Web.config | 4 +- samples/Interop45/packages.config | 24 ++++----- .../IdentityDbContext.cs | 8 +-- ...dentityEntityFrameworkBuilderExtensions.cs | 6 +-- .../IdentityRole.cs | 2 +- .../IdentityRoleClaim.cs | 2 +- .../IdentityUser.cs | 2 +- .../IdentityUserClaim.cs | 2 +- .../IdentityUserLogin.cs | 2 +- .../IdentityUserRole.cs | 2 +- .../Properties/Resources.Designer.cs | 4 +- .../RoleStore.cs | 4 +- .../UserStore.cs | 4 +- .../project.json | 4 +- .../BuilderExtensions.cs | 4 +- .../ClaimsIdentityOptions.cs | 2 +- .../DataProtectionTokenProvider.cs | 4 +- .../DataProtectionTokenProviderOptions.cs | 2 +- .../EmailTokenProvider.cs | 2 +- .../ExternalLoginInfo.cs | 2 +- .../ILookupNormalizer.cs | 2 +- .../IPasswordHasher.cs | 2 +- .../IPasswordValidator.cs | 2 +- .../IQueryableRoleStore.cs | 2 +- .../IQueryableUserStore.cs | 2 +- .../IRoleClaimStore.cs | 2 +- .../IRoleStore.cs | 2 +- .../IRoleValidator.cs | 2 +- .../ISecurityStampValidator.cs | 4 +- .../IUserClaimStore.cs | 2 +- .../IUserClaimsPrincipalFactory.cs | 2 +- .../IUserEmailStore.cs | 2 +- .../IUserLockoutStore.cs | 2 +- .../IUserLoginStore.cs | 2 +- .../IUserPasswordStore.cs | 2 +- .../IUserPhoneNumberStore.cs | 2 +- .../IUserRoleStore.cs | 2 +- .../IUserSecurityStampStore.cs | 2 +- .../IUserStore.cs | 2 +- .../IUserTokenProvider.cs | 2 +- .../IUserTwoFactorStore.cs | 2 +- .../IUserValidator.cs | 2 +- .../IdentityBuilder.cs | 4 +- .../IdentityCookieOptions.cs | 8 +-- .../IdentityError.cs | 2 +- .../IdentityErrorDescriber.cs | 2 +- .../IdentityMarkerService.cs | 2 +- .../IdentityOptions.cs | 4 +- .../IdentityResult.cs | 2 +- .../IdentityServiceCollectionExtensions.cs | 8 +-- .../LockoutOptions.cs | 2 +- .../PasswordHasher.cs | 4 +- .../PasswordHasherCompatibilityMode.cs | 2 +- .../PasswordHasherOptions.cs | 2 +- .../PasswordOptions.cs | 2 +- .../PasswordValidator.cs | 2 +- .../PasswordVerificationResult.cs | 2 +- .../PhoneNumberTokenProvider.cs | 2 +- .../PrincipalExtensions.cs | 2 +- .../Properties/AssemblyInfo.cs | 8 +-- .../Properties/Resources.Designer.cs | 4 +- .../Rfc6238AuthenticationService.cs | 2 +- .../RoleManager.cs | 6 +-- .../RoleValidator.cs | 2 +- .../SecurityStampValidator.cs | 6 +-- .../SignInManager.cs | 10 ++-- .../SignInOptions.cs | 2 +- .../SignInResult.cs | 2 +- .../TokenOptions.cs | 2 +- .../TokenProviderDescriptor.cs | 2 +- .../TotpSecurityStampBasedTokenProvider.cs | 2 +- .../UpperInvariantLookupNormalizer.cs | 2 +- .../UserClaimsPrincipalFactory.cs | 4 +- .../UserLoginInfo.cs | 2 +- .../UserManager.cs | 6 +-- .../UserOptions.cs | 2 +- .../UserValidator.cs | 2 +- .../project.json | 6 +-- .../InMemoryContext.cs | 4 +- .../InMemoryEFUserStoreTest.cs | 4 +- .../RoleStoreTest.cs | 4 +- .../TestIdentityFactory.cs | 6 +-- .../project.json | 12 ++--- .../CustomPocoTest.cs | 6 +-- .../DbUtil.cs | 8 +-- .../DefaultPocoTest.cs | 10 ++-- .../SqlStoreTestBase.cs | 10 ++-- .../UserStoreGuidKeyTest.cs | 2 +- .../UserStoreIntKeyTest.cs | 2 +- .../UserStoreStringKeyTest.cs | 2 +- .../UserStoreTest.cs | 8 +-- .../EntityFrameworkServiceBuilderExtension.cs | 4 +- .../Utilities/ScratchDatabaseFixture.cs | 6 +-- .../Utilities/SqlServerTestStore.cs | 4 +- .../Utilities/TestEnvironment.cs | 4 +- .../project.json | 16 +++--- .../FunctionalTest.cs | 16 +++--- .../HttpSignInTest.cs | 14 +++--- .../InMemoryRoleStore.cs | 4 +- .../InMemoryStoreTest.cs | 4 +- .../InMemoryUserStore.cs | 4 +- .../TestClock.cs | 4 +- .../project.json | 14 +++--- .../ApiConsistencyTest.cs | 4 +- .../IdentityBuilderTest.cs | 4 +- .../IdentityOptionsTest.cs | 4 +- .../IdentityResultTest.cs | 2 +- .../NoopRoleStore.cs | 2 +- .../NoopUserStore.cs | 2 +- .../PasswordHasherTest.cs | 2 +- .../PasswordValidatorTest.cs | 2 +- .../PrincipalExtensionsTest.cs | 2 +- .../RoleManagerTest.cs | 2 +- .../RoleValidatorTest.cs | 2 +- .../SecurityStampValidatorTest.cs | 12 ++--- .../SignInManagerTest.cs | 14 +++--- .../UserClaimsPrincipalFactoryTest.cs | 4 +- .../UserManagerTest.cs | 6 +-- .../UserValidatorTest.cs | 2 +- .../project.json | 8 +-- test/Shared/ApiConsistencyTestBase.cs | 2 +- test/Shared/IdentityResultAssert.cs | 2 +- test/Shared/MockHelpers.cs | 4 +- test/Shared/PasswordHasherOptionsAccessor.cs | 2 +- test/Shared/PriorityOrderer.cs | 2 +- test/Shared/TestLogger.cs | 2 +- test/Shared/TestRole.cs | 2 +- test/Shared/TestRoleClaim.cs | 2 +- test/Shared/TestUser.cs | 2 +- test/Shared/TestUserClaim.cs | 2 +- test/Shared/TestUserLogin.cs | 2 +- test/Shared/TestUserRole.cs | 2 +- test/Shared/UserManagerTestBase.cs | 12 ++--- 169 files changed, 438 insertions(+), 438 deletions(-) diff --git a/Identity.sln b/Identity.sln index 99adfab7ff..a257e646bd 100644 --- a/Identity.sln +++ b/Identity.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.23107.0 @@ -7,11 +7,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0F647068-660 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{52D59F18-62D2-4D17-8CF2-BE192445AF8E}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity", "src\Microsoft.AspNet.Identity\Microsoft.AspNet.Identity.xproj", "{1729302E-A58E-4652-B639-5B6B68DA2748}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Identity", "src\Microsoft.AspNetCore.Identity\Microsoft.AspNetCore.Identity.xproj", "{1729302E-A58E-4652-B639-5B6B68DA2748}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.Test", "test\Microsoft.AspNet.Identity.Test\Microsoft.AspNet.Identity.Test.xproj", "{2CF3927B-19E4-4866-9BAA-2C131580E7C3}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Identity.Test", "test\Microsoft.AspNetCore.Identity.Test\Microsoft.AspNetCore.Identity.Test.xproj", "{2CF3927B-19E4-4866-9BAA-2C131580E7C3}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.InMemory.Test", "test\Microsoft.AspNet.Identity.InMemory.Test\Microsoft.AspNet.Identity.InMemory.Test.xproj", "{65161409-C4C4-4D63-A73B-231FCFF4D503}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Identity.InMemory.Test", "test\Microsoft.AspNetCore.Identity.InMemory.Test\Microsoft.AspNetCore.Identity.InMemory.Test.xproj", "{65161409-C4C4-4D63-A73B-231FCFF4D503}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{58D94A0E-C2B7-43A7-8826-99ECBB1E0A50}" EndProject @@ -22,11 +22,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution global.json = global.json EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.EntityFramework.Test", "test\Microsoft.AspNet.Identity.EntityFramework.Test\Microsoft.AspNet.Identity.EntityFramework.Test.xproj", "{37236EA3-915D-46D5-997C-DF513C500E4B}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test", "test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.xproj", "{37236EA3-915D-46D5-997C-DF513C500E4B}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.EntityFramework.InMemory.Test", "test\Microsoft.AspNet.Identity.EntityFramework.InMemory.Test\Microsoft.AspNet.Identity.EntityFramework.InMemory.Test.xproj", "{EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test", "test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test\Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.xproj", "{EA7EB28F-53B8-4009-9C6B-74DB090CA8DD}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.EntityFramework", "src\Microsoft.AspNet.Identity.EntityFramework\Microsoft.AspNet.Identity.EntityFramework.xproj", "{4490894C-3572-4E63-86F1-EE5105CE8A06}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Identity.EntityFrameworkCore", "src\Microsoft.AspNetCore.Identity.EntityFrameworkCore\Microsoft.AspNetCore.Identity.EntityFrameworkCore.xproj", "{4490894C-3572-4E63-86F1-EE5105CE8A06}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Interop45", "samples\Interop45\Interop45.csproj", "{9A46D74F-8347-4821-A888-8DA0844443EF}" EndProject diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json index c64e52b3e9..2ca5390939 100644 --- a/NuGetPackageVerifier.json +++ b/NuGetPackageVerifier.json @@ -9,8 +9,8 @@ "StrictSemanticVersionValidationRule" ], "packages": { - "Microsoft.AspNet.Identity": { }, - "Microsoft.AspNet.Identity.EntityFramework": { } + "Microsoft.AspNetCore.Identity": { }, + "Microsoft.AspNetCore.Identity.EntityFrameworkCore": { } } }, "Default": { // Rules to run for packages not listed in any other set. diff --git a/samples/IdentitySample.Mvc/Controllers/AccountController.cs b/samples/IdentitySample.Mvc/Controllers/AccountController.cs index 5cf27389dc..adb7f812a2 100644 --- a/samples/IdentitySample.Mvc/Controllers/AccountController.cs +++ b/samples/IdentitySample.Mvc/Controllers/AccountController.cs @@ -1,13 +1,13 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Security.Claims; using System.Threading.Tasks; -using Microsoft.AspNet.Authorization; -using Microsoft.AspNet.Identity; -using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Rendering; -using Microsoft.Data.Entity; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.Rendering; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using IdentitySample.Models; using IdentitySample.Models.AccountViewModels; diff --git a/samples/IdentitySample.Mvc/Controllers/HomeController.cs b/samples/IdentitySample.Mvc/Controllers/HomeController.cs index b6dae59f8d..e9c45b37a6 100644 --- a/samples/IdentitySample.Mvc/Controllers/HomeController.cs +++ b/samples/IdentitySample.Mvc/Controllers/HomeController.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNet.Mvc; +using Microsoft.AspNetCore.Mvc; namespace IdentitySample.Controllers { diff --git a/samples/IdentitySample.Mvc/Controllers/ManageController.cs b/samples/IdentitySample.Mvc/Controllers/ManageController.cs index 96bcdd26d7..1ea61e2e35 100644 --- a/samples/IdentitySample.Mvc/Controllers/ManageController.cs +++ b/samples/IdentitySample.Mvc/Controllers/ManageController.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using System.Security.Claims; -using Microsoft.AspNet.Authorization; -using Microsoft.AspNet.Identity; -using Microsoft.AspNet.Mvc; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using IdentitySample.Models; using IdentitySample.Models.ManageViewModels; diff --git a/samples/IdentitySample.Mvc/CopyAspNetLoader.cmd b/samples/IdentitySample.Mvc/CopyAspNetLoader.cmd index 2f8ff3e7aa..f23e9109d0 100644 --- a/samples/IdentitySample.Mvc/CopyAspNetLoader.cmd +++ b/samples/IdentitySample.Mvc/CopyAspNetLoader.cmd @@ -2,6 +2,6 @@ REM copy the AspNet.Loader.dll to bin folder md bin REM figure out the path of AspNet.Loader.dll -FOR /F %%j IN ('dir /b /o:-d ..\..\packages\Microsoft.AspNet.Loader.IIS.Interop*') do (SET AspNetLoaderPath=..\..\packages\%%j\tools\AspNet.Loader.dll) +FOR /F %%j IN ('dir /b /o:-d ..\..\packages\Microsoft.AspNetCore.Loader.IIS.Interop*') do (SET AspNetLoaderPath=..\..\packages\%%j\tools\AspNet.Loader.dll) echo Found AspNetLoader.dll at %AspNetLoaderPath%. Copying to bin\ copy %AspNetLoaderPath% bin\ \ No newline at end of file diff --git a/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs index ac20eae774..b3f9533f3e 100644 --- a/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs +++ b/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.Data.Entity; -using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Metadata; -using Microsoft.Data.Entity.Migrations; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; using IdentitySample.Models; namespace IdentitySample.Data.Migrations @@ -20,7 +20,7 @@ namespace IdentitySample.Data.Migrations .HasAnnotation("ProductVersion", "7.0.0-rc2") .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRole", b => + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole", b => { b.Property("Id"); @@ -41,7 +41,7 @@ namespace IdentitySample.Data.Migrations b.HasAnnotation("Relational:TableName", "AspNetRoles"); }); - modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim", b => + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim", b => { b.Property("Id") .ValueGeneratedOnAdd(); @@ -60,7 +60,7 @@ namespace IdentitySample.Data.Migrations b.HasAnnotation("Relational:TableName", "AspNetRoleClaims"); }); - modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim", b => + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim", b => { b.Property("Id") .ValueGeneratedOnAdd(); @@ -79,7 +79,7 @@ namespace IdentitySample.Data.Migrations b.HasAnnotation("Relational:TableName", "AspNetUserClaims"); }); - modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin", b => + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin", b => { b.Property("LoginProvider"); @@ -97,7 +97,7 @@ namespace IdentitySample.Data.Migrations b.HasAnnotation("Relational:TableName", "AspNetUserLogins"); }); - modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole", b => + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole", b => { b.Property("UserId"); @@ -160,15 +160,15 @@ namespace IdentitySample.Data.Migrations b.HasAnnotation("Relational:TableName", "AspNetUsers"); }); - modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim", b => + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim", b => { - b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole") + b.HasOne("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole") .WithMany() .HasForeignKey("RoleId") .OnDelete(DeleteBehavior.Cascade); }); - modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim", b => + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim", b => { b.HasOne("$safeprojectname$.Models.ApplicationUser") .WithMany() @@ -176,7 +176,7 @@ namespace IdentitySample.Data.Migrations .OnDelete(DeleteBehavior.Cascade); }); - modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin", b => + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin", b => { b.HasOne("$safeprojectname$.Models.ApplicationUser") .WithMany() @@ -184,9 +184,9 @@ namespace IdentitySample.Data.Migrations .OnDelete(DeleteBehavior.Cascade); }); - modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole", b => + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole", b => { - b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole") + b.HasOne("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole") .WithMany() .HasForeignKey("RoleId") .OnDelete(DeleteBehavior.Cascade); diff --git a/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.cs index 8b30a39e63..3632fc51b7 100644 --- a/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.cs +++ b/samples/IdentitySample.Mvc/Data/Migrations/00000000000000_CreateIdentitySchema.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.Data.Entity.Metadata; -using Microsoft.Data.Entity.Migrations; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; namespace IdentitySample.Data.Migrations { diff --git a/samples/IdentitySample.Mvc/Data/Migrations/ApplicationDbContextModelSnapshot.cs b/samples/IdentitySample.Mvc/Data/Migrations/ApplicationDbContextModelSnapshot.cs index a1fb0c9155..de0a89cc0b 100644 --- a/samples/IdentitySample.Mvc/Data/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/samples/IdentitySample.Mvc/Data/Migrations/ApplicationDbContextModelSnapshot.cs @@ -1,11 +1,11 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.Data.Entity; -using Microsoft.Data.Entity.Infrastructure; -using Microsoft.Data.Entity.Metadata; -using Microsoft.Data.Entity.Migrations; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; using IdentitySample.Models; namespace IdentitySample.Data.Migrations @@ -19,7 +19,7 @@ namespace IdentitySample.Data.Migrations .HasAnnotation("ProductVersion", "7.0.0-rc2") .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRole", b => + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole", b => { b.Property("Id"); @@ -40,7 +40,7 @@ namespace IdentitySample.Data.Migrations b.HasAnnotation("Relational:TableName", "AspNetRoles"); }); - modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim", b => + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim", b => { b.Property("Id") .ValueGeneratedOnAdd(); @@ -59,7 +59,7 @@ namespace IdentitySample.Data.Migrations b.HasAnnotation("Relational:TableName", "AspNetRoleClaims"); }); - modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim", b => + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim", b => { b.Property("Id") .ValueGeneratedOnAdd(); @@ -78,7 +78,7 @@ namespace IdentitySample.Data.Migrations b.HasAnnotation("Relational:TableName", "AspNetUserClaims"); }); - modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin", b => + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin", b => { b.Property("LoginProvider"); @@ -96,7 +96,7 @@ namespace IdentitySample.Data.Migrations b.HasAnnotation("Relational:TableName", "AspNetUserLogins"); }); - modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole", b => + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole", b => { b.Property("UserId"); @@ -159,15 +159,15 @@ namespace IdentitySample.Data.Migrations b.HasAnnotation("Relational:TableName", "AspNetUsers"); }); - modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim", b => + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim", b => { - b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole") + b.HasOne("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole") .WithMany() .HasForeignKey("RoleId") .OnDelete(DeleteBehavior.Cascade); }); - modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim", b => + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim", b => { b.HasOne("$safeprojectname$.Models.ApplicationUser") .WithMany() @@ -175,7 +175,7 @@ namespace IdentitySample.Data.Migrations .OnDelete(DeleteBehavior.Cascade); }); - modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin", b => + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin", b => { b.HasOne("$safeprojectname$.Models.ApplicationUser") .WithMany() @@ -183,9 +183,9 @@ namespace IdentitySample.Data.Migrations .OnDelete(DeleteBehavior.Cascade); }); - modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole", b => + modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole", b => { - b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole") + b.HasOne("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole") .WithMany() .HasForeignKey("RoleId") .OnDelete(DeleteBehavior.Cascade); diff --git a/samples/IdentitySample.Mvc/Models/AccountViewModels/SendCodeViewModel.cs b/samples/IdentitySample.Mvc/Models/AccountViewModels/SendCodeViewModel.cs index 2d6e486b5e..7d87167457 100644 --- a/samples/IdentitySample.Mvc/Models/AccountViewModels/SendCodeViewModel.cs +++ b/samples/IdentitySample.Mvc/Models/AccountViewModels/SendCodeViewModel.cs @@ -1,8 +1,8 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNetCore.Mvc.Rendering; namespace IdentitySample.Models.AccountViewModels { diff --git a/samples/IdentitySample.Mvc/Models/ApplicationDbContext.cs b/samples/IdentitySample.Mvc/Models/ApplicationDbContext.cs index 1c9be042fc..50a6911a74 100644 --- a/samples/IdentitySample.Mvc/Models/ApplicationDbContext.cs +++ b/samples/IdentitySample.Mvc/Models/ApplicationDbContext.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Identity.EntityFramework; -using Microsoft.Data.Entity; +using Microsoft.AspNetCore.Identity.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; namespace IdentitySample.Models { diff --git a/samples/IdentitySample.Mvc/Models/ApplicationUser.cs b/samples/IdentitySample.Mvc/Models/ApplicationUser.cs index 85c3b5d483..28be309e48 100644 --- a/samples/IdentitySample.Mvc/Models/ApplicationUser.cs +++ b/samples/IdentitySample.Mvc/Models/ApplicationUser.cs @@ -1,8 +1,8 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Identity.EntityFramework; +using Microsoft.AspNetCore.Identity.EntityFrameworkCore; namespace IdentitySample.Models { diff --git a/samples/IdentitySample.Mvc/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs b/samples/IdentitySample.Mvc/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs index f3cfba1948..76d371bfdf 100644 --- a/samples/IdentitySample.Mvc/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs +++ b/samples/IdentitySample.Mvc/Models/ManageViewModels/ConfigureTwoFactorViewModel.cs @@ -1,8 +1,8 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNetCore.Mvc.Rendering; namespace IdentitySample.Models.ManageViewModels { diff --git a/samples/IdentitySample.Mvc/Models/ManageViewModels/IndexViewModel.cs b/samples/IdentitySample.Mvc/Models/ManageViewModels/IndexViewModel.cs index e0b576183c..09ce077c84 100644 --- a/samples/IdentitySample.Mvc/Models/ManageViewModels/IndexViewModel.cs +++ b/samples/IdentitySample.Mvc/Models/ManageViewModels/IndexViewModel.cs @@ -1,8 +1,8 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Identity; +using Microsoft.AspNetCore.Identity; namespace IdentitySample.Models.ManageViewModels { diff --git a/samples/IdentitySample.Mvc/Models/ManageViewModels/ManageLoginsViewModel.cs b/samples/IdentitySample.Mvc/Models/ManageViewModels/ManageLoginsViewModel.cs index b72fb94719..70948effa6 100644 --- a/samples/IdentitySample.Mvc/Models/ManageViewModels/ManageLoginsViewModel.cs +++ b/samples/IdentitySample.Mvc/Models/ManageViewModels/ManageLoginsViewModel.cs @@ -1,9 +1,9 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Http.Authentication; -using Microsoft.AspNet.Identity; +using Microsoft.AspNetCore.Http.Authentication; +using Microsoft.AspNetCore.Identity; namespace IdentitySample.Models.ManageViewModels { diff --git a/samples/IdentitySample.Mvc/Startup.cs b/samples/IdentitySample.Mvc/Startup.cs index d5fbf3fea3..859df5ba02 100644 --- a/samples/IdentitySample.Mvc/Startup.cs +++ b/samples/IdentitySample.Mvc/Startup.cs @@ -2,17 +2,17 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Identity.EntityFramework; -using Microsoft.Data.Entity; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Identity.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using IdentitySample.Models; using IdentitySample.Services; -using Microsoft.AspNet.Identity; -using Microsoft.AspNet.DataProtection; +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.DataProtection; using System.IO; namespace IdentitySample diff --git a/samples/IdentitySample.Mvc/Views/Account/Login.cshtml b/samples/IdentitySample.Mvc/Views/Account/Login.cshtml index d7fddd27c9..e788eec185 100644 --- a/samples/IdentitySample.Mvc/Views/Account/Login.cshtml +++ b/samples/IdentitySample.Mvc/Views/Account/Login.cshtml @@ -1,6 +1,6 @@ -@using System.Collections.Generic -@using Microsoft.AspNet.Http -@using Microsoft.AspNet.Http.Authentication +@using System.Collections.Generic +@using Microsoft.AspNetCore.Http +@using Microsoft.AspNetCore.Http.Authentication @model LoginViewModel @inject SignInManager SignInManager diff --git a/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml b/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml index 9d060df20c..1bfb1d8afd 100644 --- a/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml +++ b/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml @@ -1,5 +1,5 @@ -@model ManageLoginsViewModel -@using Microsoft.AspNet.Http.Authentication +@model ManageLoginsViewModel +@using Microsoft.AspNetCore.Http.Authentication @{ ViewData["Title"] = "Manage your external logins"; } diff --git a/samples/IdentitySample.Mvc/Views/Shared/_LoginPartial.cshtml b/samples/IdentitySample.Mvc/Views/Shared/_LoginPartial.cshtml index 10894070f3..87d35e3aba 100644 --- a/samples/IdentitySample.Mvc/Views/Shared/_LoginPartial.cshtml +++ b/samples/IdentitySample.Mvc/Views/Shared/_LoginPartial.cshtml @@ -1,4 +1,4 @@ -@using Microsoft.AspNet.Identity +@using Microsoft.AspNetCore.Identity @using IdentitySample.Models @inject SignInManager SignInManager diff --git a/samples/IdentitySample.Mvc/Views/_ViewImports.cshtml b/samples/IdentitySample.Mvc/Views/_ViewImports.cshtml index 5e12036e07..fbba680c39 100644 --- a/samples/IdentitySample.Mvc/Views/_ViewImports.cshtml +++ b/samples/IdentitySample.Mvc/Views/_ViewImports.cshtml @@ -2,5 +2,5 @@ @using IdentitySample.Models @using IdentitySample.Models.AccountViewModels @using IdentitySample.Models.ManageViewModels -@using Microsoft.AspNet.Identity -@addTagHelper *, Microsoft.AspNet.Mvc.TagHelpers +@using Microsoft.AspNetCore.Identity +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/samples/IdentitySample.Mvc/hosting.json b/samples/IdentitySample.Mvc/hosting.json index 715337cb2d..338530de11 100644 --- a/samples/IdentitySample.Mvc/hosting.json +++ b/samples/IdentitySample.Mvc/hosting.json @@ -1,4 +1,4 @@ -{ - "server": "Microsoft.AspNet.Server.Kestrel", +{ + "server": "Microsoft.AspNetCore.Server.Kestrel", "server.urls": "http://localhost:41532/" } diff --git a/samples/IdentitySample.Mvc/project.json b/samples/IdentitySample.Mvc/project.json index aa0018aa4d..06fd109f30 100644 --- a/samples/IdentitySample.Mvc/project.json +++ b/samples/IdentitySample.Mvc/project.json @@ -5,22 +5,22 @@ "description": "Identity sample MVC application on K", "version": "1.0.0-*", "dependencies": { - "Microsoft.AspNet.Mvc": "6.0.0-*", - "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-*", - "Microsoft.AspNet.DataProtection.Extensions": "1.0.0-*", - "Microsoft.AspNet.Diagnostics": "1.0.0-*", - "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-*", - "Microsoft.AspNet.Identity": "3.0.0-*", - "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-*", - "Microsoft.AspNet.Authentication.Cookies": "1.0.0-*", - "Microsoft.AspNet.Authentication.Facebook": "1.0.0-*", - "Microsoft.AspNet.Authentication.Google": "1.0.0-*", - "Microsoft.AspNet.Authentication.Twitter": "1.0.0-*", - "Microsoft.AspNet.Authorization": "1.0.0-*", - "Microsoft.AspNet.StaticFiles": "1.0.0-*", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-*", - "EntityFramework.Commands": "7.0.0-*", - "EntityFramework.MicrosoftSqlServer": "7.0.0-*", + "Microsoft.AspNetCore.Mvc": "6.0.0-*", + "Microsoft.AspNetCore.Mvc.TagHelpers": "6.0.0-*", + "Microsoft.AspNetCore.DataProtection.Extensions": "1.0.0-*", + "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "7.0.0-*", + "Microsoft.AspNetCore.Identity": "3.0.0-*", + "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "3.0.0-*", + "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*", + "Microsoft.AspNetCore.Authentication.Facebook": "1.0.0-*", + "Microsoft.AspNetCore.Authentication.Google": "1.0.0-*", + "Microsoft.AspNetCore.Authentication.Twitter": "1.0.0-*", + "Microsoft.AspNetCore.Authorization": "1.0.0-*", + "Microsoft.AspNetCore.StaticFiles": "1.0.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", + "Microsoft.EntityFrameworkCore.Commands": "7.0.0-*", + "Microsoft.EntityFrameworkCore.SqlServer": "7.0.0-*", "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*", "Microsoft.Extensions.Configuration.Json": "1.0.0-*", "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-*", diff --git a/samples/Interop45/App_Start/IdentityConfig.cs b/samples/Interop45/App_Start/IdentityConfig.cs index 536d1e45c4..f605b34796 100644 --- a/samples/Interop45/App_Start/IdentityConfig.cs +++ b/samples/Interop45/App_Start/IdentityConfig.cs @@ -1,17 +1,17 @@ -using System; +using System; using System.Collections.Generic; using System.Data.Entity; using System.Linq; using System.Security.Claims; using System.Threading.Tasks; using System.Web; -using Microsoft.AspNet.Identity; -using Microsoft.AspNet.Identity.EntityFramework; -using Microsoft.AspNet.Identity.Owin; +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Identity.EntityFrameworkCore; +using Microsoft.AspNetCore.Identity.Owin; using Microsoft.Owin; using Microsoft.Owin.Security; using Interop45.Models; -using Microsoft.AspNet.Identity.Compat; +using Microsoft.AspNetCore.Identity.Compat; namespace Interop45 { diff --git a/samples/Interop45/App_Start/Startup.Auth.cs b/samples/Interop45/App_Start/Startup.Auth.cs index 1e06713804..5718ae684d 100644 --- a/samples/Interop45/App_Start/Startup.Auth.cs +++ b/samples/Interop45/App_Start/Startup.Auth.cs @@ -1,11 +1,11 @@ -using System; -using Microsoft.AspNet.Identity; -using Microsoft.AspNet.Identity.Owin; +using System; +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Identity.Owin; using Microsoft.Owin; using Microsoft.Owin.Security.Cookies; using Owin; using Interop45.Models; -using Microsoft.AspNet.DataProtection; +using Microsoft.AspNetCore.DataProtection; using System.IO; namespace Interop45 diff --git a/samples/Interop45/Compat/CompatDbContext.cs b/samples/Interop45/Compat/CompatDbContext.cs index 4ecdd61eea..a58bf3de6f 100644 --- a/samples/Interop45/Compat/CompatDbContext.cs +++ b/samples/Interop45/Compat/CompatDbContext.cs @@ -1,12 +1,12 @@ -// Copyright (c) Microsoft Corporation, Inc. All rights reserved. +// Copyright (c) Microsoft Corporation, Inc. All rights reserved. // Licensed under the MIT License, Version 2.0. See License.txt in the project root for license information. using System.Data.Common; using System.Data.Entity; using System.Data.Entity.Infrastructure; -using Microsoft.AspNet.Identity.EntityFramework; +using Microsoft.AspNetCore.Identity.EntityFrameworkCore; -namespace Microsoft.AspNet.Identity.Compat +namespace Microsoft.AspNetCore.Identity.Compat { public class IdentityDbContext : IdentityDbContext : - EntityFramework.IdentityDbContext + Microsoft.EntityFrameworkCore.IdentityDbContext where TUser : IdentityUser where TRole : IdentityRole where TUserLogin : IdentityUserLogin diff --git a/samples/Interop45/Compat/CompatRole.cs b/samples/Interop45/Compat/CompatRole.cs index dcf5160989..72c1bf1901 100644 --- a/samples/Interop45/Compat/CompatRole.cs +++ b/samples/Interop45/Compat/CompatRole.cs @@ -1,11 +1,11 @@ -// Copyright (c) Microsoft Corporation, Inc. All rights reserved. +// Copyright (c) Microsoft Corporation, Inc. All rights reserved. // Licensed under the MIT License, Version 2.0. See License.txt in the project root for license information. using System; using System.Collections.Generic; -using Microsoft.AspNet.Identity.EntityFramework; +using Microsoft.AspNetCore.Identity.EntityFrameworkCore; -namespace Microsoft.AspNet.Identity.Compat +namespace Microsoft.AspNetCore.Identity.Compat { public class IdentityRole : IdentityRole { @@ -28,7 +28,7 @@ namespace Microsoft.AspNet.Identity.Compat } } - public class IdentityRole : EntityFramework.IdentityRole + public class IdentityRole : Microsoft.EntityFrameworkCore.IdentityRole where TUserRole : IdentityUserRole { /// diff --git a/samples/Interop45/Compat/CompatRoleClaim.cs b/samples/Interop45/Compat/CompatRoleClaim.cs index 3781c385f7..7b10ca0ae1 100644 --- a/samples/Interop45/Compat/CompatRoleClaim.cs +++ b/samples/Interop45/Compat/CompatRoleClaim.cs @@ -1,7 +1,7 @@ -// Copyright (c) Microsoft Corporation, Inc. All rights reserved. +// Copyright (c) Microsoft Corporation, Inc. All rights reserved. // Licensed under the MIT License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNet.Identity.Compat +namespace Microsoft.AspNetCore.Identity.Compat { public class IdentityRoleClaim : IdentityRoleClaim { } diff --git a/samples/Interop45/Compat/CompatUser.cs b/samples/Interop45/Compat/CompatUser.cs index 65fd490e51..09a04280ca 100644 --- a/samples/Interop45/Compat/CompatUser.cs +++ b/samples/Interop45/Compat/CompatUser.cs @@ -1,10 +1,10 @@ -// Copyright (c) Microsoft Corporation, Inc. All rights reserved. +// Copyright (c) Microsoft Corporation, Inc. All rights reserved. // Licensed under the MIT License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Identity.EntityFramework; +using Microsoft.AspNetCore.Identity.EntityFrameworkCore; -namespace Microsoft.AspNet.Identity.Compat +namespace Microsoft.AspNetCore.Identity.Compat { public class IdentityUser : IdentityUser { @@ -29,7 +29,7 @@ namespace Microsoft.AspNet.Identity.Compat } public class IdentityUser - : EntityFramework.IdentityUser + : Microsoft.EntityFrameworkCore.IdentityUser where TUserLogin : IdentityUserLogin where TUserRole : IdentityUserRole where TUserClaim : IdentityUserClaim diff --git a/samples/Interop45/Compat/CompatUserLogin.cs b/samples/Interop45/Compat/CompatUserLogin.cs index 855b07e341..6585b55cf6 100644 --- a/samples/Interop45/Compat/CompatUserLogin.cs +++ b/samples/Interop45/Compat/CompatUserLogin.cs @@ -1,9 +1,9 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -namespace Microsoft.AspNet.Identity.Compat +namespace Microsoft.AspNetCore.Identity.Compat { public class IdentityUserLogin : IdentityUserLogin { } @@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Identity.Compat /// Represents a login and its associated provider for a user. /// /// The type of the primary key of the user associated with this login. - public class IdentityUserLogin : EntityFramework.IdentityUserLogin + public class IdentityUserLogin : Microsoft.EntityFrameworkCore.IdentityUserLogin { /// /// Gets or sets the friendly name used in a UI for this login. diff --git a/samples/Interop45/Compat/CompatUserStore.cs b/samples/Interop45/Compat/CompatUserStore.cs index 6ddaea80dd..851bc9a781 100644 --- a/samples/Interop45/Compat/CompatUserStore.cs +++ b/samples/Interop45/Compat/CompatUserStore.cs @@ -1,11 +1,11 @@ -// Copyright (c) Microsoft Corporation, Inc. All rights reserved. +// Copyright (c) Microsoft Corporation, Inc. All rights reserved. // Licensed under the MIT License, Version 2.0. See License.txt in the project root for license information. using System; using System.Data.Entity; -using Microsoft.AspNet.Identity.EntityFramework; +using Microsoft.AspNetCore.Identity.EntityFrameworkCore; -namespace Microsoft.AspNet.Identity.Compat +namespace Microsoft.AspNetCore.Identity.Compat { public class IdentityUserStore : IdentityUserStore, IUserStore diff --git a/samples/Interop45/Controllers/AccountController.cs b/samples/Interop45/Controllers/AccountController.cs index 88d93fcf72..5d8b021b0d 100644 --- a/samples/Interop45/Controllers/AccountController.cs +++ b/samples/Interop45/Controllers/AccountController.cs @@ -1,12 +1,12 @@ -using System; +using System; using System.Globalization; using System.Linq; using System.Security.Claims; using System.Threading.Tasks; using System.Web; using System.Web.Mvc; -using Microsoft.AspNet.Identity; -using Microsoft.AspNet.Identity.Owin; +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Identity.Owin; using Microsoft.Owin.Security; using Interop45.Models; diff --git a/samples/Interop45/Controllers/ManageController.cs b/samples/Interop45/Controllers/ManageController.cs index 575e77a737..25bce33289 100644 --- a/samples/Interop45/Controllers/ManageController.cs +++ b/samples/Interop45/Controllers/ManageController.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Linq; using System.Threading.Tasks; using System.Web; using System.Web.Mvc; -using Microsoft.AspNet.Identity; -using Microsoft.AspNet.Identity.Owin; +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Identity.Owin; using Microsoft.Owin.Security; using Interop45.Models; diff --git a/samples/Interop45/Interop45.csproj b/samples/Interop45/Interop45.csproj index 8a0130bcd0..81296053c9 100644 --- a/samples/Interop45/Interop45.csproj +++ b/samples/Interop45/Interop45.csproj @@ -1,4 +1,4 @@ - + @@ -45,20 +45,20 @@ 4 - - ..\..\packages\Microsoft.AspNet.Cryptography.Internal.1.0.0-rc2-15760\lib\net451\Microsoft.AspNet.Cryptography.Internal.dll + + ..\..\packages\Microsoft.AspNetCore.Cryptography.Internal.1.0.0-rc2-15760\lib\net451\Microsoft.AspNetCore.Cryptography.Internal.dll True - - ..\..\packages\Microsoft.AspNet.DataProtection.1.0.0-rc2-15760\lib\net451\Microsoft.AspNet.DataProtection.dll + + ..\..\packages\Microsoft.AspNetCore.DataProtection.1.0.0-rc2-15760\lib\net451\Microsoft.AspNetCore.DataProtection.dll True - - ..\..\packages\Microsoft.AspNet.DataProtection.Abstractions.1.0.0-rc2-15760\lib\net451\Microsoft.AspNet.DataProtection.Abstractions.dll + + ..\..\packages\Microsoft.AspNetCore.DataProtection.Abstractions.1.0.0-rc2-15760\lib\net451\Microsoft.AspNetCore.DataProtection.Abstractions.dll True - - ..\..\packages\Microsoft.AspNet.DataProtection.Extensions.1.0.0-rc2-15760\lib\net451\Microsoft.AspNet.DataProtection.Extensions.dll + + ..\..\packages\Microsoft.AspNetCore.DataProtection.Extensions.1.0.0-rc2-15760\lib\net451\Microsoft.AspNetCore.DataProtection.Extensions.dll True @@ -134,30 +134,30 @@ True - ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll + ..\..\packages\Microsoft.AspNetCore.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll True - ..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + ..\..\packages\Microsoft.AspNetCore.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - ..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll + ..\..\packages\Microsoft.AspNetCore.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll True - ..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + ..\..\packages\Microsoft.AspNetCore.Razor.3.2.3\lib\net45\System.Web.Razor.dll True - ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + ..\..\packages\Microsoft.AspNetCore.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll True - ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + ..\..\packages\Microsoft.AspNetCore.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll True - ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + ..\..\packages\Microsoft.AspNetCore.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll @@ -174,19 +174,19 @@ ..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll - ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll + ..\..\packages\Microsoft.EntityFrameworkCore.6.1.3\lib\net45\Microsoft.EntityFrameworkCore.dll - - ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll + + ..\..\packages\Microsoft.EntityFrameworkCore.6.1.3\lib\net45\Microsoft.EntityFrameworkCore.SqlServer.dll - - ..\..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll + + ..\..\packages\Microsoft.AspNetCore.Identity.Core.2.2.1\lib\net45\Microsoft.AspNetCore.Identity.Core.dll - - ..\..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll + + ..\..\packages\Microsoft.AspNetCore.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNetCore.Identity.Owin.dll - - ..\..\packages\Microsoft.AspNet.Identity.EntityFramework.2.2.1\lib\net45\Microsoft.AspNet.Identity.EntityFramework.dll + + ..\..\packages\Microsoft.AspNetCore.Identity.EntityFrameworkCore.2.2.1\lib\net45\Microsoft.AspNetCore.Identity.EntityFrameworkCore.dll ..\..\packages\Owin.1.0\lib\net40\Owin.dll diff --git a/samples/Interop45/Models/IdentityModels.cs b/samples/Interop45/Models/IdentityModels.cs index 0dc97badb2..22d9f1d515 100644 --- a/samples/Interop45/Models/IdentityModels.cs +++ b/samples/Interop45/Models/IdentityModels.cs @@ -1,7 +1,7 @@ -using System.Security.Claims; +using System.Security.Claims; using System.Threading.Tasks; -using Microsoft.AspNet.Identity; -using Microsoft.AspNet.Identity.Compat; +using Microsoft.AspNetCore.Identity; +using Microsoft.AspNetCore.Identity.Compat; namespace Interop45.Models { diff --git a/samples/Interop45/Models/ManageViewModels.cs b/samples/Interop45/Models/ManageViewModels.cs index 71936f402b..112a77856f 100644 --- a/samples/Interop45/Models/ManageViewModels.cs +++ b/samples/Interop45/Models/ManageViewModels.cs @@ -1,6 +1,6 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using Microsoft.AspNet.Identity; +using Microsoft.AspNetCore.Identity; using Microsoft.Owin.Security; namespace Interop45.Models diff --git a/samples/Interop45/Views/Shared/_LoginPartial.cshtml b/samples/Interop45/Views/Shared/_LoginPartial.cshtml index f9965082e7..8f82bf2ed4 100644 --- a/samples/Interop45/Views/Shared/_LoginPartial.cshtml +++ b/samples/Interop45/Views/Shared/_LoginPartial.cshtml @@ -1,4 +1,4 @@ -@using Microsoft.AspNet.Identity +@using Microsoft.AspNetCore.Identity @if (Request.IsAuthenticated) { using (Html.BeginForm("LogOff", "Account", FormMethod.Post, new { id = "logoutForm", @class = "navbar-right" })) diff --git a/samples/Interop45/Web.config b/samples/Interop45/Web.config index d9765fae9a..963c2a3521 100644 --- a/samples/Interop45/Web.config +++ b/samples/Interop45/Web.config @@ -1,4 +1,4 @@ - +