Skip to content

Commit 75c389d

Browse files
mattqsmattqs
committed
1.0.3
1 parent c4b0d68 commit 75c389d

45 files changed

Lines changed: 928 additions & 112 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 154 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,39 @@
11
## Ignore Visual Studio temporary files, build results, and
22
## files generated by popular Visual Studio add-ons.
3-
Releases
4-
Working
3+
##
4+
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
55

66
# User-specific files
77
*.suo
88
*.user
9+
*.userosscache
910
*.sln.docstates
1011

12+
# User-specific files (MonoDevelop/Xamarin Studio)
13+
*.userprefs
14+
1115
# Build results
1216
[Dd]ebug/
1317
[Dd]ebugPublic/
1418
[Rr]elease/
19+
[Rr]eleases/
1520
x64/
16-
build/
21+
x86/
1722
bld/
1823
[Bb]in/
1924
[Oo]bj/
25+
[Ll]og/
26+
27+
# Visual Studio 2015 cache/options directory
28+
.vs/
29+
# Uncomment if you have tasks that create the project's static files in wwwroot
30+
#wwwroot/
2031

2132
# MSTest test Results
2233
[Tt]est[Rr]esult*/
2334
[Bb]uild[Ll]og.*
2435

25-
#NUNIT
36+
# NUNIT
2637
*.VisualState.xml
2738
TestResult.xml
2839

@@ -31,6 +42,15 @@ TestResult.xml
3142
[Rr]eleasePS/
3243
dlldata.c
3344

45+
# Benchmark Results
46+
BenchmarkDotNet.Artifacts/
47+
48+
# .NET Core
49+
project.lock.json
50+
project.fragment.lock.json
51+
artifacts/
52+
**/Properties/launchSettings.json
53+
3454
*_i.c
3555
*_p.c
3656
*_i.h
@@ -63,14 +83,21 @@ _Chutzpah*
6383
ipch/
6484
*.aps
6585
*.ncb
86+
*.opendb
6687
*.opensdf
6788
*.sdf
6889
*.cachefile
90+
*.VC.db
91+
*.VC.VC.opendb
6992

7093
# Visual Studio profiler
7194
*.psess
7295
*.vsp
7396
*.vspx
97+
*.sap
98+
99+
# Visual Studio Trace Files
100+
*.e2e
74101

75102
# TFS 2012 Local Workspace
76103
$tf/
@@ -83,7 +110,7 @@ _ReSharper*/
83110
*.[Rr]e[Ss]harper
84111
*.DotSettings.user
85112

86-
# JustCode is a .NET coding addin-in
113+
# JustCode is a .NET coding add-in
87114
.JustCode
88115

89116
# TeamCity is a build add-in
@@ -92,10 +119,18 @@ _TeamCity*
92119
# DotCover is a Code Coverage Tool
93120
*.dotCover
94121

122+
# AxoCover is a Code Coverage Tool
123+
.axoCover/*
124+
!.axoCover/settings.json
125+
126+
# Visual Studio code coverage results
127+
*.coverage
128+
*.coveragexml
129+
95130
# NCrunch
96-
*.ncrunch*
97131
_NCrunch_*
98132
.*crunch*.local.xml
133+
nCrunchTemp_*
99134

100135
# MightyMoose
101136
*.mm.*
@@ -123,41 +158,70 @@ publish/
123158
# Publish Web Output
124159
*.[Pp]ublish.xml
125160
*.azurePubxml
126-
127-
# NuGet Packages Directory
128-
packages/
129-
## TODO: If the tool you use requires repositories.config uncomment the next line
130-
#!packages/repositories.config
131-
132-
# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
133-
# This line needs to be after the ignore of the build folder (and the packages folder if the line above has been uncommented)
134-
!packages/build/
135-
136-
# Windows Azure Build Output
161+
# Note: Comment the next line if you want to checkin your web deploy settings,
162+
# but database connection strings (with potential passwords) will be unencrypted
163+
*.pubxml
164+
*.publishproj
165+
166+
# Microsoft Azure Web App publish settings. Comment the next line if you want to
167+
# checkin your Azure Web App publish settings, but sensitive information contained
168+
# in these scripts will be unencrypted
169+
PublishScripts/
170+
171+
# NuGet Packages
172+
*.nupkg
173+
# The packages folder can be ignored because of Package Restore
174+
**/packages/*
175+
# except build/, which is used as an MSBuild target.
176+
!**/packages/build/
177+
# Uncomment if necessary however generally it will be regenerated when needed
178+
#!**/packages/repositories.config
179+
# NuGet v3's project.json files produces more ignorable files
180+
*.nuget.props
181+
*.nuget.targets
182+
183+
# Microsoft Azure Build Output
137184
csx/
138185
*.build.csdef
139186

