Rename WebSocket client

Author: josesimoes

NFWebsockets.Example/Program.cs

@@ -38,7 +38,7 @@ public static void Main()
             Debug.WriteLine($"WebSocket server is up and running, connect on: ws://{ip}:{webSocketServer.Port}{webSocketServer.Prefix}");
 
             //Now let's also attach a local websocket client. Just because we can :-)
-            WebSocketClient client = new WebSocketClient();
+            ClientWebSocket client = new ClientWebSocket();
 
             ///////////////////////////////////////////
             // secure connection config

Websockets.Client/System.Net.WebSockets.Client.nfproj

@@ -51,6 +51,12 @@
   </ItemGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
   <ItemGroup>
+    <Compile Include="..\WebSockets\ClientWebSocket\ClientWebSocket.cs">
+      <Link>ClientWebSocket\ClientWebSocket.cs</Link>
+    </Compile>
+    <Compile Include="..\WebSockets\ClientWebSocket\ClientWebSocketOptions.cs">
+      <Link>ClientWebSocket\ClientWebSocketOptions.cs</Link>
+    </Compile>
     <Compile Include="..\WebSockets\MessageReceivedEventArgs.cs">
       <Link>MessageReceivedEventArgs.cs</Link>
     </Compile>
@@ -60,12 +66,6 @@
     <Compile Include="..\WebSockets\WebSocket.cs">
       <Link>WebSocket.cs</Link>
     </Compile>
-    <Compile Include="..\WebSockets\WebSocketClient\ClientWebSocketOptions.cs">
-      <Link>WebSocketClient\ClientWebSocketOptions.cs</Link>
-    </Compile>
-    <Compile Include="..\WebSockets\WebSocketClient\WebSocketClient.cs">
-      <Link>WebSocketClient\WebSocketClient.cs</Link>
-    </Compile>
     <Compile Include="..\WebSockets\WebSocketFrame\FragmentationType.cs">
       <Link>WebSocketFrame\FragmentationType.cs</Link>
     </Compile>
@@ -106,7 +106,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-    <None Include="..\WebSockets\key.snk"/>
+    <None Include="..\WebSockets\key.snk" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="mscorlib, Version=1.10.3.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
@@ -137,7 +137,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="WebSocketFrame\" />
-    <Folder Include="WebSocketClient\" />
+    <Folder Include="ClientWebSocket\" />
   </ItemGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
   <ProjectExtensions>

Websockets.Server/System.Net.WebSockets.Server.nfproj

@@ -112,7 +112,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-    <None Include="..\WebSockets\key.snk"/>
+    <None Include="..\WebSockets\key.snk" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="mscorlib, Version=1.10.3.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">

Websockets/WebSocketClient/WebSocketClient.cs renamed to Websockets/ClientWebSocket/ClientWebSocket.cs

@@ -17,9 +17,9 @@ namespace System.Net.WebSockets
     public delegate void MessageReceivedEventHandler(object sender, MessageReceivedEventArgs e);
 
     /// <summary>
-    /// Provides a client for connecting to WebSocket services..
+    /// Provides a client for connecting to WebSocket services.
     /// </summary>
-    public class WebSocketClient : WebSocket, IDisposable
+    public class ClientWebSocket : WebSocket, IDisposable
     {
         private NetworkStream _networkStream;
 
@@ -78,10 +78,10 @@ public X509Certificate CACertificate
         public bool UseStoredDeviceCertificate { get; set; } = false;
 
         /// <summary>
-        /// Gets the WebSocket state of the <see cref="WebSocketClient"/> instance.
+        /// Gets the WebSocket state of the <see cref="ClientWebSocket"/> instance.
         /// </summary>
         /// <value>
-        /// The WebSocket state of the <see cref="WebSocketClient"/> instance.
+        /// The WebSocket state of the <see cref="ClientWebSocket"/> instance.
         /// </value>
         public override WebSocketState State { get; set; } = WebSocketState.Closed;
 
@@ -91,7 +91,7 @@ public X509Certificate CACertificate
         /// Creates an instance of the WebSocketClient class.
         /// </summary>
         /// <param name="options">Optional <see cref="ClientWebSocketOptions"/> where extra options can be defined.</param>
-        public WebSocketClient(ClientWebSocketOptions options = null) : base(options)
+        public ClientWebSocket(ClientWebSocketOptions options = null) : base(options)
         {
             if(options != null)
             {

Websockets/WebSocketClient/ClientWebSocketOptions.cs renamed to Websockets/ClientWebSocket/ClientWebSocketOptions.cs

@@ -54,8 +54,8 @@
     <Compile Include="MessageReceivedEventArgs.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="WebSocket.cs" />
-    <Compile Include="WebSocketClient\ClientWebSocketOptions.cs" />
-    <Compile Include="WebSocketClient\WebSocketClient.cs" />
+    <Compile Include="ClientWebSocket\ClientWebSocketOptions.cs" />
+    <Compile Include="ClientWebSocket\ClientWebSocket.cs" />
     <Compile Include="WebSocketFrame\FragmentationType.cs" />
     <Compile Include="WebSocketFrame\MessageFrame.cs" />
     <Compile Include="WebSocketFrame\OpCode.cs" />