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

Merge branch 'release/2.1' into dev 

# Conflicts:
#	build/dependencies.props
#	korebuild-lock.txt
This commit is contained in:
Chris Ross (ASP.NET) 2018-03-23 09:16:55 -07:00
parent e5cffe685b f91db5b794
commit 3d9a19d865
7 changed files with 7 additions and 2596 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

456
src/Microsoft.AspNetCore.Http.Abstractions/baseline.netcore.json
View File

@ -1,5 +1,5 @@
{ {
"AssemblyIdentity": "Microsoft.AspNetCore.Http.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "AssemblyIdentity": "Microsoft.AspNetCore.Http.Abstractions, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [ "Types": [
{ {
"Name": "Microsoft.AspNetCore.Builder.MapExtensions", "Name": "Microsoft.AspNetCore.Builder.MapExtensions",
@ -4355,392 +4355,6 @@
], ],
"GenericParameters": [] "GenericParameters": []
}, },
{
"Name": "Microsoft.AspNetCore.Http.Internal.HeaderSegment",
"Visibility": "Public",
"Kind": "Struct",
"Sealed": true,
"ImplementedInterfaces": [
"System.IEquatable<Microsoft.AspNetCore.Http.Internal.HeaderSegment>"
],
"Members": [
{
"Kind": "Method",
"Name": "get_Formatting",
"Parameters": [],
"ReturnType": "Microsoft.Extensions.Primitives.StringSegment",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Data",
"Parameters": [],
"ReturnType": "Microsoft.Extensions.Primitives.StringSegment",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "Equals",
"Parameters": [
{
"Name": "other",
"Type": "Microsoft.AspNetCore.Http.Internal.HeaderSegment"
}
],
"ReturnType": "System.Boolean",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Http.Internal.HeaderSegment>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "Equals",
"Parameters": [
{
"Name": "obj",
"Type": "System.Object"
}
],
"ReturnType": "System.Boolean",
"Virtual": true,
"Override": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "GetHashCode",
"Parameters": [],
"ReturnType": "System.Int32",
"Virtual": true,
"Override": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "op_Equality",
"Parameters": [
{
"Name": "left",
"Type": "Microsoft.AspNetCore.Http.Internal.HeaderSegment"
},
{
"Name": "right",
"Type": "Microsoft.AspNetCore.Http.Internal.HeaderSegment"
}
],
"ReturnType": "System.Boolean",
"Static": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "op_Inequality",
"Parameters": [
{
"Name": "left",
"Type": "Microsoft.AspNetCore.Http.Internal.HeaderSegment"
},
{
"Name": "right",
"Type": "Microsoft.AspNetCore.Http.Internal.HeaderSegment"
}
],
"ReturnType": "System.Boolean",
"Static": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "formatting",
"Type": "Microsoft.Extensions.Primitives.StringSegment"
},
{
"Name": "data",
"Type": "Microsoft.Extensions.Primitives.StringSegment"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Http.Internal.HeaderSegmentCollection",
"Visibility": "Public",
"Kind": "Struct",
"Sealed": true,
"ImplementedInterfaces": [
"System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Http.Internal.HeaderSegment>",
"System.IEquatable<Microsoft.AspNetCore.Http.Internal.HeaderSegmentCollection>"
],
"Members": [
{
"Kind": "Method",
"Name": "Equals",
"Parameters": [
{
"Name": "other",
"Type": "Microsoft.AspNetCore.Http.Internal.HeaderSegmentCollection"
}
],
"ReturnType": "System.Boolean",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.IEquatable<Microsoft.AspNetCore.Http.Internal.HeaderSegmentCollection>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "Equals",
"Parameters": [
{
"Name": "obj",
"Type": "System.Object"
}
],
"ReturnType": "System.Boolean",
"Virtual": true,
"Override": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "GetHashCode",
"Parameters": [],
"ReturnType": "System.Int32",
"Virtual": true,
"Override": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "op_Equality",
"Parameters": [
{
"Name": "left",
"Type": "Microsoft.AspNetCore.Http.Internal.HeaderSegmentCollection"
},
{
"Name": "right",
"Type": "Microsoft.AspNetCore.Http.Internal.HeaderSegmentCollection"
}
],
"ReturnType": "System.Boolean",
"Static": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "op_Inequality",
"Parameters": [
{
"Name": "left",
"Type": "Microsoft.AspNetCore.Http.Internal.HeaderSegmentCollection"
},
{
"Name": "right",
"Type": "Microsoft.AspNetCore.Http.Internal.HeaderSegmentCollection"
}
],
"ReturnType": "System.Boolean",
"Static": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "GetEnumerator",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Http.Internal.HeaderSegmentCollection+Enumerator",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "headers",
"Type": "Microsoft.Extensions.Primitives.StringValues"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Http.Internal.ParsingHelpers",
"Visibility": "Public",
"Kind": "Class",
"Abstract": true,
"Static": true,
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "GetHeader",
"Parameters": [
{
"Name": "headers",
"Type": "Microsoft.AspNetCore.Http.IHeaderDictionary"
},
{
"Name": "key",
"Type": "System.String"
}
],
"ReturnType": "Microsoft.Extensions.Primitives.StringValues",
"Static": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "GetHeaderSplit",
"Parameters": [
{
"Name": "headers",
"Type": "Microsoft.AspNetCore.Http.IHeaderDictionary"
},
{
"Name": "key",
"Type": "System.String"
}
],
"ReturnType": "Microsoft.Extensions.Primitives.StringValues",
"Static": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "GetHeaderUnmodified",
"Parameters": [
{
"Name": "headers",
"Type": "Microsoft.AspNetCore.Http.IHeaderDictionary"
},
{
"Name": "key",
"Type": "System.String"
}
],
"ReturnType": "Microsoft.Extensions.Primitives.StringValues",
"Static": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "SetHeaderJoined",
"Parameters": [
{
"Name": "headers",
"Type": "Microsoft.AspNetCore.Http.IHeaderDictionary"
},
{
"Name": "key",
"Type": "System.String"
},
{
"Name": "value",
"Type": "Microsoft.Extensions.Primitives.StringValues"
}
],
"ReturnType": "System.Void",
"Static": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "SetHeaderUnmodified",
"Parameters": [
{
"Name": "headers",
"Type": "Microsoft.AspNetCore.Http.IHeaderDictionary"
},
{
"Name": "key",
"Type": "System.String"
},
{
"Name": "values",
"Type": "System.Nullable<Microsoft.Extensions.Primitives.StringValues>"
}
],
"ReturnType": "System.Void",
"Static": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "AppendHeaderJoined",
"Parameters": [
{
"Name": "headers",
"Type": "Microsoft.AspNetCore.Http.IHeaderDictionary"
},
{
"Name": "key",
"Type": "System.String"
},
{
"Name": "values",
"Type": "System.String[]",
"IsParams": true
}
],
"ReturnType": "System.Void",
"Static": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "AppendHeaderUnmodified",
"Parameters": [
{
"Name": "headers",
"Type": "Microsoft.AspNetCore.Http.IHeaderDictionary"
},
{
"Name": "key",
"Type": "System.String"
},
{
"Name": "values",
"Type": "Microsoft.Extensions.Primitives.StringValues"
}
],
"ReturnType": "System.Void",
"Static": true,
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{ {
"Name": "Microsoft.AspNetCore.Http.Authentication.AuthenticateInfo", "Name": "Microsoft.AspNetCore.Http.Authentication.AuthenticateInfo",
"Visibility": "Public", "Visibility": "Public",
@ -5337,74 +4951,6 @@
} }
], ],
"GenericParameters": [] "GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Http.Internal.HeaderSegmentCollection+Enumerator",
"Visibility": "Public",
"Kind": "Struct",
"Sealed": true,
"ImplementedInterfaces": [
"System.Collections.Generic.IEnumerator<Microsoft.AspNetCore.Http.Internal.HeaderSegment>"
],
"Members": [
{
"Kind": "Method",
"Name": "get_Current",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Http.Internal.HeaderSegment",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.Collections.Generic.IEnumerator<Microsoft.AspNetCore.Http.Internal.HeaderSegment>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "Dispose",
"Parameters": [],
"ReturnType": "System.Void",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.IDisposable",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "MoveNext",
"Parameters": [],
"ReturnType": "System.Boolean",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.Collections.IEnumerator",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "Reset",
"Parameters": [],
"ReturnType": "System.Void",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.Collections.IEnumerator",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "headers",
"Type": "Microsoft.Extensions.Primitives.StringValues"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
} }
] ]
} }

2
src/Microsoft.AspNetCore.Http.Extensions/baseline.netcore.json
View File

@ -1,5 +1,5 @@
{ {
"AssemblyIdentity": "Microsoft.AspNetCore.Http.Extensions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "AssemblyIdentity": "Microsoft.AspNetCore.Http.Extensions, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [ "Types": [
{ {
"Name": "Microsoft.AspNetCore.Http.HeaderDictionaryTypeExtensions", "Name": "Microsoft.AspNetCore.Http.HeaderDictionaryTypeExtensions",

2
src/Microsoft.AspNetCore.Http.Features/baseline.netcore.json
View File

@ -1,5 +1,5 @@
{ {
"AssemblyIdentity": "Microsoft.AspNetCore.Http.Features, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "AssemblyIdentity": "Microsoft.AspNetCore.Http.Features, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [ "Types": [
{ {
"Name": "Microsoft.AspNetCore.Http.CookieOptions", "Name": "Microsoft.AspNetCore.Http.CookieOptions",

2137
src/Microsoft.AspNetCore.Http/baseline.netcore.json
View File

File diff suppressed because it is too large Load Diff

2
src/Microsoft.AspNetCore.Owin/baseline.netcore.json
View File

@ -1,5 +1,5 @@
{ {
"AssemblyIdentity": "Microsoft.AspNetCore.Owin, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "AssemblyIdentity": "Microsoft.AspNetCore.Owin, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [ "Types": [
{ {
"Name": "Microsoft.AspNetCore.Builder.OwinExtensions", "Name": "Microsoft.AspNetCore.Builder.OwinExtensions",

2
src/Microsoft.AspNetCore.WebUtilities/baseline.netcore.json
View File

@ -1,5 +1,5 @@
{ {
"AssemblyIdentity": "Microsoft.AspNetCore.WebUtilities, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "AssemblyIdentity": "Microsoft.AspNetCore.WebUtilities, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [ "Types": [
{ {
"Name": "Microsoft.AspNetCore.WebUtilities.WebEncoders", "Name": "Microsoft.AspNetCore.WebUtilities.WebEncoders",

2
src/Microsoft.Net.Http.Headers/baseline.netcore.json
View File

@ -1,5 +1,5 @@
{ {
"AssemblyIdentity": "Microsoft.Net.Http.Headers, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "AssemblyIdentity": "Microsoft.Net.Http.Headers, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [ "Types": [
{ {
"Name": "Microsoft.Net.Http.Headers.CacheControlHeaderValue", "Name": "Microsoft.Net.Http.Headers.CacheControlHeaderValue",