diff --git a/KestrelHttpServer.sln b/KestrelHttpServer.sln index 4758d5299..980a5d253 100644 --- a/KestrelHttpServer.sln +++ b/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 diff --git a/samples/LargeResponseApp/Microsoft.AspNet.Hosting.ini b/samples/LargeResponseApp/Microsoft.AspNet.Hosting.ini index 3fc5452c9..c566ee4f7 100644 --- a/samples/LargeResponseApp/Microsoft.AspNet.Hosting.ini +++ b/samples/LargeResponseApp/Microsoft.AspNet.Hosting.ini @@ -1,3 +1,3 @@  -Server = Kestrel +Server = Microsoft.AspNet.Server.Kestrel Server.Urls = http://localhost:5001/ diff --git a/samples/LargeResponseApp/project.json b/samples/LargeResponseApp/project.json index f533e7ed4..b2ce38723 100644 --- a/samples/LargeResponseApp/project.json +++ b/samples/LargeResponseApp/project.json @@ -10,7 +10,7 @@ }, "commands": { - "run": "Kestrel", + "run": "Microsoft.AspNet.Server.Kestrel", "web": "Microsoft.AspNet.Hosting" } } diff --git a/samples/SampleApp/Microsoft.AspNet.Hosting.ini b/samples/SampleApp/Microsoft.AspNet.Hosting.ini index 3acac330e..882b9e026 100644 --- a/samples/SampleApp/Microsoft.AspNet.Hosting.ini +++ b/samples/SampleApp/Microsoft.AspNet.Hosting.ini @@ -1,3 +1,3 @@  -Server = Kestrel +Server = Microsoft.AspNet.Server.Kestrel Server.Urls = http://localhost:5000/ diff --git a/samples/SampleApp/project.json b/samples/SampleApp/project.json index fe1e191d7..698cdeb26 100644 --- a/samples/SampleApp/project.json +++ b/samples/SampleApp/project.json @@ -12,7 +12,7 @@ } }, "commands": { - "run": "Kestrel", + "run": "Microsoft.AspNet.Server.Kestrel", "web": "Microsoft.AspNet.Hosting" } } diff --git a/src/Kestrel/Kestrel.xproj b/src/Kestrel/Kestrel.xproj deleted file mode 100644 index 446aa1f97..000000000 --- a/src/Kestrel/Kestrel.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 30b7617e-58ef-4382-b3ea-5b2e718cf1a6 - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Kestrel/Properties/AssemblyInfo.cs b/src/Kestrel/Properties/AssemblyInfo.cs deleted file mode 100644 index 025a94598..000000000 --- a/src/Kestrel/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -// 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. - -using System.Reflection; - -[assembly: AssemblyMetadata("Serviceable", "True")] \ No newline at end of file diff --git a/src/Kestrel/project.json b/src/Kestrel/project.json deleted file mode 100644 index 1187eba23..000000000 --- a/src/Kestrel/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "description": "ASP.NET 5 cross platform development web server.", - "repository": { - "type": "git", - "url": "git://github.com/aspnet/kestrelhttpserver" - }, - "dependencies": { - "Microsoft.AspNet.Hosting": "1.0.0-*", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-*" - }, - "frameworks": { - "dnx451": { - "dependencies": { } - }, - "dnxcore50": { - "dependencies": { - "System.Runtime": "4.0.21-beta-*" - } - } - } -} diff --git a/src/Kestrel/IKestrelServerInformation.cs b/src/Microsoft.AspNet.Server.Kestrel/IKestrelServerInformation.cs similarity index 86% rename from src/Kestrel/IKestrelServerInformation.cs rename to src/Microsoft.AspNet.Server.Kestrel/IKestrelServerInformation.cs index a9fce59d0..b9bd5641f 100644 --- a/src/Kestrel/IKestrelServerInformation.cs +++ b/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 { diff --git a/src/Kestrel/Program.cs b/src/Microsoft.AspNet.Server.Kestrel/Program.cs similarity index 94% rename from src/Kestrel/Program.cs rename to src/Microsoft.AspNet.Server.Kestrel/Program.cs index 220cf1eed..2b022bac9 100644 --- a/src/Kestrel/Program.cs +++ b/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) } } } - diff --git a/src/Kestrel/ServerAddress.cs b/src/Microsoft.AspNet.Server.Kestrel/ServerAddress.cs similarity index 98% rename from src/Kestrel/ServerAddress.cs rename to src/Microsoft.AspNet.Server.Kestrel/ServerAddress.cs index dfbe1ff3d..845baf11b 100644 --- a/src/Kestrel/ServerAddress.cs +++ b/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 { diff --git a/src/Kestrel/ServerFactory.cs b/src/Microsoft.AspNet.Server.Kestrel/ServerFactory.cs similarity index 98% rename from src/Kestrel/ServerFactory.cs rename to src/Microsoft.AspNet.Server.Kestrel/ServerFactory.cs index 2c4b96030..93c6545ca 100644 --- a/src/Kestrel/ServerFactory.cs +++ b/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 description for ServerFactory diff --git a/src/Kestrel/ServerInformation.cs b/src/Microsoft.AspNet.Server.Kestrel/ServerInformation.cs similarity index 96% rename from src/Kestrel/ServerInformation.cs rename to src/Microsoft.AspNet.Server.Kestrel/ServerInformation.cs index a3b770834..6205e4c2c 100644 --- a/src/Kestrel/ServerInformation.cs +++ b/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 { diff --git a/src/Kestrel/ServerRequest.cs b/src/Microsoft.AspNet.Server.Kestrel/ServerRequest.cs similarity index 99% rename from src/Kestrel/ServerRequest.cs rename to src/Microsoft.AspNet.Server.Kestrel/ServerRequest.cs index 66f5879f4..9d7d3dabe 100644 --- a/src/Kestrel/ServerRequest.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Server.Kestrel/project.json b/src/Microsoft.AspNet.Server.Kestrel/project.json index 2a3603152..0ff9347b8 100644 --- a/src/Microsoft.AspNet.Server.Kestrel/project.json +++ b/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": {