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

Merge branch 'rel/2.0.0-preview1' into dev

This commit is contained in:
Pranav K 2017-05-05 09:52:42 -07:00
parent d30ef1f298 ce021a888e
commit 12ffc786ea
8 changed files with 6 additions and 5611 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.props
View File

@ -3,7 +3,7 @@
<AspNetCoreVersion>2.0.0-*</AspNetCoreVersion>
<BenchmarkDotNetVersion>0.10.3</BenchmarkDotNetVersion>
<CoreFxVersion>4.3.0</CoreFxVersion>
<InternalAspNetCoreSdkVersion>2.0.0-*</InternalAspNetCoreSdkVersion>
<InternalAspNetCoreSdkVersion>2.1.0-*</InternalAspNetCoreSdkVersion>
<MoqVersion>4.7.1</MoqVersion>
<NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion>
<TestSdkVersion>15.0.0</TestSdkVersion>

2
samples/RoutingSample.Web/RoutingSample.Web.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

849
src/Microsoft.AspNetCore.Routing.Abstractions/baseline.netframework.json
View File

@ -1,849 +0,0 @@
{
"AssemblyIdentity": "Microsoft.AspNetCore.Routing.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [
{
"Name": "Microsoft.AspNetCore.Routing.IRouteConstraint",
"Visibility": "Public",
"Kind": "Interface",
"Abstract": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "Match",
"Parameters": [
{
"Name": "httpContext",
"Type": "Microsoft.AspNetCore.Http.HttpContext"
},
{
"Name": "route",
"Type": "Microsoft.AspNetCore.Routing.IRouter"
},
{
"Name": "routeKey",
"Type": "System.String"
},
{
"Name": "values",
"Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
},
{
"Name": "routeDirection",
"Type": "Microsoft.AspNetCore.Routing.RouteDirection"
}
],
"ReturnType": "System.Boolean",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.IRouteHandler",
"Visibility": "Public",
"Kind": "Interface",
"Abstract": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "GetRequestHandler",
"Parameters": [
{
"Name": "httpContext",
"Type": "Microsoft.AspNetCore.Http.HttpContext"
},
{
"Name": "routeData",
"Type": "Microsoft.AspNetCore.Routing.RouteData"
}
],
"ReturnType": "Microsoft.AspNetCore.Http.RequestDelegate",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.IRouter",
"Visibility": "Public",
"Kind": "Interface",
"Abstract": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "RouteAsync",
"Parameters": [
{
"Name": "context",
"Type": "Microsoft.AspNetCore.Routing.RouteContext"
}
],
"ReturnType": "System.Threading.Tasks.Task",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "GetVirtualPath",
"Parameters": [
{
"Name": "context",
"Type": "Microsoft.AspNetCore.Routing.VirtualPathContext"
}
],
"ReturnType": "Microsoft.AspNetCore.Routing.VirtualPathData",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.IRoutingFeature",
"Visibility": "Public",
"Kind": "Interface",
"Abstract": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_RouteData",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Routing.RouteData",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_RouteData",
"Parameters": [
{
"Name": "value",
"Type": "Microsoft.AspNetCore.Routing.RouteData"
}
],
"ReturnType": "System.Void",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.RouteContext",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_Handler",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Http.RequestDelegate",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_Handler",
"Parameters": [
{
"Name": "value",
"Type": "Microsoft.AspNetCore.Http.RequestDelegate"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_HttpContext",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Http.HttpContext",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_RouteData",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Routing.RouteData",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_RouteData",
"Parameters": [
{
"Name": "value",
"Type": "Microsoft.AspNetCore.Routing.RouteData"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "httpContext",
"Type": "Microsoft.AspNetCore.Http.HttpContext"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.RouteData",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_DataTokens",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Routing.RouteValueDictionary",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Routers",
"Parameters": [],
"ReturnType": "System.Collections.Generic.IList<Microsoft.AspNetCore.Routing.IRouter>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Values",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Routing.RouteValueDictionary",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "PushState",
"Parameters": [
{
"Name": "router",
"Type": "Microsoft.AspNetCore.Routing.IRouter"
},
{
"Name": "values",
"Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
},
{
"Name": "dataTokens",
"Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
}
],
"ReturnType": "Microsoft.AspNetCore.Routing.RouteData+RouteDataSnapshot",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "other",
"Type": "Microsoft.AspNetCore.Routing.RouteData"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.RouteDirection",
"Visibility": "Public",
"Kind": "Enumeration",
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Field",
"Name": "IncomingRequest",
"Parameters": [],
"GenericParameter": [],
"Literal": "0"
},
{
"Kind": "Field",
"Name": "UrlGeneration",
"Parameters": [],
"GenericParameter": [],
"Literal": "1"
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.RouteValueDictionary",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [
"System.Collections.Generic.IDictionary<System.String, System.Object>",
"System.Collections.Generic.IReadOnlyDictionary<System.String, System.Object>"
],
"Members": [
{
"Kind": "Method",
"Name": "get_Item",
"Parameters": [
{
"Name": "key",
"Type": "System.String"
}
],
"ReturnType": "System.Object",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_Item",
"Parameters": [
{
"Name": "key",
"Type": "System.String"
},
{
"Name": "value",
"Type": "System.Object"
}
],
"ReturnType": "System.Void",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Comparer",
"Parameters": [],
"ReturnType": "System.Collections.Generic.IEqualityComparer<System.String>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Count",
"Parameters": [],
"ReturnType": "System.Int32",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.String, System.Object>>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Keys",
"Parameters": [],
"ReturnType": "System.Collections.Generic.ICollection<System.String>",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Values",
"Parameters": [],
"ReturnType": "System.Collections.Generic.ICollection<System.Object>",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "Add",
"Parameters": [
{
"Name": "key",
"Type": "System.String"
},
{
"Name": "value",
"Type": "System.Object"
}
],
"ReturnType": "System.Void",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "Clear",
"Parameters": [],
"ReturnType": "System.Void",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<System.String, System.Object>>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "ContainsKey",
"Parameters": [
{
"Name": "key",
"Type": "System.String"
}
],
"ReturnType": "System.Boolean",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "GetEnumerator",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Routing.RouteValueDictionary+Enumerator",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "Remove",
"Parameters": [
{
"Name": "key",
"Type": "System.String"
}
],
"ReturnType": "System.Boolean",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "TryGetValue",
"Parameters": [
{
"Name": "key",
"Type": "System.String"
},
{
"Name": "value",
"Type": "System.Object",
"Direction": "Out"
}
],
"ReturnType": "System.Boolean",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.Collections.Generic.IDictionary<System.String, System.Object>",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "values",
"Type": "System.Object"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.RoutingHttpContextExtensions",
"Visibility": "Public",
"Kind": "Class",
"Abstract": true,
"Static": true,
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "GetRouteData",
"Parameters": [
{
"Name": "httpContext",
"Type": "Microsoft.AspNetCore.Http.HttpContext"
}
],
"ReturnType": "Microsoft.AspNetCore.Routing.RouteData",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "GetRouteValue",
"Parameters": [
{
"Name": "httpContext",
"Type": "Microsoft.AspNetCore.Http.HttpContext"
},
{
"Name": "key",
"Type": "System.String"
}
],
"ReturnType": "System.Object",
"Static": true,
"Extension": true,
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.VirtualPathContext",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_AmbientValues",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Routing.RouteValueDictionary",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_HttpContext",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Http.HttpContext",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_RouteName",
"Parameters": [],
"ReturnType": "System.String",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Values",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Routing.RouteValueDictionary",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_Values",
"Parameters": [
{
"Name": "value",
"Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "httpContext",
"Type": "Microsoft.AspNetCore.Http.HttpContext"
},
{
"Name": "ambientValues",
"Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
},
{
"Name": "values",
"Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
}
],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "httpContext",
"Type": "Microsoft.AspNetCore.Http.HttpContext"
},
{
"Name": "ambientValues",
"Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
},
{
"Name": "values",
"Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
},
{
"Name": "routeName",
"Type": "System.String"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.VirtualPathData",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "get_DataTokens",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Routing.RouteValueDictionary",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Router",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Routing.IRouter",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_Router",
"Parameters": [
{
"Name": "value",
"Type": "Microsoft.AspNetCore.Routing.IRouter"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_VirtualPath",
"Parameters": [],
"ReturnType": "System.String",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "set_VirtualPath",
"Parameters": [
{
"Name": "value",
"Type": "System.String"
}
],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "router",
"Type": "Microsoft.AspNetCore.Routing.IRouter"
},
{
"Name": "virtualPath",
"Type": "System.String"
}
],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "router",
"Type": "Microsoft.AspNetCore.Routing.IRouter"
},
{
"Name": "virtualPath",
"Type": "System.String"
},
{
"Name": "dataTokens",
"Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.RouteData+RouteDataSnapshot",
"Visibility": "Public",
"Kind": "Struct",
"Sealed": true,
"ImplementedInterfaces": [],
"Members": [
{
"Kind": "Method",
"Name": "Restore",
"Parameters": [],
"ReturnType": "System.Void",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "routeData",
"Type": "Microsoft.AspNetCore.Routing.RouteData"
},
{
"Name": "dataTokens",
"Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
},
{
"Name": "routers",
"Type": "System.Collections.Generic.IList<Microsoft.AspNetCore.Routing.IRouter>"
},
{
"Name": "values",
"Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
},
{
"Name": "Microsoft.AspNetCore.Routing.RouteValueDictionary+Enumerator",
"Visibility": "Public",
"Kind": "Struct",
"Sealed": true,
"ImplementedInterfaces": [
"System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<System.String, System.Object>>"
],
"Members": [
{
"Kind": "Method",
"Name": "get_Current",
"Parameters": [],
"ReturnType": "System.Collections.Generic.KeyValuePair<System.String, System.Object>",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<System.String, System.Object>>",
"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": "dictionary",
"Type": "Microsoft.AspNetCore.Routing.RouteValueDictionary"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": []
}
]
}

4750
src/Microsoft.AspNetCore.Routing/baseline.netframework.json
View File

File diff suppressed because it is too large Load Diff

3
test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj
View File

@ -3,8 +3,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

3
test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj
View File

@ -3,8 +3,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

5
test/Microsoft.AspNetCore.Routing.FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj
View File

@ -3,10 +3,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>

3
test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj
View File

@ -3,8 +3,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>