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:55:23 -07:00
parent 7232621646 52869b03ec
commit 3cdaa8b2ab
6 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/HttpOverridesSample/project.json
View File

@ -1,6 +1,6 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "buildOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {

2
samples/ResponseBufferingSample/project.json
View File

@ -5,7 +5,7 @@
"Microsoft.AspNetCore.Buffering": "0.1.0-*", "Microsoft.AspNetCore.Buffering": "0.1.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
}, },
"compilationOptions": { "buildOptions": {
"emitEntryPoint": true "emitEntryPoint": true
}, },
"commands": { "commands": {

20
src/Microsoft.AspNetCore.Buffering/project.json
View File

@ -1,6 +1,6 @@
{ {
"version": "0.1.0-*", "version": "0.1.0-*",
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "nowarn": [
@ -9,14 +9,16 @@
"xmlDoc": true "xmlDoc": true
}, },
"description": "ASP.NET Core middleware for buffering response bodies.", "description": "ASP.NET Core middleware for buffering response bodies.",
"tags": [ "packOptions": {
"aspnetcore", "repository": {
"buffer", "type": "git",
"buffering" "url": "git://github.com/aspnet/basicmiddleware"
], },
"repository": { "tags": [
"type": "git", "aspnetcore",
"url": "git://github.com/aspnet/basicmiddleware" "buffer",
"buffering"
]
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Http.Abstractions": "1.0.0-*" "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-*"

22
src/Microsoft.AspNetCore.HttpOverrides/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,15 +9,17 @@
"xmlDoc": true "xmlDoc": true
}, },
"description": "ASP.NET Core basic middleware for:\r\nX-Forwarded-* headers to forward headers from a proxy.\r\nHTTP method override header.", "description": "ASP.NET Core basic middleware for:\r\nX-Forwarded-* headers to forward headers from a proxy.\r\nHTTP method override header.",
"tags": [ "packOptions": {
"aspnetcore", "repository": {
"proxy", "type": "git",
"headers", "url": "git://github.com/aspnet/basicmiddleware"
"xforwarded" },
], "tags": [
"repository": { "aspnetcore",
"type": "git", "proxy",
"url": "git://github.com/aspnet/basicmiddleware" "headers",
"xforwarded"
]
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Http.Extensions": "1.0.0-*", "Microsoft.AspNetCore.Http.Extensions": "1.0.0-*",

4
test/Microsoft.AspNetCore.Buffering.Tests/project.json
View File

@ -1,9 +1,10 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Buffering": "0.1.0-*", "Microsoft.AspNetCore.Buffering": "0.1.0-*",
"Microsoft.AspNetCore.TestHost": "1.0.0-*", "Microsoft.AspNetCore.TestHost": "1.0.0-*",
@ -16,7 +17,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": [

4
test/Microsoft.AspNetCore.HttpOverrides.Tests/project.json
View File

@ -1,9 +1,10 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true "warningsAsErrors": true
}, },
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.HttpOverrides": "1.0.0-*", "Microsoft.AspNetCore.HttpOverrides": "1.0.0-*",
"Microsoft.AspNetCore.TestHost": "1.0.0-*", "Microsoft.AspNetCore.TestHost": "1.0.0-*",
@ -17,7 +18,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": [