Merge branch 'release' into dev

This commit is contained in:
Stephen Halter 2016-04-13 12:51:56 -07:00
commit c9a1d4000f
2 changed files with 11 additions and 3 deletions

View File

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

View File

@ -1,6 +1,10 @@
{
"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": {
"type": "git",
"url": "git://github.com/aspnet/kestrelhttpserver"