Skip to content

Commit edcee85

Browse files
JunTaoLuoJunTaoLuo
authored
Convert Identity to Reference (#6086)
* Convert Identity to Reference * Remove Microsoft.AspNet.Identity.AspNetCoreCompat
1 parent 167695f commit edcee85

File tree

584 files changed

+1507
-2622
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

584 files changed

+1507
-2622
lines changed

‎build/artifacts.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<PackageArtifact Include="dotnet-sql-cache" Category="ship" />
2323
<PackageArtifact Include="dotnet-user-secrets" Category="ship" />
2424
<PackageArtifact Include="dotnet-watch" Category="ship" />
25-
<PackageArtifact Include="Microsoft.AspNet.Identity.AspNetCoreCompat" Category="noship" />
2625
<PackageArtifact Include="Microsoft.AspNetCore.All" Category="ship" />
2726
<PackageArtifact Include="Microsoft.AspNetCore.Antiforgery" AllMetapackage="true" AppMetapackage="true" Category="ship" />
2827
<PackageArtifact Include="Microsoft.AspNetCore.App" Category="ship" />

‎build/buildorder.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
<ItemGroup>
1010
<RepositoryBuildOrder Include="EntityFrameworkCore" Order="8" />
11-
<RepositoryBuildOrder Include="Identity" Order="15" RootPath="$(RepositoryRoot)src\Identity\" />
1211
<RepositoryBuildOrder Include="MvcPrecompilation" Order="15" RootPath="$(RepositoryRoot)src\MvcPrecompilation\" />
1312
<RepositoryBuildOrder Include="Scaffolding" Order="15" />
1413
<RepositoryBuildOrder Include="AzureIntegration" Order="15" RootPath="$(RepositoryRoot)src\AzureIntegration\" />

‎build/dependencies.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@
9393
<MicrosoftAspNetCoreHostingWebHostBuilderFactorySourcesPackageVersion>2.1.1</MicrosoftAspNetCoreHostingWebHostBuilderFactorySourcesPackageVersion>
9494
<MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>0.5.1</MicrosoftAspNetCoreServerIntegrationTestingPackageVersion>
9595
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>2.1.4</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
96+
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>2.1.4</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
9697
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.1.4</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
98+
<MicrosoftEntityFrameworkCoreToolsPackageVersion>2.1.4</MicrosoftEntityFrameworkCoreToolsPackageVersion>
9799

98100
<!-- External and partner dependencies -->
99101
<AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>

‎build/repo.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@
6666
"
6767
Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
6868

69+
70+
<!-- Exclude the WPF samples for now because they use classic .csproj, which is not yet supported in our build. -->
71+
<ProjectToExclude Include="$(RepositoryRoot)src\Identity\Identity\samples\NativeWPFClient\NativeWPFClient.csproj;" />
72+
6973
<!-- Exclude the websockets samples for now because they use classic .csproj, which is not yet supported in our build. -->
7074
<ProjectToExclude Include="
7175
$(RepositoryRoot)src\Middleware\WebSockets\samples\**\*.csproj;
@@ -83,6 +87,7 @@
8387
$(RepositoryRoot)src\Hosting\**\*.*proj;
8488
$(RepositoryRoot)src\Http\**\*.*proj;
8589
$(RepositoryRoot)src\Html\**\*.*proj;
90+
$(RepositoryRoot)src\Identity\**\*.*proj;
8691
$(RepositoryRoot)src\Servers\**\*.csproj;
8792
$(RepositoryRoot)src\Servers\**\*.pkgproj;
8893
$(RepositoryRoot)src\Security\**\*.*proj;

‎build/submodules.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
<ItemGroup>
4848
<ShippedRepository Include="AzureIntegration" RootPath="$(RepositoryRoot)src\AzureIntegration\" />
4949
<ShippedRepository Include="EntityFrameworkCore" />
50-
<ShippedRepository Include="Identity" RootPath="$(RepositoryRoot)src\Identity\" />
5150
<ShippedRepository Include="JsonPatch" />
5251
<ShippedRepository Include="MvcPrecompilation" RootPath="$(RepositoryRoot)src\MvcPrecompilation\"/>
5352
<ShippedRepository Include="SignalR" RootPath="$(RepositoryRoot)src\SignalR\" />

‎eng/Baseline.Designer.props

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,47 @@
422422
<BaselinePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[2.1.1, )" />
423423
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
424424
</ItemGroup>
425+
<!-- Package: Microsoft.AspNetCore.Identity-->
426+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity' ">
427+
<BaselinePackageVersion>2.1.6</BaselinePackageVersion>
428+
</PropertyGroup>
429+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity' AND '$(TargetFramework)' == 'netstandard2.0' ">
430+
<BaselinePackageReference Include="Microsoft.Extensions.Identity.Core" Version="[2.1.6, )" />
431+
<BaselinePackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="[2.1.1, )" />
432+
<BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="[2.1.1, )" />
433+
<BaselinePackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.1, )" />
434+
</ItemGroup>
435+
<!-- Package: Microsoft.AspNetCore.Identity.EntityFrameworkCore-->
436+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.EntityFrameworkCore' ">
437+
<BaselinePackageVersion>2.1.6</BaselinePackageVersion>
438+
</PropertyGroup>
439+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.EntityFrameworkCore' AND '$(TargetFramework)' == 'netstandard2.0' ">
440+
<BaselinePackageReference Include="Microsoft.AspNetCore.Identity" Version="[2.1.6, )" />
441+
<BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[2.1.6, )" />
442+
<BaselinePackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[2.1.1, )" />
443+
</ItemGroup>
444+
<!-- Package: Microsoft.AspNetCore.Identity.Specification.Tests-->
445+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.Specification.Tests' ">
446+
<BaselinePackageVersion>2.1.6</BaselinePackageVersion>
447+
</PropertyGroup>
448+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.Specification.Tests' AND '$(TargetFramework)' == 'netstandard2.0' ">
449+
<BaselinePackageReference Include="Microsoft.AspNetCore.Identity" Version="[2.1.6, )" />
450+
<BaselinePackageReference Include="Microsoft.Extensions.Configuration" Version="[2.1.1, )" />
451+
<BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[2.1.1, )" />
452+
<BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[2.1.1, )" />
453+
<BaselinePackageReference Include="xunit" Version="[2.3.1, )" />
454+
</ItemGroup>
455+
<!-- Package: Microsoft.AspNetCore.Identity.UI-->
456+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.UI' ">
457+
<BaselinePackageVersion>2.1.6</BaselinePackageVersion>
458+
</PropertyGroup>
459+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.UI' AND '$(TargetFramework)' == 'netstandard2.0' ">
460+
<BaselinePackageReference Include="Microsoft.AspNetCore.Identity" Version="[2.1.6, )" />
461+
<BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[2.1.6, )" />
462+
<BaselinePackageReference Include="Microsoft.AspNetCore.Mvc" Version="[2.1.1, )" />
463+
<BaselinePackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="[2.1.1, )" />
464+
<BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="[2.1.1, )" />
465+
</ItemGroup>
425466
<!-- Package: Microsoft.AspNetCore.JsonPatch-->
426467
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.JsonPatch' ">
427468
<BaselinePackageVersion>2.1.1</BaselinePackageVersion>
@@ -927,6 +968,25 @@
927968
<BaselinePackageReference Include="Microsoft.Net.Http.Headers" Version="[2.1.1, )" />
928969
<BaselinePackageReference Include="System.Text.Encodings.Web" Version="[4.5.0, )" />
929970
</ItemGroup>
971+
<!-- Package: Microsoft.Extensions.Identity.Core-->
972+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Core' ">
973+
<BaselinePackageVersion>2.1.6</BaselinePackageVersion>
974+
</PropertyGroup>
975+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Core' AND '$(TargetFramework)' == 'netstandard2.0' ">
976+
<BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="[2.1.1, )" />
977+
<BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[2.1.1, )" />
978+
<BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[2.1.1, )" />
979+
<BaselinePackageReference Include="System.ComponentModel.Annotations" Version="[4.5.0, )" />
980+
</ItemGroup>
981+
<!-- Package: Microsoft.Extensions.Identity.Stores-->
982+
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Stores' ">
983+
<BaselinePackageVersion>2.1.6</BaselinePackageVersion>
984+
</PropertyGroup>
985+
<ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Stores' AND '$(TargetFramework)' == 'netstandard2.0' ">
986+
<BaselinePackageReference Include="Microsoft.Extensions.Identity.Core" Version="[2.1.6, )" />
987+
<BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[2.1.1, )" />
988+
<BaselinePackageReference Include="System.ComponentModel.Annotations" Version="[4.5.0, )" />
989+
</ItemGroup>
930990
<!-- Package: Microsoft.AspNetCore-->
931991
<PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore' ">
932992
<BaselinePackageVersion>2.1.6</BaselinePackageVersion>

