aspnet
/
Identity
зеркало из https://github.com/aspnet/Identity.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Rename AspNet 5 file contents. 

See https://github.com/aspnet/Announcements/issues/144 for more information.
This commit is contained in:
N. Taylor Mullen 2016-01-22 12:25:42 -08:00
Родитель 4132083a6c
Коммит 078512dc94
169 изменённых файлов: 438 добавлений и 438 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
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

4
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.

12
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;

2
samples/IdentitySample.Mvc/Controllers/HomeController.cs
Просмотреть файл

@ -1,4 +1,4 @@
using Microsoft.AspNet.Mvc;
using Microsoft.AspNetCore.Mvc;
namespace IdentitySample.Controllers
{

8
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;

2
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\

32
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<string>("Id");
@ -41,7 +41,7 @@ namespace IdentitySample.Data.Migrations
b.HasAnnotation("Relational:TableName", "AspNetRoles");
});
modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim<string>", b =>
modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd();
@ -60,7 +60,7 @@ namespace IdentitySample.Data.Migrations
b.HasAnnotation("Relational:TableName", "AspNetRoleClaims");
});
modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim<string>", b =>
modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd();
@ -79,7 +79,7 @@ namespace IdentitySample.Data.Migrations
b.HasAnnotation("Relational:TableName", "AspNetUserClaims");
});
modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin<string>", b =>
modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin<string>", b =>
{
b.Property<string>("LoginProvider");
@ -97,7 +97,7 @@ namespace IdentitySample.Data.Migrations
b.HasAnnotation("Relational:TableName", "AspNetUserLogins");
});
modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole<string>", b =>
modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole<string>", b =>
{
b.Property<string>("UserId");
@ -160,15 +160,15 @@ namespace IdentitySample.Data.Migrations
b.HasAnnotation("Relational:TableName", "AspNetUsers");
});
modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim<string>", b =>
modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim<string>", 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<string>", b =>
modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim<string>", 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<string>", b =>
modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin<string>", 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<string>", b =>
modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole<string>", b =>
{
b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole")
b.HasOne("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole")
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade);

