Skip to content

Commit 55df508

Browse files
mattqsmattqs
committed
0.9.22
System.NullReferenceException Client Socket OnClose #15 System.Collections.Generic.KeyNotFoundException #14
1 parent 90dcb58 commit 55df508

File tree

9 files changed

+74
-46
lines changed

9 files changed

+74
-46
lines changed

‎Src/EngineIoClientDotNet.Xamarin-MonoTouch/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.DS_Store

‎Src/EngineIoClientDotNet.Xamarin-MonoTouch/EngineIoClientDotNet.Xamarin-MonoTouch.csproj‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
<RootNamespace>EngineIoClientDotNet</RootNamespace>
1010
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
1111
<AssemblyName>EngineIoClientDotNet</AssemblyName>
12-
<ProductVersion>8.0.30703</ProductVersion>
13-
<SchemaVersion>2.0</SchemaVersion>
1412
</PropertyGroup>
1513
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1614
<DebugSymbols>true</DebugSymbols>
@@ -35,16 +33,14 @@
3533
<CodesignKey>iPhone Developer</CodesignKey>
3634
</PropertyGroup>
3735
<ItemGroup>
38-
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
39-
<HintPath>packages\Newtonsoft.Json.7.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
40-
<Private>True</Private>
41-
</Reference>
4236
<Reference Include="System" />
4337
<Reference Include="System.Core" />
4438
<Reference Include="monotouch" />
45-
<Reference Include="WebSocket4Net, Version=0.12.0.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
46-
<HintPath>packages\WebSocket4Net.0.13.1\lib\monotouch10\WebSocket4Net.dll</HintPath>
47-
<Private>True</Private>
39+
<Reference Include="Newtonsoft.Json">
40+
<HintPath>packages\Newtonsoft.Json.8.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
41+
</Reference>
42+
<Reference Include="WebSocket4Net">
43+
<HintPath>packages\WebSocket4Net.0.14.1\lib\monotouch10\WebSocket4Net.dll</HintPath>
4844
</Reference>
4945
</ItemGroup>
5046
<ItemGroup>

‎Src/EngineIoClientDotNet.Xamarin-MonoTouch/EngineIoClientDotNet.Xamarin-MonoTouch.userprefs‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
11
<Properties StartupItem="EngineIoClientDotNet.Xamarin-MonoTouch.csproj">
2-
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
3-
<MonoDevelop.Ide.Workbench />
2+
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" />
3+
<MonoDevelop.Ide.Workbench ActiveDocument="../EngineIoClientDotNet.mono/Client/Transports/WebSocket.cs">
4+
<Files>
5+
<File FileName="../EngineIoClientDotNet.mono/Client/HandshakeData.cs" Line="1" Column="7" />
6+
<File FileName="packages.config" Line="5" Column="12" />
7+
<File FileName="../EngineIoClientDotNet.mono/Client/Transports/WebSocket.cs" Line="5" Column="7" />
8+
</Files>
9+
<Pads>
10+
<Pad Id="ProjectPad">
11+
<State name="__root__">
12+
<Node name="EngineIoClientDotNet.Xamarin-MonoTouch" expanded="True">
13+
<Node name="EngineIoClientDotNet.Xamarin-MonoTouch" expanded="True" selected="True">
14+
<Node name="References" expanded="True" />
15+
<Node name="Packages" expanded="True" />
16+
<Node name="Client" expanded="True">
17+
<Node name="Transports" expanded="True" />
18+
</Node>
19+
</Node>
20+
</Node>
21+
</State>
22+
</Pad>
23+
</Pads>
24+
</MonoDevelop.Ide.Workbench>
425
<MonoDevelop.Ide.DebuggingService.Breakpoints>
526
<BreakpointStore />
627
</MonoDevelop.Ide.DebuggingService.Breakpoints>

‎Src/EngineIoClientDotNet.Xamarin-iOS/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.DS_Store

