diff --git a/WebSockets.sln b/WebSockets.sln index d17c4c30fe..9101a12f9e 100644 --- a/WebSockets.sln +++ b/WebSockets.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.21813.0 +VisualStudioVersion = 14.0.22013.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestServer", "test\TestServer\TestServer.csproj", "{4E5F5FCC-172C-44D9-BEA0-39098A79CD0B}" EndProject @@ -23,6 +23,11 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebSockets EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.WebSockets.Server", "src\Microsoft.AspNet.WebSockets.Server\Microsoft.AspNet.WebSockets.Server.kproj", "{78A097D0-C0A4-4AED-93E2-84A65392FB52}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{86E1ADA2-631C-484F-906C-2D0BCF628E65}" + ProjectSection(SolutionItems) = preProject + global.json = global.json + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/src/Microsoft.AspNet.WebSockets.Server/WebSocketMiddlewareExtensions.cs b/src/Microsoft.AspNet.WebSockets.Server/WebSocketMiddlewareExtensions.cs index 8dd1559d23..91c69080ba 100644 --- a/src/Microsoft.AspNet.WebSockets.Server/WebSocketMiddlewareExtensions.cs +++ b/src/Microsoft.AspNet.WebSockets.Server/WebSocketMiddlewareExtensions.cs @@ -7,12 +7,12 @@ namespace Microsoft.AspNet.Builder { public static class WebSocketMiddlewareExtensions { - public static IBuilder UseWebSockets(this IBuilder builder) + public static IApplicationBuilder UseWebSockets(this IApplicationBuilder builder) { return builder.UseWebSockets(new WebSocketOptions()); } - public static IBuilder UseWebSockets(this IBuilder builder, WebSocketOptions options) // TODO: [NotNull] + public static IApplicationBuilder UseWebSockets(this IApplicationBuilder builder, WebSocketOptions options) // TODO: [NotNull] { return builder.Use(next => new WebSocketMiddleware(next, options).Invoke); }