‎eng/Baseline.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
5353
<Package Id="Microsoft.AspNetCore.Http" Version="2.1.1" />
5454
<Package Id="Microsoft.AspNetCore.HttpOverrides" Version="2.1.1" />
5555
<Package Id="Microsoft.AspNetCore.HttpsPolicy" Version="2.1.1" />
56+
<Package Id="Microsoft.AspNetCore.Identity" Version="2.1.6" />
57+
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.1.6" />
58+
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="2.1.6" />
59+
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="2.1.6" />
5660
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="2.1.1" />
5761
<Package Id="Microsoft.AspNetCore.Localization.Routing" Version="2.1.1" />
5862
<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.
101105
<Package Id="Microsoft.AspNetCore.TestHost" Version="2.1.1" />
102106
<Package Id="Microsoft.AspNetCore.WebSockets" Version="2.1.1" />
103107
<Package Id="Microsoft.AspNetCore.WebUtilities" Version="2.1.1" />
108+
<Package Id="Microsoft.Extensions.Identity.Core" Version="2.1.6" />
109+
<Package Id="Microsoft.Extensions.Identity.Stores" Version="2.1.6" />
104110
<Package Id="Microsoft.AspNetCore" Version="2.1.6" />
105111
<Package Id="Microsoft.CodeAnalysis.Razor" Version="2.1.2" />
106112
<Package Id="Microsoft.Net.Http.Headers" Version="2.1.1" />

