From 72c32367a47820cf484485b9fc217df2511479e9 Mon Sep 17 00:00:00 2001 From: David Fowler Date: Sun, 5 Oct 2014 11:26:15 -0700 Subject: [PATCH] Fixup references and the sample --- KestrelHttpServer.sln | 14 +++++++++++++- samples/SampleApp/Startup.cs | 2 +- src/Microsoft.AspNet.Server.Kestrel/project.json | 13 ++----------- .../project.json | 5 +---- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/KestrelHttpServer.sln b/KestrelHttpServer.sln index 0f6a44b724..30b34d2c9d 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.22013.1 +VisualStudioVersion = 14.0.22111.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.kproj", "{F510611A-3BEE-4B88-A613-5F4A74ED82A1}" EndProject @@ -19,6 +19,12 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SampleApp", "samples\Sample EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Kestrel", "src\Kestrel\Kestrel.kproj", "{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}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8A3D00B8-1CCF-4BE6-A060-11104CE2D9CE}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -45,4 +51,10 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {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} + EndGlobalSection EndGlobal diff --git a/samples/SampleApp/Startup.cs b/samples/SampleApp/Startup.cs index f6a9e33a64..8a5b27fe3e 100644 --- a/samples/SampleApp/Startup.cs +++ b/samples/SampleApp/Startup.cs @@ -9,7 +9,7 @@ namespace SampleApp { public class Startup { - public void Configure(IBuilder app) + public void Configure(IApplicationBuilder app) { app.UseWebSockets(); diff --git a/src/Microsoft.AspNet.Server.Kestrel/project.json b/src/Microsoft.AspNet.Server.Kestrel/project.json index b9318104e7..a76c33de04 100644 --- a/src/Microsoft.AspNet.Server.Kestrel/project.json +++ b/src/Microsoft.AspNet.Server.Kestrel/project.json @@ -1,20 +1,11 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.Framework.Runtime.Interfaces": "1.0.0-*" + "Microsoft.Framework.Runtime.Interfaces": { "version": "1.0.0-*","type": "build" } }, "frameworks": { - "aspnet50": { - "compilationOptions": { - "define": [ "TRACE", "NET45" ], - "allowUnsafe": true - } - }, + "aspnet50": { }, "aspnetcore50": { - "compilationOptions": { - "define": [ "TRACE", "K10" ], - "allowUnsafe": true - }, "dependencies": { "System.Threading.ThreadPool": "4.0.10.0", "System.Diagnostics.Debug": "4.0.10.0", diff --git a/test/Microsoft.AspNet.Server.KestrelTests/project.json b/test/Microsoft.AspNet.Server.KestrelTests/project.json index 99c5d008c7..8a4f25365e 100644 --- a/test/Microsoft.AspNet.Server.KestrelTests/project.json +++ b/test/Microsoft.AspNet.Server.KestrelTests/project.json @@ -5,11 +5,8 @@ "Microsoft.AspNet.Server.Kestrel": "1.0.0-*" }, "frameworks": { - "aspnet50": { - "compilationOptions": { "define": [ "TRACE" ] } - }, + "aspnet50": { }, "aspnetcore50": { - "compilationOptions": { "define": [ "TRACE" ] }, "dependencies": { "System.Net.Sockets": "4.0.0.0", "System.Runtime.Handles": "4.0.0.0",