From e0676292fcc8537fb6a7d3709b36b5963881a981 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 23 May 2016 13:23:32 -0700 Subject: [PATCH] Add Interop 45 Compat package Initial samples fixes (more coming to make things work) --- Identity.sln | 32 +++- NuGet.config | 2 +- .../Models/ApplicationDbContext.cs | 2 + samples/IdentitySample.Mvc/Program.cs | 24 +++ .../Properties/launchSettings.json | 6 + samples/IdentitySample.Mvc/Startup.cs | 15 +- .../Views/Shared/_Layout.cshtml | 2 +- samples/IdentitySample.Mvc/appsettings.json | 2 +- samples/IdentitySample.Mvc/project.json | 3 +- samples/IdentitySample.Mvc/web.Debug.config | 30 ++++ samples/IdentitySample.Mvc/web.Release.config | 31 ++++ .../App_Start/BundleConfig.cs | 2 +- .../App_Start/FilterConfig.cs | 2 +- .../App_Start/IdentityConfig.cs | 15 +- .../App_Start/RouteConfig.cs | 2 +- .../App_Start/Startup.Auth.cs | 40 +++-- .../Content/Site.css | 0 .../Content/bootstrap.css | 0 .../Content/bootstrap.min.css | 0 .../Controllers/AccountController.cs | 10 +- .../Controllers/HomeController.cs | 2 +- .../Controllers/ManageController.cs | 12 +- samples/{Interop45 => Interop4.5}/Global.asax | 2 +- .../{Interop45 => Interop4.5}/Global.asax.cs | 2 +- .../Interop4.5.csproj} | 149 +++++++----------- .../Models/AccountViewModels.cs | 2 +- .../Models/IdentityModels.cs | 9 +- .../Models/ManageViewModels.cs | 6 +- .../Project_Readme.html | 0 .../Properties/AssemblyInfo.cs | 8 +- .../Scripts/_references.js | Bin .../Scripts/bootstrap.js | 0 .../Scripts/bootstrap.min.js | 0 .../Scripts/jquery-1.10.2.intellisense.js | 16 +- .../Scripts/jquery-1.10.2.js | 0 .../Scripts/jquery-1.10.2.min.js | 0 .../Scripts/jquery-1.10.2.min.map | 0 .../Scripts/jquery.validate-vsdoc.js | 0 .../Scripts/jquery.validate.js | 0 .../Scripts/jquery.validate.min.js | 0 .../Scripts/jquery.validate.unobtrusive.js | 0 .../jquery.validate.unobtrusive.min.js | 0 .../Scripts/modernizr-2.6.2.js | 0 .../Scripts/respond.js | 0 .../Scripts/respond.min.js | 0 samples/{Interop45 => Interop4.5}/Startup.cs | 4 +- .../Views/Account/ConfirmEmail.cshtml | 0 .../Account/ExternalLoginConfirmation.cshtml | 2 +- .../Views/Account/ExternalLoginFailure.cshtml | 0 .../Views/Account/ForgotPassword.cshtml | 2 +- .../Account/ForgotPasswordConfirmation.cshtml | 0 .../Views/Account/Login.cshtml | 2 +- .../Views/Account/Register.cshtml | 2 +- .../Views/Account/ResetPassword.cshtml | 2 +- .../Account/ResetPasswordConfirmation.cshtml | 0 .../Views/Account/SendCode.cshtml | 2 +- .../Views/Account/VerifyCode.cshtml | 2 +- .../Account/_ExternalLoginsListPartial.cshtml | 2 +- .../Views/Home/About.cshtml | 0 .../Views/Home/Contact.cshtml | 0 .../Views/Home/Index.cshtml | 0 .../Views/Manage/AddPhoneNumber.cshtml | 2 +- .../Views/Manage/ChangePassword.cshtml | 2 +- .../Views/Manage/Index.cshtml | 4 +- .../Views/Manage/ManageLogins.cshtml | 2 +- .../Views/Manage/SetPassword.cshtml | 2 +- .../Views/Manage/VerifyPhoneNumber.cshtml | 2 +- .../Views/Shared/Error.cshtml | 0 .../Views/Shared/Lockout.cshtml | 0 .../Views/Shared/_Layout.cshtml | 0 .../Views/Shared/_LoginPartial.cshtml | 2 +- .../Views/Web.config | 2 +- .../Views/_ViewStart.cshtml | 0 .../Web.Debug.config | 0 .../Web.Release.config | 0 samples/{Interop45 => Interop4.5}/Web.config | 16 +- samples/{Interop45 => Interop4.5}/favicon.ico | Bin .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin samples/Interop4.5/packages.config | 58 +++++++ samples/Interop45/Migrations/Configuration.cs | 32 ---- samples/Interop45/PostMigration.sql | 6 - samples/Interop45/packages.config | 47 ------ .../CookieInterop.cs | 21 +++ .../IdentityDbContext.cs | 22 ++- .../IdentityRole.cs | 6 +- .../IdentityRoleClaim.cs | 2 +- .../IdentityUser.cs | 22 ++- .../IdentityUserLogin.cs | 6 +- ...Microsoft.AspNet.Identity.CoreCompat.xproj | 19 +++ .../UserStore.cs | 18 +-- .../project.json | 35 ++++ 94 files changed, 460 insertions(+), 316 deletions(-) create mode 100644 samples/IdentitySample.Mvc/Program.cs create mode 100644 samples/IdentitySample.Mvc/web.Debug.config create mode 100644 samples/IdentitySample.Mvc/web.Release.config rename samples/{Interop45 => Interop4.5}/App_Start/BundleConfig.cs (98%) rename samples/{Interop45 => Interop4.5}/App_Start/FilterConfig.cs (91%) rename samples/{Interop45 => Interop4.5}/App_Start/IdentityConfig.cs (91%) rename samples/{Interop45 => Interop4.5}/App_Start/RouteConfig.cs (96%) rename samples/{Interop45 => Interop4.5}/App_Start/Startup.Auth.cs (74%) rename samples/{Interop45 => Interop4.5}/Content/Site.css (100%) rename samples/{Interop45 => Interop4.5}/Content/bootstrap.css (100%) rename samples/{Interop45 => Interop4.5}/Content/bootstrap.min.css (100%) rename samples/{Interop45 => Interop4.5}/Controllers/AccountController.cs (99%) rename samples/{Interop45 => Interop4.5}/Controllers/HomeController.cs (93%) rename samples/{Interop45 => Interop4.5}/Controllers/ManageController.cs (98%) rename samples/{Interop45 => Interop4.5}/Global.asax (62%) rename samples/{Interop45 => Interop4.5}/Global.asax.cs (96%) rename samples/{Interop45/Interop45.csproj => Interop4.5/Interop4.5.csproj} (70%) rename samples/{Interop45 => Interop4.5}/Models/AccountViewModels.cs (99%) rename samples/{Interop45 => Interop4.5}/Models/IdentityModels.cs (83%) rename samples/{Interop45 => Interop4.5}/Models/ManageViewModels.cs (96%) rename samples/{Interop45 => Interop4.5}/Project_Readme.html (100%) rename samples/{Interop45 => Interop4.5}/Properties/AssemblyInfo.cs (85%) rename samples/{Interop45 => Interop4.5}/Scripts/_references.js (100%) rename samples/{Interop45 => Interop4.5}/Scripts/bootstrap.js (100%) rename samples/{Interop45 => Interop4.5}/Scripts/bootstrap.min.js (100%) rename samples/{Interop45 => Interop4.5}/Scripts/jquery-1.10.2.intellisense.js (99%) rename samples/{Interop45 => Interop4.5}/Scripts/jquery-1.10.2.js (100%) rename samples/{Interop45 => Interop4.5}/Scripts/jquery-1.10.2.min.js (100%) rename samples/{Interop45 => Interop4.5}/Scripts/jquery-1.10.2.min.map (100%) rename samples/{Interop45 => Interop4.5}/Scripts/jquery.validate-vsdoc.js (100%) rename samples/{Interop45 => Interop4.5}/Scripts/jquery.validate.js (100%) rename samples/{Interop45 => Interop4.5}/Scripts/jquery.validate.min.js (100%) rename samples/{Interop45 => Interop4.5}/Scripts/jquery.validate.unobtrusive.js (100%) rename samples/{Interop45 => Interop4.5}/Scripts/jquery.validate.unobtrusive.min.js (100%) rename samples/{Interop45 => Interop4.5}/Scripts/modernizr-2.6.2.js (100%) rename samples/{Interop45 => Interop4.5}/Scripts/respond.js (100%) rename samples/{Interop45 => Interop4.5}/Scripts/respond.min.js (100%) rename samples/{Interop45 => Interop4.5}/Startup.cs (69%) rename samples/{Interop45 => Interop4.5}/Views/Account/ConfirmEmail.cshtml (100%) rename samples/{Interop45 => Interop4.5}/Views/Account/ExternalLoginConfirmation.cshtml (95%) rename samples/{Interop45 => Interop4.5}/Views/Account/ExternalLoginFailure.cshtml (100%) rename samples/{Interop45 => Interop4.5}/Views/Account/ForgotPassword.cshtml (93%) rename samples/{Interop45 => Interop4.5}/Views/Account/ForgotPasswordConfirmation.cshtml (100%) rename samples/{Interop45 => Interop4.5}/Views/Account/Login.cshtml (98%) rename samples/{Interop45 => Interop4.5}/Views/Account/Register.cshtml (96%) rename samples/{Interop45 => Interop4.5}/Views/Account/ResetPassword.cshtml (96%) rename samples/{Interop45 => Interop4.5}/Views/Account/ResetPasswordConfirmation.cshtml (100%) rename samples/{Interop45 => Interop4.5}/Views/Account/SendCode.cshtml (93%) rename samples/{Interop45 => Interop4.5}/Views/Account/VerifyCode.cshtml (96%) rename samples/{Interop45 => Interop4.5}/Views/Account/_ExternalLoginsListPartial.cshtml (95%) rename samples/{Interop45 => Interop4.5}/Views/Home/About.cshtml (100%) rename samples/{Interop45 => Interop4.5}/Views/Home/Contact.cshtml (100%) rename samples/{Interop45 => Interop4.5}/Views/Home/Index.cshtml (100%) rename samples/{Interop45 => Interop4.5}/Views/Manage/AddPhoneNumber.cshtml (93%) rename samples/{Interop45 => Interop4.5}/Views/Manage/ChangePassword.cshtml (96%) rename samples/{Interop45 => Interop4.5}/Views/Manage/Index.cshtml (97%) rename samples/{Interop45 => Interop4.5}/Views/Manage/ManageLogins.cshtml (98%) rename samples/{Interop45 => Interop4.5}/Views/Manage/SetPassword.cshtml (96%) rename samples/{Interop45 => Interop4.5}/Views/Manage/VerifyPhoneNumber.cshtml (94%) rename samples/{Interop45 => Interop4.5}/Views/Shared/Error.cshtml (100%) rename samples/{Interop45 => Interop4.5}/Views/Shared/Lockout.cshtml (100%) rename samples/{Interop45 => Interop4.5}/Views/Shared/_Layout.cshtml (100%) rename samples/{Interop45 => Interop4.5}/Views/Shared/_LoginPartial.cshtml (95%) rename samples/{Interop45 => Interop4.5}/Views/Web.config (97%) rename samples/{Interop45 => Interop4.5}/Views/_ViewStart.cshtml (100%) rename samples/{Interop45 => Interop4.5}/Web.Debug.config (100%) rename samples/{Interop45 => Interop4.5}/Web.Release.config (100%) rename samples/{Interop45 => Interop4.5}/Web.config (82%) rename samples/{Interop45 => Interop4.5}/favicon.ico (100%) rename samples/{Interop45 => Interop4.5}/fonts/glyphicons-halflings-regular.eot (100%) rename samples/{Interop45 => Interop4.5}/fonts/glyphicons-halflings-regular.svg (100%) rename samples/{Interop45 => Interop4.5}/fonts/glyphicons-halflings-regular.ttf (100%) rename samples/{Interop45 => Interop4.5}/fonts/glyphicons-halflings-regular.woff (100%) create mode 100644 samples/Interop4.5/packages.config delete mode 100644 samples/Interop45/Migrations/Configuration.cs delete mode 100644 samples/Interop45/PostMigration.sql delete mode 100644 samples/Interop45/packages.config create mode 100644 src/Microsoft.AspNet.Identity.CoreCompat/CookieInterop.cs rename samples/Interop45/Compat/CompatDbContext.cs => src/Microsoft.AspNet.Identity.CoreCompat/IdentityDbContext.cs (82%) rename samples/Interop45/Compat/CompatRole.cs => src/Microsoft.AspNet.Identity.CoreCompat/IdentityRole.cs (85%) rename samples/Interop45/Compat/CompatRoleClaim.cs => src/Microsoft.AspNet.Identity.CoreCompat/IdentityRoleClaim.cs (95%) rename samples/Interop45/Compat/CompatUser.cs => src/Microsoft.AspNet.Identity.CoreCompat/IdentityUser.cs (71%) rename samples/Interop45/Compat/CompatUserLogin.cs => src/Microsoft.AspNet.Identity.CoreCompat/IdentityUserLogin.cs (80%) create mode 100644 src/Microsoft.AspNet.Identity.CoreCompat/Microsoft.AspNet.Identity.CoreCompat.xproj rename samples/Interop45/Compat/CompatUserStore.cs => src/Microsoft.AspNet.Identity.CoreCompat/UserStore.cs (65%) create mode 100644 src/Microsoft.AspNet.Identity.CoreCompat/project.json diff --git a/Identity.sln b/Identity.sln index 1eac0bdf30..0cb74460ed 100644 --- a/Identity.sln +++ b/Identity.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0F647068-6602-4E24-B1DC-8ED91481A50A}" EndProject @@ -27,6 +27,10 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Identi EndProject 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}") = "Interop4.5", "samples\Interop4.5\Interop4.5.csproj", "{4D30B14B-20FC-4DDA-97C5-B32D13FE2578}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Identity.CoreCompat", "src\Microsoft.AspNet.Identity.CoreCompat\Microsoft.AspNet.Identity.CoreCompat.xproj", "{6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -107,6 +111,30 @@ Global {4490894C-3572-4E63-86F1-EE5105CE8A06}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {4490894C-3572-4E63-86F1-EE5105CE8A06}.Release|Mixed Platforms.Build.0 = Release|Any CPU {4490894C-3572-4E63-86F1-EE5105CE8A06}.Release|x86.ActiveCfg = Release|Any CPU + {4D30B14B-20FC-4DDA-97C5-B32D13FE2578}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4D30B14B-20FC-4DDA-97C5-B32D13FE2578}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4D30B14B-20FC-4DDA-97C5-B32D13FE2578}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {4D30B14B-20FC-4DDA-97C5-B32D13FE2578}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {4D30B14B-20FC-4DDA-97C5-B32D13FE2578}.Debug|x86.ActiveCfg = Debug|Any CPU + {4D30B14B-20FC-4DDA-97C5-B32D13FE2578}.Debug|x86.Build.0 = Debug|Any CPU + {4D30B14B-20FC-4DDA-97C5-B32D13FE2578}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4D30B14B-20FC-4DDA-97C5-B32D13FE2578}.Release|Any CPU.Build.0 = Release|Any CPU + {4D30B14B-20FC-4DDA-97C5-B32D13FE2578}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {4D30B14B-20FC-4DDA-97C5-B32D13FE2578}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {4D30B14B-20FC-4DDA-97C5-B32D13FE2578}.Release|x86.ActiveCfg = Release|Any CPU + {4D30B14B-20FC-4DDA-97C5-B32D13FE2578}.Release|x86.Build.0 = Release|Any CPU + {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Debug|x86.ActiveCfg = Debug|Any CPU + {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Debug|x86.Build.0 = Debug|Any CPU + {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Release|Any CPU.Build.0 = Release|Any CPU + {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Release|x86.ActiveCfg = Release|Any CPU + {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -119,5 +147,7 @@ Global {37236EA3-915D-46D5-997C-DF513C500E4B} = {52D59F18-62D2-4D17-8CF2-BE192445AF8E} {EA7EB28F-53B8-4009-9C6B-74DB090CA8DD} = {52D59F18-62D2-4D17-8CF2-BE192445AF8E} {4490894C-3572-4E63-86F1-EE5105CE8A06} = {0F647068-6602-4E24-B1DC-8ED91481A50A} + {4D30B14B-20FC-4DDA-97C5-B32D13FE2578} = {58D94A0E-C2B7-43A7-8826-99ECBB1E0A50} + {6A74C6EA-B241-4D6B-BCE4-BF89EC1D2475} = {0F647068-6602-4E24-B1DC-8ED91481A50A} EndGlobalSection EndGlobal diff --git a/NuGet.config b/NuGet.config index 52bf414192..5500f6d507 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,4 +1,4 @@ - + diff --git a/samples/IdentitySample.Mvc/Models/ApplicationDbContext.cs b/samples/IdentitySample.Mvc/Models/ApplicationDbContext.cs index 50a6911a74..902414c46c 100644 --- a/samples/IdentitySample.Mvc/Models/ApplicationDbContext.cs +++ b/samples/IdentitySample.Mvc/Models/ApplicationDbContext.cs @@ -9,6 +9,8 @@ namespace IdentitySample.Models { public class ApplicationDbContext : IdentityDbContext { + public ApplicationDbContext(DbContextOptions options) : base(options) { } + protected override void OnModelCreating(ModelBuilder builder) { base.OnModelCreating(builder); diff --git a/samples/IdentitySample.Mvc/Program.cs b/samples/IdentitySample.Mvc/Program.cs new file mode 100644 index 0000000000..b186e6812d --- /dev/null +++ b/samples/IdentitySample.Mvc/Program.cs @@ -0,0 +1,24 @@ +using System.IO; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; + +namespace IdentitySample +{ + public static class Program + { + public static void Main(string[] args) + { + var config = new ConfigurationBuilder().AddEnvironmentVariables("ASPNETCORE_").Build(); + + var host = new WebHostBuilder() + .UseKestrel() + .UseConfiguration(config) + .UseContentRoot(Directory.GetCurrentDirectory()) + .UseIISIntegration() + .UseStartup() + .Build(); + + host.Run(); + } + } +} \ No newline at end of file diff --git a/samples/IdentitySample.Mvc/Properties/launchSettings.json b/samples/IdentitySample.Mvc/Properties/launchSettings.json index cf11afc04f..485fe8532f 100644 --- a/samples/IdentitySample.Mvc/Properties/launchSettings.json +++ b/samples/IdentitySample.Mvc/Properties/launchSettings.json @@ -14,6 +14,12 @@ "environmentVariables": { "ASPNET_ENVIRONMENT": "Development" } + }, + "web": { + "commandName": "web", + "environmentVariables": { + "ASPNET_ENVIRONMENT": "Development" + } } } } \ No newline at end of file diff --git a/samples/IdentitySample.Mvc/Startup.cs b/samples/IdentitySample.Mvc/Startup.cs index 8d0a690e0f..91a0a774e4 100644 --- a/samples/IdentitySample.Mvc/Startup.cs +++ b/samples/IdentitySample.Mvc/Startup.cs @@ -23,6 +23,7 @@ namespace IdentitySample { // Set up configuration sources. var builder = new ConfigurationBuilder() + .SetBasePath(Directory.GetCurrentDirectory()) .AddJsonFile("appsettings.json") .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true); @@ -47,8 +48,8 @@ namespace IdentitySample services.AddIdentity(options => { options.Cookies.ApplicationCookie.AuthenticationScheme = "ApplicationCookie"; - options.Cookies.ApplicationCookie.DataProtectionProvider = DataProtectionProvider.Create(new DirectoryInfo("C:\\Github\\Identity\\artifacts")); options.Cookies.ApplicationCookie.CookieName = "Interop"; + options.Cookies.ApplicationCookie.DataProtectionProvider = DataProtectionProvider.Create(new DirectoryInfo("C:\\Github\\Identity\\artifacts")); }) .AddEntityFrameworkStores() .AddDefaultTokenProviders(); @@ -114,18 +115,6 @@ namespace IdentitySample template: "{controller=Home}/{action=Index}/{id?}"); }); } - - // Entry point for the application. - public static void Main(string[] args) - { - var host = new WebHostBuilder() - .UseKestrel() - .UseIISIntegration() - .UseStartup() - .Build(); - - host.Run(); - } } } diff --git a/samples/IdentitySample.Mvc/Views/Shared/_Layout.cshtml b/samples/IdentitySample.Mvc/Views/Shared/_Layout.cshtml index f5869ac96a..912a38b7a3 100644 --- a/samples/IdentitySample.Mvc/Views/Shared/_Layout.cshtml +++ b/samples/IdentitySample.Mvc/Views/Shared/_Layout.cshtml @@ -17,7 +17,7 @@ - $safeprojectname$ + Identity Sample
    diff --git a/samples/IdentitySample.Mvc/appsettings.json b/samples/IdentitySample.Mvc/appsettings.json index 83423f9b11..fb243cd65f 100644 --- a/samples/IdentitySample.Mvc/appsettings.json +++ b/samples/IdentitySample.Mvc/appsettings.json @@ -1,7 +1,7 @@ { "Data": { "DefaultConnection": { - "ConnectionString": "Server=(localdb)\\mssqllocaldb;Database=Interop11-23;Trusted_Connection=True;MultipleActiveResultSets=true" + "ConnectionString": "Server=(localdb)\\mssqllocaldb;Database=Interop-Shared;Trusted_Connection=True;MultipleActiveResultSets=true" } }, "Logging": { diff --git a/samples/IdentitySample.Mvc/project.json b/samples/IdentitySample.Mvc/project.json index 0ef2e67f17..68dd940800 100644 --- a/samples/IdentitySample.Mvc/project.json +++ b/samples/IdentitySample.Mvc/project.json @@ -33,7 +33,8 @@ "Microsoft.Extensions.Logging.Debug": "1.0.0-*" }, "buildOptions": { - "emitEntryPoint": true + "emitEntryPoint": true, + "preserveCompilationContext": true }, "frameworks": { "net451": {}, diff --git a/samples/IdentitySample.Mvc/web.Debug.config b/samples/IdentitySample.Mvc/web.Debug.config new file mode 100644 index 0000000000..2e302f9f95 --- /dev/null +++ b/samples/IdentitySample.Mvc/web.Debug.config @@ -0,0 +1,30 @@ + + + + + + + + + + \ No newline at end of file diff --git a/samples/IdentitySample.Mvc/web.Release.config b/samples/IdentitySample.Mvc/web.Release.config new file mode 100644 index 0000000000..c35844462b --- /dev/null +++ b/samples/IdentitySample.Mvc/web.Release.config @@ -0,0 +1,31 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/samples/Interop45/App_Start/BundleConfig.cs b/samples/Interop4.5/App_Start/BundleConfig.cs similarity index 98% rename from samples/Interop45/App_Start/BundleConfig.cs rename to samples/Interop4.5/App_Start/BundleConfig.cs index 57a9826b85..428b023f65 100644 --- a/samples/Interop45/App_Start/BundleConfig.cs +++ b/samples/Interop4.5/App_Start/BundleConfig.cs @@ -1,7 +1,7 @@ using System.Web; using System.Web.Optimization; -namespace Interop45 +namespace Interop4._5 { public class BundleConfig { diff --git a/samples/Interop45/App_Start/FilterConfig.cs b/samples/Interop4.5/App_Start/FilterConfig.cs similarity index 91% rename from samples/Interop45/App_Start/FilterConfig.cs rename to samples/Interop4.5/App_Start/FilterConfig.cs index bb076a5ade..72f3996281 100644 --- a/samples/Interop45/App_Start/FilterConfig.cs +++ b/samples/Interop4.5/App_Start/FilterConfig.cs @@ -1,7 +1,7 @@ using System.Web; using System.Web.Mvc; -namespace Interop45 +namespace Interop4._5 { public class FilterConfig { diff --git a/samples/Interop45/App_Start/IdentityConfig.cs b/samples/Interop4.5/App_Start/IdentityConfig.cs similarity index 91% rename from samples/Interop45/App_Start/IdentityConfig.cs rename to samples/Interop4.5/App_Start/IdentityConfig.cs index f605b34796..2823cf05da 100644 --- a/samples/Interop45/App_Start/IdentityConfig.cs +++ b/samples/Interop4.5/App_Start/IdentityConfig.cs @@ -1,19 +1,18 @@ -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.AspNetCore.Identity; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; -using Microsoft.AspNetCore.Identity.Owin; +using Microsoft.AspNet.Identity; +using Microsoft.AspNet.Identity.EntityFramework; +using Microsoft.AspNet.Identity.Owin; using Microsoft.Owin; using Microsoft.Owin.Security; -using Interop45.Models; -using Microsoft.AspNetCore.Identity.Compat; +using Interop4._5.Models; -namespace Interop45 +namespace Interop4._5 { public class EmailService : IIdentityMessageService { @@ -43,7 +42,7 @@ namespace Interop45 public static ApplicationUserManager Create(IdentityFactoryOptions options, IOwinContext context) { - var manager = new ApplicationUserManager(new IdentityUserStore(context.Get())); + var manager = new ApplicationUserManager(new UserStore(context.Get())); // Configure validation logic for usernames manager.UserValidator = new UserValidator(manager) { diff --git a/samples/Interop45/App_Start/RouteConfig.cs b/samples/Interop4.5/App_Start/RouteConfig.cs similarity index 96% rename from samples/Interop45/App_Start/RouteConfig.cs rename to samples/Interop4.5/App_Start/RouteConfig.cs index f4674089e9..42a353a46f 100644 --- a/samples/Interop45/App_Start/RouteConfig.cs +++ b/samples/Interop4.5/App_Start/RouteConfig.cs @@ -5,7 +5,7 @@ using System.Web; using System.Web.Mvc; using System.Web.Routing; -namespace Interop45 +namespace Interop4._5 { public class RouteConfig { diff --git a/samples/Interop45/App_Start/Startup.Auth.cs b/samples/Interop4.5/App_Start/Startup.Auth.cs similarity index 74% rename from samples/Interop45/App_Start/Startup.Auth.cs rename to samples/Interop4.5/App_Start/Startup.Auth.cs index 5718ae684d..6fe8ad3e3c 100644 --- a/samples/Interop45/App_Start/Startup.Auth.cs +++ b/samples/Interop4.5/App_Start/Startup.Auth.cs @@ -1,14 +1,13 @@ -using System; -using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Identity.Owin; +using System; +using Microsoft.AspNet.Identity; +using Microsoft.AspNet.Identity.Owin; using Microsoft.Owin; using Microsoft.Owin.Security.Cookies; using Owin; -using Interop45.Models; -using Microsoft.AspNetCore.DataProtection; +using Interop4._5.Models; using System.IO; -namespace Interop45 +namespace Interop4._5 { public partial class Startup { @@ -26,8 +25,8 @@ namespace Interop45 app.UseCookieAuthentication(new CookieAuthenticationOptions { AuthenticationType = DefaultAuthenticationTypes.ApplicationCookie, - LoginPath = new PathString("/Account/Login"), CookieName = "Interop", + LoginPath = new PathString("/Account/Login"), Provider = new CookieAuthenticationProvider { // Enables the application to validate the security stamp when the user logs in. @@ -35,8 +34,9 @@ namespace Interop45 OnValidateIdentity = SecurityStampValidator.OnValidateIdentity( validateInterval: TimeSpan.FromMinutes(30), regenerateIdentity: (manager, user) => user.GenerateUserIdentityAsync(manager)) - } - }, new DataProtectionProvider(new DirectoryInfo("C:\\Github\\Identity\\artifacts"))); + }, + TicketDataFormat = CookieInterop.CreateSharedDataFormat(new DirectoryInfo("C:\\Github\\Identity\\artifacts"), DefaultAuthenticationTypes.ApplicationCookie) + }); app.UseExternalSignInCookie(DefaultAuthenticationTypes.ExternalCookie); // Enables the application to temporarily store user information when they are verifying the second factor in the two-factor authentication process. @@ -67,4 +67,24 @@ namespace Interop45 //}); } } -} \ No newline at end of file +} + +// Temporary Copy from CookieInterop in CoreCompat, samples should reference that +namespace Owin +{ + using System.IO; + using Microsoft.AspNetCore.DataProtection; + using Microsoft.Owin.Security; + using Microsoft.Owin.Security.Interop; + + public static class CookieInterop + { + public static ISecureDataFormat CreateSharedDataFormat(DirectoryInfo keyDirectory, string authenticationType) + { + var dataProtector = DataProtectionProvider.Create(keyDirectory) + .CreateProtector("Microsoft.AspNet.Authentication.Cookies.CookieAuthenticationMiddleware", // full name of the ASP.NET 5 type + authenticationType, "v2"); + return new AspNetTicketDataFormat(new DataProtectorShim(dataProtector)); + } + } +} diff --git a/samples/Interop45/Content/Site.css b/samples/Interop4.5/Content/Site.css similarity index 100% rename from samples/Interop45/Content/Site.css rename to samples/Interop4.5/Content/Site.css diff --git a/samples/Interop45/Content/bootstrap.css b/samples/Interop4.5/Content/bootstrap.css similarity index 100% rename from samples/Interop45/Content/bootstrap.css rename to samples/Interop4.5/Content/bootstrap.css diff --git a/samples/Interop45/Content/bootstrap.min.css b/samples/Interop4.5/Content/bootstrap.min.css similarity index 100% rename from samples/Interop45/Content/bootstrap.min.css rename to samples/Interop4.5/Content/bootstrap.min.css diff --git a/samples/Interop45/Controllers/AccountController.cs b/samples/Interop4.5/Controllers/AccountController.cs similarity index 99% rename from samples/Interop45/Controllers/AccountController.cs rename to samples/Interop4.5/Controllers/AccountController.cs index 5d8b021b0d..4415a46b5f 100644 --- a/samples/Interop45/Controllers/AccountController.cs +++ b/samples/Interop4.5/Controllers/AccountController.cs @@ -1,16 +1,16 @@ -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.AspNetCore.Identity; -using Microsoft.AspNetCore.Identity.Owin; +using Microsoft.AspNet.Identity; +using Microsoft.AspNet.Identity.Owin; using Microsoft.Owin.Security; -using Interop45.Models; +using Interop4._5.Models; -namespace Interop45.Controllers +namespace Interop4._5.Controllers { [Authorize] public class AccountController : Controller diff --git a/samples/Interop45/Controllers/HomeController.cs b/samples/Interop4.5/Controllers/HomeController.cs similarity index 93% rename from samples/Interop45/Controllers/HomeController.cs rename to samples/Interop4.5/Controllers/HomeController.cs index fb674ae24f..edf2499b19 100644 --- a/samples/Interop45/Controllers/HomeController.cs +++ b/samples/Interop4.5/Controllers/HomeController.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Web; using System.Web.Mvc; -namespace Interop45.Controllers +namespace Interop4._5.Controllers { public class HomeController : Controller { diff --git a/samples/Interop45/Controllers/ManageController.cs b/samples/Interop4.5/Controllers/ManageController.cs similarity index 98% rename from samples/Interop45/Controllers/ManageController.cs rename to samples/Interop4.5/Controllers/ManageController.cs index 1ae5a3d7eb..5c4cc5abfc 100644 --- a/samples/Interop45/Controllers/ManageController.cs +++ b/samples/Interop4.5/Controllers/ManageController.cs @@ -1,14 +1,14 @@ -using System; +using System; using System.Linq; using System.Threading.Tasks; using System.Web; using System.Web.Mvc; -using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Identity.Owin; +using Microsoft.AspNet.Identity; +using Microsoft.AspNet.Identity.Owin; using Microsoft.Owin.Security; -using Interop45.Models; +using Interop4._5.Models; -namespace Interop45.Controllers +namespace Interop4._5.Controllers { [Authorize] public class ManageController : Controller @@ -195,7 +195,7 @@ namespace Interop45.Controllers } // - // GET: /Manage/RemovePhoneNumber + // POST: /Manage/RemovePhoneNumber [HttpPost] [ValidateAntiForgeryToken] public async Task RemovePhoneNumber() diff --git a/samples/Interop45/Global.asax b/samples/Interop4.5/Global.asax similarity index 62% rename from samples/Interop45/Global.asax rename to samples/Interop4.5/Global.asax index 658eed11ba..73a14650cf 100644 --- a/samples/Interop45/Global.asax +++ b/samples/Interop4.5/Global.asax @@ -1 +1 @@ -<%@ Application Codebehind="Global.asax.cs" Inherits="Interop45.MvcApplication" Language="C#" %> +<%@ Application Codebehind="Global.asax.cs" Inherits="Interop4._5.MvcApplication" Language="C#" %> diff --git a/samples/Interop45/Global.asax.cs b/samples/Interop4.5/Global.asax.cs similarity index 96% rename from samples/Interop45/Global.asax.cs rename to samples/Interop4.5/Global.asax.cs index e0c3a5de44..bb45b09c1b 100644 --- a/samples/Interop45/Global.asax.cs +++ b/samples/Interop4.5/Global.asax.cs @@ -6,7 +6,7 @@ using System.Web.Mvc; using System.Web.Optimization; using System.Web.Routing; -namespace Interop45 +namespace Interop4._5 { public class MvcApplication : System.Web.HttpApplication { diff --git a/samples/Interop45/Interop45.csproj b/samples/Interop4.5/Interop4.5.csproj similarity index 70% rename from samples/Interop45/Interop45.csproj rename to samples/Interop4.5/Interop4.5.csproj index 81296053c9..1938543976 100644 --- a/samples/Interop45/Interop45.csproj +++ b/samples/Interop4.5/Interop4.5.csproj @@ -1,4 +1,4 @@ - + @@ -9,13 +9,13 @@ 2.0 - {9A46D74F-8347-4821-A888-8DA0844443EF} + {4D30B14B-20FC-4DDA-97C5-B32D13FE2578} {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} Library Properties - Interop45 - Interop45 - v4.6 + Interop4._5 + Interop4.5 + v4.5.1 false true @@ -45,20 +45,20 @@ 4 - - ..\..\packages\Microsoft.AspNetCore.Cryptography.Internal.1.0.0-rc2-15760\lib\net451\Microsoft.AspNetCore.Cryptography.Internal.dll + + ..\..\packages\Microsoft.AspNetCore.Cryptography.Internal.1.0.0-rc3-20677\lib\net451\Microsoft.AspNetCore.Cryptography.Internal.dll True - - ..\..\packages\Microsoft.AspNetCore.DataProtection.1.0.0-rc2-15760\lib\net451\Microsoft.AspNetCore.DataProtection.dll + + ..\..\packages\Microsoft.AspNetCore.DataProtection.1.0.0-rc3-20677\lib\net451\Microsoft.AspNetCore.DataProtection.dll True - - ..\..\packages\Microsoft.AspNetCore.DataProtection.Abstractions.1.0.0-rc2-15760\lib\net451\Microsoft.AspNetCore.DataProtection.Abstractions.dll + + ..\..\packages\Microsoft.AspNetCore.DataProtection.Abstractions.1.0.0-rc3-20677\lib\net451\Microsoft.AspNetCore.DataProtection.Abstractions.dll True - - ..\..\packages\Microsoft.AspNetCore.DataProtection.Extensions.1.0.0-rc2-15760\lib\net451\Microsoft.AspNetCore.DataProtection.Extensions.dll + + ..\..\packages\Microsoft.AspNetCore.DataProtection.Extensions.1.0.0-rc3-20677\lib\net451\Microsoft.AspNetCore.DataProtection.Extensions.dll True @@ -66,59 +66,48 @@ True - - ..\..\packages\Microsoft.Extensions.Configuration.1.0.0-rc2-15779\lib\net451\Microsoft.Extensions.Configuration.dll + + ..\..\packages\Microsoft.Extensions.DependencyInjection.1.0.0-rc3-20677\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll True - - ..\..\packages\Microsoft.Extensions.Configuration.Abstractions.1.0.0-rc2-15779\lib\net451\Microsoft.Extensions.Configuration.Abstractions.dll + + ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0-rc3-20677\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll True - - ..\..\packages\Microsoft.Extensions.Configuration.Binder.1.0.0-rc2-15779\lib\net451\Microsoft.Extensions.Configuration.Binder.dll + + ..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.0-rc3-20677\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll True - - ..\..\packages\Microsoft.Extensions.DependencyInjection.1.0.0-rc2-15748\lib\net451\Microsoft.Extensions.DependencyInjection.dll + + ..\..\packages\Microsoft.Extensions.Options.1.0.0-rc3-20677\lib\netstandard1.0\Microsoft.Extensions.Options.dll True - - ..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0-rc2-15748\lib\net451\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + ..\..\packages\Microsoft.Extensions.PlatformAbstractions.1.0.0-rc3-20677\lib\net451\Microsoft.Extensions.PlatformAbstractions.dll True - - ..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.0-rc2-15757\lib\net451\Microsoft.Extensions.Logging.Abstractions.dll + + ..\..\packages\Microsoft.Extensions.Primitives.1.0.0-rc3-20677\lib\netstandard1.0\Microsoft.Extensions.Primitives.dll True - - ..\..\packages\Microsoft.Extensions.OptionsModel.1.0.0-rc2-15753\lib\net451\Microsoft.Extensions.OptionsModel.dll - True - - - ..\..\packages\Microsoft.Extensions.PlatformAbstractions.1.0.0-rc2-16062\lib\net451\Microsoft.Extensions.PlatformAbstractions.dll - True - - - ..\..\packages\Microsoft.Extensions.Primitives.1.0.0-rc2-15802\lib\net451\Microsoft.Extensions.Primitives.dll - True - - - ..\..\packages\Microsoft.Owin.Security.Cookies.Interop.1.0.0-t151023210157\lib\net451\Microsoft.Owin.Security.Cookies.Interop.dll + + ..\..\packages\Microsoft.Owin.Security.Interop.1.0.0-rc3-20677\lib\net451\Microsoft.Owin.Security.Interop.dll True - - + + + - + @@ -134,32 +123,31 @@ True - ..\..\packages\Microsoft.AspNetCore.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll + ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll True - ..\..\packages\Microsoft.AspNetCore.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + ..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - ..\..\packages\Microsoft.AspNetCore.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll + ..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll True - ..\..\packages\Microsoft.AspNetCore.Razor.3.2.3\lib\net45\System.Web.Razor.dll + ..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll True - ..\..\packages\Microsoft.AspNetCore.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll True - ..\..\packages\Microsoft.AspNetCore.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll True - ..\..\packages\Microsoft.AspNetCore.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True ..\..\packages\WebGrease.1.5.2\lib\WebGrease.dll @@ -174,19 +162,19 @@ ..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll - ..\..\packages\Microsoft.EntityFrameworkCore.6.1.3\lib\net45\Microsoft.EntityFrameworkCore.dll + ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll - - ..\..\packages\Microsoft.EntityFrameworkCore.6.1.3\lib\net45\Microsoft.EntityFrameworkCore.SqlServer.dll + + ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll - - ..\..\packages\Microsoft.AspNetCore.Identity.Core.2.2.1\lib\net45\Microsoft.AspNetCore.Identity.Core.dll + + ..\..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll - - ..\..\packages\Microsoft.AspNetCore.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNetCore.Identity.Owin.dll + + ..\..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll - - ..\..\packages\Microsoft.AspNetCore.Identity.EntityFrameworkCore.2.2.1\lib\net45\Microsoft.AspNetCore.Identity.EntityFrameworkCore.dll + + ..\..\packages\Microsoft.AspNet.Identity.EntityFramework.2.2.1\lib\net45\Microsoft.AspNet.Identity.EntityFramework.dll ..\..\packages\Owin.1.0\lib\net40\Owin.dll @@ -225,35 +213,12 @@ - - - - - - Global.asax - - - 201511031830242_InitialCreate.cs - - - - 201511232040531_Identity3Migration.cs - - - - 201511232057540_IdentityV3Schema.cs - - - - 201511232103169_Identity3Migration1.cs - - @@ -328,18 +293,10 @@ - - 201511031830242_InitialCreate.cs - - - 201511232040531_Identity3Migration.cs - - - 201511232057540_IdentityV3Schema.cs - - - 201511232103169_Identity3Migration1.cs - + + {6a74c6ea-b241-4d6b-bce4-bf89ec1d2475} + Microsoft.AspNet.Identity.CoreCompat + 10.0 @@ -357,9 +314,9 @@ True True - 64848 + 25633 / - http://localhost:64848/ + http://localhost:25633/ False False diff --git a/samples/Interop45/Models/AccountViewModels.cs b/samples/Interop4.5/Models/AccountViewModels.cs similarity index 99% rename from samples/Interop45/Models/AccountViewModels.cs rename to samples/Interop4.5/Models/AccountViewModels.cs index 5a09ebb82e..8002964c53 100644 --- a/samples/Interop45/Models/AccountViewModels.cs +++ b/samples/Interop4.5/Models/AccountViewModels.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace Interop45.Models +namespace Interop4._5.Models { public class ExternalLoginConfirmationViewModel { diff --git a/samples/Interop45/Models/IdentityModels.cs b/samples/Interop4.5/Models/IdentityModels.cs similarity index 83% rename from samples/Interop45/Models/IdentityModels.cs rename to samples/Interop4.5/Models/IdentityModels.cs index 22d9f1d515..b26450ea6b 100644 --- a/samples/Interop45/Models/IdentityModels.cs +++ b/samples/Interop4.5/Models/IdentityModels.cs @@ -1,9 +1,10 @@ +using System.Data.Entity; using System.Security.Claims; using System.Threading.Tasks; -using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Identity.Compat; +using Microsoft.AspNet.Identity; +using Microsoft.AspNet.Identity.EntityFramework; -namespace Interop45.Models +namespace Interop4._5.Models { // You can add profile data for the user by adding more properties to your ApplicationUser class, please visit http://go.microsoft.com/fwlink/?LinkID=317594 to learn more. public class ApplicationUser : IdentityUser @@ -20,7 +21,7 @@ namespace Interop45.Models public class ApplicationDbContext : IdentityDbContext { public ApplicationDbContext() - : base("DefaultConnection") + : base("DefaultConnection", throwIfV1Schema: false) { } diff --git a/samples/Interop45/Models/ManageViewModels.cs b/samples/Interop4.5/Models/ManageViewModels.cs similarity index 96% rename from samples/Interop45/Models/ManageViewModels.cs rename to samples/Interop4.5/Models/ManageViewModels.cs index 112a77856f..1f40e5e0f9 100644 --- a/samples/Interop45/Models/ManageViewModels.cs +++ b/samples/Interop4.5/Models/ManageViewModels.cs @@ -1,9 +1,9 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using Microsoft.AspNetCore.Identity; +using Microsoft.AspNet.Identity; using Microsoft.Owin.Security; -namespace Interop45.Models +namespace Interop4._5.Models { public class IndexViewModel { diff --git a/samples/Interop45/Project_Readme.html b/samples/Interop4.5/Project_Readme.html similarity index 100% rename from samples/Interop45/Project_Readme.html rename to samples/Interop4.5/Project_Readme.html diff --git a/samples/Interop45/Properties/AssemblyInfo.cs b/samples/Interop4.5/Properties/AssemblyInfo.cs similarity index 85% rename from samples/Interop45/Properties/AssemblyInfo.cs rename to samples/Interop4.5/Properties/AssemblyInfo.cs index 9df5a5201b..a3b892b902 100644 --- a/samples/Interop45/Properties/AssemblyInfo.cs +++ b/samples/Interop4.5/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("Interop45")] +[assembly: AssemblyTitle("Interop4._5")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Interop45")] -[assembly: AssemblyCopyright("Copyright © 2015")] +[assembly: AssemblyProduct("Interop4._5")] +[assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -20,7 +20,7 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("ee1d4894-00ce-4c3b-a5dd-5a859e15992d")] +[assembly: Guid("4503c902-d743-4fef-9d85-7e0393595cd3")] // Version information for an assembly consists of the following four values: // diff --git a/samples/Interop45/Scripts/_references.js b/samples/Interop4.5/Scripts/_references.js similarity index 100% rename from samples/Interop45/Scripts/_references.js rename to samples/Interop4.5/Scripts/_references.js diff --git a/samples/Interop45/Scripts/bootstrap.js b/samples/Interop4.5/Scripts/bootstrap.js similarity index 100% rename from samples/Interop45/Scripts/bootstrap.js rename to samples/Interop4.5/Scripts/bootstrap.js diff --git a/samples/Interop45/Scripts/bootstrap.min.js b/samples/Interop4.5/Scripts/bootstrap.min.js similarity index 100% rename from samples/Interop45/Scripts/bootstrap.min.js rename to samples/Interop4.5/Scripts/bootstrap.min.js diff --git a/samples/Interop45/Scripts/jquery-1.10.2.intellisense.js b/samples/Interop4.5/Scripts/jquery-1.10.2.intellisense.js similarity index 99% rename from samples/Interop45/Scripts/jquery-1.10.2.intellisense.js rename to samples/Interop4.5/Scripts/jquery-1.10.2.intellisense.js index f1d83254a6..2c4d454eb7 100644 --- a/samples/Interop45/Scripts/jquery-1.10.2.intellisense.js +++ b/samples/Interop4.5/Scripts/jquery-1.10.2.intellisense.js @@ -1,18 +1,4 @@ -/* NUGET: BEGIN LICENSE TEXT - * - * Microsoft grants you the right to use these script files for the sole - * purpose of either: (i) interacting through your browser with the Microsoft - * website or online service, subject to the applicable licensing or use - * terms; or (ii) using the files as included with a Microsoft product subject - * to that product's license terms. Microsoft reserves all other rights to the - * files not expressly granted by Microsoft, whether by implication, estoppel - * or otherwise. Insofar as a script file is dual licensed under GPL, - * Microsoft neither took the code under GPL nor distributes it thereunder but - * under the terms set out in this paragraph. All notices and licenses - * below are for informational purposes only. - * - * NUGET: END LICENSE TEXT */ -intellisense.annotate(jQuery, { +intellisense.annotate(jQuery, { 'ajax': function() { /// /// Perform an asynchronous HTTP (Ajax) request. diff --git a/samples/Interop45/Scripts/jquery-1.10.2.js b/samples/Interop4.5/Scripts/jquery-1.10.2.js similarity index 100% rename from samples/Interop45/Scripts/jquery-1.10.2.js rename to samples/Interop4.5/Scripts/jquery-1.10.2.js diff --git a/samples/Interop45/Scripts/jquery-1.10.2.min.js b/samples/Interop4.5/Scripts/jquery-1.10.2.min.js similarity index 100% rename from samples/Interop45/Scripts/jquery-1.10.2.min.js rename to samples/Interop4.5/Scripts/jquery-1.10.2.min.js diff --git a/samples/Interop45/Scripts/jquery-1.10.2.min.map b/samples/Interop4.5/Scripts/jquery-1.10.2.min.map similarity index 100% rename from samples/Interop45/Scripts/jquery-1.10.2.min.map rename to samples/Interop4.5/Scripts/jquery-1.10.2.min.map diff --git a/samples/Interop45/Scripts/jquery.validate-vsdoc.js b/samples/Interop4.5/Scripts/jquery.validate-vsdoc.js similarity index 100% rename from samples/Interop45/Scripts/jquery.validate-vsdoc.js rename to samples/Interop4.5/Scripts/jquery.validate-vsdoc.js diff --git a/samples/Interop45/Scripts/jquery.validate.js b/samples/Interop4.5/Scripts/jquery.validate.js similarity index 100% rename from samples/Interop45/Scripts/jquery.validate.js rename to samples/Interop4.5/Scripts/jquery.validate.js diff --git a/samples/Interop45/Scripts/jquery.validate.min.js b/samples/Interop4.5/Scripts/jquery.validate.min.js similarity index 100% rename from samples/Interop45/Scripts/jquery.validate.min.js rename to samples/Interop4.5/Scripts/jquery.validate.min.js diff --git a/samples/Interop45/Scripts/jquery.validate.unobtrusive.js b/samples/Interop4.5/Scripts/jquery.validate.unobtrusive.js similarity index 100% rename from samples/Interop45/Scripts/jquery.validate.unobtrusive.js rename to samples/Interop4.5/Scripts/jquery.validate.unobtrusive.js diff --git a/samples/Interop45/Scripts/jquery.validate.unobtrusive.min.js b/samples/Interop4.5/Scripts/jquery.validate.unobtrusive.min.js similarity index 100% rename from samples/Interop45/Scripts/jquery.validate.unobtrusive.min.js rename to samples/Interop4.5/Scripts/jquery.validate.unobtrusive.min.js diff --git a/samples/Interop45/Scripts/modernizr-2.6.2.js b/samples/Interop4.5/Scripts/modernizr-2.6.2.js similarity index 100% rename from samples/Interop45/Scripts/modernizr-2.6.2.js rename to samples/Interop4.5/Scripts/modernizr-2.6.2.js diff --git a/samples/Interop45/Scripts/respond.js b/samples/Interop4.5/Scripts/respond.js similarity index 100% rename from samples/Interop45/Scripts/respond.js rename to samples/Interop4.5/Scripts/respond.js diff --git a/samples/Interop45/Scripts/respond.min.js b/samples/Interop4.5/Scripts/respond.min.js similarity index 100% rename from samples/Interop45/Scripts/respond.min.js rename to samples/Interop4.5/Scripts/respond.min.js diff --git a/samples/Interop45/Startup.cs b/samples/Interop4.5/Startup.cs similarity index 69% rename from samples/Interop45/Startup.cs rename to samples/Interop4.5/Startup.cs index f8f57abdb8..ae24ccb10a 100644 --- a/samples/Interop45/Startup.cs +++ b/samples/Interop4.5/Startup.cs @@ -1,8 +1,8 @@ using Microsoft.Owin; using Owin; -[assembly: OwinStartupAttribute(typeof(Interop45.Startup))] -namespace Interop45 +[assembly: OwinStartupAttribute(typeof(Interop4._5.Startup))] +namespace Interop4._5 { public partial class Startup { diff --git a/samples/Interop45/Views/Account/ConfirmEmail.cshtml b/samples/Interop4.5/Views/Account/ConfirmEmail.cshtml similarity index 100% rename from samples/Interop45/Views/Account/ConfirmEmail.cshtml rename to samples/Interop4.5/Views/Account/ConfirmEmail.cshtml diff --git a/samples/Interop45/Views/Account/ExternalLoginConfirmation.cshtml b/samples/Interop4.5/Views/Account/ExternalLoginConfirmation.cshtml similarity index 95% rename from samples/Interop45/Views/Account/ExternalLoginConfirmation.cshtml rename to samples/Interop4.5/Views/Account/ExternalLoginConfirmation.cshtml index c300e5fea4..fe4120780f 100644 --- a/samples/Interop45/Views/Account/ExternalLoginConfirmation.cshtml +++ b/samples/Interop4.5/Views/Account/ExternalLoginConfirmation.cshtml @@ -1,4 +1,4 @@ -@model Interop45.Models.ExternalLoginConfirmationViewModel +@model Interop4._5.Models.ExternalLoginConfirmationViewModel @{ ViewBag.Title = "Register"; } diff --git a/samples/Interop45/Views/Account/ExternalLoginFailure.cshtml b/samples/Interop4.5/Views/Account/ExternalLoginFailure.cshtml similarity index 100% rename from samples/Interop45/Views/Account/ExternalLoginFailure.cshtml rename to samples/Interop4.5/Views/Account/ExternalLoginFailure.cshtml diff --git a/samples/Interop45/Views/Account/ForgotPassword.cshtml b/samples/Interop4.5/Views/Account/ForgotPassword.cshtml similarity index 93% rename from samples/Interop45/Views/Account/ForgotPassword.cshtml rename to samples/Interop4.5/Views/Account/ForgotPassword.cshtml index 96e4885883..feadcbf664 100644 --- a/samples/Interop45/Views/Account/ForgotPassword.cshtml +++ b/samples/Interop4.5/Views/Account/ForgotPassword.cshtml @@ -1,4 +1,4 @@ -@model Interop45.Models.ForgotPasswordViewModel +@model Interop4._5.Models.ForgotPasswordViewModel @{ ViewBag.Title = "Forgot your password?"; } diff --git a/samples/Interop45/Views/Account/ForgotPasswordConfirmation.cshtml b/samples/Interop4.5/Views/Account/ForgotPasswordConfirmation.cshtml similarity index 100% rename from samples/Interop45/Views/Account/ForgotPasswordConfirmation.cshtml rename to samples/Interop4.5/Views/Account/ForgotPasswordConfirmation.cshtml diff --git a/samples/Interop45/Views/Account/Login.cshtml b/samples/Interop4.5/Views/Account/Login.cshtml similarity index 98% rename from samples/Interop45/Views/Account/Login.cshtml rename to samples/Interop4.5/Views/Account/Login.cshtml index c597167f67..d85f510163 100644 --- a/samples/Interop45/Views/Account/Login.cshtml +++ b/samples/Interop4.5/Views/Account/Login.cshtml @@ -1,4 +1,4 @@ -@using Interop45.Models +@using Interop4._5.Models @model LoginViewModel @{ ViewBag.Title = "Log in"; diff --git a/samples/Interop45/Views/Account/Register.cshtml b/samples/Interop4.5/Views/Account/Register.cshtml similarity index 96% rename from samples/Interop45/Views/Account/Register.cshtml rename to samples/Interop4.5/Views/Account/Register.cshtml index 4c78ee4a24..4dd83c74dc 100644 --- a/samples/Interop45/Views/Account/Register.cshtml +++ b/samples/Interop4.5/Views/Account/Register.cshtml @@ -1,4 +1,4 @@ -@model Interop45.Models.RegisterViewModel +@model Interop4._5.Models.RegisterViewModel @{ ViewBag.Title = "Register"; } diff --git a/samples/Interop45/Views/Account/ResetPassword.cshtml b/samples/Interop4.5/Views/Account/ResetPassword.cshtml similarity index 96% rename from samples/Interop45/Views/Account/ResetPassword.cshtml rename to samples/Interop4.5/Views/Account/ResetPassword.cshtml index 57fae8c473..e7325d8e68 100644 --- a/samples/Interop45/Views/Account/ResetPassword.cshtml +++ b/samples/Interop4.5/Views/Account/ResetPassword.cshtml @@ -1,4 +1,4 @@ -@model Interop45.Models.ResetPasswordViewModel +@model Interop4._5.Models.ResetPasswordViewModel @{ ViewBag.Title = "Reset password"; } diff --git a/samples/Interop45/Views/Account/ResetPasswordConfirmation.cshtml b/samples/Interop4.5/Views/Account/ResetPasswordConfirmation.cshtml similarity index 100% rename from samples/Interop45/Views/Account/ResetPasswordConfirmation.cshtml rename to samples/Interop4.5/Views/Account/ResetPasswordConfirmation.cshtml diff --git a/samples/Interop45/Views/Account/SendCode.cshtml b/samples/Interop4.5/Views/Account/SendCode.cshtml similarity index 93% rename from samples/Interop45/Views/Account/SendCode.cshtml rename to samples/Interop4.5/Views/Account/SendCode.cshtml index 6b03ac6641..7de991f1c7 100644 --- a/samples/Interop45/Views/Account/SendCode.cshtml +++ b/samples/Interop4.5/Views/Account/SendCode.cshtml @@ -1,4 +1,4 @@ -@model Interop45.Models.SendCodeViewModel +@model Interop4._5.Models.SendCodeViewModel @{ ViewBag.Title = "Send"; } diff --git a/samples/Interop45/Views/Account/VerifyCode.cshtml b/samples/Interop4.5/Views/Account/VerifyCode.cshtml similarity index 96% rename from samples/Interop45/Views/Account/VerifyCode.cshtml rename to samples/Interop4.5/Views/Account/VerifyCode.cshtml index 255b1a8e49..6f79142d1f 100644 --- a/samples/Interop45/Views/Account/VerifyCode.cshtml +++ b/samples/Interop4.5/Views/Account/VerifyCode.cshtml @@ -1,4 +1,4 @@ -@model Interop45.Models.VerifyCodeViewModel +@model Interop4._5.Models.VerifyCodeViewModel @{ ViewBag.Title = "Verify"; } diff --git a/samples/Interop45/Views/Account/_ExternalLoginsListPartial.cshtml b/samples/Interop4.5/Views/Account/_ExternalLoginsListPartial.cshtml similarity index 95% rename from samples/Interop45/Views/Account/_ExternalLoginsListPartial.cshtml rename to samples/Interop4.5/Views/Account/_ExternalLoginsListPartial.cshtml index a7fa2bca9e..095c3ec2aa 100644 --- a/samples/Interop45/Views/Account/_ExternalLoginsListPartial.cshtml +++ b/samples/Interop4.5/Views/Account/_ExternalLoginsListPartial.cshtml @@ -1,4 +1,4 @@ -@model Interop45.Models.ExternalLoginListViewModel +@model Interop4._5.Models.ExternalLoginListViewModel @using Microsoft.Owin.Security

    Use another service to log in.

    diff --git a/samples/Interop45/Views/Home/About.cshtml b/samples/Interop4.5/Views/Home/About.cshtml similarity index 100% rename from samples/Interop45/Views/Home/About.cshtml rename to samples/Interop4.5/Views/Home/About.cshtml diff --git a/samples/Interop45/Views/Home/Contact.cshtml b/samples/Interop4.5/Views/Home/Contact.cshtml similarity index 100% rename from samples/Interop45/Views/Home/Contact.cshtml rename to samples/Interop4.5/Views/Home/Contact.cshtml diff --git a/samples/Interop45/Views/Home/Index.cshtml b/samples/Interop4.5/Views/Home/Index.cshtml similarity index 100% rename from samples/Interop45/Views/Home/Index.cshtml rename to samples/Interop4.5/Views/Home/Index.cshtml diff --git a/samples/Interop45/Views/Manage/AddPhoneNumber.cshtml b/samples/Interop4.5/Views/Manage/AddPhoneNumber.cshtml similarity index 93% rename from samples/Interop45/Views/Manage/AddPhoneNumber.cshtml rename to samples/Interop4.5/Views/Manage/AddPhoneNumber.cshtml index 039496523c..c27d3008b6 100644 --- a/samples/Interop45/Views/Manage/AddPhoneNumber.cshtml +++ b/samples/Interop4.5/Views/Manage/AddPhoneNumber.cshtml @@ -1,4 +1,4 @@ -@model Interop45.Models.AddPhoneNumberViewModel +@model Interop4._5.Models.AddPhoneNumberViewModel @{ ViewBag.Title = "Phone Number"; } diff --git a/samples/Interop45/Views/Manage/ChangePassword.cshtml b/samples/Interop4.5/Views/Manage/ChangePassword.cshtml similarity index 96% rename from samples/Interop45/Views/Manage/ChangePassword.cshtml rename to samples/Interop4.5/Views/Manage/ChangePassword.cshtml index 51009e856c..c3a1dba10e 100644 --- a/samples/Interop45/Views/Manage/ChangePassword.cshtml +++ b/samples/Interop4.5/Views/Manage/ChangePassword.cshtml @@ -1,4 +1,4 @@ -@model Interop45.Models.ChangePasswordViewModel +@model Interop4._5.Models.ChangePasswordViewModel @{ ViewBag.Title = "Change Password"; } diff --git a/samples/Interop45/Views/Manage/Index.cshtml b/samples/Interop4.5/Views/Manage/Index.cshtml similarity index 97% rename from samples/Interop45/Views/Manage/Index.cshtml rename to samples/Interop4.5/Views/Manage/Index.cshtml index 3e0bde8d00..f8ea43f4d7 100644 --- a/samples/Interop45/Views/Manage/Index.cshtml +++ b/samples/Interop4.5/Views/Manage/Index.cshtml @@ -1,4 +1,4 @@ -@model Interop45.Models.IndexViewModel +@model Interop4._5.Models.IndexViewModel @{ ViewBag.Title = "Manage"; } @@ -52,7 +52,7 @@ } else { - [  @Html.ActionLink("Add", "AddPhoneNumber")  ] + [  @Html.ActionLink("Add", "AddPhoneNumber") } *@ diff --git a/samples/Interop45/Views/Manage/ManageLogins.cshtml b/samples/Interop4.5/Views/Manage/ManageLogins.cshtml similarity index 98% rename from samples/Interop45/Views/Manage/ManageLogins.cshtml rename to samples/Interop4.5/Views/Manage/ManageLogins.cshtml index 525dcb5943..3a368b01fd 100644 --- a/samples/Interop45/Views/Manage/ManageLogins.cshtml +++ b/samples/Interop4.5/Views/Manage/ManageLogins.cshtml @@ -1,4 +1,4 @@ -@model Interop45.Models.ManageLoginsViewModel +@model Interop4._5.Models.ManageLoginsViewModel @using Microsoft.Owin.Security @{ ViewBag.Title = "Manage your external logins"; diff --git a/samples/Interop45/Views/Manage/SetPassword.cshtml b/samples/Interop4.5/Views/Manage/SetPassword.cshtml similarity index 96% rename from samples/Interop45/Views/Manage/SetPassword.cshtml rename to samples/Interop4.5/Views/Manage/SetPassword.cshtml index 7275041b6c..9a2aac1453 100644 --- a/samples/Interop45/Views/Manage/SetPassword.cshtml +++ b/samples/Interop4.5/Views/Manage/SetPassword.cshtml @@ -1,4 +1,4 @@ -@model Interop45.Models.SetPasswordViewModel +@model Interop4._5.Models.SetPasswordViewModel @{ ViewBag.Title = "Create Password"; } diff --git a/samples/Interop45/Views/Manage/VerifyPhoneNumber.cshtml b/samples/Interop4.5/Views/Manage/VerifyPhoneNumber.cshtml similarity index 94% rename from samples/Interop45/Views/Manage/VerifyPhoneNumber.cshtml rename to samples/Interop4.5/Views/Manage/VerifyPhoneNumber.cshtml index 8928db0fba..9733046bda 100644 --- a/samples/Interop45/Views/Manage/VerifyPhoneNumber.cshtml +++ b/samples/Interop4.5/Views/Manage/VerifyPhoneNumber.cshtml @@ -1,4 +1,4 @@ -@model Interop45.Models.VerifyPhoneNumberViewModel +@model Interop4._5.Models.VerifyPhoneNumberViewModel @{ ViewBag.Title = "Verify Phone Number"; } diff --git a/samples/Interop45/Views/Shared/Error.cshtml b/samples/Interop4.5/Views/Shared/Error.cshtml similarity index 100% rename from samples/Interop45/Views/Shared/Error.cshtml rename to samples/Interop4.5/Views/Shared/Error.cshtml diff --git a/samples/Interop45/Views/Shared/Lockout.cshtml b/samples/Interop4.5/Views/Shared/Lockout.cshtml similarity index 100% rename from samples/Interop45/Views/Shared/Lockout.cshtml rename to samples/Interop4.5/Views/Shared/Lockout.cshtml diff --git a/samples/Interop45/Views/Shared/_Layout.cshtml b/samples/Interop4.5/Views/Shared/_Layout.cshtml similarity index 100% rename from samples/Interop45/Views/Shared/_Layout.cshtml rename to samples/Interop4.5/Views/Shared/_Layout.cshtml diff --git a/samples/Interop45/Views/Shared/_LoginPartial.cshtml b/samples/Interop4.5/Views/Shared/_LoginPartial.cshtml similarity index 95% rename from samples/Interop45/Views/Shared/_LoginPartial.cshtml rename to samples/Interop4.5/Views/Shared/_LoginPartial.cshtml index 8f82bf2ed4..f9965082e7 100644 --- a/samples/Interop45/Views/Shared/_LoginPartial.cshtml +++ b/samples/Interop4.5/Views/Shared/_LoginPartial.cshtml @@ -1,4 +1,4 @@ -@using Microsoft.AspNetCore.Identity +@using Microsoft.AspNet.Identity @if (Request.IsAuthenticated) { using (Html.BeginForm("LogOff", "Account", FormMethod.Post, new { id = "logoutForm", @class = "navbar-right" })) diff --git a/samples/Interop45/Views/Web.config b/samples/Interop4.5/Views/Web.config similarity index 97% rename from samples/Interop45/Views/Web.config rename to samples/Interop4.5/Views/Web.config index 5e688c377e..be6be93aea 100644 --- a/samples/Interop45/Views/Web.config +++ b/samples/Interop4.5/Views/Web.config @@ -17,7 +17,7 @@ - + diff --git a/samples/Interop45/Views/_ViewStart.cshtml b/samples/Interop4.5/Views/_ViewStart.cshtml similarity index 100% rename from samples/Interop45/Views/_ViewStart.cshtml rename to samples/Interop4.5/Views/_ViewStart.cshtml diff --git a/samples/Interop45/Web.Debug.config b/samples/Interop4.5/Web.Debug.config similarity index 100% rename from samples/Interop45/Web.Debug.config rename to samples/Interop4.5/Web.Debug.config diff --git a/samples/Interop45/Web.Release.config b/samples/Interop4.5/Web.Release.config similarity index 100% rename from samples/Interop45/Web.Release.config rename to samples/Interop4.5/Web.Release.config diff --git a/samples/Interop45/Web.config b/samples/Interop4.5/Web.config similarity index 82% rename from samples/Interop45/Web.config rename to samples/Interop4.5/Web.config index 963c2a3521..336ac827b6 100644 --- a/samples/Interop45/Web.config +++ b/samples/Interop4.5/Web.config @@ -1,4 +1,4 @@ - + - + @@ -82,17 +82,13 @@ - + - - - - - - + + \ No newline at end of file diff --git a/samples/Interop45/favicon.ico b/samples/Interop4.5/favicon.ico similarity index 100% rename from samples/Interop45/favicon.ico rename to samples/Interop4.5/favicon.ico diff --git a/samples/Interop45/fonts/glyphicons-halflings-regular.eot b/samples/Interop4.5/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from samples/Interop45/fonts/glyphicons-halflings-regular.eot rename to samples/Interop4.5/fonts/glyphicons-halflings-regular.eot diff --git a/samples/Interop45/fonts/glyphicons-halflings-regular.svg b/samples/Interop4.5/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from samples/Interop45/fonts/glyphicons-halflings-regular.svg rename to samples/Interop4.5/fonts/glyphicons-halflings-regular.svg diff --git a/samples/Interop45/fonts/glyphicons-halflings-regular.ttf b/samples/Interop4.5/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from samples/Interop45/fonts/glyphicons-halflings-regular.ttf rename to samples/Interop4.5/fonts/glyphicons-halflings-regular.ttf diff --git a/samples/Interop45/fonts/glyphicons-halflings-regular.woff b/samples/Interop4.5/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from samples/Interop45/fonts/glyphicons-halflings-regular.woff rename to samples/Interop4.5/fonts/glyphicons-halflings-regular.woff diff --git a/samples/Interop4.5/packages.config b/samples/Interop4.5/packages.config new file mode 100644 index 0000000000..2b28349282 --- /dev/null +++ b/samples/Interop4.5/packages.config @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/Interop45/Migrations/Configuration.cs b/samples/Interop45/Migrations/Configuration.cs deleted file mode 100644 index ec50a63877..0000000000 --- a/samples/Interop45/Migrations/Configuration.cs +++ /dev/null @@ -1,32 +0,0 @@ -namespace Interop45.Migrations -{ - using System; - using System.Data.Entity; - using System.Data.Entity.Migrations; - using System.Linq; - - internal sealed class Configuration : DbMigrationsConfiguration - { - public Configuration() - { - AutomaticMigrationsEnabled = false; - ContextKey = "Interop45.Models.ApplicationDbContext"; - } - - protected override void Seed(Interop45.Models.ApplicationDbContext context) - { - // This method will be called after migrating to the latest version. - - // You can use the DbSet.AddOrUpdate() helper extension method - // to avoid creating duplicate seed data. E.g. - // - // context.People.AddOrUpdate( - // p => p.FullName, - // new Person { FullName = "Andrew Peters" }, - // new Person { FullName = "Brice Lambson" }, - // new Person { FullName = "Rowan Miller" } - // ); - // - } - } -} diff --git a/samples/Interop45/PostMigration.sql b/samples/Interop45/PostMigration.sql deleted file mode 100644 index 89c178478b..0000000000 --- a/samples/Interop45/PostMigration.sql +++ /dev/null @@ -1,6 +0,0 @@ -update dbo.AspNetUsers set NormalizedUserName = UPPER(UserName); -Go -update dbo.AspNetUsers set NormalizedEmail = UPPER(Email); -Go -update dbo.AspNetRoles set NormalizedName = UPPER(Name); -Go diff --git a/samples/Interop45/packages.config b/samples/Interop45/packages.config deleted file mode 100644 index 1f0dedcba2..0000000000 --- a/samples/Interop45/packages.config +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Microsoft.AspNet.Identity.CoreCompat/CookieInterop.cs b/src/Microsoft.AspNet.Identity.CoreCompat/CookieInterop.cs new file mode 100644 index 0000000000..1e32ce03cb --- /dev/null +++ b/src/Microsoft.AspNet.Identity.CoreCompat/CookieInterop.cs @@ -0,0 +1,21 @@ +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.IO; +using Microsoft.AspNetCore.DataProtection; +using Microsoft.Owin.Security; +using Microsoft.Owin.Security.Interop; + +namespace Owin +{ + public static class CookieInterop + { + public static ISecureDataFormat CreateSharedDataFormat(DirectoryInfo keyDirectory, string authenticationType) + { + var dataProtector = DataProtectionProvider.Create(keyDirectory) + .CreateProtector("Microsoft.AspNet.Authentication.Cookies.CookieAuthenticationMiddleware", // full name of the ASP.NET 5 type + authenticationType, "v2"); + return new AspNetTicketDataFormat(new DataProtectorShim(dataProtector)); + } + } +} \ No newline at end of file diff --git a/samples/Interop45/Compat/CompatDbContext.cs b/src/Microsoft.AspNet.Identity.CoreCompat/IdentityDbContext.cs similarity index 82% rename from samples/Interop45/Compat/CompatDbContext.cs rename to src/Microsoft.AspNet.Identity.CoreCompat/IdentityDbContext.cs index a58bf3de6f..7797340502 100644 --- a/samples/Interop45/Compat/CompatDbContext.cs +++ b/src/Microsoft.AspNet.Identity.CoreCompat/IdentityDbContext.cs @@ -1,12 +1,15 @@ // 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 System.Data.Common; using System.Data.Entity; using System.Data.Entity.Infrastructure; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; +using System.Data.Entity.Validation; +using Microsoft.AspNet.Identity.EntityFramework; -namespace Microsoft.AspNetCore.Identity.Compat +namespace Microsoft.AspNet.Identity.CoreCompat { public class IdentityDbContext : IdentityDbContext : - Microsoft.EntityFrameworkCore.IdentityDbContext + IdentityDbContext where TUser : IdentityUser where TRole : IdentityRole where TUserLogin : IdentityUserLogin @@ -117,11 +120,22 @@ namespace Microsoft.AspNetCore.Identity.Compat .Map(config => config.ToTable("AspNetRoleClaims")); modelBuilder.Entity().Property(x => x.ConcurrencyStamp).IsConcurrencyToken(true); + } + protected override DbEntityValidationResult ValidateEntity(DbEntityEntry entityEntry, IDictionary items) + { + if (entityEntry.Entity is TUser && entityEntry.State == EntityState.Modified) + { + entityEntry.Property("ConcurrencyToken").CurrentValue = Guid.NewGuid(); + } + else if (entityEntry.Entity is TRole && entityEntry.State == EntityState.Modified) + { + entityEntry.Property("ConcurrencyToken").CurrentValue = Guid.NewGuid(); + } + return base.ValidateEntity(entityEntry, items); } public virtual IDbSet RoleClaims { get; set; } - } } diff --git a/samples/Interop45/Compat/CompatRole.cs b/src/Microsoft.AspNet.Identity.CoreCompat/IdentityRole.cs similarity index 85% rename from samples/Interop45/Compat/CompatRole.cs rename to src/Microsoft.AspNet.Identity.CoreCompat/IdentityRole.cs index 72c1bf1901..c671706d92 100644 --- a/samples/Interop45/Compat/CompatRole.cs +++ b/src/Microsoft.AspNet.Identity.CoreCompat/IdentityRole.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; +using Microsoft.AspNet.Identity.EntityFramework; -namespace Microsoft.AspNetCore.Identity.Compat +namespace Microsoft.AspNet.Identity.CoreCompat { public class IdentityRole : IdentityRole { @@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Identity.Compat } } - public class IdentityRole : Microsoft.EntityFrameworkCore.IdentityRole + public class IdentityRole : Microsoft.AspNet.Identity.EntityFramework.IdentityRole where TUserRole : IdentityUserRole { /// diff --git a/samples/Interop45/Compat/CompatRoleClaim.cs b/src/Microsoft.AspNet.Identity.CoreCompat/IdentityRoleClaim.cs similarity index 95% rename from samples/Interop45/Compat/CompatRoleClaim.cs rename to src/Microsoft.AspNet.Identity.CoreCompat/IdentityRoleClaim.cs index 7b10ca0ae1..c6b10687b4 100644 --- a/samples/Interop45/Compat/CompatRoleClaim.cs +++ b/src/Microsoft.AspNet.Identity.CoreCompat/IdentityRoleClaim.cs @@ -1,7 +1,7 @@ // 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.AspNetCore.Identity.Compat +namespace Microsoft.AspNet.Identity.CoreCompat { public class IdentityRoleClaim : IdentityRoleClaim { } diff --git a/samples/Interop45/Compat/CompatUser.cs b/src/Microsoft.AspNet.Identity.CoreCompat/IdentityUser.cs similarity index 71% rename from samples/Interop45/Compat/CompatUser.cs rename to src/Microsoft.AspNet.Identity.CoreCompat/IdentityUser.cs index 09a04280ca..e9df36348b 100644 --- a/samples/Interop45/Compat/CompatUser.cs +++ b/src/Microsoft.AspNet.Identity.CoreCompat/IdentityUser.cs @@ -2,9 +2,9 @@ // Licensed under the MIT License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; +using Microsoft.AspNet.Identity.EntityFramework; -namespace Microsoft.AspNetCore.Identity.Compat +namespace Microsoft.AspNet.Identity.CoreCompat { public class IdentityUser : IdentityUser { @@ -29,17 +29,29 @@ namespace Microsoft.AspNetCore.Identity.Compat } public class IdentityUser - : Microsoft.EntityFrameworkCore.IdentityUser + : Microsoft.AspNet.Identity.EntityFramework.IdentityUser where TUserLogin : IdentityUserLogin where TUserRole : IdentityUserRole where TUserClaim : IdentityUserClaim { - public string NormalizedUserName { get; set; } + public string NormalizedUserName { + get + { + return UserName.ToUpperInvariant(); + } + set { } + } /// /// Normalized email /// - public string NormalizedEmail { get; set; } + public string NormalizedEmail { + get + { + return Email.ToUpperInvariant(); + } + set { } + } /// /// Concurrency stamp diff --git a/samples/Interop45/Compat/CompatUserLogin.cs b/src/Microsoft.AspNet.Identity.CoreCompat/IdentityUserLogin.cs similarity index 80% rename from samples/Interop45/Compat/CompatUserLogin.cs rename to src/Microsoft.AspNet.Identity.CoreCompat/IdentityUserLogin.cs index 6585b55cf6..5d36abb580 100644 --- a/samples/Interop45/Compat/CompatUserLogin.cs +++ b/src/Microsoft.AspNet.Identity.CoreCompat/IdentityUserLogin.cs @@ -1,9 +1,7 @@ // 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.AspNetCore.Identity.Compat +namespace Microsoft.AspNet.Identity.CoreCompat { public class IdentityUserLogin : IdentityUserLogin { } @@ -11,7 +9,7 @@ namespace Microsoft.AspNetCore.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 : Microsoft.EntityFrameworkCore.IdentityUserLogin + public class IdentityUserLogin : EntityFramework.IdentityUserLogin { /// /// Gets or sets the friendly name used in a UI for this login. diff --git a/src/Microsoft.AspNet.Identity.CoreCompat/Microsoft.AspNet.Identity.CoreCompat.xproj b/src/Microsoft.AspNet.Identity.CoreCompat/Microsoft.AspNet.Identity.CoreCompat.xproj new file mode 100644 index 0000000000..24858b4a78 --- /dev/null +++ b/src/Microsoft.AspNet.Identity.CoreCompat/Microsoft.AspNet.Identity.CoreCompat.xproj @@ -0,0 +1,19 @@ + + + + 14.0.25123 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 6a74c6ea-b241-4d6b-bce4-bf89ec1d2475 + Microsoft.AspNet.Identity.CoreCompat + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\ + + + + 2.0 + + + \ No newline at end of file diff --git a/samples/Interop45/Compat/CompatUserStore.cs b/src/Microsoft.AspNet.Identity.CoreCompat/UserStore.cs similarity index 65% rename from samples/Interop45/Compat/CompatUserStore.cs rename to src/Microsoft.AspNet.Identity.CoreCompat/UserStore.cs index 851bc9a781..e6cb6921a5 100644 --- a/samples/Interop45/Compat/CompatUserStore.cs +++ b/src/Microsoft.AspNet.Identity.CoreCompat/UserStore.cs @@ -3,18 +3,18 @@ using System; using System.Data.Entity; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; +using Microsoft.AspNet.Identity.EntityFramework; -namespace Microsoft.AspNetCore.Identity.Compat +namespace Microsoft.AspNet.Identity.CoreCompat { - public class IdentityUserStore : - IdentityUserStore, IUserStore + public class UserStore : + UserStore, IUserStore where TUser : IdentityUser { /// /// Default constuctor which uses a new instance of a default EntityyDbContext /// - public IdentityUserStore() + public UserStore() : this(new IdentityDbContext()) { DisposeContext = true; @@ -24,14 +24,14 @@ namespace Microsoft.AspNetCore.Identity.Compat /// Constructor /// /// - public IdentityUserStore(DbContext context) + public UserStore(DbContext context) : base(context) { } } - public class IdentityUserStore - : UserStore + public class UserStore + : EntityFramework.UserStore where TKey : IEquatable where TUser : IdentityUser where TRole : IdentityRole @@ -43,7 +43,7 @@ namespace Microsoft.AspNetCore.Identity.Compat /// Constructor /// /// - public IdentityUserStore(DbContext context) : base(context) { } + public UserStore(DbContext context) : base(context) { } } } diff --git a/src/Microsoft.AspNet.Identity.CoreCompat/project.json b/src/Microsoft.AspNet.Identity.CoreCompat/project.json new file mode 100644 index 0000000000..9350e17142 --- /dev/null +++ b/src/Microsoft.AspNet.Identity.CoreCompat/project.json @@ -0,0 +1,35 @@ +{ + "version": "1.0.0-*", + "buildOptions": { + "warningsAsErrors": true, + "keyFile": "../../tools/Key.snk", + "nowarn": [ "CS1591" ], + "xmlDoc": true + }, + "description": "A compatibility layer for sharing identity databases between Microsoft.AspNet.Identity.EntityFramework and Microsoft.AspNetCore.Identity.EntityFrameworkCore", + "packOptions": { + "repository": { + "type": "git", + "url": "git://github.com/aspnet/identity" + }, + "tags": [ + "aspnetcore", + "identity", + "membership" + ] + }, + "dependencies": { + "Microsoft.AspNet.Identity.EntityFramework": "2.2.1", + "Microsoft.AspNet.DataProtection.Extensions": "1.0.0-*", + "Microsoft.Owin.Security.Cookies": "3.0.1", + "Microsoft.Owin.Security.Interop": "1.0.0-*" + }, + "frameworks": { + "net451": { + "frameworkAssemblies": { + "System.Collections": "", + "System.Data": "" + } + } + } +} \ No newline at end of file