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

Merge remote-tracking branch 'origin/release/2.1' into rybrande/MergeRelease21IntoDev

This commit is contained in:
Ryan Brandenburg 2018-04-16 14:20:27 -07:00
parent a7105cabd1 195b378bcb
commit af6f10030c
1 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/Microsoft.AspNetCore.Cors/baseline.netcore.json
View File

@ -1,5 +1,5 @@
{ {
"AssemblyIdentity": "Microsoft.AspNetCore.Cors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "AssemblyIdentity": "Microsoft.AspNetCore.Cors, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [ "Types": [
{ {
"Name": "Microsoft.AspNetCore.Builder.CorsMiddlewareExtensions", "Name": "Microsoft.AspNetCore.Builder.CorsMiddlewareExtensions",
@ -423,6 +423,27 @@
"Visibility": "Public", "Visibility": "Public",
"GenericParameter": [] "GenericParameter": []
}, },
{
"Kind": "Method",
"Name": "get_IsOriginAllowed",
"Parameters": [],
"ReturnType": "System.Func<System.String, System.Boolean>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_IsOriginAllowed",
"Parameters": [
{
"Name": "value",
"Type": "System.Func<System.String, System.Boolean>"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{ {
"Kind": "Method", "Kind": "Method",
"Name": "get_ExposedHeaders", "Name": "get_ExposedHeaders",
@ -632,6 +653,27 @@
"Visibility": "Public", "Visibility": "Public",
"GenericParameter": [] "GenericParameter": []
}, },
{
"Kind": "Method",
"Name": "SetIsOriginAllowed",
"Parameters": [
{
"Name": "isOriginAllowed",
"Type": "System.Func<System.String, System.Boolean>"
}
],
"ReturnType": "Microsoft.AspNetCore.Cors.Infrastructure.CorsPolicyBuilder",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "SetIsOriginAllowedToAllowWildcardSubdomains",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Cors.Infrastructure.CorsPolicyBuilder",
"Visibility": "Public",
"GenericParameter": []
},
{ {
"Kind": "Method", "Kind": "Method",
"Name": "Build", "Name": "Build",
@ -921,6 +963,22 @@
], ],
"Visibility": "Public", "Visibility": "Public",
"GenericParameter": [] "GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "options",
"Type": "Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Cors.Infrastructure.CorsOptions>"
},
{
"Name": "loggerFactory",
"Type": "Microsoft.Extensions.Logging.ILoggerFactory"
}
],
"Visibility": "Public",
"GenericParameter": []
} }
], ],
"GenericParameters": [] "GenericParameters": []