6
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
{

32
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<string>("Id");
@ -40,7 +40,7 @@ namespace IdentitySample.Data.Migrations
b.HasAnnotation("Relational:TableName", "AspNetRoles");
});
modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim<string>", b =>
modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd();
@ -59,7 +59,7 @@ namespace IdentitySample.Data.Migrations
b.HasAnnotation("Relational:TableName", "AspNetRoleClaims");
});
modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim<string>", b =>
modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd();
@ -78,7 +78,7 @@ namespace IdentitySample.Data.Migrations
b.HasAnnotation("Relational:TableName", "AspNetUserClaims");
});
modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin<string>", b =>
modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin<string>", b =>
{
b.Property<string>("LoginProvider");
@ -96,7 +96,7 @@ namespace IdentitySample.Data.Migrations
b.HasAnnotation("Relational:TableName", "AspNetUserLogins");
});
modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole<string>", b =>
modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole<string>", b =>
{
b.Property<string>("UserId");
@ -159,15 +159,15 @@ namespace IdentitySample.Data.Migrations
b.HasAnnotation("Relational:TableName", "AspNetUsers");
});
modelBuilder.Entity("Microsoft.AspNet.Identity.EntityFramework.IdentityRoleClaim<string>", b =>
modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim<string>", 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<string>", b =>
modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim<string>", 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<string>", b =>
modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin<string>", 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<string>", b =>
modelBuilder.Entity("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole<string>", b =>
{
b.HasOne("Microsoft.AspNet.Identity.EntityFramework.IdentityRole")
b.HasOne("Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole")
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade);

4
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
{

6
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
{

4
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
{

4
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
{

4
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
{

6
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
{

12
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

6
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<ApplicationUser> SignInManager

4
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";
}

2
samples/IdentitySample.Mvc/Views/Shared/_LoginPartial.cshtml
Просмотреть файл

@ -1,4 +1,4 @@
@using Microsoft.AspNet.Identity
@using Microsoft.AspNetCore.Identity
@using IdentitySample.Models
@inject SignInManager<ApplicationUser> SignInManager

4
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

4
samples/IdentitySample.Mvc/hosting.json
Просмотреть файл

@ -1,4 +1,4 @@
{
"server": "Microsoft.AspNet.Server.Kestrel",
{
"server": "Microsoft.AspNetCore.Server.Kestrel",
"server.urls": "http://localhost:41532/"
}

32
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-*",

10
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
{

8
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

8
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<TUser> :
IdentityDbContext<TUser, IdentityRole, string,
@ -65,7 +65,7 @@ namespace Microsoft.AspNet.Identity.Compat
}
public class IdentityDbContext<TUser, TRole, TKey, TUserLogin, TUserRole, TUserClaim, TRoleClaim> :
EntityFramework.IdentityDbContext<TUser, TRole, TKey, TUserLogin, TUserRole, TUserClaim>
Microsoft.EntityFrameworkCore.IdentityDbContext<TUser, TRole, TKey, TUserLogin, TUserRole, TUserClaim>
where TUser : IdentityUser<TKey, TUserLogin, TUserRole, TUserClaim>
where TRole : IdentityRole<TKey, TUserRole>
where TUserLogin : IdentityUserLogin<TKey>

8
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<string, IdentityUserRole>
{
@ -28,7 +28,7 @@ namespace Microsoft.AspNet.Identity.Compat
}
}
public class IdentityRole<TKey, TUserRole> : EntityFramework.IdentityRole<TKey, TUserRole>
public class IdentityRole<TKey, TUserRole> : Microsoft.EntityFrameworkCore.IdentityRole<TKey, TUserRole>
where TUserRole : IdentityUserRole<TKey>
{
/// <summary>

4
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<string> { }

8
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<string, IdentityUserLogin, IdentityUserRole, IdentityUserClaim>
{
@ -29,7 +29,7 @@ namespace Microsoft.AspNet.Identity.Compat
}
public class IdentityUser<TKey, TUserLogin, TUserRole, TUserClaim>
: EntityFramework.IdentityUser<TKey, TUserLogin, TUserRole, TUserClaim>
: Microsoft.EntityFrameworkCore.IdentityUser<TKey, TUserLogin, TUserRole, TUserClaim>
where TUserLogin : IdentityUserLogin<TKey>
where TUserRole : IdentityUserRole<TKey>
where TUserClaim : IdentityUserClaim<TKey>

6
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<string> { }
@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Identity.Compat
/// Represents a login and its associated provider for a user.
/// </summary>
/// <typeparam name="TKey">The type of the primary key of the user associated with this login.</typeparam>
public class IdentityUserLogin<TKey> : EntityFramework.IdentityUserLogin<TKey>
public class IdentityUserLogin<TKey> : Microsoft.EntityFrameworkCore.IdentityUserLogin<TKey>
{
/// <summary>
/// Gets or sets the friendly name used in a UI for this login.

6
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<TUser> :
IdentityUserStore<TUser, IdentityRole, string, IdentityUserLogin, IdentityUserRole, IdentityUserClaim>, IUserStore<TUser>

6
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;

6
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;

50
samples/Interop45/Interop45.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
<Import Project="..\..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\..\packages\Microsoft.Net.Compilers.1.0.0\build\Microsoft.Net.Compilers.props')" />
@ -45,20 +45,20 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNet.Cryptography.Internal, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.AspNet.Cryptography.Internal.1.0.0-rc2-15760\lib\net451\Microsoft.AspNet.Cryptography.Internal.dll</HintPath>
<Reference Include="Microsoft.AspNetCore.Cryptography.Internal, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.AspNetCore.Cryptography.Internal.1.0.0-rc2-15760\lib\net451\Microsoft.AspNetCore.Cryptography.Internal.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.AspNet.DataProtection, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.AspNet.DataProtection.1.0.0-rc2-15760\lib\net451\Microsoft.AspNet.DataProtection.dll</HintPath>
<Reference Include="Microsoft.AspNetCore.DataProtection, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.AspNetCore.DataProtection.1.0.0-rc2-15760\lib\net451\Microsoft.AspNetCore.DataProtection.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.AspNet.DataProtection.Abstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.AspNet.DataProtection.Abstractions.1.0.0-rc2-15760\lib\net451\Microsoft.AspNet.DataProtection.Abstractions.dll</HintPath>
<Reference Include="Microsoft.AspNetCore.DataProtection.Abstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.AspNetCore.DataProtection.Abstractions.1.0.0-rc2-15760\lib\net451\Microsoft.AspNetCore.DataProtection.Abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.AspNet.DataProtection.Extensions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.AspNet.DataProtection.Extensions.1.0.0-rc2-15760\lib\net451\Microsoft.AspNet.DataProtection.Extensions.dll</HintPath>
<Reference Include="Microsoft.AspNetCore.DataProtection.Extensions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.AspNetCore.DataProtection.Extensions.1.0.0-rc2-15760\lib\net451\Microsoft.AspNetCore.DataProtection.Extensions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@ -134,30 +134,30 @@
</Reference>
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
<HintPath>..\..\packages\Microsoft.AspNetCore.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
</Reference>
<Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
<HintPath>..\..\packages\Microsoft.AspNetCore.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Web.Optimization">
<HintPath>..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
<HintPath>..\..\packages\Microsoft.AspNetCore.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
</Reference>
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
<HintPath>..\..\packages\Microsoft.AspNetCore.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
<HintPath>..\..\packages\Microsoft.AspNetCore.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
<HintPath>..\..\packages\Microsoft.AspNetCore.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
<HintPath>..\..\packages\Microsoft.AspNetCore.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="WebGrease">
@ -174,19 +174,19 @@
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="EntityFramework">
<HintPath>..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
<HintPath>..\..\packages\Microsoft.EntityFrameworkCore.6.1.3\lib\net45\Microsoft.EntityFrameworkCore.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer">
<HintPath>..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
<Reference Include="Microsoft.EntityFrameworkCore.SqlServer">
<HintPath>..\..\packages\Microsoft.EntityFrameworkCore.6.1.3\lib\net45\Microsoft.EntityFrameworkCore.SqlServer.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.Identity.Core">
<HintPath>..\..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
<Reference Include="Microsoft.AspNetCore.Identity.Core">
<HintPath>..\..\packages\Microsoft.AspNetCore.Identity.Core.2.2.1\lib\net45\Microsoft.AspNetCore.Identity.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.Identity.Owin">
<HintPath>..\..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
<Reference Include="Microsoft.AspNetCore.Identity.Owin">
<HintPath>..\..\packages\Microsoft.AspNetCore.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNetCore.Identity.Owin.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.Identity.EntityFramework">
<HintPath>..\..\packages\Microsoft.AspNet.Identity.EntityFramework.2.2.1\lib\net45\Microsoft.AspNet.Identity.EntityFramework.dll</HintPath>
<Reference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore">
<HintPath>..\..\packages\Microsoft.AspNetCore.Identity.EntityFrameworkCore.2.2.1\lib\net45\Microsoft.AspNetCore.Identity.EntityFrameworkCore.dll</HintPath>
</Reference>
<Reference Include="Owin">
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>

6
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
{

4
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

2
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" }))

4
samples/Interop45/Web.config
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
For more information on how to configure your ASP.NET application, please visit
http://go.microsoft.com/fwlink/?LinkId=301880
@ -82,7 +82,7 @@
<entityFramework>
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
<providers>
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, Microsoft.EntityFrameworkCore.SqlServer" />
</providers>
</entityFramework>
<system.codedom>

24
samples/Interop45/packages.config
Просмотреть файл

@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Antlr" version="3.4.1.9004" targetFramework="net45" />
<package id="bootstrap" version="3.0.0" targetFramework="net45" />
<package id="EntityFramework" version="6.1.3" targetFramework="net45" />
<package id="jQuery" version="1.10.2" targetFramework="net45" />
<package id="jQuery.Validation" version="1.11.1" targetFramework="net45" />
<package id="Microsoft.AspNet.Cryptography.Internal" version="1.0.0-rc2-15760" targetFramework="net46" />
<package id="Microsoft.AspNet.DataProtection" version="1.0.0-rc2-15760" targetFramework="net46" />
<package id="Microsoft.AspNet.DataProtection.Abstractions" version="1.0.0-rc2-15760" targetFramework="net46" />
<package id="Microsoft.AspNet.DataProtection.Extensions" version="1.0.0-rc2-15760" targetFramework="net46" />
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
<package id="Microsoft.AspNet.Identity.EntityFramework" version="2.2.1" targetFramework="net45" />
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
<package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
<package id="Microsoft.AspNetCore.Cryptography.Internal" version="1.0.0-rc2-15760" targetFramework="net46" />
<package id="Microsoft.AspNetCore.DataProtection" version="1.0.0-rc2-15760" targetFramework="net46" />
<package id="Microsoft.AspNetCore.DataProtection.Abstractions" version="1.0.0-rc2-15760" targetFramework="net46" />
<package id="Microsoft.AspNetCore.DataProtection.Extensions" version="1.0.0-rc2-15760" targetFramework="net46" />
<package id="Microsoft.AspNetCore.Identity.Core" version="2.2.1" targetFramework="net45" />
<package id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" version="2.2.1" targetFramework="net45" />
<package id="Microsoft.AspNetCore.Identity.Owin" version="2.2.1" targetFramework="net45" />
<package id="Microsoft.AspNetCore.Mvc" version="5.2.3" targetFramework="net45" />
<package id="Microsoft.AspNetCore.Razor" version="3.2.3" targetFramework="net45" />
<package id="Microsoft.AspNetCore.Web.Optimization" version="1.1.3" targetFramework="net45" />
<package id="Microsoft.AspNetCore.WebPages" version="3.2.3" targetFramework="net45" />
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Extensions.Configuration" version="1.0.0-rc2-15779" targetFramework="net46" />
<package id="Microsoft.Extensions.Configuration.Abstractions" version="1.0.0-rc2-15779" targetFramework="net46" />

8
src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/IdentityDbContext.cs
Просмотреть файл

@ -2,11 +2,11 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using Microsoft.Data.Entity;
using Microsoft.Data.Entity.Infrastructure;
using Microsoft.Data.Entity.Metadata;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
namespace Microsoft.AspNet.Identity.EntityFramework
namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore
{
/// <summary>
/// Base class for the Entity Framework database context used for identity.

6
src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/IdentityEntityFrameworkBuilderExtensions.cs
Просмотреть файл

@ -2,9 +2,9 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using Microsoft.AspNet.Identity;
using Microsoft.AspNet.Identity.EntityFramework;
using Microsoft.Data.Entity;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection.Extensions;
namespace Microsoft.Extensions.DependencyInjection

2
src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/IdentityRole.cs
Просмотреть файл

@ -4,7 +4,7 @@
using System;
using System.Collections.Generic;
namespace Microsoft.AspNet.Identity.EntityFramework
namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore
{
/// <summary>
/// The default implementation of <see cref="IdentityRole{TKey}"/> which uses a string as the primary key.

2
src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/IdentityRoleClaim.cs
Просмотреть файл

@ -3,7 +3,7 @@
using System;
namespace Microsoft.AspNet.Identity.EntityFramework
namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore
{
/// <summary>
/// Represents a claim that is granted to all users within a role.

2
src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/IdentityUser.cs
Просмотреть файл

@ -4,7 +4,7 @@
using System;
using System.Collections.Generic;
namespace Microsoft.AspNet.Identity.EntityFramework
namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore
{
/// <summary>
/// The default implementation of <see cref="IdentityUser{TKey}"/> which uses a string as a primary key.

2
src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/IdentityUserClaim.cs
Просмотреть файл

@ -3,7 +3,7 @@
using System;
namespace Microsoft.AspNet.Identity.EntityFramework
namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore
{
/// <summary>
/// Represents a claim that a user possesses.

2
src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/IdentityUserLogin.cs
Просмотреть файл

@ -3,7 +3,7 @@
using System;
namespace Microsoft.AspNet.Identity.EntityFramework
namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore
{
/// <summary>
/// Represents a login and its associated provider for a user.

2
src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/IdentityUserRole.cs
Просмотреть файл

@ -3,7 +3,7 @@
using System;
namespace Microsoft.AspNet.Identity.EntityFramework
namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore
{
/// <summary>
/// Represents the link between a user and a role.

4
src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/Properties/Resources.Designer.cs сгенерированный
Просмотреть файл

@ -1,5 +1,5 @@
// <auto-generated />
namespace Microsoft.AspNet.Identity.EntityFramework
namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore
{
using System.Globalization;
using System.Reflection;
@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Identity.EntityFramework
internal static class Resources
{
private static readonly ResourceManager _resourceManager
= new ResourceManager("Microsoft.AspNet.Identity.EntityFramework.Resources", typeof(Resources).GetTypeInfo().Assembly);
= new ResourceManager("Microsoft.AspNetCore.Identity.EntityFrameworkCore.Resources", typeof(Resources).GetTypeInfo().Assembly);
/// <summary>
/// Role {0} does not exist.

4
src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/RoleStore.cs
Просмотреть файл

@ -8,9 +8,9 @@ using System.Linq;
using System.Security.Claims;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Data.Entity;
using Microsoft.EntityFrameworkCore;
namespace Microsoft.AspNet.Identity.EntityFramework
namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore
{
/// <summary>
/// Creates a new instance of a persistence store for roles.

4
src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/UserStore.cs
Просмотреть файл

@ -9,9 +9,9 @@ using System.Linq;
using System.Security.Claims;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Data.Entity;
using Microsoft.EntityFrameworkCore;
namespace Microsoft.AspNet.Identity.EntityFramework
namespace Microsoft.AspNetCore.Identity.EntityFrameworkCore
{
/// <summary>
/// Creates a new instance of a persistence store for users, using the default implementation

4
src/Microsoft.AspNetCore.Identity.EntityFrameworkCore/project.json
Просмотреть файл

@ -10,8 +10,8 @@
"url": "git://github.com/aspnet/identity"
},
"dependencies": {
"Microsoft.AspNet.Identity": "3.0.0-*",
"EntityFramework.Relational": "7.0.0-*"
"Microsoft.AspNetCore.Identity": "3.0.0-*",
"Microsoft.EntityFrameworkCore.Relational": "7.0.0-*"
},
"frameworks": {
"net451": {

4
src/Microsoft.AspNetCore.Identity/BuilderExtensions.cs
Просмотреть файл

@ -3,11 +3,11 @@
using System;
using Microsoft.AspNet.Identity;
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
namespace Microsoft.AspNet.Builder
namespace Microsoft.AspNetCore.Builder
{
/// <summary>
/// Identity extensions for <see cref="IApplicationBuilder"/>.

2
src/Microsoft.AspNetCore.Identity/ClaimsIdentityOptions.cs
Просмотреть файл

@ -3,7 +3,7 @@
using System.Security.Claims;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Options used to configure the claim types used for well known claims.

4
src/Microsoft.AspNetCore.Identity/DataProtectionTokenProvider.cs
Просмотреть файл

@ -6,10 +6,10 @@ using System.IO;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNet.DataProtection;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.Extensions.Options;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides protection and validation of identity tokens.

2
src/Microsoft.AspNetCore.Identity/DataProtectionTokenProviderOptions.cs
Просмотреть файл

@ -3,7 +3,7 @@
using System;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Contains options for the <see cref="DataProtectorTokenProvider{TUser}"/>.

2
src/Microsoft.AspNetCore.Identity/EmailTokenProvider.cs
Просмотреть файл

@ -1,6 +1,6 @@
using System.Threading.Tasks;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// TokenProvider that generates tokens from the user's security stamp and notifies a user via email.

2
src/Microsoft.AspNetCore.Identity/ExternalLoginInfo.cs
Просмотреть файл

@ -3,7 +3,7 @@
using System.Security.Claims;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Represents login information, source and externally source principal for a user record

2
src/Microsoft.AspNetCore.Identity/ILookupNormalizer.cs
Просмотреть файл

@ -1,7 +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.
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction for normalizing keys for lookup purposes.

2
src/Microsoft.AspNetCore.Identity/IPasswordHasher.cs
Просмотреть файл

@ -1,7 +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.
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction for hashing passwords.

2
src/Microsoft.AspNetCore.Identity/IPasswordValidator.cs
Просмотреть файл

@ -4,7 +4,7 @@
using System.Threading;
using System.Threading.Tasks;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction for validating passwords.

2
src/Microsoft.AspNetCore.Identity/IQueryableRoleStore.cs
Просмотреть файл

@ -3,7 +3,7 @@
using System.Linq;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction for querying roles in a Role store.

2
src/Microsoft.AspNetCore.Identity/IQueryableUserStore.cs
Просмотреть файл

@ -3,7 +3,7 @@
using System.Linq;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction for querying roles in a User store.

2
src/Microsoft.AspNetCore.Identity/IRoleClaimStore.cs
Просмотреть файл

@ -6,7 +6,7 @@ using System.Security.Claims;
using System.Threading;
using System.Threading.Tasks;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction for a store of role specific claims.

2
src/Microsoft.AspNetCore.Identity/IRoleStore.cs
Просмотреть файл

@ -5,7 +5,7 @@ using System;
using System.Threading;
using System.Threading.Tasks;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction for a storage and management of roles.

2
src/Microsoft.AspNetCore.Identity/IRoleValidator.cs
Просмотреть файл

@ -3,7 +3,7 @@
using System.Threading.Tasks;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction for a validating a role.

4
src/Microsoft.AspNetCore.Identity/ISecurityStampValidator.cs
Просмотреть файл

@ -2,9 +2,9 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Threading.Tasks;
using Microsoft.AspNet.Authentication.Cookies;
using Microsoft.AspNetCore.Authentication.Cookies;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction for a validating a security stamp of an incoming identity, and regenerating or rejecting the

2
src/Microsoft.AspNetCore.Identity/IUserClaimStore.cs
Просмотреть файл

@ -6,7 +6,7 @@ using System.Security.Claims;
using System.Threading;
using System.Threading.Tasks;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction for a store of claims for a user.

2
src/Microsoft.AspNetCore.Identity/IUserClaimsPrincipalFactory.cs
Просмотреть файл

@ -4,7 +4,7 @@
using System.Security.Claims;
using System.Threading.Tasks;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction for a factory to create a <see cref="ClaimsPrincipal"/> from a user.

2
src/Microsoft.AspNetCore.Identity/IUserEmailStore.cs
Просмотреть файл

@ -4,7 +4,7 @@
using System.Threading;
using System.Threading.Tasks;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction for the storage and management of user email addresses.

2
src/Microsoft.AspNetCore.Identity/IUserLockoutStore.cs
Просмотреть файл

@ -5,7 +5,7 @@ using System;
using System.Threading;
using System.Threading.Tasks;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction for a storing information which can be used to implement account lockout,

2
src/Microsoft.AspNetCore.Identity/IUserLoginStore.cs
Просмотреть файл

@ -5,7 +5,7 @@ using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction for storing information that maps external login information provided

2
src/Microsoft.AspNetCore.Identity/IUserPasswordStore.cs
Просмотреть файл

@ -4,7 +4,7 @@
using System.Threading;
using System.Threading.Tasks;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction for a store containing users' password hashes..

2
src/Microsoft.AspNetCore.Identity/IUserPhoneNumberStore.cs
Просмотреть файл

@ -4,7 +4,7 @@
using System.Threading;
using System.Threading.Tasks;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction for a store containing users' telephone numbers.

2
src/Microsoft.AspNetCore.Identity/IUserRoleStore.cs
Просмотреть файл

@ -5,7 +5,7 @@ using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction for a store which maps users to roles.

2
src/Microsoft.AspNetCore.Identity/IUserSecurityStampStore.cs
Просмотреть файл

@ -4,7 +4,7 @@
using System.Threading;
using System.Threading.Tasks;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction for a store which stores a user's security stamp.

2
src/Microsoft.AspNetCore.Identity/IUserStore.cs
Просмотреть файл

@ -5,7 +5,7 @@ using System;
using System.Threading;
using System.Threading.Tasks;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction for a store which manages user accounts.

2
src/Microsoft.AspNetCore.Identity/IUserTokenProvider.cs
Просмотреть файл

@ -3,7 +3,7 @@
using System.Threading.Tasks;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction for token generators.

2
src/Microsoft.AspNetCore.Identity/IUserTwoFactorStore.cs
Просмотреть файл

@ -4,7 +4,7 @@
using System.Threading;
using System.Threading.Tasks;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction to store a flag indicating whether a user has two factor authentication enabled.

2
src/Microsoft.AspNetCore.Identity/IUserValidator.cs
Просмотреть файл

@ -4,7 +4,7 @@
using System.Threading;
using System.Threading.Tasks;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides an abstraction for user validation.

4
src/Microsoft.AspNetCore.Identity/IdentityBuilder.cs
Просмотреть файл

@ -3,10 +3,10 @@
using System;
using System.Reflection;
using Microsoft.AspNet.Builder;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Helper functions for configuring identity services.

8
src/Microsoft.AspNetCore.Identity/IdentityCookieOptions.cs
Просмотреть файл

@ -2,11 +2,11 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using Microsoft.AspNet.Authentication.Cookies;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Http;
using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Represents all the options you can use to configure the cookies middleware uesd by the identity system.

2
src/Microsoft.AspNetCore.Identity/IdentityError.cs
Просмотреть файл

@ -1,7 +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.
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Encapsulates an error from the identity subsystem.

2
src/Microsoft.AspNetCore.Identity/IdentityErrorDescriber.cs
Просмотреть файл

@ -1,7 +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.
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Service to enable localization for application facing identity errors.

2
src/Microsoft.AspNetCore.Identity/IdentityMarkerService.cs
Просмотреть файл

@ -1,7 +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.
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Used to verify AddIdentity was called on a ServiceCollection

4
src/Microsoft.AspNetCore.Identity/IdentityOptions.cs
Просмотреть файл

@ -2,9 +2,9 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using Microsoft.AspNet.Identity;
using Microsoft.AspNetCore.Identity;
namespace Microsoft.AspNet.Builder
namespace Microsoft.AspNetCore.Builder
{
/// <summary>
/// Represents all the options you can use to configure the identity system.

2
src/Microsoft.AspNetCore.Identity/IdentityResult.cs
Просмотреть файл

@ -5,7 +5,7 @@ using System.Collections.Generic;
using System.Linq;
using Microsoft.Extensions.Logging;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Represents the result of an identity operation.

8
src/Microsoft.AspNetCore.Identity/IdentityServiceCollectionExtensions.cs
Просмотреть файл

@ -2,10 +2,10 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Http.Internal;
using Microsoft.AspNet.Identity;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Internal;
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.DependencyInjection.Extensions;
namespace Microsoft.Extensions.DependencyInjection

2
src/Microsoft.AspNetCore.Identity/LockoutOptions.cs
Просмотреть файл

@ -3,7 +3,7 @@
using System;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Options for configuring user lockout.

4
src/Microsoft.AspNetCore.Identity/PasswordHasher.cs
Просмотреть файл

@ -4,10 +4,10 @@
using System;
using System.Runtime.CompilerServices;
using System.Security.Cryptography;
using Microsoft.AspNet.Cryptography.KeyDerivation;
using Microsoft.AspNetCore.Cryptography.KeyDerivation;
using Microsoft.Extensions.Options;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Implements the standard Identity password hashing.

2
src/Microsoft.AspNetCore.Identity/PasswordHasherCompatibilityMode.cs
Просмотреть файл

@ -1,7 +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.
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Specifies the format used for hashing passwords.

2
src/Microsoft.AspNetCore.Identity/PasswordHasherOptions.cs
Просмотреть файл

@ -3,7 +3,7 @@
using System.Security.Cryptography;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Specifies options for password hashing.

2
src/Microsoft.AspNetCore.Identity/PasswordOptions.cs
Просмотреть файл

@ -1,7 +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.
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Specifies options for password requirements.

2
src/Microsoft.AspNetCore.Identity/PasswordValidator.cs
Просмотреть файл

@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides the default password policy for Identity.

2
src/Microsoft.AspNetCore.Identity/PasswordVerificationResult.cs
Просмотреть файл

@ -1,7 +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.
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Specifies the results for password verification.

2
src/Microsoft.AspNetCore.Identity/PhoneNumberTokenProvider.cs
Просмотреть файл

@ -1,7 +1,7 @@
using System;
using System.Threading.Tasks;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Represents a token provider that generates tokens from a user's security stamp and

2
src/Microsoft.AspNetCore.Identity/PrincipalExtensions.cs
Просмотреть файл

@ -2,7 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Linq;
using Microsoft.AspNet.Identity;
using Microsoft.AspNetCore.Identity;
namespace System.Security.Claims
{

8
src/Microsoft.AspNetCore.Identity/Properties/AssemblyInfo.cs
Просмотреть файл

@ -5,9 +5,9 @@ using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("Microsoft.AspNet.Identity.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Microsoft.AspNet.Identity.EntityFramework.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Microsoft.AspNet.Identity.EntityFramework.InMemory.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Microsoft.AspNet.Identity.InMemory.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Identity.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Identity.InMemory.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: AssemblyMetadata("Serviceable", "True")]
[assembly: NeutralResourcesLanguage("en-us")]

4
src/Microsoft.AspNetCore.Identity/Properties/Resources.Designer.cs сгенерированный
Просмотреть файл

@ -1,5 +1,5 @@
// <auto-generated />
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
using System.Globalization;
using System.Reflection;
@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Identity
internal static class Resources
{
private static readonly ResourceManager _resourceManager
= new ResourceManager("Microsoft.AspNet.Identity.Resources", typeof(Resources).GetTypeInfo().Assembly);
= new ResourceManager("Microsoft.AspNetCore.Identity.Resources", typeof(Resources).GetTypeInfo().Assembly);
/// <summary>
/// Optimistic concurrency failure, object has been modified.

2
src/Microsoft.AspNetCore.Identity/Rfc6238AuthenticationService.cs
Просмотреть файл

@ -7,7 +7,7 @@ using System.Net;
using System.Security.Cryptography;
using System.Text;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
internal static class Rfc6238AuthenticationService
{

6
src/Microsoft.AspNetCore.Identity/RoleManager.cs
Просмотреть файл

@ -8,11 +8,11 @@ using System.Runtime.CompilerServices;
using System.Security.Claims;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNet.Hosting;
using Microsoft.AspNet.Http;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides the APIs for managing roles in a persistence store.

2
src/Microsoft.AspNetCore.Identity/RoleValidator.cs
Просмотреть файл

@ -5,7 +5,7 @@ using System;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace Microsoft.AspNet.Identity
namespace Microsoft.AspNetCore.Identity
{
/// <summary>
/// Provides the default validation of roles.

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше