huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1703 from aspnet/release/2.1 

Release/2.1
This commit is contained in:
Pranav K 2018-03-21 15:42:44 -07:00 committed by GitHub
parent a48b32fd08 aa49e6990c
commit 5ee278a569
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 13489 additions and 9588 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/dependencies.props
View File

@ -4,7 +4,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="Package Versions"> <PropertyGroup Label="Package Versions">
<AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion> <AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>
<InternalAspNetCoreSdkPackageVersion>2.1.0-preview2-15742</InternalAspNetCoreSdkPackageVersion> <InternalAspNetCoreSdkPackageVersion>2.1.0-preview2-15744</InternalAspNetCoreSdkPackageVersion>
<MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion> <MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreAuthenticationCookiesPackageVersion>
<MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion> <MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreAuthenticationFacebookPackageVersion>
<MicrosoftAspNetCoreAuthenticationGooglePackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreAuthenticationGooglePackageVersion> <MicrosoftAspNetCoreAuthenticationGooglePackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreAuthenticationGooglePackageVersion>
@ -21,9 +21,9 @@
<MicrosoftAspNetCoreHttpAbstractionsPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreHttpAbstractionsPackageVersion> <MicrosoftAspNetCoreHttpAbstractionsPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreHttpAbstractionsPackageVersion>
<MicrosoftAspNetCoreHttpPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreHttpPackageVersion> <MicrosoftAspNetCoreHttpPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreHttpPackageVersion>
<MicrosoftAspNetCoreHttpsPolicyPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreHttpsPolicyPackageVersion> <MicrosoftAspNetCoreHttpsPolicyPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreHttpsPolicyPackageVersion>
<MicrosoftAspNetCoreMvcPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreMvcPackageVersion> <MicrosoftAspNetCoreMvcPackageVersion>2.1.0-a-preview2-application-part-18617</MicrosoftAspNetCoreMvcPackageVersion>
<MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion> <MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreMvcRazorViewCompilationPackageVersion>
<MicrosoftAspNetCoreMvcTestingPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreMvcTestingPackageVersion> <MicrosoftAspNetCoreMvcTestingPackageVersion>2.1.0-a-preview2-application-part-18617</MicrosoftAspNetCoreMvcTestingPackageVersion>
<MicrosoftAspNetCoreRazorDesignPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreRazorDesignPackageVersion> <MicrosoftAspNetCoreRazorDesignPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreRazorDesignPackageVersion>
<MicrosoftAspNetCoreRewritePackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreRewritePackageVersion> <MicrosoftAspNetCoreRewritePackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreRewritePackageVersion>
<MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreServerIISIntegrationPackageVersion> <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.1.0-preview2-30355</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>

4
korebuild-lock.txt
View File

@ -1,2 +1,2 @@
version:2.1.0-preview2-15742 version:2.1.0-preview2-15744
commithash:21fbb0f2c3fe4a9216e2d59632b98cfd7d685962 commithash:9e15cb6062ab5b9790d3fa699e018543a6950713

888
src/AspNetCoreCompat/baseline.netframework.json
View File

@ -1,888 +0,0 @@
{
"AssemblyIdentity": "Microsoft.AspNet.Identity.AspNetCoreCompat, Version=0.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [
{
"Name": "Microsoft.AspNet.Identity.CoreCompat.IdentityDbContext<T0>",
"Visibility": "Public",
"Kind": "Class",
"BaseType": "Microsoft.AspNet.Identity.CoreCompat.IdentityDbContext<T0, Microsoft.AspNet.Identity.CoreCompat.IdentityRole, System.String, Microsoft.AspNet.Identity.CoreCompat.IdentityUserLogin, Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole, Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim, Microsoft.AspNet.Identity.CoreCompat.IdentityRoleClaim>",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "model",
"Type": "System.Data.Entity.Infrastructure.DbCompiledModel"
}
],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "nameOrConnectionString",
"Type": "System.String"
}
],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "nameOrConnectionString",
"Type": "System.String"
},
{
"Name": "model",
"Type": "System.Data.Entity.Infrastructure.DbCompiledModel"
}
],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "existingConnection",
"Type": "System.Data.Common.DbConnection"
},
{
"Name": "contextOwnsConnection",
"Type": "System.Boolean"
}
],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "existingConnection",
"Type": "System.Data.Common.DbConnection"
},
{
"Name": "model",
"Type": "System.Data.Entity.Infrastructure.DbCompiledModel"
},
{
"Name": "contextOwnsConnection",
"Type": "System.Boolean"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": [
{
"ParameterName": "TUser",
"ParameterPosition": 0,
"BaseTypeOrInterfaces": [
"Microsoft.AspNet.Identity.CoreCompat.IdentityUser"
]
}
]
},
{
"Name": "Microsoft.AspNet.Identity.CoreCompat.IdentityDbContext<T0, T1, T2, T3, T4, T5, T6>",
"Visibility": "Public",
"Kind": "Class",
"BaseType": "Microsoft.AspNet.Identity.EntityFramework.IdentityDbContext<T0, T1, T2, T3, T4, T5>",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "OnModelCreating",
"Parameters": [
{
"Name": "modelBuilder",
"Type": "System.Data.Entity.DbModelBuilder"
}
],
"ReturnType": "System.Void",
"Virtual": true,
"Override": true,
"Visibility": "Protected",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "ValidateEntity",
"Parameters": [
{
"Name": "entityEntry",
"Type": "System.Data.Entity.Infrastructure.DbEntityEntry"
},
{
"Name": "items",
"Type": "System.Collections.Generic.IDictionary<System.Object, System.Object>"
}
],
"ReturnType": "System.Data.Entity.Validation.DbEntityValidationResult",
"Virtual": true,
"Override": true,
"Visibility": "Protected",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_RoleClaims",
"Parameters": [],
"ReturnType": "System.Data.Entity.IDbSet<T6>",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_RoleClaims",
"Parameters": [
{
"Name": "value",
"Type": "System.Data.Entity.IDbSet<T6>"
}
],
"ReturnType": "System.Void",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "model",
"Type": "System.Data.Entity.Infrastructure.DbCompiledModel"
}
],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "nameOrConnectionString",
"Type": "System.String"
}
],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "nameOrConnectionString",
"Type": "System.String"
},
{
"Name": "model",
"Type": "System.Data.Entity.Infrastructure.DbCompiledModel"
}
],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "existingConnection",
"Type": "System.Data.Common.DbConnection"
},
{
"Name": "contextOwnsConnection",
"Type": "System.Boolean"
}
],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "existingConnection",
"Type": "System.Data.Common.DbConnection"
},
{
"Name": "model",
"Type": "System.Data.Entity.Infrastructure.DbCompiledModel"
},
{
"Name": "contextOwnsConnection",
"Type": "System.Boolean"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": [
{
"ParameterName": "TUser",
"ParameterPosition": 0,
"BaseTypeOrInterfaces": [
"Microsoft.AspNet.Identity.CoreCompat.IdentityUser<T2, T3, T4, T5>"
]
},
{
"ParameterName": "TRole",
"ParameterPosition": 1,
"BaseTypeOrInterfaces": [
"Microsoft.AspNet.Identity.CoreCompat.IdentityRole<T2, T4>"
]
},
{
"ParameterName": "TKey",
"ParameterPosition": 2,
"BaseTypeOrInterfaces": []
},
{
"ParameterName": "TUserLogin",
"ParameterPosition": 3,
"BaseTypeOrInterfaces": [
"Microsoft.AspNet.Identity.CoreCompat.IdentityUserLogin<T2>"
]
},
{
"ParameterName": "TUserRole",
"ParameterPosition": 4,
"BaseTypeOrInterfaces": [
"Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole<T2>"
]
},
{
"ParameterName": "TUserClaim",
"ParameterPosition": 5,
"BaseTypeOrInterfaces": [
"Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim<T2>"
]
},
{
"ParameterName": "TRoleClaim",
"ParameterPosition": 6,
"BaseTypeOrInterfaces": [
"Microsoft.AspNet.Identity.CoreCompat.IdentityRoleClaim<T2>"
]
}
]
},
{
"Name": "Microsoft.AspNet.Identity.CoreCompat.IdentityRole",
"Visibility": "Public",
"Kind": "Class",
"BaseType": "Microsoft.AspNet.Identity.CoreCompat.IdentityRole<System.String, Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole>",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "roleName",
"Type": "System.String"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNet.Identity.CoreCompat.IdentityRole<T0, T1>",
"Visibility": "Public",
"Kind": "Class",
"BaseType": "Microsoft.AspNet.Identity.EntityFramework.IdentityRole<T0, T1>",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_NormalizedName",
"Parameters": [],
"ReturnType": "System.String",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_NormalizedName",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_ConcurrencyStamp",
"Parameters": [],
"ReturnType": "System.String",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_ConcurrencyStamp",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Claims",
"Parameters": [],
"ReturnType": "System.Collections.Generic.ICollection<Microsoft.AspNet.Identity.CoreCompat.IdentityRoleClaim<T0>>",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": [
{
"ParameterName": "TKey",
"ParameterPosition": 0,
"BaseTypeOrInterfaces": []
},
{
"ParameterName": "TUserRole",
"ParameterPosition": 1,
"BaseTypeOrInterfaces": [
"Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole<T0>"
]
}
]
},
{
"Name": "Microsoft.AspNet.Identity.CoreCompat.IdentityRoleClaim",
"Visibility": "Public",
"Kind": "Class",
"BaseType": "Microsoft.AspNet.Identity.CoreCompat.IdentityRoleClaim<System.String>",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNet.Identity.CoreCompat.IdentityRoleClaim<T0>",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_Id",
"Parameters": [],
"ReturnType": "System.Int32",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_Id",
"Parameters": [
{
"Name": "value",
"Type": "System.Int32"
}
],
"ReturnType": "System.Void",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_RoleId",
"Parameters": [],
"ReturnType": "T0",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_RoleId",
"Parameters": [
{
"Name": "value",
"Type": "T0"
}
],
"ReturnType": "System.Void",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_ClaimType",
"Parameters": [],
"ReturnType": "System.String",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_ClaimType",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_ClaimValue",
"Parameters": [],
"ReturnType": "System.String",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_ClaimValue",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": [
{
"ParameterName": "TKey",
"ParameterPosition": 0,
"BaseTypeOrInterfaces": []
}
]
},
{
"Name": "Microsoft.AspNet.Identity.CoreCompat.IdentityUser",
"Visibility": "Public",
"Kind": "Class",
"BaseType": "Microsoft.AspNet.Identity.CoreCompat.IdentityUser<System.String, Microsoft.AspNet.Identity.CoreCompat.IdentityUserLogin, Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole, Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim>",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "userName",
"Type": "System.String"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNet.Identity.CoreCompat.IdentityUser<T0, T1, T2, T3>",
"Visibility": "Public",
"Kind": "Class",
"BaseType": "Microsoft.AspNet.Identity.EntityFramework.IdentityUser<T0, T1, T2, T3>",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_NormalizedUserName",
"Parameters": [],
"ReturnType": "System.String",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_NormalizedUserName",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_NormalizedEmail",
"Parameters": [],
"ReturnType": "System.String",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_NormalizedEmail",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_ConcurrencyStamp",
"Parameters": [],
"ReturnType": "System.String",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_ConcurrencyStamp",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": [
{
"ParameterName": "TKey",
"ParameterPosition": 0,
"BaseTypeOrInterfaces": []
},
{
"ParameterName": "TUserLogin",
"ParameterPosition": 1,
"BaseTypeOrInterfaces": [
"Microsoft.AspNet.Identity.CoreCompat.IdentityUserLogin<T0>"
]
},
{
"ParameterName": "TUserRole",
"ParameterPosition": 2,
"BaseTypeOrInterfaces": [
"Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole<T0>"
]
},
{
"ParameterName": "TUserClaim",
"ParameterPosition": 3,
"BaseTypeOrInterfaces": [
"Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim<T0>"
]
}
]
},
{
"Name": "Microsoft.AspNet.Identity.CoreCompat.IdentityUserLogin",
"Visibility": "Public",
"Kind": "Class",
"BaseType": "Microsoft.AspNet.Identity.CoreCompat.IdentityUserLogin<System.String>",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNet.Identity.CoreCompat.IdentityUserLogin<T0>",
"Visibility": "Public",
"Kind": "Class",
"BaseType": "Microsoft.AspNet.Identity.EntityFramework.IdentityUserLogin<T0>",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_ProviderDisplayName",
"Parameters": [],
"ReturnType": "System.String",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_ProviderDisplayName",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Virtual": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": [
{
"ParameterName": "TKey",
"ParameterPosition": 0,
"BaseTypeOrInterfaces": []
}
]
},
{
"Name": "Microsoft.AspNet.Identity.CoreCompat.UserStore<T0>",
"Visibility": "Public",
"Kind": "Class",
"BaseType": "Microsoft.AspNet.Identity.CoreCompat.UserStore<T0, Microsoft.AspNet.Identity.CoreCompat.IdentityRole, System.String, Microsoft.AspNet.Identity.CoreCompat.IdentityUserLogin, Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole, Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim>",
"ImplementedInterfaces": [
"Microsoft.AspNet.Identity.IUserStore<T0>"
],
"Members": [
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "context",
"Type": "System.Data.Entity.DbContext"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": [
{
"ParameterName": "TUser",
"ParameterPosition": 0,
"BaseTypeOrInterfaces": [
"Microsoft.AspNet.Identity.CoreCompat.IdentityUser"
]
}
]
},
{
"Name": "Microsoft.AspNet.Identity.CoreCompat.UserStore<T0, T1, T2, T3, T4, T5>",
"Visibility": "Public",
"Kind": "Class",
"BaseType": "Microsoft.AspNet.Identity.EntityFramework.UserStore<T0, T1, T2, T3, T4, T5>",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "context",
"Type": "System.Data.Entity.DbContext"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": [
{
"ParameterName": "TUser",
"ParameterPosition": 0,
"BaseTypeOrInterfaces": [
"Microsoft.AspNet.Identity.CoreCompat.IdentityUser<T2, T3, T4, T5>"
]
},
{
"ParameterName": "TRole",
"ParameterPosition": 1,
"BaseTypeOrInterfaces": [
"Microsoft.AspNet.Identity.CoreCompat.IdentityRole<T2, T4>"
]
},
{
"ParameterName": "TKey",
"ParameterPosition": 2,
"BaseTypeOrInterfaces": [
"System.IEquatable<T2>"
]
},
{
"ParameterName": "TUserLogin",
"ParameterPosition": 3,
"New": true,
"BaseTypeOrInterfaces": [
"Microsoft.AspNet.Identity.CoreCompat.IdentityUserLogin<T2>"
]
},
{
"ParameterName": "TUserRole",
"ParameterPosition": 4,
"New": true,
"BaseTypeOrInterfaces": [
"Microsoft.AspNet.Identity.EntityFramework.IdentityUserRole<T2>"
]
},
{
"ParameterName": "TUserClaim",
"ParameterPosition": 5,
"New": true,
"BaseTypeOrInterfaces": [
"Microsoft.AspNet.Identity.EntityFramework.IdentityUserClaim<T2>"
]
}
]
},
{
"Name": "Owin.CookieInterop",
"Visibility": "Public",
"Kind": "Class",
"Abstract": true,
"Static": true,
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "CreateSharedDataFormat",
"Parameters": [
{
"Name": "keyDirectory",
"Type": "System.IO.DirectoryInfo"
},
{
"Name": "authenticationType",
"Type": "System.String"
}
],
"ReturnType": "Microsoft.Owin.Security.ISecureDataFormat<Microsoft.Owin.Security.AuthenticationTicket>",
"Static": true,
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
}
],
"SourceFilters": []
}