‎eng/Dependencies.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,17 @@ and are generated based on the last package release.
3333
<LatestPackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
3434
<LatestPackageReference Include="Microsoft.CSharp" Version="$(MicrosoftCSharpPackageVersion)" />
3535
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(MicrosoftEntityFrameworkCoreInMemoryPackageVersion)" />
36+
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(MicrosoftEntityFrameworkCoreSqlitePackageVersion)" />
3637
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
38+
<LatestPackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(MicrosoftEntityFrameworkCoreToolsPackageVersion)" />
3739
<LatestPackageReference Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="$(MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion)" />
3840
<LatestPackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryPackageVersion)" />
3941
<LatestPackageReference Include="Microsoft.Extensions.Caching.Redis" Version="$(MicrosoftExtensionsCachingRedisPackageVersion)" />
4042
<LatestPackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="$(MicrosoftExtensionsCachingSqlServerPackageVersion)" />
4143
<LatestPackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
4244
<LatestPackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
4345
<LatestPackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
46+
<LatestPackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
4447
<LatestPackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
4548
<LatestPackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
4649
<LatestPackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />

‎eng/ProjectReferences.props

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@
3535
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Routing" ProjectPath="$(RepositoryRoot)src\Http\Routing\src\Microsoft.AspNetCore.Routing.csproj" />
3636
<ProjectReferenceProvider Include="Microsoft.AspNetCore.WebUtilities" ProjectPath="$(RepositoryRoot)src\Http\WebUtilities\src\Microsoft.AspNetCore.WebUtilities.csproj" />
3737
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Html.Abstractions" ProjectPath="$(RepositoryRoot)src\Html\Abstractions\src\Microsoft.AspNetCore.Html.Abstractions.csproj" />
38+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" ProjectPath="$(RepositoryRoot)src\Identity\EF\src\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
39+
<ProjectReferenceProvider Include="Microsoft.Extensions.Identity.Core" ProjectPath="$(RepositoryRoot)src\Identity\Extensions\Core\src\Microsoft.Extensions.Identity.Core.csproj" />
40+
<ProjectReferenceProvider Include="Microsoft.Extensions.Identity.Stores" ProjectPath="$(RepositoryRoot)src\Identity\Extensions\Stores\src\Microsoft.Extensions.Identity.Stores.csproj" />
41+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Identity" ProjectPath="$(RepositoryRoot)src\Identity\Identity\Core\src\Microsoft.AspNetCore.Identity.csproj" />
42+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Identity.Specification.Tests" ProjectPath="$(RepositoryRoot)src\Identity\Identity\Specification.Tests\src\Microsoft.AspNetCore.Identity.Specification.Tests.csproj" />
43+
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Identity.UI" ProjectPath="$(RepositoryRoot)src\Identity\Identity\UI\src\Microsoft.AspNetCore.Identity.UI.csproj" />
3844
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Connections.Abstractions" ProjectPath="$(RepositoryRoot)src\Servers\Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj" />
3945
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.HttpSys" ProjectPath="$(RepositoryRoot)src\Servers\HttpSys\src\Microsoft.AspNetCore.Server.HttpSys.csproj" />
4046
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Server.IISIntegration" ProjectPath="$(RepositoryRoot)src\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj" />

‎src/Identity/.gitignore

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)