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:56:12 -07:00
parent 853820cd9d 7fdc9271f4
commit 7b5d7f7883
8 changed files with 55 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Microsoft.AspNetCore.Hosting.Abstractions/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,9 +9,11 @@
"xmlDoc": true "xmlDoc": true
}, },
"description": "ASP.NET 5 Hosting abstractions.", "description": "ASP.NET 5 Hosting abstractions.",
"repository": { "packOptions": {
"type": "git", "repository": {
"url": "git://github.com/aspnet/hosting" "type": "git",
"url": "git://github.com/aspnet/hosting"
}
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Http.Abstractions": "1.0.0-*", "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-*",

10
src/Microsoft.AspNetCore.Hosting.Server.Abstractions/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,9 +9,11 @@
"xmlDoc": true "xmlDoc": true
}, },
"description": "ASP.NET 5 Hosting server abstractions.", "description": "ASP.NET 5 Hosting server abstractions.",
"repository": { "packOptions": {
"type": "git", "repository": {
"url": "git://github.com/aspnet/hosting" "type": "git",
"url": "git://github.com/aspnet/hosting"
}
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Http.Features": "1.0.0-*", "Microsoft.AspNetCore.Http.Features": "1.0.0-*",

16
src/Microsoft.AspNetCore.Hosting.WindowsServices/project.json
View File

@ -1,14 +1,18 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 core hosting infrastructure and startup logic for web applications running within a Windows service.", "description": "ASP.NET 5 core hosting infrastructure and startup logic for web applications running within a Windows service.",
"repository": { "packOptions": {
"type": "git", "repository": {
"url": "git://github.com/aspnet/hosting" "type": "git",
"url": "git://github.com/aspnet/hosting"
}
}, },
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ], "nowarn": [
"CS1591"
],
"xmlDoc": true "xmlDoc": true
}, },
"dependencies": { "dependencies": {
@ -21,4 +25,4 @@
} }
} }
} }
} }

10
src/Microsoft.AspNetCore.Hosting/project.json
View File

@ -1,11 +1,13 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 core hosting infrastructure and startup logic for web applications.", "description": "ASP.NET 5 core hosting infrastructure and startup logic for web applications.",
"repository": { "packOptions": {
"type": "git", "repository": {
"url": "git://github.com/aspnet/hosting" "type": "git",
"url": "git://github.com/aspnet/hosting"
}
}, },
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "nowarn": [

10
src/Microsoft.AspNetCore.Server.Testing/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,9 +9,11 @@
"xmlDoc": true "xmlDoc": true
}, },
"description": "ASP.NET 5 helpers to deploy applications to IIS Express, IIS, WebListener and Kestrel for testing.", "description": "ASP.NET 5 helpers to deploy applications to IIS Express, IIS, WebListener and Kestrel for testing.",
"repository": { "packOptions": {
"type": "git", "repository": {
"url": "git://github.com/aspnet/hosting" "type": "git",
"url": "git://github.com/aspnet/hosting"
}
}, },
"resource": [ "resource": [
"Deployers/RemoteWindowsDeployer/RemotePSSessionHelper.ps1", "Deployers/RemoteWindowsDeployer/RemotePSSessionHelper.ps1",

10
src/Microsoft.AspNetCore.TestHost/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,9 +9,11 @@
"xmlDoc": true "xmlDoc": true
}, },
"description": "ASP.NET 5 web server for writing and running tests.", "description": "ASP.NET 5 web server for writing and running tests.",
"repository": { "packOptions": {
"type": "git", "repository": {
"url": "git://github.com/aspnet/hosting" "type": "git",
"url": "git://github.com/aspnet/hosting"
}
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNetCore.Hosting": "1.0.0-*" "Microsoft.AspNetCore.Hosting": "1.0.0-*"

19
test/Microsoft.AspNetCore.Hosting.Tests/project.json
View File

@ -1,12 +1,20 @@
{ {
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk",
"copyToOutput": {
"include": [
"testroot/**/*"
]
}
},
"publishOptions": {
"include": [
"testroot/**/*"
]
}, },
"content": [
"testroot/**/*"
],
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Hosting": "1.0.0-*", "Microsoft.AspNetCore.Hosting": "1.0.0-*",
"Microsoft.AspNetCore.Owin": "1.0.0-*", "Microsoft.AspNetCore.Owin": "1.0.0-*",
@ -22,7 +30,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.TestHost.Tests/project.json
View File

@ -1,9 +1,10 @@
{ {
"compilationOptions": { "buildOptions": {
"warningsAsErrors": true, "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
}, },
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.TestHost": "1.0.0-*", "Microsoft.AspNetCore.TestHost": "1.0.0-*",
"Microsoft.AspNetCore.Testing": "1.0.0-*", "Microsoft.AspNetCore.Testing": "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": [