140-
# Windows Store app package directory
187+
# Microsoft Azure Emulator
188+
ecf/
189+
rcf/
190+
191+
# Windows Store app package directories and files
141192
AppPackages/
193+
BundleArtifacts/
194+
Package.StoreAssociation.xml
195+
_pkginfo.txt
196+
*.appx
197+
198+
# Visual Studio cache files
199+
# files ending in .cache can be ignored
200+
*.[Cc]ache
201+
# but keep track of directories ending in .cache
202+
!*.[Cc]ache/
142203

143204
# Others
144-
sql/
145-
*.Cache
146205
ClientBin/
147-
[Ss]tyle[Cc]op.*
148206
~$*
149207
*~
150208
*.dbmdl
151209
*.dbproj.schemaview
210+
*.jfm
152211
*.pfx
153212
*.publishsettings
154-
node_modules/
213+
orleans.codegen.cs
214+
215+
# Since there are multiple workflows, uncomment next line to ignore bower_components
216+
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
217+
#bower_components/
155218

156219
# RIA/Silverlight projects
157220
Generated_Code/
158221

159-
# Backup & report files from converting an old project file to a newer
160-
# Visual Studio version. Backup files are not needed, because we have git ;-)
222+
# Backup & report files from converting an old project file
223+
# to a newer Visual Studio version. Backup files are not needed,
224+
# because we have git ;-)
161225
_UpgradeReport_Files/
162226
Backup*/
163227
UpgradeLog*.XML
@@ -166,6 +230,7 @@ UpgradeLog*.htm
166230
# SQL Server files
167231
*.mdf
168232
*.ldf
233+
*.ndf
169234

170235
# Business Intelligence projects
171236
*.rdl.data
@@ -174,7 +239,70 @@ UpgradeLog*.htm
174239

