Remove WebSocketProtocol dependencies (#6651)

davidfowl · pakrym · commit 71ce37ee9136 · 2019-01-13T18:22:11.000-08:00
diff --git a/src/Servers/IIS/IIS/test/Common.Tests/Common.Tests.csproj b/src/Servers/IIS/IIS/test/Common.Tests/Common.Tests.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
@@ -10,7 +10,6 @@
     <Reference Include="Microsoft.Extensions.Logging" />
     <Reference Include="Microsoft.Extensions.Logging.Testing" />
     <Reference Include="System.Diagnostics.EventLog" />
-    <Reference Include="System.Net.WebSockets.WebSocketProtocol" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
@@ -29,7 +29,6 @@
     <Reference Include="Microsoft.Extensions.Logging" />
     <Reference Include="Microsoft.Extensions.Logging.Testing" />
     <Reference Include="System.Diagnostics.EventLog" />
-    <Reference Include="System.Net.WebSockets.WebSocketProtocol" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
@@ -30,7 +30,6 @@
     <Reference Include="Microsoft.Extensions.Logging.Testing" />
     <Reference Include="Microsoft.Extensions.Logging" />
     <Reference Include="System.Diagnostics.EventLog" />
-    <Reference Include="System.Net.WebSockets.WebSocketProtocol" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj b/src/Servers/IIS/IIS/test/IIS.Tests/IIS.Tests.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\..\build\testsite.props" />
 
@@ -18,7 +18,6 @@
     <Reference Include="Microsoft.Extensions.Logging.Testing" />
     <Reference Include="Microsoft.Extensions.Logging" />
     <Reference Include="System.Diagnostics.EventLog" />
-    <Reference Include="System.Net.WebSockets.WebSocketProtocol" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj
@@ -30,7 +30,6 @@
     <Reference Include="Microsoft.Extensions.Logging" />
     <Reference Include="Microsoft.Extensions.Logging.Testing" />
     <Reference Include="System.Diagnostics.EventLog" />
-    <Reference Include="System.Net.WebSockets.WebSocketProtocol" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <Import Project="..\..\..\..\build\testsite.props" />
 
@@ -20,7 +20,6 @@
     <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
     <Reference Include="Microsoft.Extensions.Configuration.Json" />
     <Reference Include="Microsoft.Extensions.Logging.Console" />
-    <Reference Include="System.Net.WebSockets.WebSocketProtocol" />
     <Reference Include="xunit.assert" />
   </ItemGroup>
 
diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/Startup.WebSockets.cs
@@ -96,7 +96,7 @@ private static async Task<WebSocket> Upgrade(HttpContext context)
             Stream opaqueTransport = await upgradeFeature.UpgradeAsync();
 
             // Get the WebSocket object
-            var ws = WebSocketProtocol.CreateFromStream(opaqueTransport, isServer: true, subProtocol: null, keepAliveInterval: TimeSpan.FromMinutes(2));
+            var ws = WebSocket.CreateFromStream(opaqueTransport, isServer: true, subProtocol: null, keepAliveInterval: TimeSpan.FromMinutes(2));
             return ws;
         }
 
diff --git a/src/Servers/IIS/IIS/test/testassets/StressTestWebSite/Startup.cs b/src/Servers/IIS/IIS/test/testassets/StressTestWebSite/Startup.cs
@@ -36,7 +36,7 @@ public void Configure(IApplicationBuilder app)
             app.Map("/ResponseHeaders", ResponseHeaders);
             app.Map("/EnvironmentVariables", EnvironmentVariables);
             app.Map("/RequestInformation", RequestInformation);
-            app.Map("/WebSocket", WebSocket);
+            app.Map("/WebSocket", WebSockets);
 
             app.Run(async context =>
             {
@@ -152,7 +152,7 @@ private void RequestInformation(IApplicationBuilder app)
             });
         }
 
-        private void WebSocket(IApplicationBuilder app)
+        private void WebSockets(IApplicationBuilder app)
         {
             app.Run(async context =>
             {
@@ -170,7 +170,7 @@ private void WebSocket(IApplicationBuilder app)
                 Stream opaqueTransport = await upgradeFeature.UpgradeAsync();
 
                 // Get the WebSocket object
-                var ws = WebSocketProtocol.CreateFromStream(opaqueTransport, isServer: true, subProtocol: null, keepAliveInterval: TimeSpan.FromMinutes(2));
+                var ws = WebSocket.CreateFromStream(opaqueTransport, isServer: true, subProtocol: null, keepAliveInterval: TimeSpan.FromMinutes(2));
 
                 var appLifetime = app.ApplicationServices.GetRequiredService<IApplicationLifetime>();
 
diff --git a/src/Servers/IIS/IIS/test/testassets/StressTestWebSite/StressTestWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/StressTestWebSite/StressTestWebSite.csproj
@@ -19,7 +19,6 @@
     <Reference Include="Microsoft.AspNetCore.ResponseCompression" />
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
     <Reference Include="Microsoft.Extensions.Logging.Console" />
-    <Reference Include="System.Net.WebSockets.WebSocketProtocol" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ private static async Task<WebSocket> Upgrade(HttpContext context)`
`96`	`96`	`Stream opaqueTransport = await upgradeFeature.UpgradeAsync();`
`97`	`97`
`98`	`98`	`// Get the WebSocket object`
`99`		`- var ws = WebSocketProtocol.CreateFromStream(opaqueTransport, isServer: true, subProtocol: null, keepAliveInterval: TimeSpan.FromMinutes(2));`
	`99`	`+ var ws = WebSocket.CreateFromStream(opaqueTransport, isServer: true, subProtocol: null, keepAliveInterval: TimeSpan.FromMinutes(2));`
`100`	`100`	`return ws;`
`101`	`101`	`}`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public void Configure(IApplicationBuilder app)`
`36`	`36`	`app.Map("/ResponseHeaders", ResponseHeaders);`
`37`	`37`	`app.Map("/EnvironmentVariables", EnvironmentVariables);`
`38`	`38`	`app.Map("/RequestInformation", RequestInformation);`
`39`		`- app.Map("/WebSocket", WebSocket);`
	`39`	`+ app.Map("/WebSocket", WebSockets);`
`40`	`40`
`41`	`41`	`app.Run(async context =>`
`42`	`42`	`{`
`@@ -152,7 +152,7 @@ private void RequestInformation(IApplicationBuilder app)`
`152`	`152`	`});`
`153`	`153`	`}`
`154`	`154`
`155`		`- private void WebSocket(IApplicationBuilder app)`
	`155`	`+ private void WebSockets(IApplicationBuilder app)`
`156`	`156`	`{`
`157`	`157`	`app.Run(async context =>`
`158`	`158`	`{`
`@@ -170,7 +170,7 @@ private void WebSocket(IApplicationBuilder app)`
`170`	`170`	`Stream opaqueTransport = await upgradeFeature.UpgradeAsync();`
`171`	`171`
`172`	`172`	`// Get the WebSocket object`
`173`		`- var ws = WebSocketProtocol.CreateFromStream(opaqueTransport, isServer: true, subProtocol: null, keepAliveInterval: TimeSpan.FromMinutes(2));`
	`173`	`+ var ws = WebSocket.CreateFromStream(opaqueTransport, isServer: true, subProtocol: null, keepAliveInterval: TimeSpan.FromMinutes(2));`
`174`	`174`
`175`	`175`	`var appLifetime = app.ApplicationServices.GetRequiredService<IApplicationLifetime>();`
`176`	`176`