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-05-02 15:11:17 -07:00
parent 32d2b443b2 59d905ae3b
commit c81da904b2
4 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/MusicStore.Standalone/project.json
View File

@ -4,7 +4,7 @@
], ],
"description": "Music store application on ASP.NET 5", "description": "Music store application on ASP.NET 5",
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "buildOptions": {
"emitEntryPoint": true, "emitEntryPoint": true,
"warningsAsErrors": true, "warningsAsErrors": true,
"define": [ "define": [
@ -22,13 +22,15 @@
"../MusicStore/bin", "../MusicStore/bin",
"../MusicStore/obj" "../MusicStore/obj"
], ],
"content": [ "publishOptions": {
"include": [
"Areas", "Areas",
"Views", "Views",
"wwwroot", "wwwroot",
"config.json", "config.json",
"web.config" "web.config"
], ]
},
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*", "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*",
"Microsoft.AspNetCore.Authentication.Facebook": "1.0.0-*", "Microsoft.AspNetCore.Authentication.Facebook": "1.0.0-*",

8
src/MusicStore/project.json
View File

@ -4,7 +4,7 @@
], ],
"description": "Music store application on ASP.NET 5", "description": "Music store application on ASP.NET 5",
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "buildOptions": {
"emitEntryPoint": true, "emitEntryPoint": true,
"warningsAsErrors": true, "warningsAsErrors": true,
"define": [ "define": [
@ -19,13 +19,15 @@
"compile": [ "compile": [
"../../shared/**/*.cs" "../../shared/**/*.cs"
], ],
"content": [ "publishOptions": {
"include": [
"Areas", "Areas",
"Views", "Views",
"wwwroot", "wwwroot",
"config.json", "config.json",
"web.config" "web.config"
], ]
},
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*", "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*",
"Microsoft.AspNetCore.Authentication.Facebook": "1.0.0-*", "Microsoft.AspNetCore.Authentication.Facebook": "1.0.0-*",

4
test/E2ETests/project.json
View File

@ -1,11 +1,12 @@
{ {
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true "warningsAsErrors": true
}, },
"compile": [ "compile": [
"../../shared/**/*.cs" "../../shared/**/*.cs"
], ],
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*", "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*",
"Microsoft.AspNetCore.Authentication.OpenIdConnect": "0.1.0-*", "Microsoft.AspNetCore.Authentication.OpenIdConnect": "0.1.0-*",
"Microsoft.AspNetCore.Identity": "1.0.0-*", "Microsoft.AspNetCore.Identity": "1.0.0-*",
@ -25,7 +26,6 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"type": "platform" "type": "platform"
}, },
"dotnet-test-xunit": "1.0.0-*",
"System.Data.SqlClient": "4.1.0-*", "System.Data.SqlClient": "4.1.0-*",
"System.Xml.XmlDocument": "4.0.1-*" "System.Xml.XmlDocument": "4.0.1-*"
}, },

6
test/MusicStore.Test/project.json
View File

@ -1,8 +1,9 @@
{ {
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.Extensions.Logging.Testing": "1.0.0-*", "Microsoft.Extensions.Logging.Testing": "1.0.0-*",
"MusicStore": "1.0.0-*", "MusicStore": "1.0.0-*",
"XUnit": "2.1.0" "XUnit": "2.1.0"
@ -17,8 +18,7 @@
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"version": "1.0.0-*", "version": "1.0.0-*",
"type": "platform" "type": "platform"
}, }
"dotnet-test-xunit": "1.0.0-*"
} }
}, },
"net451": {} "net451": {}