Convert Identity to Reference (dotnet#6086)

* Convert Identity to Reference * Remove Microsoft.AspNet.Identity.AspNetCoreCompat
diogoxluis · Dec 21, 2018 · edcee85 · edcee85
1 parent 167695f
commit edcee85
Show file tree

Hide file tree

Showing 584 changed files with 1,507 additions and 2,622 deletions.
diff --git a/build/artifacts.props b/build/artifacts.props
@@ -22,7 +22,6 @@
     <PackageArtifact Include="dotnet-sql-cache" Category="ship" />
     <PackageArtifact Include="dotnet-user-secrets" Category="ship" />
     <PackageArtifact Include="dotnet-watch" Category="ship" />
-    <PackageArtifact Include="Microsoft.AspNet.Identity.AspNetCoreCompat" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.All" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Antiforgery" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.App" Category="ship" />

diff --git a/build/buildorder.props b/build/buildorder.props
@@ -8,7 +8,6 @@
 
   <ItemGroup>
     <RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
-    <RepositoryBuildOrder Include="Identity" Order="15" RootPath="$(RepositoryRoot)src\Identity\"  />
     <RepositoryBuildOrder Include="MvcPrecompilation" Order="15" RootPath="$(RepositoryRoot)src\MvcPrecompilation\" />
     <RepositoryBuildOrder Include="Scaffolding" Order="15" />
     <RepositoryBuildOrder Include="AzureIntegration" Order="15" RootPath="$(RepositoryRoot)src\AzureIntegration\" />

diff --git a/build/dependencies.props b/build/dependencies.props
@@ -93,7 +93,9 @@
     <MicrosoftAspNetCoreHostingWebHostBuilderFactorySourcesPackageVersion>2.1.1</MicrosoftAspNetCoreHostingWebHostBuilderFactorySourcesPackageVersion>
     <MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.5.1</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
     <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.1.4</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
+    <MicrosoftEntityFrameworkCoreSqlitePackageVersion>2.1.4</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
     <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.1.4</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
+    <MicrosoftEntityFrameworkCoreToolsPackageVersion>2.1.4</MicrosoftEntityFrameworkCoreToolsPackageVersion>
 
     <!-- External and partner dependencies -->
     <AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>

diff --git a/build/repo.props b/build/repo.props
@@ -66,6 +66,10 @@
                           "
                           Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
 
+
+    <!-- Exclude the WPF samples for now because they use classic .csproj, which is not yet supported in our build. -->
+    <ProjectToExclude Include="$(RepositoryRoot)src\Identity\Identity\samples\NativeWPFClient\NativeWPFClient.csproj;" />
+
         <!-- Exclude the websockets samples for now because they use classic .csproj, which is not yet supported in our build. -->
         <ProjectToExclude Include="
                           $(RepositoryRoot)src\Middleware\WebSockets\samples\**\*.csproj;
@@ -83,6 +87,7 @@
                           $(RepositoryRoot)src\Hosting\**\*.*proj;
                           $(RepositoryRoot)src\Http\**\*.*proj;
                           $(RepositoryRoot)src\Html\**\*.*proj;
+                          $(RepositoryRoot)src\Identity\**\*.*proj;
                           $(RepositoryRoot)src\Servers\**\*.csproj;
                           $(RepositoryRoot)src\Servers\**\*.pkgproj;
                           $(RepositoryRoot)src\Security\**\*.*proj;

diff --git a/build/submodules.props b/build/submodules.props
@@ -47,7 +47,6 @@
   <ItemGroup>
     <ShippedRepository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
     <ShippedRepository Include="EntityFrameworkCore" />
-    <ShippedRepository Include="Identity" RootPath="$(RepositoryRoot)src\Identity\" />
     <ShippedRepository Include="JsonPatch" />
     <ShippedRepository Include="MvcPrecompilation" RootPath="$(RepositoryRoot)src\MvcPrecompilation\"/>
     <ShippedRepository Include="SignalR" RootPath="$(RepositoryRoot)src\SignalR\" />

diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
@@ -422,6 +422,47 @@
     <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[2.1.1, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
   </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Identity-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity' ">
+    <BaselinePackageVersion>2.1.6</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Core" Version="[2.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
+  </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Identity.EntityFrameworkCore-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.EntityFrameworkCore' ">
+    <BaselinePackageVersion>2.1.6</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.EntityFrameworkCore' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Identity" Version="[2.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[2.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[2.1.1, )" />
+  </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Identity.Specification.Tests-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.Specification.Tests' ">
+    <BaselinePackageVersion>2.1.6</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.Specification.Tests' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Identity" Version="[2.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Configuration" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="xunit" Version="[2.3.1, )" />
+  </ItemGroup>
+  <!-- Package: Microsoft.AspNetCore.Identity.UI-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.UI' ">
+    <BaselinePackageVersion>2.1.6</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.UI' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Identity" Version="[2.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[2.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Mvc" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="[2.1.1, )" />
+  </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.JsonPatch-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.JsonPatch' ">
     <BaselinePackageVersion>2.1.1</BaselinePackageVersion>
@@ -927,6 +968,25 @@
     <BaselinePackageReference Include="Microsoft.Net.Http.Headers" Version="[2.1.1, )" />
     <BaselinePackageReference Include="System.Text.Encodings.Web" Version="[4.5.0, )" />
   </ItemGroup>
+  <!-- Package: Microsoft.Extensions.Identity.Core-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Core' ">
+    <BaselinePackageVersion>2.1.6</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Core' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="System.ComponentModel.Annotations" Version="[4.5.0, )" />
+  </ItemGroup>
+  <!-- Package: Microsoft.Extensions.Identity.Stores-->
+  <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Stores' ">
+    <BaselinePackageVersion>2.1.6</BaselinePackageVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Stores' AND '$(TargetFramework)' == 'netstandard2.0' ">
+    <BaselinePackageReference Include="Microsoft.Extensions.Identity.Core" Version="[2.1.6, )" />
+    <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[2.1.1, )" />
+    <BaselinePackageReference Include="System.ComponentModel.Annotations" Version="[4.5.0, )" />
+  </ItemGroup>
   <!-- Package: Microsoft.AspNetCore-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore' ">
     <BaselinePackageVersion>2.1.6</BaselinePackageVersion>

diff --git a/eng/Baseline.xml b/eng/Baseline.xml
@@ -53,6 +53,10 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
   <Package Id="Microsoft.AspNetCore.Http" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.HttpOverrides" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.HttpsPolicy" Version="2.1.1" />
+  <Package Id="Microsoft.AspNetCore.Identity" Version="2.1.6" />
+  <Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.1.6" />
+  <Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="2.1.6" />
+  <Package Id="Microsoft.AspNetCore.Identity.UI" Version="2.1.6" />
   <Package Id="Microsoft.AspNetCore.JsonPatch" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Localization.Routing" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.Localization" Version="2.1.1" />
@@ -101,6 +105,8 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
   <Package Id="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.WebSockets" Version="2.1.1" />
   <Package Id="Microsoft.AspNetCore.WebUtilities" Version="2.1.1" />
+  <Package Id="Microsoft.Extensions.Identity.Core" Version="2.1.6" />
+  <Package Id="Microsoft.Extensions.Identity.Stores" Version="2.1.6" />
   <Package Id="Microsoft.AspNetCore" Version="2.1.6" />
   <Package Id="Microsoft.CodeAnalysis.Razor" Version="2.1.2" />
   <Package Id="Microsoft.Net.Http.Headers" Version="2.1.1" />

diff --git a/eng/Dependencies.props b/eng/Dependencies.props
@@ -33,14 +33,17 @@ and are generated based on the last package release.
     <LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
     <LatestPackageReference Include="Microsoft.CSharp" Version="$(MicrosoftCSharpPackageVersion)" />
     <LatestPackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftEntityFrameworkCoreInMemoryPackageVersion)" />
+    <LatestPackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(MicrosoftEntityFrameworkCoreSqlitePackageVersion)" />
     <LatestPackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
+    <LatestPackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(MicrosoftEntityFrameworkCoreToolsPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="$(MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.Caching.Redis" Version="$(MicrosoftExtensionsCachingRedisPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="$(MicrosoftExtensionsCachingSqlServerPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
+    <LatestPackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
     <LatestPackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />

diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props
@@ -35,6 +35,12 @@
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Routing" ProjectPath="$(RepositoryRoot)src\Http\Routing\src\Microsoft.AspNetCore.Routing.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.WebUtilities" ProjectPath="$(RepositoryRoot)src\Http\WebUtilities\src\Microsoft.AspNetCore.WebUtilities.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Html.Abstractions" ProjectPath="$(RepositoryRoot)src\Html\Abstractions\src\Microsoft.AspNetCore.Html.Abstractions.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" ProjectPath="$(RepositoryRoot)src\Identity\EF\src\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.Extensions.Identity.Core" ProjectPath="$(RepositoryRoot)src\Identity\Extensions\Core\src\Microsoft.Extensions.Identity.Core.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.Extensions.Identity.Stores" ProjectPath="$(RepositoryRoot)src\Identity\Extensions\Stores\src\Microsoft.Extensions.Identity.Stores.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Identity" ProjectPath="$(RepositoryRoot)src\Identity\Identity\Core\src\Microsoft.AspNetCore.Identity.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Identity.Specification.Tests" ProjectPath="$(RepositoryRoot)src\Identity\Identity\Specification.Tests\src\Microsoft.AspNetCore.Identity.Specification.Tests.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Identity.UI" ProjectPath="$(RepositoryRoot)src\Identity\Identity\UI\src\Microsoft.AspNetCore.Identity.UI.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Connections.Abstractions" ProjectPath="$(RepositoryRoot)src\Servers\Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.HttpSys" ProjectPath="$(RepositoryRoot)src\Servers\HttpSys\src\Microsoft.AspNetCore.Server.HttpSys.csproj" />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.IISIntegration" ProjectPath="$(RepositoryRoot)src\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj" />

diff --git a/src/Identity/.gitignore b/src/Identity/.gitignore
diff --git a/src/Identity/Directory.Build.props b/src/Identity/Directory.Build.props
diff --git a/src/Identity/Directory.Build.targets b/src/Identity/Directory.Build.targets
diff --git a/src/Identity/src/EF/IdentityDbContext.cs → src/Identity/EF/src/IdentityDbContext.cs b/src/Identity/src/EF/IdentityDbContext.cs → src/Identity/EF/src/IdentityDbContext.cs
diff --git a/...entityEntityFrameworkBuilderExtensions.cs → ...entityEntityFrameworkBuilderExtensions.cs b/...entityEntityFrameworkBuilderExtensions.cs → ...entityEntityFrameworkBuilderExtensions.cs
diff --git a/src/Identity/src/EF/IdentityUserContext.cs → src/Identity/EF/src/IdentityUserContext.cs b/src/Identity/src/EF/IdentityUserContext.cs → src/Identity/EF/src/IdentityUserContext.cs
diff --git a/...tCore.Identity.EntityFrameworkCore.csproj → ...tCore.Identity.EntityFrameworkCore.csproj b/...tCore.Identity.EntityFrameworkCore.csproj → ...tCore.Identity.EntityFrameworkCore.csproj
@@ -8,12 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Identity\Microsoft.AspNetCore.Identity.csproj" />
-    <ProjectReference Include="..\Stores\Microsoft.Extensions.Identity.Stores.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCoreRelationalPackageVersion)" />
+    <Reference Include="Microsoft.AspNetCore.Identity" />
+    <Reference Include="Microsoft.Extensions.Identity.Stores" />
+    <Reference Include="Microsoft.EntityFrameworkCore.Relational" />
   </ItemGroup>
 
 </Project>
diff --git a/...y/src/EF/Properties/Resources.Designer.cs → ...y/EF/src/Properties/Resources.Designer.cs b/...y/src/EF/Properties/Resources.Designer.cs → ...y/EF/src/Properties/Resources.Designer.cs
diff --git a/src/Identity/src/EF/Resources.resx → src/Identity/EF/src/Resources.resx b/src/Identity/src/EF/Resources.resx → src/Identity/EF/src/Resources.resx
diff --git a/src/Identity/src/EF/RoleStore.cs → src/Identity/EF/src/RoleStore.cs b/src/Identity/src/EF/RoleStore.cs → src/Identity/EF/src/RoleStore.cs
diff --git a/src/Identity/src/EF/UserOnlyStore.cs → src/Identity/EF/src/UserOnlyStore.cs b/src/Identity/src/EF/UserOnlyStore.cs → src/Identity/EF/src/UserOnlyStore.cs
diff --git a/src/Identity/src/EF/UserStore.cs → src/Identity/EF/src/UserStore.cs b/src/Identity/src/EF/UserStore.cs → src/Identity/EF/src/UserStore.cs
diff --git a/src/Identity/src/EF/baseline.netcore.json → src/Identity/EF/src/baseline.netcore.json b/src/Identity/src/EF/baseline.netcore.json → src/Identity/EF/src/baseline.netcore.json
diff --git a/.../test/EF.InMemory.Test/InMemoryContext.cs → .../test/EF.InMemory.Test/InMemoryContext.cs b/.../test/EF.InMemory.Test/InMemoryContext.cs → .../test/EF.InMemory.Test/InMemoryContext.cs
diff --git a/....InMemory.Test/InMemoryEFOnlyUsersTest.cs → ....InMemory.Test/InMemoryEFOnlyUsersTest.cs b/....InMemory.Test/InMemoryEFOnlyUsersTest.cs → ....InMemory.Test/InMemoryEFOnlyUsersTest.cs
diff --git a/....InMemory.Test/InMemoryEFUserStoreTest.cs → ....InMemory.Test/InMemoryEFUserStoreTest.cs b/....InMemory.Test/InMemoryEFUserStoreTest.cs → ....InMemory.Test/InMemoryEFUserStoreTest.cs
diff --git a/...ory.Test/InMemoryStoreWithGenericsTest.cs → ...ory.Test/InMemoryStoreWithGenericsTest.cs b/...ory.Test/InMemoryStoreWithGenericsTest.cs → ...ory.Test/InMemoryStoreWithGenericsTest.cs
diff --git a/...t/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj b/...t/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\..\Shared\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Identity" />
+    <Reference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
+    <Reference Include="Microsoft.AspNetCore.Identity.Specification.Tests" />
+    <Reference Include="Microsoft.AspNetCore.Hosting" />
+    <Reference Include="Microsoft.AspNetCore.Http" />
+    <Reference Include="Microsoft.EntityFrameworkCore.InMemory" />
+  </ItemGroup>
+
+</Project>
diff --git a/...ty/test/EF.InMemory.Test/RoleStoreTest.cs → ...EF/test/EF.InMemory.Test/RoleStoreTest.cs b/...ty/test/EF.InMemory.Test/RoleStoreTest.cs → ...EF/test/EF.InMemory.Test/RoleStoreTest.cs
diff --git a/...t/EF.InMemory.Test/TestIdentityFactory.cs → ...t/EF.InMemory.Test/TestIdentityFactory.cs b/...t/EF.InMemory.Test/TestIdentityFactory.cs → ...t/EF.InMemory.Test/TestIdentityFactory.cs
diff --git a/...entity/test/EF.Test/ApiConsistencyTest.cs → ...ity/EF/test/EF.Test/ApiConsistencyTest.cs b/...entity/test/EF.Test/ApiConsistencyTest.cs → ...ity/EF/test/EF.Test/ApiConsistencyTest.cs
diff --git a/src/Identity/test/EF.Test/CustomPocoTest.cs → ...dentity/EF/test/EF.Test/CustomPocoTest.cs b/src/Identity/test/EF.Test/CustomPocoTest.cs → ...dentity/EF/test/EF.Test/CustomPocoTest.cs
diff --git a/src/Identity/test/EF.Test/DbUtil.cs → src/Identity/EF/test/EF.Test/DbUtil.cs b/src/Identity/test/EF.Test/DbUtil.cs → src/Identity/EF/test/EF.Test/DbUtil.cs
diff --git a/src/Identity/test/EF.Test/DefaultPocoTest.cs → ...entity/EF/test/EF.Test/DefaultPocoTest.cs b/src/Identity/test/EF.Test/DefaultPocoTest.cs → ...entity/EF/test/EF.Test/DefaultPocoTest.cs
diff --git a/...ty/test/EF.Test/MaxKeyLengthSchemaTest.cs → ...EF/test/EF.Test/MaxKeyLengthSchemaTest.cs b/...ty/test/EF.Test/MaxKeyLengthSchemaTest.cs → ...EF/test/EF.Test/MaxKeyLengthSchemaTest.cs
diff --git a/src/Identity/EF/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj b/src/Identity/EF/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\..\Shared\*.cs" />
+    <Content Include="config.json" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Identity" />
+    <Reference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
+    <Reference Include="Microsoft.AspNetCore.Identity.Specification.Tests" />
+    <Reference Include="Microsoft.AspNetCore.Hosting" />
+    <Reference Include="Microsoft.AspNetCore.Http" />
+    <Reference Include="Microsoft.AspNetCore.TestHost" />
+    <Reference Include="Microsoft.EntityFrameworkCore.InMemory" />
+    <Reference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+    <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <Reference Include="Microsoft.Extensions.Configuration.FileExtensions" />
+    <Reference Include="Microsoft.Extensions.Configuration.Json" />
+  </ItemGroup>
+
+</Project>
diff --git a/...test/EF.Test/SqlStoreOnlyUsersTestBase.cs → ...test/EF.Test/SqlStoreOnlyUsersTestBase.cs b/...test/EF.Test/SqlStoreOnlyUsersTestBase.cs → ...test/EF.Test/SqlStoreOnlyUsersTestBase.cs
diff --git a/...Identity/test/EF.Test/SqlStoreTestBase.cs → ...ntity/EF/test/EF.Test/SqlStoreTestBase.cs b/...Identity/test/EF.Test/SqlStoreTestBase.cs → ...ntity/EF/test/EF.Test/SqlStoreTestBase.cs
diff --git a/...test/EF.Test/UserOnlyCustomContextTest.cs → ...test/EF.Test/UserOnlyCustomContextTest.cs b/...test/EF.Test/UserOnlyCustomContextTest.cs → ...test/EF.Test/UserOnlyCustomContextTest.cs
diff --git a/src/Identity/test/EF.Test/UserOnlyTest.cs → src/Identity/EF/test/EF.Test/UserOnlyTest.cs b/src/Identity/test/EF.Test/UserOnlyTest.cs → src/Identity/EF/test/EF.Test/UserOnlyTest.cs
diff --git a/....Test/UserStoreEncryptPersonalDataTest.cs → ....Test/UserStoreEncryptPersonalDataTest.cs b/....Test/UserStoreEncryptPersonalDataTest.cs → ....Test/UserStoreEncryptPersonalDataTest.cs
diff --git a/...tity/test/EF.Test/UserStoreGuidKeyTest.cs → ...y/EF/test/EF.Test/UserStoreGuidKeyTest.cs b/...tity/test/EF.Test/UserStoreGuidKeyTest.cs → ...y/EF/test/EF.Test/UserStoreGuidKeyTest.cs
diff --git a/...ntity/test/EF.Test/UserStoreIntKeyTest.cs → ...ty/EF/test/EF.Test/UserStoreIntKeyTest.cs b/...ntity/test/EF.Test/UserStoreIntKeyTest.cs → ...ty/EF/test/EF.Test/UserStoreIntKeyTest.cs
diff --git a/...ty/test/EF.Test/UserStoreStringKeyTest.cs → ...EF/test/EF.Test/UserStoreStringKeyTest.cs b/...ty/test/EF.Test/UserStoreStringKeyTest.cs → ...EF/test/EF.Test/UserStoreStringKeyTest.cs
diff --git a/src/Identity/test/EF.Test/UserStoreTest.cs → ...Identity/EF/test/EF.Test/UserStoreTest.cs b/src/Identity/test/EF.Test/UserStoreTest.cs → ...Identity/EF/test/EF.Test/UserStoreTest.cs
diff --git a/...test/EF.Test/UserStoreWithGenericsTest.cs → ...test/EF.Test/UserStoreWithGenericsTest.cs b/...test/EF.Test/UserStoreWithGenericsTest.cs → ...test/EF.Test/UserStoreWithGenericsTest.cs
diff --git a/....Test/Utilities/ScratchDatabaseFixture.cs → ....Test/Utilities/ScratchDatabaseFixture.cs b/....Test/Utilities/ScratchDatabaseFixture.cs → ....Test/Utilities/ScratchDatabaseFixture.cs
diff --git a/...t/EF.Test/Utilities/SqlServerTestStore.cs → ...t/EF.Test/Utilities/SqlServerTestStore.cs b/...t/EF.Test/Utilities/SqlServerTestStore.cs → ...t/EF.Test/Utilities/SqlServerTestStore.cs
diff --git a/...test/EF.Test/Utilities/TestEnvironment.cs → ...test/EF.Test/Utilities/TestEnvironment.cs b/...test/EF.Test/Utilities/TestEnvironment.cs → ...test/EF.Test/Utilities/TestEnvironment.cs
diff --git a/src/Identity/test/EF.Test/config.json → src/Identity/EF/test/EF.Test/config.json b/src/Identity/test/EF.Test/config.json → src/Identity/EF/test/EF.Test/config.json
diff --git a/...ty/src/Core/AuthenticatorTokenProvider.cs → ...ns/Core/src/AuthenticatorTokenProvider.cs b/...ty/src/Core/AuthenticatorTokenProvider.cs → ...ns/Core/src/AuthenticatorTokenProvider.cs
diff --git a/src/Identity/src/Core/Base32.cs → src/Identity/Extensions/Core/src/Base32.cs b/src/Identity/src/Core/Base32.cs → src/Identity/Extensions/Core/src/Base32.cs
diff --git a/...dentity/src/Core/ClaimsIdentityOptions.cs → ...ensions/Core/src/ClaimsIdentityOptions.cs b/...dentity/src/Core/ClaimsIdentityOptions.cs → ...ensions/Core/src/ClaimsIdentityOptions.cs
diff --git a/.../src/Core/DefaultPersonalDataProtector.cs → .../Core/src/DefaultPersonalDataProtector.cs b/.../src/Core/DefaultPersonalDataProtector.cs → .../Core/src/DefaultPersonalDataProtector.cs
diff --git a/src/Identity/src/Core/EmailTokenProvider.cs → ...Extensions/Core/src/EmailTokenProvider.cs b/src/Identity/src/Core/EmailTokenProvider.cs → ...Extensions/Core/src/EmailTokenProvider.cs
diff --git a/src/Identity/src/Core/ILookupNormalizer.cs → .../Extensions/Core/src/ILookupNormalizer.cs b/src/Identity/src/Core/ILookupNormalizer.cs → .../Extensions/Core/src/ILookupNormalizer.cs
diff --git a/src/Identity/src/Core/ILookupProtector.cs → ...y/Extensions/Core/src/ILookupProtector.cs b/src/Identity/src/Core/ILookupProtector.cs → ...y/Extensions/Core/src/ILookupProtector.cs
diff --git a/...ntity/src/Core/ILookupProtectorKeyRing.cs → ...sions/Core/src/ILookupProtectorKeyRing.cs b/...ntity/src/Core/ILookupProtectorKeyRing.cs → ...sions/Core/src/ILookupProtectorKeyRing.cs
diff --git a/src/Identity/src/Core/IPasswordHasher.cs → ...ty/Extensions/Core/src/IPasswordHasher.cs b/src/Identity/src/Core/IPasswordHasher.cs → ...ty/Extensions/Core/src/IPasswordHasher.cs
diff --git a/src/Identity/src/Core/IPasswordValidator.cs → ...Extensions/Core/src/IPasswordValidator.cs b/src/Identity/src/Core/IPasswordValidator.cs → ...Extensions/Core/src/IPasswordValidator.cs
diff --git a/...entity/src/Core/IPersonalDataProtector.cs → ...nsions/Core/src/IPersonalDataProtector.cs b/...entity/src/Core/IPersonalDataProtector.cs → ...nsions/Core/src/IPersonalDataProtector.cs
diff --git a/src/Identity/src/Core/IProtectedUserStore.cs → ...xtensions/Core/src/IProtectedUserStore.cs b/src/Identity/src/Core/IProtectedUserStore.cs → ...xtensions/Core/src/IProtectedUserStore.cs
diff --git a/src/Identity/src/Core/IQueryableRoleStore.cs → ...xtensions/Core/src/IQueryableRoleStore.cs b/src/Identity/src/Core/IQueryableRoleStore.cs → ...xtensions/Core/src/IQueryableRoleStore.cs
diff --git a/src/Identity/src/Core/IQueryableUserStore.cs → ...xtensions/Core/src/IQueryableUserStore.cs b/src/Identity/src/Core/IQueryableUserStore.cs → ...xtensions/Core/src/IQueryableUserStore.cs
diff --git a/src/Identity/src/Core/IRoleClaimStore.cs → ...ty/Extensions/Core/src/IRoleClaimStore.cs b/src/Identity/src/Core/IRoleClaimStore.cs → ...ty/Extensions/Core/src/IRoleClaimStore.cs
diff --git a/src/Identity/src/Core/IRoleStore.cs → ...dentity/Extensions/Core/src/IRoleStore.cs b/src/Identity/src/Core/IRoleStore.cs → ...dentity/Extensions/Core/src/IRoleStore.cs
diff --git a/src/Identity/src/Core/IRoleValidator.cs → ...ity/Extensions/Core/src/IRoleValidator.cs b/src/Identity/src/Core/IRoleValidator.cs → ...ity/Extensions/Core/src/IRoleValidator.cs
diff --git a/...src/Core/IUserAuthenticationTokenStore.cs → ...Core/src/IUserAuthenticationTokenStore.cs b/...src/Core/IUserAuthenticationTokenStore.cs → ...Core/src/IUserAuthenticationTokenStore.cs
diff --git a/...ty/src/Core/IUserAuthenticatorKeyStore.cs → ...ns/Core/src/IUserAuthenticatorKeyStore.cs b/...ty/src/Core/IUserAuthenticatorKeyStore.cs → ...ns/Core/src/IUserAuthenticatorKeyStore.cs
diff --git a/src/Identity/src/Core/IUserClaimStore.cs → ...ty/Extensions/Core/src/IUserClaimStore.cs b/src/Identity/src/Core/IUserClaimStore.cs → ...ty/Extensions/Core/src/IUserClaimStore.cs
diff --git a/...y/src/Core/IUserClaimsPrincipalFactory.cs → ...s/Core/src/IUserClaimsPrincipalFactory.cs b/...y/src/Core/IUserClaimsPrincipalFactory.cs → ...s/Core/src/IUserClaimsPrincipalFactory.cs
diff --git a/src/Identity/src/Core/IUserEmailStore.cs → ...ty/Extensions/Core/src/IUserEmailStore.cs b/src/Identity/src/Core/IUserEmailStore.cs → ...ty/Extensions/Core/src/IUserEmailStore.cs
diff --git a/src/Identity/src/Core/IUserLockoutStore.cs → .../Extensions/Core/src/IUserLockoutStore.cs b/src/Identity/src/Core/IUserLockoutStore.cs → .../Extensions/Core/src/IUserLockoutStore.cs
diff --git a/src/Identity/src/Core/IUserLoginStore.cs → ...ty/Extensions/Core/src/IUserLoginStore.cs b/src/Identity/src/Core/IUserLoginStore.cs → ...ty/Extensions/Core/src/IUserLoginStore.cs
diff --git a/src/Identity/src/Core/IUserPasswordStore.cs → ...Extensions/Core/src/IUserPasswordStore.cs b/src/Identity/src/Core/IUserPasswordStore.cs → ...Extensions/Core/src/IUserPasswordStore.cs
diff --git a/...dentity/src/Core/IUserPhoneNumberStore.cs → ...ensions/Core/src/IUserPhoneNumberStore.cs b/...dentity/src/Core/IUserPhoneNumberStore.cs → ...ensions/Core/src/IUserPhoneNumberStore.cs
diff --git a/src/Identity/src/Core/IUserRoleStore.cs → ...ity/Extensions/Core/src/IUserRoleStore.cs b/src/Identity/src/Core/IUserRoleStore.cs → ...ity/Extensions/Core/src/IUserRoleStore.cs
diff --git a/...ntity/src/Core/IUserSecurityStampStore.cs → ...sions/Core/src/IUserSecurityStampStore.cs b/...ntity/src/Core/IUserSecurityStampStore.cs → ...sions/Core/src/IUserSecurityStampStore.cs
diff --git a/src/Identity/src/Core/IUserStore.cs → ...dentity/Extensions/Core/src/IUserStore.cs b/src/Identity/src/Core/IUserStore.cs → ...dentity/Extensions/Core/src/IUserStore.cs
diff --git a/...c/Core/IUserTwoFactorRecoveryCodeStore.cs → ...re/src/IUserTwoFactorRecoveryCodeStore.cs b/...c/Core/IUserTwoFactorRecoveryCodeStore.cs → ...re/src/IUserTwoFactorRecoveryCodeStore.cs
diff --git a/src/Identity/src/Core/IUserTwoFactorStore.cs → ...xtensions/Core/src/IUserTwoFactorStore.cs b/src/Identity/src/Core/IUserTwoFactorStore.cs → ...xtensions/Core/src/IUserTwoFactorStore.cs
diff --git a/...y/src/Core/IUserTwoFactorTokenProvider.cs → ...s/Core/src/IUserTwoFactorTokenProvider.cs b/...y/src/Core/IUserTwoFactorTokenProvider.cs → ...s/Core/src/IUserTwoFactorTokenProvider.cs
diff --git a/src/Identity/src/Core/IUserValidator.cs → ...ity/Extensions/Core/src/IUserValidator.cs b/src/Identity/src/Core/IUserValidator.cs → ...ity/Extensions/Core/src/IUserValidator.cs
diff --git a/src/Identity/src/Core/IdentityBuilder.cs → ...ty/Extensions/Core/src/IdentityBuilder.cs b/src/Identity/src/Core/IdentityBuilder.cs → ...ty/Extensions/Core/src/IdentityBuilder.cs
diff --git a/src/Identity/src/Core/IdentityError.cs → ...tity/Extensions/Core/src/IdentityError.cs b/src/Identity/src/Core/IdentityError.cs → ...tity/Extensions/Core/src/IdentityError.cs
diff --git a/...entity/src/Core/IdentityErrorDescriber.cs → ...nsions/Core/src/IdentityErrorDescriber.cs b/...entity/src/Core/IdentityErrorDescriber.cs → ...nsions/Core/src/IdentityErrorDescriber.cs
diff --git a/src/Identity/src/Core/IdentityOptions.cs → ...ty/Extensions/Core/src/IdentityOptions.cs b/src/Identity/src/Core/IdentityOptions.cs → ...ty/Extensions/Core/src/IdentityOptions.cs
diff --git a/src/Identity/src/Core/IdentityResult.cs → ...ity/Extensions/Core/src/IdentityResult.cs b/src/Identity/src/Core/IdentityResult.cs → ...ity/Extensions/Core/src/IdentityResult.cs
diff --git a/...re/IdentityServiceCollectionExtensions.cs → ...rc/IdentityServiceCollectionExtensions.cs b/...re/IdentityServiceCollectionExtensions.cs → ...rc/IdentityServiceCollectionExtensions.cs
diff --git a/src/Identity/src/Core/LockoutOptions.cs → ...ity/Extensions/Core/src/LockoutOptions.cs b/src/Identity/src/Core/LockoutOptions.cs → ...ity/Extensions/Core/src/LockoutOptions.cs