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:53:55 -07:00
parent 48c7c3c1d2 a35571b8c5
commit d1c6eec38c
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json
View File

@ -16,7 +16,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-*"
}, },
"imports": [ "imports": [
"dnxcore50", "dnxcore50",

2
test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json
View File

@ -22,7 +22,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.TraceSource": "4.0.0-*" "System.Diagnostics.TraceSource": "4.0.0-*"
}, },
"imports": [ "imports": [

2
test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json
View File

@ -30,7 +30,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-*"
} }
}, },
"net451": { "net451": {

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

@ -22,7 +22,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.TraceSource": "4.0.0-*" "System.Diagnostics.TraceSource": "4.0.0-*"
}, },
"imports": [ "imports": [

2
test/Microsoft.AspNetCore.MiddlewareAnalysis.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-*"
}, },
"imports": [ "imports": [
"dnxcore50", "dnxcore50",