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 14:57:41 -07:00
parent fae70a2bfe 8c56b1fdb7
commit 133e95a2f0
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
samples/StaticFileSample/project.json
View File

@ -1,5 +1,5 @@
{ {
"compilationOptions": { "buildOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
@ -23,10 +23,12 @@
] ]
} }
}, },
"content": [ "publishOptions": {
"wwwroot", "include": [
"web.config" "wwwroot",
], "web.config"
]
},
"tools": { "tools": {
"Microsoft.AspNetCore.Server.IISIntegration.Tools": { "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
"version": "1.0.0-*", "version": "1.0.0-*",

18
src/Microsoft.AspNetCore.StaticFiles/project.json
View File

@ -1,6 +1,6 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "nowarn": [
@ -9,13 +9,15 @@
"xmlDoc": true "xmlDoc": true
}, },
"description": "ASP.NET Core static files middleware. Includes middleware for serving static files, directory browsing, and default files.", "description": "ASP.NET Core static files middleware. Includes middleware for serving static files, directory browsing, and default files.",
"tags": [ "packOptions": {
"aspnetcore", "repository": {
"staticfiles" "type": "git",
], "url": "git://github.com/aspnet/staticfiles"
"repository": { },
"type": "git", "tags": [
"url": "git://github.com/aspnet/staticfiles" "aspnetcore",
"staticfiles"
]
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Http.Extensions": "1.0.0-*", "Microsoft.AspNetCore.Http.Extensions": "1.0.0-*",

14
test/Microsoft.AspNetCore.StaticFiles.Tests/project.json
View File

@ -1,13 +1,16 @@
{ {
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
}, },
"content": [ "publishOptions": {
"SubFolder/**/*", "include": [
"TestDocument.txt" "SubFolder/**/*",
], "TestDocument.txt"
]
},
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*", "Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
"Microsoft.AspNetCore.TestHost": "1.0.0-*", "Microsoft.AspNetCore.TestHost": "1.0.0-*",
@ -22,7 +25,6 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"type": "platform" "type": "platform"
}, },
"dotnet-test-xunit": "1.0.0-*",
"System.Diagnostics.Process": "4.1.0-*" "System.Diagnostics.Process": "4.1.0-*"
}, },
"imports": [ "imports": [