Merge Kestrel into Microsoft.AspNet.Server.Kestrel

KestrelHttpServer.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.22823.1
+VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Server.Kestrel", "src\Microsoft.AspNet.Server.Kestrel\Microsoft.AspNet.Server.Kestrel.xproj", "{F510611A-3BEE-4B88-A613-5F4A74ED82A1}"
 EndProject
@@ -17,8 +17,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SampleApp", "samples\SampleApp\SampleApp.xproj", "{2C3CB3DC-EEBF-4F52-9E1C-4F2F972E76C3}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Kestrel", "src\Kestrel\Kestrel.xproj", "{30B7617E-58EF-4382-B3EA-5B2E718CF1A6}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2D5D5227-4DBD-499A-96B1-76A36B03B750}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D3273454-EA07-41D2-BF0B-FCC3675C2483}"
@@ -49,10 +47,6 @@ Global
 		{2C3CB3DC-EEBF-4F52-9E1C-4F2F972E76C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2C3CB3DC-EEBF-4F52-9E1C-4F2F972E76C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2C3CB3DC-EEBF-4F52-9E1C-4F2F972E76C3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{30B7617E-58EF-4382-B3EA-5B2E718CF1A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{30B7617E-58EF-4382-B3EA-5B2E718CF1A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{30B7617E-58EF-4382-B3EA-5B2E718CF1A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{30B7617E-58EF-4382-B3EA-5B2E718CF1A6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B35D4D31-E74C-4646-8A11-7A7A40F0021E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B35D4D31-E74C-4646-8A11-7A7A40F0021E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B35D4D31-E74C-4646-8A11-7A7A40F0021E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -69,7 +63,6 @@ Global
 		{F510611A-3BEE-4B88-A613-5F4A74ED82A1} = {2D5D5227-4DBD-499A-96B1-76A36B03B750}
 		{37F3BFB2-6454-49E5-9D7F-581BF755CCFE} = {D3273454-EA07-41D2-BF0B-FCC3675C2483}
 		{2C3CB3DC-EEBF-4F52-9E1C-4F2F972E76C3} = {8A3D00B8-1CCF-4BE6-A060-11104CE2D9CE}
-		{30B7617E-58EF-4382-B3EA-5B2E718CF1A6} = {2D5D5227-4DBD-499A-96B1-76A36B03B750}
 		{B35D4D31-E74C-4646-8A11-7A7A40F0021E} = {8A3D00B8-1CCF-4BE6-A060-11104CE2D9CE}
 		{BD2D4D29-1BD9-40D0-BB31-337D5416B63C} = {327F7880-D9AF-46BD-B45C-3B7E34A01DFD}
 	EndGlobalSection

samples/LargeResponseApp/Microsoft.AspNet.Hosting.ini

@@ -1,3 +1,3 @@
 
-Server = Kestrel
+Server = Microsoft.AspNet.Server.Kestrel
 Server.Urls = http://localhost:5001/

samples/LargeResponseApp/project.json

@@ -10,7 +10,7 @@
   },
 
   "commands": {
-      "run": "Kestrel",
+      "run": "Microsoft.AspNet.Server.Kestrel",
       "web": "Microsoft.AspNet.Hosting"
   }
 }

samples/SampleApp/Microsoft.AspNet.Hosting.ini

@@ -1,3 +1,3 @@
 
-Server = Kestrel
+Server = Microsoft.AspNet.Server.Kestrel
 Server.Urls = http://localhost:5000/

samples/SampleApp/project.json

@@ -12,7 +12,7 @@
         }
     },
     "commands": {
-        "run": "Kestrel",
+        "run": "Microsoft.AspNet.Server.Kestrel",
         "web": "Microsoft.AspNet.Hosting"
     }
 }

src/Kestrel/IKestrelServerInformation.cs → src/Microsoft.AspNet.Server.Kestrel/IKestrelServerInformation.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Kestrel
+namespace Microsoft.AspNet.Server.Kestrel
 {
     public interface IKestrelServerInformation
     {

src/Kestrel/Program.cs → src/Microsoft.AspNet.Server.Kestrel/Program.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Linq;
 
-namespace Kestrel
+namespace Microsoft.AspNet.Server.Kestrel
 {
     public class Program
     {
@@ -23,4 +23,3 @@ public void Main(string[] args)
         }
     }
 }
-

src/Kestrel/ServerAddress.cs → src/Microsoft.AspNet.Server.Kestrel/ServerAddress.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Globalization;
 
-namespace Kestrel
+namespace Microsoft.AspNet.Server.Kestrel
 {
     public class ServerAddress
     {

src/Kestrel/ServerFactory.cs → src/Microsoft.AspNet.Server.Kestrel/ServerFactory.cs

@@ -10,7 +10,7 @@
 using Microsoft.Dnx.Runtime;
 using Microsoft.Framework.Configuration;
 
-namespace Kestrel
+namespace Microsoft.AspNet.Server.Kestrel
 {
     /// <summary>
     /// Summary description for ServerFactory

src/Kestrel/ServerInformation.cs → src/Microsoft.AspNet.Server.Kestrel/ServerInformation.cs

@@ -6,7 +6,7 @@
 using Microsoft.AspNet.Hosting.Server;
 using Microsoft.Framework.Configuration;
 
-namespace Kestrel
+namespace Microsoft.AspNet.Server.Kestrel
 {
     public class ServerInformation : IServerInformation, IKestrelServerInformation
     {

src/Kestrel/ServerRequest.cs → src/Microsoft.AspNet.Server.Kestrel/ServerRequest.cs

@@ -9,7 +9,7 @@
 using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Server.Kestrel.Http;
 
-namespace Kestrel
+namespace Microsoft.AspNet.Server.Kestrel
 {
     public class ServerRequest : IHttpRequestFeature, IHttpResponseFeature, IHttpUpgradeFeature
     {

src/Microsoft.AspNet.Server.Kestrel/project.json

@@ -6,6 +6,7 @@
         "url": "git://github.com/aspnet/kestrelhttpserver"
     },
     "dependencies": {
+        "Microsoft.AspNet.Hosting": "1.0.0-*",
         "Microsoft.Dnx.Runtime.Abstractions": "1.0.0-beta7-*"
     },
     "frameworks": {