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 15:05:29 -07:00
parent 83ee793c21 f0e88ede96
commit c8d842c160
2 changed files with 2 additions and 447 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Routing.Abstractions/baseline.netcore.json
View File

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

447
src/Microsoft.AspNetCore.Routing/baseline.netcore.json
View File

@ -1,5 +1,5 @@
{
"AssemblyIdentity": "Microsoft.AspNetCore.Routing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"AssemblyIdentity": "Microsoft.AspNetCore.Routing, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [
{
"Name": "Microsoft.AspNetCore.Builder.MapRouteRouteBuilderExtensions",
@ -3287,383 +3287,6 @@
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.Internal.BufferValue",
"Visibility": "Public",
"Kind": "Struct",
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_RequiresEncoding",
"Parameters": [],
"ReturnType": "System.Boolean",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Value",
"Parameters": [],
"ReturnType": "System.String",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
},
{
"Name": "requiresEncoding",
"Type": "System.Boolean"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.Internal.LinkGenerationDecisionTree",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "GetMatches",
"Parameters": [
{
"Name": "context",
"Type": "Microsoft.AspNetCore.Routing.VirtualPathContext"
}
],
"ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Routing.Internal.OutboundMatchResult>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "entries",
"Type": "System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Routing.Tree.OutboundMatch>"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.Internal.OutboundMatchResult",
"Visibility": "Public",
"Kind": "Struct",
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_Match",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Routing.Tree.OutboundMatch",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_IsFallbackMatch",
"Parameters": [],
"ReturnType": "System.Boolean",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "match",
"Type": "Microsoft.AspNetCore.Routing.Tree.OutboundMatch"
},
{
"Name": "isFallbackMatch",
"Type": "System.Boolean"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.Internal.PathTokenizer",
"Visibility": "Public",
"Kind": "Struct",
"Sealed": true,
"ImplementedInterfaces": [
"System.Collections.Generic.IReadOnlyList<Microsoft.Extensions.Primitives.StringSegment>"
],
"Members": [
{
"Kind": "Method",
"Name": "get_Count",
"Parameters": [],
"ReturnType": "System.Int32",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.Collections.Generic.IReadOnlyCollection<Microsoft.Extensions.Primitives.StringSegment>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Item",
"Parameters": [
{
"Name": "index",
"Type": "System.Int32"
}
],
"ReturnType": "Microsoft.Extensions.Primitives.StringSegment",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.Collections.Generic.IReadOnlyList<Microsoft.Extensions.Primitives.StringSegment>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "GetEnumerator",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Routing.Internal.PathTokenizer+Enumerator",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "path",
"Type": "Microsoft.AspNetCore.Http.PathString"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.Internal.RoutingMarkerService",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.Internal.SegmentState",
"Visibility": "Public",
"Kind": "Enumeration",
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Field",
"Name": "Beginning",
"Parameters": [],
"GenericParameter": [],
"Literal": "0"
},
{
"Kind": "Field",
"Name": "Inside",
"Parameters": [],
"GenericParameter": [],
"Literal": "1"
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.Internal.UriBuilderContextPooledObjectPolicy",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [
"Microsoft.Extensions.ObjectPool.IPooledObjectPolicy<Microsoft.AspNetCore.Routing.Internal.UriBuildingContext>"
],
"Members": [
{
"Kind": "Method",
"Name": "Create",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Routing.Internal.UriBuildingContext",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "Microsoft.Extensions.ObjectPool.IPooledObjectPolicy<Microsoft.AspNetCore.Routing.Internal.UriBuildingContext>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "Return",
"Parameters": [
{
"Name": "obj",
"Type": "Microsoft.AspNetCore.Routing.Internal.UriBuildingContext"
}
],
"ReturnType": "System.Boolean",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "Microsoft.Extensions.ObjectPool.IPooledObjectPolicy<Microsoft.AspNetCore.Routing.Internal.UriBuildingContext>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "encoder",
"Type": "System.Text.Encodings.Web.UrlEncoder"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.Internal.UriBuildingContext",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_BufferState",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Routing.Internal.SegmentState",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_UriState",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Routing.Internal.SegmentState",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Writer",
"Parameters": [],
"ReturnType": "System.IO.TextWriter",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "Accept",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Boolean",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "Remove",
"Parameters": [
{
"Name": "literal",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "Buffer",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Boolean",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "EndSegment",
"Parameters": [],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "Clear",
"Parameters": [],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "ToString",
"Parameters": [],
"ReturnType": "System.String",
"Virtual": true,
"Override": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "urlEncoder",
"Type": "System.Text.Encodings.Web.UrlEncoder"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.Constraints.AlphaRouteConstraint",
"Visibility": "Public",
@ -4931,74 +4554,6 @@
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.Internal.PathTokenizer+Enumerator",
"Visibility": "Public",
"Kind": "Struct",
"Sealed": true,
"ImplementedInterfaces": [
"System.Collections.Generic.IEnumerator<Microsoft.Extensions.Primitives.StringSegment>"
],
"Members": [
{
"Kind": "Method",
"Name": "get_Current",
"Parameters": [],
"ReturnType": "Microsoft.Extensions.Primitives.StringSegment",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.Collections.Generic.IEnumerator<Microsoft.Extensions.Primitives.StringSegment>",
"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": "tokenizer",
"Type": "Microsoft.AspNetCore.Routing.Internal.PathTokenizer"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
}
]
}