Skip to content

Commit a6b5bb1

Browse files
author
Nate McMaster
committed
Merge source code from aspnet/Identity
2 parents 7078102 + c645961 commit a6b5bb1

File tree

570 files changed

+115566
-7
lines changed

Some content is hidden

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

570 files changed

+115566
-7
lines changed

.gitmodules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
path = modules/EntityFrameworkCore
33
url = https://github.com/aspnet/EntityFrameworkCore.git
44
branch = release/2.1
5-
[submodule "modules/Identity"]
6-
path = modules/Identity
7-
url = https://github.com/aspnet/Identity.git
8-
branch = release/2.1
95
[submodule "modules/Scaffolding"]
106
path = modules/Scaffolding
117
url = https://github.com/aspnet/Scaffolding.git

build/buildorder.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<RepositoryBuildOrder Include="MetaPackages" Order="13" RootPath="$(RepositoryRoot)src\MetaPackages\" />
2323
<RepositoryBuildOrder Include="Mvc" Order="14" RootPath="$(RepositoryRoot)src\Mvc\" />
2424
<RepositoryBuildOrder Include="AADIntegration" Order="15" RootPath="$(RepositoryRoot)src\AADIntegration\" />
25-
<RepositoryBuildOrder Include="Identity" Order="15" />
25+
<RepositoryBuildOrder Include="Identity" Order="15" RootPath="$(RepositoryRoot)src\Identity\" />
2626
<RepositoryBuildOrder Include="JavaScriptServices" Order="15" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
2727
<RepositoryBuildOrder Include="MvcPrecompilation" Order="15" RootPath="$(RepositoryRoot)src\MvcPrecompilation\" />
2828
<RepositoryBuildOrder Include="Scaffolding" Order="15" />

build/submodules.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<ShippedRepository Include="CORS" RootPath="$(RepositoryRoot)src\CORS\" />
5555
<ShippedRepository Include="EntityFrameworkCore" />
5656
<ShippedRepository Include="HttpSysServer" RootPath="$(RepositoryRoot)src\HttpSysServer\" />
57-
<ShippedRepository Include="Identity" />
57+
<ShippedRepository Include="Identity" RootPath="$(RepositoryRoot)src\Identity\" />
5858
<ShippedRepository Include="JavaScriptServices" RootPath="$(RepositoryRoot)src\JavaScriptServices\" />
5959
<ShippedRepository Include="JsonPatch" />
6060
<ShippedRepository Include="Mvc" RootPath="$(RepositoryRoot)src\Mvc\" />

modules/Identity

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/Identity/.gitignore

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
[Oo]bj/
2+
[Bb]in/
3+
TestResults/
4+
.nuget/
5+
_ReSharper.*/
6+
packages/
7+
artifacts/
8+
PublishProfiles/
9+
*.user
10+
*.suo
11+
*.cache
12+
*.docstates
13+
_ReSharper.*
14+
nuget.exe
15+
*net45.csproj
16+
*net451.csproj
17+
*k10.csproj
18+
*.psess
19+
*.vsp
20+
*.pidb
21+
*.userprefs
22+
*DS_Store
23+
*.ncrunchsolution
24+
*.*sdf
25+
*.ipch
26+
*.sln.ide
27+
project.lock.json
28+
.vs
29+
.vscode
30+
.build/
31+
.testPublish/
32+
global.json

src/Identity/Directory.Build.props

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<Project>
2+
<Import
3+
Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
4+
Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />
5+
6+
<Import Project="version.props" />
7+
<Import Project="build\dependencies.props" />
8+
<Import Project="build\sources.props" />
9+
10+
<PropertyGroup>
11+
<Product>Microsoft ASP.NET Core</Product>
12+
<RepositoryUrl>https://github.com/aspnet/Identity</RepositoryUrl>
13+
<RepositoryType>git</RepositoryType>
14+
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
15+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
16+
<SignAssembly>true</SignAssembly>
17+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
18+
</PropertyGroup>
19+
20+
</Project>

src/Identity/Directory.Build.targets

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<PropertyGroup>
3+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
4+
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
5+
<NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
6+
</PropertyGroup>
7+
</Project>

src/Identity/Identity.sln

Lines changed: 482 additions & 0 deletions
Large diffs are not rendered by default.

src/Identity/IdentityCore.sln

Lines changed: 319 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"Default": {
3+
"rules": [
4+
"DefaultCompositeRule"
5+
],
6+
"packages": {
7+
"Microsoft.AspNetCore.Identity.UI": {
8+
"Exclusions": {
9+
"DOC_MISSING": {
10+
"lib/netstandard2.0/Microsoft.AspNetCore.Identity.UI.dll": "This is a library with packaged UI",
11+
"lib/netstandard2.0/Microsoft.AspNetCore.Identity.UI.Views.dll": "This assembly is generated and contains precompiled razor pages"
12+
}
13+
}
14+
}
15+
}
16+
}
17+
}

0 commit comments

Comments
 (0)