6863
src/Core/baseline.netcore.json Normal file
View File

File diff suppressed because it is too large Load Diff

3517
src/EF/baseline.netcore.json
View File

File diff suppressed because it is too large Load Diff

103
src/EF/breakingchanges.netcore.json
View File

@ -1,103 +0,0 @@
[
{
"TypeId": "public class Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUser, Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole, System.String>",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<T0, T1, T2> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<T0, T1, T2, Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim<T2>, Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole<T2>, Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin<T2>, Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim<T2>, Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserToken<T2>> where T0 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUser<T2> where T1 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole<T2> where T2 : System.IEquatable<T2>",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<T0> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<T0, Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole, System.String> where T0 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUser",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole<System.String>",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole<T0, T1, T2> where T0 : System.IEquatable<T0> where T1 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole<T0> where T2 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim<T0>",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole<T0> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole<T0, Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole<T0>, Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim<T0>> where T0 : System.IEquatable<T0>",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim<T0> where T0 : System.IEquatable<T0>",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUser : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUser<System.String>",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim<T0> where T0 : System.IEquatable<T0>",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin<T0> where T0 : System.IEquatable<T0>",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole<T0> where T0 : System.IEquatable<T0>",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserToken<T0> where T0 : System.IEquatable<T0>",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Identity.EntityFrameworkCore.RoleStore<T0, T1, T2> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.RoleStore<T0, T1, T2, Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole<T2>, Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim<T2>> where T0 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole<T2> where T1 : Microsoft.EntityFrameworkCore.DbContext where T2 : System.IEquatable<T2>",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Identity.EntityFrameworkCore.RoleStore<T0, T1> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.RoleStore<T0, T1, System.String> where T0 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole<System.String> where T1 : Microsoft.EntityFrameworkCore.DbContext",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Identity.EntityFrameworkCore.RoleStore<T0> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.RoleStore<T0, Microsoft.EntityFrameworkCore.DbContext, System.String> where T0 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole<System.String>",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUser<System.String>>",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<T0, T1, T2> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<T0, T1, T2, System.String> where T0 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUser<System.String> where T1 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole<System.String> where T2 : Microsoft.EntityFrameworkCore.DbContext",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<T0> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<T0, Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole, Microsoft.EntityFrameworkCore.DbContext, System.String> where T0 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUser<System.String>, new()",
"Kind": "Removal"
},
{
"TypeId": "public abstract class Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityDbContext<T0, T1, T2, T3, T4, T5, T6, T7> : Microsoft.EntityFrameworkCore.DbContext where T0 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUser<T2, T3, T4, T5> where T1 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole<T2, T4, T6> where T2 : System.IEquatable<T2> where T3 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim<T2> where T4 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole<T2> where T5 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin<T2> where T6 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim<T2> where T7 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserToken<T2>",
"Kind": "Removal"
},
{
"TypeId": "public abstract class Microsoft.AspNetCore.Identity.EntityFrameworkCore.RoleStore<T0, T1, T2, T3, T4> : Microsoft.AspNetCore.Identity.IQueryableRoleStore<T0>, Microsoft.AspNetCore.Identity.IRoleClaimStore<T0> where T0 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole<T2, T3, T4> where T1 : Microsoft.EntityFrameworkCore.DbContext where T2 : System.IEquatable<T2> where T3 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole<T2> where T4 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim<T2>",
"Kind": "Removal"
},
{
"TypeId": "public abstract class Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<T0, T1, T2, T3, T4, T5, T6, T7> : Microsoft.AspNetCore.Identity.IUserLoginStore<T0>, Microsoft.AspNetCore.Identity.IUserRoleStore<T0>, Microsoft.AspNetCore.Identity.IUserClaimStore<T0>, Microsoft.AspNetCore.Identity.IUserPasswordStore<T0>, Microsoft.AspNetCore.Identity.IUserSecurityStampStore<T0>, Microsoft.AspNetCore.Identity.IUserEmailStore<T0>, Microsoft.AspNetCore.Identity.IUserLockoutStore<T0>, Microsoft.AspNetCore.Identity.IUserPhoneNumberStore<T0>, Microsoft.AspNetCore.Identity.IQueryableUserStore<T0>, Microsoft.AspNetCore.Identity.IUserTwoFactorStore<T0>, Microsoft.AspNetCore.Identity.IUserAuthenticationTokenStore<T0> where T0 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUser<T3, T4, T5, T6> where T1 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole<T3, T5, Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRoleClaim<T3>> where T2 : Microsoft.EntityFrameworkCore.DbContext where T3 : System.IEquatable<T3> where T4 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim<T3> where T5 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole<T3> where T6 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin<T3> where T7 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserToken<T3>",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUser<T0, T1, T2, T3> where T0 : System.IEquatable<T0>",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUser<T0> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUser<T0, Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim<T0>, Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole<T0>, Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin<T0>> where T0 : System.IEquatable<T0>",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<T0, T1, T2, T3> : Microsoft.AspNetCore.Identity.EntityFrameworkCore.UserStore<T0, T1, T2, T3, Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserClaim<T3>, Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserRole<T3>, Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserLogin<T3>, Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUserToken<T3>> where T0 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityUser<T3> where T1 : Microsoft.AspNetCore.Identity.EntityFrameworkCore.IdentityRole<T3> where T2 : Microsoft.EntityFrameworkCore.DbContext where T3 : System.IEquatable<T3>",
"Kind": "Removal"
},
{
"TypeId": "public static class Microsoft.Extensions.DependencyInjection.IdentityEntityFrameworkBuilderExtensions",
"MemberId": "public static new Microsoft.AspNetCore.Identity.IdentityBuilder AddEntityFrameworkStores<T0, T1>(this Microsoft.AspNetCore.Identity.IdentityBuilder builder) where T0 : Microsoft.EntityFrameworkCore.DbContext where T1 : System.IEquatable<T1>",
"Kind": "Removal"
}
]

6719
src/Identity/baseline.netcore.json
View File

File diff suppressed because it is too large Load Diff

1527
src/Specification.Tests/baseline.netcore.json Normal file
View File

File diff suppressed because it is too large Load Diff

3380
src/Stores/baseline.netcore.json Normal file
View File

File diff suppressed because it is too large Load Diff

59
src/UI/IdentityBuilderUIExtensions.cs
View File

@ -1,10 +1,6 @@
// 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. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.IO;
using System.Linq;
using System.Reflection;
using Microsoft.AspNetCore.Identity.UI; using Microsoft.AspNetCore.Identity.UI;
using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.AspNetCore.Identity.UI.Services;
using Microsoft.AspNetCore.Mvc.ApplicationParts; using Microsoft.AspNetCore.Mvc.ApplicationParts;
@ -32,7 +28,7 @@ namespace Microsoft.AspNetCore.Identity
public static IdentityBuilder AddDefaultUI(this IdentityBuilder builder) public static IdentityBuilder AddDefaultUI(this IdentityBuilder builder)
{ {
builder.AddSignInManager(); builder.AddSignInManager();
AddAdditionalApplicationParts(builder); AddRelatedParts(builder);
builder.Services.ConfigureOptions( builder.Services.ConfigureOptions(
typeof(IdentityDefaultUIConfigureOptions<>) typeof(IdentityDefaultUIConfigureOptions<>)
@ -42,7 +38,7 @@ namespace Microsoft.AspNetCore.Identity
return builder; return builder;
} }
private static void AddAdditionalApplicationParts(IdentityBuilder builder) private static void AddRelatedParts(IdentityBuilder builder)
{ {
// For preview1, we don't have a good mechanism to plug in additional parts. // For preview1, we don't have a good mechanism to plug in additional parts.
// We need to provide API surface to allow libraries to plug in existing parts // We need to provide API surface to allow libraries to plug in existing parts
@ -51,56 +47,19 @@ namespace Microsoft.AspNetCore.Identity
// * Discovery of the parts. // * Discovery of the parts.
// * Ordering of the parts. // * Ordering of the parts.
// * Loading of the assembly in memory. // * Loading of the assembly in memory.
var thisAssembly = typeof(IdentityBuilderUIExtensions).Assembly;
var additionalReferences = thisAssembly
.GetCustomAttributes<AssemblyMetadataAttribute>()
.Where(am => string.Equals(am.Key, "Microsoft.AspNetCore.Mvc.AdditionalReference"))
.Select(am => am.Value.Split(',')[0])
.ToArray();
var mvcBuilder = builder.Services var mvcBuilder = builder.Services
.AddMvc() .AddMvc()
.ConfigureApplicationPartManager(apm => .ConfigureApplicationPartManager(partManager =>
{ {
foreach (var reference in additionalReferences) var thisAssembly = typeof(IdentityBuilderUIExtensions).Assembly;
var relatedAssemblies = RelatedAssemblyAttribute.GetRelatedAssemblies(thisAssembly, throwOnError: true);
foreach (var assembly in relatedAssemblies)
{ {
var fileName = Path.GetFileName(reference); partManager.ApplicationParts.Add(new CompiledRazorAssemblyPart(assembly));
var filePath = Path.Combine(Path.GetDirectoryName(thisAssembly.Location), fileName);
var additionalAssembly = LoadAssembly(filePath);
// This needs to change to additional assembly part.
var additionalPart = new AssemblyPart(additionalAssembly);
if (!apm.ApplicationParts.Any(ap => HasSameName(ap.Name, additionalPart.Name)))
{
apm.ApplicationParts.Add(additionalPart);
}
} }
}); });
bool HasSameName(string left, string right) => string.Equals(left, right, StringComparison.Ordinal);
}
private static Assembly LoadAssembly(string filePath)
{
Assembly viewsAssembly = null;
if (File.Exists(filePath))
{
try
{
viewsAssembly = Assembly.LoadFile(filePath);
}
catch (FileLoadException)
{
throw new InvalidOperationException("Unable to load the precompiled views assembly in " +
$"'{filePath}'.");
}
}
else
{
throw new InvalidOperationException("Could not find the precompiled views assembly for 'Microsoft.AspNetCore.Identity.UI' at " +
$"'{filePath}'.");
}
return viewsAssembly;
} }
} }
} }

11
src/UI/Microsoft.AspNetCore.Identity.UI.csproj
View File

@ -2,15 +2,13 @@
<PropertyGroup> <PropertyGroup>
<Description>ASP.NET Core Identity UI is the default Razor Pages built-in UI for the ASP.NET Core Identity framework.</Description> <Description>ASP.NET Core Identity UI is the default Razor Pages built-in UI for the ASP.NET Core Identity framework.</Description>
<PrecompiledDescription>Precompiled views assembly for the ASP.NET Core Identity UI package.</PrecompiledDescription> <ViewAssemblyDescription>Compiled Razor views assembly for the ASP.NET Core Identity UI package.</ViewAssemblyDescription>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<GenerateDocumentationFile>false</GenerateDocumentationFile> <GenerateDocumentationFile>false</GenerateDocumentationFile>
<PackageTags>aspnetcore;identity;membership;razorpages</PackageTags> <PackageTags>aspnetcore;identity;membership;razorpages</PackageTags>
<EnableApiCheck>false</EnableApiCheck> <EnableApiCheck>false</EnableApiCheck>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest> <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
<RazorCompileOnBuild>true</RazorCompileOnBuild> <EnableDefaultCompiledViewAssemblyLoadBehavior>false</EnableDefaultCompiledViewAssemblyLoadBehavior>
<PrecompiledAssemblyTitle Condition=" '$(PrecompiledAssemblyTitle)' == '' ">$(RazorTargetName).dll</PrecompiledAssemblyTitle>
<PreserveCompilationContext>false</PreserveCompilationContext>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -39,7 +37,7 @@
</AssemblyAttribute> </AssemblyAttribute>
<RazorAssemblyAttribute Include="System.Reflection.AssemblyDescriptionAttribute"> <RazorAssemblyAttribute Include="System.Reflection.AssemblyDescriptionAttribute">
<_Parameter1>$(PrecompiledDescription)</_Parameter1> <_Parameter1>$(ViewAssemblyDescription)</_Parameter1>
</RazorAssemblyAttribute> </RazorAssemblyAttribute>
<RazorAssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(BuildNumber)' != ''"> <RazorAssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(BuildNumber)' != ''">
<_Parameter1>BuildNumber</_Parameter1> <_Parameter1>BuildNumber</_Parameter1>
@ -60,8 +58,7 @@
<ExpectedOutputFile>$(OutputPath)$(RazorTargetName).dll</ExpectedOutputFile> <ExpectedOutputFile>$(OutputPath)$(RazorTargetName).dll</ExpectedOutputFile>
</PropertyGroup> </PropertyGroup>
<Error Text="Unable to find precompiled view file $(ExpectedOutputFile)" <Error Text="Unable to find precompiled view file $(ExpectedOutputFile)" Condition="!Exists('$(ExpectedOutputFile)')" />
Condition="!Exists('$(ExpectedOutputFile)')" />
</Target> </Target>
</Project> </Project>