175240
# Microsoft Fakes
176241
FakesAssemblies/
242+
243+
# GhostDoc plugin setting file
244+
*.GhostDoc.xml
245+
246+
# Node.js Tools for Visual Studio
247+
.ntvs_analysis.dat
248+
node_modules/
249+
250+
# Typescript v1 declaration files
251+
typings/
252+
253+
# Visual Studio 6 build log
254+
*.plg
255+
256+
# Visual Studio 6 workspace options file
257+
*.opt
258+
259+
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
260+
*.vbw
261+
262+
# Visual Studio LightSwitch build output
263+
**/*.HTMLClient/GeneratedArtifacts
264+
**/*.DesktopClient/GeneratedArtifacts
265+
**/*.DesktopClient/ModelManifest.xml
266+
**/*.Server/GeneratedArtifacts
267+
**/*.Server/ModelManifest.xml
268+
_Pvt_Extensions
269+
270+
# Paket dependency manager
271+
.paket/paket.exe
272+
paket-files/
273+
274+
# FAKE - F# Make
275+
.fake/
276+
277+
# JetBrains Rider
278+
.idea/
279+
*.sln.iml
280+
281+
# CodeRush
282+
.cr/
283+
284+
# Python Tools for Visual Studio (PTVS)
285+
__pycache__/
286+
*.pyc
287+
288+
# Cake - Uncomment if you are using it
289+
# tools/**
290+
# !tools/packages.config
291+
292+
# Tabs Studio
293+
*.tss
294+
295+
# Telerik's JustMock configuration file
296+
*.jmconfig
297+
298+
# BizTalk build output
299+
*.btp.cs
300+
*.btm.cs
301+
*.odx.cs
302+
*.xsd.cs
303+
304+
# OpenCover UI analysis results
305+
OpenCover/
177306
EngineIoClientDotNet_Tests/Resources/test.xml
178307
TestServer/test.xml
179-
TestServer/test.xml
180-
TestServer/test.xml
308+
Working/

‎Src/SocketIoClientDotNet.Tests.net35/SocketIoClientDotNet.Tests.net35.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="EngineIoClientDotNet, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
34-
<HintPath>..\SocketIoClientDotNet.net35\packages\EngineIoClientDotNet.1.0.0.1-beta1\lib\net35\EngineIoClientDotNet.dll</HintPath>
33+
<Reference Include="EngineIoClientDotNet, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
34+
<HintPath>..\SocketIoClientDotNet.net35\packages\EngineIoClientDotNet.1.0.3\lib\net35\EngineIoClientDotNet.dll</HintPath>
3535
</Reference>
3636
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
3737
<HintPath>..\SocketIoClientDotNet.net35\packages\Newtonsoft.Json.9.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
3838
</Reference>
39-
<Reference Include="SuperSocket.ClientEngine, Version=0.8.0.12, Culture=neutral, PublicKeyToken=ee9af13f57f00acc, processorArchitecture=MSIL">
40-
<HintPath>..\SocketIoClientDotNet.net35\packages\SuperSocket.ClientEngine.Core.0.8.0.12\lib\net35-client\SuperSocket.ClientEngine.dll</HintPath>
39+
<Reference Include="SuperSocket.ClientEngine, Version=0.8.0.13, Culture=neutral, PublicKeyToken=ee9af13f57f00acc, processorArchitecture=MSIL">
40+
<HintPath>..\SocketIoClientDotNet.net35\packages\SuperSocket.ClientEngine.Core.0.8.0.13\lib\net35-client\SuperSocket.ClientEngine.dll</HintPath>
4141
</Reference>
4242
<Reference Include="System" />
4343
<Reference Include="System.Core" />
@@ -50,7 +50,7 @@
5050
<Reference Include="System.Data" />
5151
<Reference Include="System.Xml" />
5252
<Reference Include="WebSocket4Net, Version=0.15.0.9, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
53-
<HintPath>..\SocketIoClientDotNet.net35\packages\WebSocket4Net.0.15.0-beta9\lib\net35\WebSocket4Net.dll</HintPath>
53+
<HintPath>..\SocketIoClientDotNet.net35\packages\WebSocket4Net.0.15.0\lib\net35\WebSocket4Net.dll</HintPath>
5454
</Reference>
5555
<Reference Include="xunit, Version=1.9.2.1705, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
5656
<HintPath>..\SocketIoClientDotNet.net35\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>

‎Src/SocketIoClientDotNet.Tests.net35/SocketIoClientDotNet.Tests.net35.v3.ncrunchproject‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<ProjectConfiguration>
2+
<Settings>
3+
<IgnoredTests>
4+
<FixtureTestSelector>
5+
<FixtureName>SocketIoClientDotNet.Tests.ParserTests.ByteArrayTest</FixtureName>
6+
</FixtureTestSelector>
7+
<FixtureTestSelector>
8+
<FixtureName>SocketIoClientDotNet.Tests.ModuleTests.HasBinaryDataTest</FixtureName>
9+
</FixtureTestSelector>
10+
<FixtureTestSelector>
11+
<FixtureName>SocketIoClientDotNet.Tests.ClientTests.UrlTest</FixtureName>
12+
</FixtureTestSelector>
13+
<FixtureTestSelector>
14+
<FixtureName>SocketIoClientDotNet.Tests.ClientTests.ServerConnectionTest</FixtureName>
15+
</FixtureTestSelector>
16+
</IgnoredTests>
17+
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
18+
</Settings>
19+
</ProjectConfiguration>

‎Src/SocketIoClientDotNet.Tests.net35/app.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
1111
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
1212
</dependentAssembly>
13+
<dependentAssembly>
14+
<assemblyIdentity name="SuperSocket.ClientEngine" publicKeyToken="ee9af13f57f00acc" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-0.8.0.12" newVersion="0.8.0.12" />
16+
</dependentAssembly>
1317
</assemblyBinding>
1418
</runtime>
1519
</configuration>

‎Src/SocketIoClientDotNet.Tests.net35/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EngineIoClientDotNet" version="1.0.0.1-beta1" targetFramework="net35" />
3+
<package id="EngineIoClientDotNet" version="1.0.3" targetFramework="net35" />
44
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net35" />
5-
<package id="SuperSocket.ClientEngine.Core" version="0.8.0.12" targetFramework="net35" />
5+
<package id="SuperSocket.ClientEngine.Core" version="0.8.0.13" targetFramework="net35" />
66
<package id="System.Threading.Tasks.Unofficial" version="3.1" targetFramework="net35" />
7-
<package id="WebSocket4Net" version="0.15.0-beta9" targetFramework="net35" />
7+
<package id="WebSocket4Net" version="0.15.0" targetFramework="net35" />
88
<package id="xunit" version="1.9.2" targetFramework="net35" />
99
</packages>

‎Src/SocketIoClientDotNet.Tests.net40/SocketIoClientDotNet.Tests.net40.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@
3333
<Prefer32Bit>false</Prefer32Bit>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="EngineIoClientDotNet, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\SocketIoClientDotNet.net40\packages\EngineIoClientDotNet.1.0.0.1-beta1\lib\net40\EngineIoClientDotNet.dll</HintPath>
36+
<Reference Include="EngineIoClientDotNet, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\SocketIoClientDotNet.net40\packages\EngineIoClientDotNet.1.0.3\lib\net40\EngineIoClientDotNet.dll</HintPath>
3838
</Reference>
3939
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4040
<HintPath>..\SocketIoClientDotNet.net40\packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
4141
</Reference>
42-
<Reference Include="SuperSocket.ClientEngine, Version=0.8.0.12, Culture=neutral, PublicKeyToken=ee9af13f57f00acc, processorArchitecture=MSIL">
43-
<HintPath>..\SocketIoClientDotNet.net40\packages\SuperSocket.ClientEngine.Core.0.8.0.12\lib\net40-client\SuperSocket.ClientEngine.dll</HintPath>
42+
<Reference Include="SuperSocket.ClientEngine, Version=0.8.0.13, Culture=neutral, PublicKeyToken=ee9af13f57f00acc, processorArchitecture=MSIL">
43+
<HintPath>..\SocketIoClientDotNet.net40\packages\SuperSocket.ClientEngine.Core.0.8.0.13\lib\net40-client\SuperSocket.ClientEngine.dll</HintPath>
4444
</Reference>
4545
<Reference Include="System" />
4646
<Reference Include="System.Core" />
@@ -51,7 +51,7 @@
5151
<Reference Include="System.Data" />
5252
<Reference Include="System.Xml" />
5353
<Reference Include="WebSocket4Net, Version=0.15.0.9, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
54-
<HintPath>..\SocketIoClientDotNet.net40\packages\WebSocket4Net.0.15.0-beta9\lib\net40\WebSocket4Net.dll</HintPath>
54+
<HintPath>..\SocketIoClientDotNet.net40\packages\WebSocket4Net.0.15.0\lib\net40\WebSocket4Net.dll</HintPath>
5555
</Reference>
5656
<Reference Include="xunit, Version=1.9.2.1705, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
5757
<HintPath>..\SocketIoClientDotNet.net40\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>

0 commit comments

Comments
 (0)