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

Merge branch 'release' into dev

This commit is contained in:
Pranav K 2016-04-19 14:54:10 -07:00
parent 793cd22aa0 f826be9206
commit ea2d30ff49
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@
"type": "platform" "type": "platform"
}, },
"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-*",
"System.Diagnostics.Process": "4.1.0-*", "System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*" "System.Diagnostics.TraceSource": "4.0.0-*"
}, },

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

@ -19,7 +19,7 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"type": "platform" "type": "platform"
}, },
"dotnet-test-xunit": "1.0.0-dev-*", "dotnet-test-xunit": "1.0.0-*",
"System.Diagnostics.Process": "4.1.0-*" "System.Diagnostics.Process": "4.1.0-*"
}, },
"imports": [ "imports": [

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

@ -21,7 +21,7 @@
"type": "platform" "type": "platform"
}, },
"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-*",
"System.Diagnostics.Process": "4.1.0-*", "System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.TraceSource": "4.0.0-*" "System.Diagnostics.TraceSource": "4.0.0-*"
}, },