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

Merge branch 'release' into dev

This commit is contained in:
Pavel Krymets 2016-04-18 17:03:21 -07:00
parent d7a36ce05e d98924f713
commit 793cd22aa0
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
samples/RoutingSample.Web/project.json
View File

@ -1,5 +1,6 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.Routing": "1.0.0-*" "Microsoft.AspNetCore.Routing": "1.0.0-*"

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

@ -3,6 +3,7 @@
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Routing.Abstractions": "1.0.0-*", "Microsoft.AspNetCore.Routing.Abstractions": "1.0.0-*",
"Microsoft.AspNetCore.Testing": "1.0.0-*", "Microsoft.AspNetCore.Testing": "1.0.0-*",
"xunit": "2.1.0" "xunit": "2.1.0"
@ -17,7 +18,7 @@
"moq.netcore": "4.4.0-beta8", "moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*", "dotnet-test-xunit": "1.0.0-dev-*",
"System.Diagnostics.Process": "4.1.0-*", "System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*", "System.Diagnostics.TraceSource": "4.0.0-*"
}, },
"imports": [ "imports": [
"dnxcore50", "dnxcore50",

1
test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/project.json
View File

@ -3,6 +3,7 @@
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Routing": "1.0.0-*", "Microsoft.AspNetCore.Routing": "1.0.0-*",
"Microsoft.AspNetCore.Routing.DecisionTree.Sources": { "Microsoft.AspNetCore.Routing.DecisionTree.Sources": {
"type": "build", "type": "build",

1
test/Microsoft.AspNetCore.Routing.Tests/project.json
View File

@ -3,6 +3,7 @@
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Http": "1.0.0-*", "Microsoft.AspNetCore.Http": "1.0.0-*",
"Microsoft.AspNetCore.Routing": "1.0.0-*", "Microsoft.AspNetCore.Routing": "1.0.0-*",
"Microsoft.AspNetCore.Testing": "1.0.0-*", "Microsoft.AspNetCore.Testing": "1.0.0-*",