diff --git a/Example/AssemblyInfo.cs b/Example/AssemblyInfo.cs deleted file mode 100644 index 9a9617356..000000000 --- a/Example/AssemblyInfo.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("Example")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("sta.blockhead")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("1.0.*")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/Example2/App.config b/Example2/App.config deleted file mode 100644 index 3a02690ea..000000000 --- a/Example2/App.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Example2/AssemblyInfo.cs b/Example2/AssemblyInfo.cs deleted file mode 100644 index 55cd94f77..000000000 --- a/Example2/AssemblyInfo.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("Example2")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("sta.blockhead")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("1.0.*")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/Example2/Example2.csproj b/Example2/Example2.csproj deleted file mode 100644 index 685a1ef6d..000000000 --- a/Example2/Example2.csproj +++ /dev/null @@ -1,70 +0,0 @@ - - - - Debug - AnyCPU - 9.0.21022 - 2.0 - {B81A24C8-25BB-42B2-AF99-1E1EACCE74C7} - Exe - Example2 - example2 - v3.5 - - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - true - - - none - false - bin\Release - prompt - 4 - true - - - true - full - false - bin\Debug_Ubuntu - DEBUG; - prompt - 4 - true - - - none - false - bin\Release_Ubuntu - prompt - 4 - true - - - - - - - - - - - - - - - {B357BAC7-529E-4D81-A0D2-71041B19C8DE} - websocket-sharp - - - - - - \ No newline at end of file diff --git a/Example3/App.config b/Example3/App.config deleted file mode 100644 index fa624b42b..000000000 --- a/Example3/App.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/Example3/AssemblyInfo.cs b/Example3/AssemblyInfo.cs deleted file mode 100644 index b9a88a257..000000000 --- a/Example3/AssemblyInfo.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("Example3")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("sta.blockhead")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("1.0.*")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/Example3/Example3.csproj b/Example3/Example3.csproj deleted file mode 100644 index ce4fe265c..000000000 --- a/Example3/Example3.csproj +++ /dev/null @@ -1,76 +0,0 @@ - - - - Debug - AnyCPU - 9.0.21022 - 2.0 - {C648BA25-77E5-4A40-A97F-D0AA37B9FB26} - Exe - Example3 - example3 - v3.5 - - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - true - - - none - false - bin\Release - prompt - 4 - true - - - true - full - false - bin\Debug_Ubuntu - DEBUG; - prompt - 4 - true - - - none - false - bin\Release_Ubuntu - prompt - 4 - true - - - - - - - - - - - - - - - {B357BAC7-529E-4D81-A0D2-71041B19C8DE} - websocket-sharp - - - - - - - - - - - - \ No newline at end of file diff --git a/Example3/Public/Js/echotest.js b/Example3/Public/Js/echotest.js deleted file mode 100644 index a356f0d3e..000000000 --- a/Example3/Public/Js/echotest.js +++ /dev/null @@ -1,68 +0,0 @@ -/* - * echotest.js - * - * Derived from Echo Test of WebSocket.org (http://www.websocket.org/echo.html). - * - * Copyright (c) 2012 Kaazing Corporation. - */ - -var url = "ws://localhost:4649/Echo"; -//var url = "wss://localhost:5963/Echo"; -var output; - -function init () { - output = document.getElementById ("output"); - doWebSocket (); -} - -function doWebSocket () { - websocket = new WebSocket (url); - - websocket.onopen = function (e) { - onOpen (e); - }; - - websocket.onmessage = function (e) { - onMessage (e); - }; - - websocket.onerror = function (e) { - onError (e); - }; - - websocket.onclose = function (e) { - onClose (e); - }; -} - -function onOpen (event) { - writeToScreen ("CONNECTED"); - send ("WebSocket rocks"); -} - -function onMessage (event) { - writeToScreen ('RESPONSE: ' + event.data + ''); - websocket.close (); -} - -function onError (event) { - writeToScreen ('ERROR: ' + event.data + ''); -} - -function onClose (event) { - writeToScreen ("DISCONNECTED"); -} - -function send (message) { - writeToScreen ("SENT: " + message); - websocket.send (message); -} - -function writeToScreen (message) { - var pre = document.createElement ("p"); - pre.style.wordWrap = "break-word"; - pre.innerHTML = message; - output.appendChild (pre); -} - -window.addEventListener ("load", init, false); \ No newline at end of file diff --git a/Example3/Public/index.html b/Example3/Public/index.html deleted file mode 100644 index 8d6fe43c3..000000000 --- a/Example3/Public/index.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - WebSocket Echo Test - - - -

WebSocket Echo Test

