huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release' into dev

This commit is contained in:
Stephen Halter 2016-04-13 12:51:56 -07:00
parent 5354005a1a 795fc36cde
commit c9a1d4000f
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Microsoft.AspNetCore.Server.Kestrel.Https/project.json
View File

@ -1,5 +1,10 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "HTTPS support for the ASP.NET Core Kestrel cross-platform web server.",
"tags": [
"aspnetcore",
"kestrel"
],
"compilationOptions": { "compilationOptions": {
"keyFile": "../../tools/Key.snk", "keyFile": "../../tools/Key.snk",
"nowarn": [ "nowarn": [
@ -7,7 +12,6 @@
], ],
"xmlDoc": true "xmlDoc": true
}, },
"description": "Adds HTTPS support to Kestrel",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/kestrelhttpserver" "url": "git://github.com/aspnet/kestrelhttpserver"
@ -16,7 +20,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": { },
"netstandard1.3": { "netstandard1.3": {
"dependencies": { "dependencies": {
"System.Net.Security": "4.0.0-*" "System.Net.Security": "4.0.0-*"

6
src/Microsoft.AspNetCore.Server.Kestrel/project.json
View File

@ -1,6 +1,10 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "ASP.NET 5 cross platform web server.", "description": "ASP.NET Core Kestrel cross-platform web server.",
"tags": [
"aspnetcore",
"kestrel"
],
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/aspnet/kestrelhttpserver" "url": "git://github.com/aspnet/kestrelhttpserver"