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:02 -07:00
parent 9830dffabd 0a8f1327b5
commit bf5ee72106
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,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.TestHost.Tests/project.json
View File

@ -17,7 +17,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": [