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-15 17:05:06 -07:00
parent 92455b6d9c 9992ca4c82
commit 67b0bc68dc
5 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
samples/IdentitySample.Mvc/project.json
View File

@ -26,21 +26,23 @@
"Microsoft.Extensions.Configuration.Json": "1.0.0-*", "Microsoft.Extensions.Configuration.Json": "1.0.0-*",
"Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-*", "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-*",
"Microsoft.Extensions.Logging.Console": "1.0.0-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*",
"Microsoft.Extensions.Logging.Debug": "1.0.0-*", "Microsoft.Extensions.Logging.Debug": "1.0.0-*"
"Microsoft.NETCore.Platforms": "1.0.1-*"
}, },
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"netstandardapp1.5": { "netcoreapp1.0": {
"imports": [ "imports": [
"dnxcore50", "dnxcore50",
"portable-net45+win8" "portable-net45+win8"
], ],
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-*" "Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
}
} }
} }
}, },

10
test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test/project.json
View File

@ -14,12 +14,16 @@
}, },
"compile": "../Shared/*.cs", "compile": "../Shared/*.cs",
"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",

10
test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test/project.json
View File

@ -19,12 +19,16 @@
}, },
"compile": "../Shared/*.cs", "compile": "../Shared/*.cs",
"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",

10
test/Microsoft.AspNetCore.Identity.InMemory.Test/project.json
View File

@ -15,12 +15,16 @@
}, },
"compile": "../Shared/*.cs", "compile": "../Shared/*.cs",
"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",

8
test/Microsoft.AspNetCore.Identity.Test/project.json
View File

@ -14,11 +14,15 @@
}, },
"compile": "../Shared/*.cs", "compile": "../Shared/*.cs",
"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.TraceSource": "4.0.0-*"
}, },
"imports": [ "imports": [
"dnxcore50", "dnxcore50",