‎Src/EngineIoClientDotNet.Xamarin-iOS/EngineIoClientDotNet.Xamarin-iOS.csproj‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,15 @@
3333
<CodesignKey>iPhone Developer</CodesignKey>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
37-
<HintPath>packages\Newtonsoft.Json.7.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
38-
<Private>True</Private>
39-
</Reference>
4036
<Reference Include="System" />
4137
<Reference Include="System.Core" />
42-
<Reference Include="WebSocket4Net, Version=0.13.0.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
43-
<HintPath>packages\WebSocket4Net.0.13.1\lib\Xamarin.iOS10\WebSocket4Net.dll</HintPath>
44-
<Private>True</Private>
45-
</Reference>
4638
<Reference Include="Xamarin.iOS" />
39+
<Reference Include="WebSocket4Net">
40+
<HintPath>packages\WebSocket4Net.0.14.1\lib\Xamarin.iOS10\WebSocket4Net.dll</HintPath>
41+
</Reference>
42+
<Reference Include="Newtonsoft.Json">
43+
<HintPath>packages\Newtonsoft.Json.8.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
44+
</Reference>
4745
</ItemGroup>
4846
<ItemGroup>
4947
<Compile Include="..\Quobject.Collections.Immutable\AvlNode.cs">
@@ -76,12 +74,12 @@
7674
<Compile Include="..\Quobject.Collections.Immutable\ImmutableStack.cs">
7775
<Link>Quobject.Collections.Immutable\ImmutableStack.cs</Link>
7876
</Compile>
79-
<Compile Include="..\EngineIoClientDotNet.mono\Client\EngineIOException.cs">
80-
<Link>Client\EngineIOException.cs</Link>
81-
</Compile>
8277
<Compile Include="..\EngineIoClientDotNet.mono\Client\HandshakeData.cs">
8378
<Link>Client\HandshakeData.cs</Link>
8479
</Compile>
80+
<Compile Include="..\EngineIoClientDotNet.mono\Client\EngineIOException.cs">
81+
<Link>Client\EngineIOException.cs</Link>
82+
</Compile>
8583
<Compile Include="..\EngineIoClientDotNet.mono\Client\Socket.cs">
8684
<Link>Client\Socket.cs</Link>
8785
</Compile>