-
- - diff --git a/README.md b/README.md index 27fb489d3..e6bc053de 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,10 @@ ## Welcome to websocket-sharp! ## +Created by [@sta](https://github.com/sta) and this fork in maintained by [@darknessxk](https://github.com/darknessxk) + +This Project is a NET Core version + websocket-sharp supports: - [RFC 6455](#supported-websocket-specifications) @@ -11,19 +15,19 @@ websocket-sharp supports: - [HTTP Authentication](#http-authentication) - [Query string, Origin header, and Cookies](#query-string-origin-header-and-cookies) - [Connecting through the HTTP proxy server](#connecting-through-the-http-proxy-server) -- .NET Framework **3.5** or later (includes compatible environment such as [Mono]) +- .NET Core **3.1** or later ## Branches ## - [master] for production releases. -- [hybi-00] for older [draft-ietf-hybi-thewebsocketprotocol-00]. No longer maintained. -- [draft75] for even more old [draft-hixie-thewebsocketprotocol-75]. No longer maintained. +- [devel] for edge features. +- [release/x.x.x.x] for releases ## Build ## websocket-sharp is built as a single assembly, **websocket-sharp.dll**. -websocket-sharp is developed with [MonoDevelop]. So a simple way to build is to open **websocket-sharp.sln** and run build for **websocket-sharp project** with any of the build configurations (e.g. `Debug`) in MonoDevelop. +websocket-sharp is developed originally with [MonoDevelop] and now ported to NET Core. So a simple way to build is to open **websocket-sharp.sln** and run build for **websocket-sharp project** with any of the build configurations (e.g. `Debug`). ## Install ## @@ -31,25 +35,12 @@ websocket-sharp is developed with [MonoDevelop]. So a simple way to build is to You should add your websocket-sharp.dll (e.g. `/path/to/websocket-sharp/bin/Debug/websocket-sharp.dll`) to the library references of your project. -If you would like to use that dll in your [Unity] project, you should add it to any folder of your project (e.g. `Assets/Plugins`) in the **Unity Editor**. - ### NuGet Gallery ### -websocket-sharp is available on the [NuGet Gallery], as still a **prerelease** version. - -- [NuGet Gallery: websocket-sharp] - -You can add websocket-sharp to your project with the NuGet Package Manager, by using the following command in the Package Manager Console. - - PM> Install-Package WebSocketSharp -Pre - -### Unity Asset Store ### - -websocket-sharp is available on the Unity Asset Store (Sorry, Not available now). +TBD -- [WebSocket-Sharp for Unity] -It works with **Unity Free**, but there are some limitations: +### Other infos - [Security Sandbox of the Webplayer] (The server is not available in Web Player) - [WebGL Networking] (Not available in WebGL) diff --git a/websocket-sharp/AssemblyInfo.cs b/websocket-sharp/AssemblyInfo.cs index c85deaa45..aa528884e 100644 --- a/websocket-sharp/AssemblyInfo.cs +++ b/websocket-sharp/AssemblyInfo.cs @@ -1,26 +1,17 @@ -using System.Reflection; -using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. +// In SDK-style projects such as this one, several assembly attributes that were historically +// defined in this file are now automatically added during build and populated with +// values defined in project properties. For details of which attributes are included +// and how to customise this process see: https://aka.ms/assembly-info-properties -[assembly: AssemblyTitle("websocket-sharp")] -[assembly: AssemblyDescription("A C# implementation of the WebSocket protocol client and server")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("websocket-sharp.dll")] -[assembly: AssemblyCopyright("sta.blockhead")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. +// Setting ComVisible to false makes the types in this assembly not visible to COM +// components. If you need to access a type in this assembly from COM, set the ComVisible +// attribute to true on that type. -[assembly: AssemblyVersion("1.0.2.*")] +[assembly: ComVisible(false)] -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. +// The following GUID is for the ID of the typelib if this project is exposed to COM. -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] +[assembly: Guid("9a61a627-53cb-4544-8cf4-687a8256d6be")] diff --git a/websocket-sharp/doc/.gitignore b/websocket-sharp/doc/.gitignore deleted file mode 100644 index 7b744c39d..000000000 --- a/websocket-sharp/doc/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -## Ignore MonoDevelop build results. - -html -mdoc diff --git a/websocket-sharp/doc/doc.sh b/websocket-sharp/doc/doc.sh deleted file mode 100755 index e4f3fa6b3..000000000 --- a/websocket-sharp/doc/doc.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# @(#) doc.sh ver.0.0.2 2013.01.24 -# -# Usage: -# doc.sh -# -# Description: -# Creating documentation for websocket-sharp. -# -########################################################################### - -SRC_DIR="../bin/Release_Ubuntu" -XML="${SRC_DIR}/websocket-sharp.xml" -DLL="${SRC_DIR}/websocket-sharp.dll" - -DOC_DIR="." -MDOC_DIR="${DOC_DIR}/mdoc" -HTML_DIR="${DOC_DIR}/html" - -createDir() { - if [ ! -d $1 ]; then - mkdir -p $1 - fi -} - -set -e -createDir ${MDOC_DIR} -createDir ${HTML_DIR} -mdoc update --delete -fno-assembly-versions -i ${XML} -o ${MDOC_DIR}/ ${DLL} -mdoc export-html -o ${HTML_DIR}/ ${MDOC_DIR}/ diff --git a/websocket-sharp/websocket-sharp.csproj b/websocket-sharp/websocket-sharp.csproj index 0860c0313..62d2803bf 100644 --- a/websocket-sharp/websocket-sharp.csproj +++ b/websocket-sharp/websocket-sharp.csproj @@ -1,149 +1,8 @@ - - + + - Debug - AnyCPU - 9.0.21022 - 2.0 - {B357BAC7-529E-4D81-A0D2-71041B19C8DE} - Library - WebSocketSharp - websocket-sharp - v3.5 - true - websocket-sharp.snk + netcoreapp3.1 + websocket_sharp - - true - full - false - bin\Debug - DEBUG - prompt - 4 - false - - - none - false - bin\Release - prompt - 4 - false - - - true - full - false - bin\Debug_Ubuntu - DEBUG - prompt - 4 - false - - - none - false - bin\Release_Ubuntu - prompt - 4 - false - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + diff --git a/websocket-sharp/websocket-sharp.snk b/websocket-sharp/websocket-sharp.snk deleted file mode 100644 index a2546f385..000000000 Binary files a/websocket-sharp/websocket-sharp.snk and /dev/null differ