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 16:30:01 -07:00
parent b63b8d0672 9337f3e48e
commit a13aaffdfe
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
test/Microsoft.AspNetCore.JsonPatch.Test/project.json
View File

@ -3,18 +3,23 @@
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.JsonPatch": "1.0.0-*", "Microsoft.AspNetCore.JsonPatch": "1.0.0-*",
"Microsoft.AspNetCore.Testing": "1.0.0-*", "Microsoft.AspNetCore.Testing": "1.0.0-*",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"testRunner": "xunit", "testRunner": "xunit",
"frameworks": { "frameworks": {
"netstandardapp1.5": { "netcoreapp1.0": {
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-*",
"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-dev-*",
"NETStandard.Library": "1.5.0-*", "System.Diagnostics.Process": "4.1.0-*",
"System.Diagnostics.Process": "4.1.0-*" "System.Diagnostics.TraceSource": "4.0.0-*"
}, },
"imports": [ "imports": [
"dnxcore50", "dnxcore50",
@ -23,9 +28,15 @@
}, },
"net451": { "net451": {
"frameworkAssemblies": { "frameworkAssemblies": {
"System.Linq.Expressions": { "type": "build" }, "System.Linq.Expressions": {
"System.Runtime": { "type": "build" }, "type": "build"
"System.Threading.Tasks": { "type": "build" } },
"System.Runtime": {
"type": "build"
},
"System.Threading.Tasks": {
"type": "build"
}
}, },
"dependencies": { "dependencies": {
"Moq": "4.2.1312.1622", "Moq": "4.2.1312.1622",