‎Src/EngineIoClientDotNet.Xamarin-iOS/EngineIoClientDotNet.Xamarin-iOS.sln‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
3+
# Visual Studio 2012
44
VisualStudioVersion = 12.0.31101.0
55
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EngineIoClientDotNet.Xamarin-iOS", "EngineIoClientDotNet.Xamarin-iOS.csproj", "{491F98D3-B919-452A-A604-F0870614037A}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EngineIoClientDotNet.Tests.Xamarin-iOS.TestApp", "..\EngineIoClientDotNet.Tests.Xamarin-iOS\EngineIoClientDotNet.Tests.Xamarin-iOS.TestApp.csproj", "{A67E3D93-2C9F-4E45-AEED-A6E7AA629D95}"
9+
EndProject
610
Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "grunt(1)", "http://localhost:8528", "{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}"
711
ProjectSection(WebsiteProperties) = preProject
812
UseIISExpress = "true"
@@ -24,10 +28,6 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "grunt(1)", "http://localhos
2428
SlnRelativePath = "..\..\grunt\"
2529
EndProjectSection
2630
EndProject
27-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EngineIoClientDotNet.Xamarin-iOS", "EngineIoClientDotNet.Xamarin-iOS.csproj", "{491F98D3-B919-452A-A604-F0870614037A}"
28-
EndProject
29-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EngineIoClientDotNet.Tests.Xamarin-iOS.TestApp", "..\EngineIoClientDotNet.Tests.Xamarin-iOS\EngineIoClientDotNet.Tests.Xamarin-iOS.TestApp.csproj", "{A67E3D93-2C9F-4E45-AEED-A6E7AA629D95}"
30-
EndProject
3131
Global
3232
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3333
Debug|Any CPU = Debug|Any CPU
@@ -38,18 +38,6 @@ Global
3838
Release|iPhoneSimulator = Release|iPhoneSimulator
3939
EndGlobalSection
4040
GlobalSection(ProjectConfigurationPlatforms) = postSolution
41-
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42-
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Debug|Any CPU.Build.0 = Debug|Any CPU
43-
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Debug|iPhone.ActiveCfg = Debug|Any CPU
44-
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Debug|iPhone.Build.0 = Debug|Any CPU
45-
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
46-
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
47-
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Release|Any CPU.ActiveCfg = Debug|Any CPU
48-
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Release|Any CPU.Build.0 = Debug|Any CPU
49-
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Release|iPhone.ActiveCfg = Debug|Any CPU
50-
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Release|iPhone.Build.0 = Debug|Any CPU
51-
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Release|iPhoneSimulator.ActiveCfg = Debug|Any CPU
52-
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Release|iPhoneSimulator.Build.0 = Debug|Any CPU
5341
{491F98D3-B919-452A-A604-F0870614037A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5442
{491F98D3-B919-452A-A604-F0870614037A}.Debug|Any CPU.Build.0 = Debug|Any CPU
5543
{491F98D3-B919-452A-A604-F0870614037A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@@ -74,6 +62,18 @@ Global
7462
{A67E3D93-2C9F-4E45-AEED-A6E7AA629D95}.Release|iPhone.Build.0 = Release|iPhone
7563
{A67E3D93-2C9F-4E45-AEED-A6E7AA629D95}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
7664
{A67E3D93-2C9F-4E45-AEED-A6E7AA629D95}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
65+
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66+
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Debug|Any CPU.Build.0 = Debug|Any CPU
67+
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Debug|iPhone.ActiveCfg = Debug|Any CPU
68+
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Debug|iPhone.Build.0 = Debug|Any CPU
69+
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
70+
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
71+
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Release|Any CPU.ActiveCfg = Debug|Any CPU
72+
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Release|Any CPU.Build.0 = Debug|Any CPU
73+
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Release|iPhone.ActiveCfg = Debug|Any CPU
74+
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Release|iPhone.Build.0 = Debug|Any CPU
75+
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Release|iPhoneSimulator.ActiveCfg = Debug|Any CPU
76+
{7F5CBDD0-5537-4B8B-AD7E-9F7E88600084}.Release|iPhoneSimulator.Build.0 = Debug|Any CPU
7777
EndGlobalSection
7878
GlobalSection(SolutionProperties) = preSolution
7979
HideSolutionNode = FALSE

‎Src/EngineIoClientDotNet.Xamarin-iOS/EngineIoClientDotNet.Xamarin-iOS.userprefs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Properties StartupItem="EngineIoClientDotNet.Xamarin-iOS.csproj">
2+
<DisabledProjects>
3+
<String>../EngineIoClientDotNet.Tests.Xamarin-iOS/EngineIoClientDotNet.Tests.Xamarin-iOS.TestApp.csproj</String>
4+
</DisabledProjects>
5+
<MonoDevelop.Ide.Workspace ActiveConfiguration="Release" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" />
6+
<MonoDevelop.Ide.Workbench />
7+
<MonoDevelop.Ide.DebuggingService.Breakpoints>
8+
<BreakpointStore />
9+
</MonoDevelop.Ide.DebuggingService.Breakpoints>
10+
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
11+
</Properties>

‎Src/EngineIoClientDotNet.Xamarin-iOS/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="xamarinios1" userInstalled="true" />
4-
<package id="WebSocket4Net" version="0.13.1" targetFramework="xamarinios1" userInstalled="true" />
3+
<package id="Newtonsoft.Json" version="8.0.1" targetFramework="xamarinios10" />
4+
<package id="WebSocket4Net" version="0.14.1" targetFramework="xamarinios10" />
55
</packages>

‎grunt/Gruntfile.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ module.exports = function (grunt) {
88
util = require('util'),
99
os = node_os.platform() === 'win32' ? 'win' : 'linux',
1010
nuget_builds = [
11-
{ "Name": "EngineIoClientDotNet.net35", "NuGetDir": "net35", "SourceDir":"net35" },
12-
{ "Name": "EngineIoClientDotNet.net40", "NuGetDir": "net40", "SourceDir": "net40" },
13-
{ "Name": "EngineIoClientDotNet.net45", "NuGetDir": "net45", "SourceDir": "net45" },
14-
{ "Name": "EngineIoClientDotNet.windowsphone8", "NuGetDir": "windowsphone8", "SourceDir": "" },
11+
{ "Name": "EngineIoClientDotNet.net35", "NuGetDir": "net35", "SourceDir":"" },
12+
{ "Name": "EngineIoClientDotNet.net40", "NuGetDir": "net40", "SourceDir": "" },
13+
{ "Name": "EngineIoClientDotNet.net45", "NuGetDir": "net45", "SourceDir": "" },
14+
{ "Name": "EngineIoClientDotNet.windowsphone8", "NuGetDir": "windowsphone8", "SourceDir": "windowsphone8" },
1515
{ "Name": "EngineIoClientDotNet.netcore45", "NuGetDir": "netcore45", "SourceDir": "", copyOnly: true },
16-
{ "Name": "EngineIoClientDotNet.Xamarin-iOS", "NuGetDir": "xamarinios10", "SourceDir": "xamarinios10" },
16+
{ "Name": "EngineIoClientDotNet.Xamarin-iOS", "NuGetDir": "xamarinios10", "SourceDir": "" },
1717
{ "Name": "EngineIoClientDotNet.Xamarin-MonoTouch", "NuGetDir": "monotouch10", "SourceDir": "monotouch10" },
1818
{ "Name": "EngineIoClientDotNet.Xamarin-Android", "NuGetDir": "monoandroid10", "SourceDir": "", copyOnly: true },
1919
{ "Name": "EngineIoClientDotNet.portable-wpa81+wp81", "NuGetDir": "portable-wpa81+wp81", "SourceDir": "" },

0 commit comments

Comments
 (0)