Skip to content

Commit 71ea458

Browse files
mattqsmattqs
committed
0.9.8 release
support for .net 3.5
1 parent 65c4fe4 commit 71ea458

File tree

9 files changed

+60
-61
lines changed

9 files changed

+60
-61
lines changed

‎Src/EngineIoClientDotNet.Tests.net35/ClientTests/SSLServerConnectionTest.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ public void Upgrade()
206206

207207
object test = null;
208208
test = events.Dequeue();
209-
test = events.Dequeue();
210209
Assert.NotNull(test);
211210
Assert.IsAssignableFrom<Transport>(test);
212211

‎Src/EngineIoClientDotNet.Tests.net35/ClientTests/SocketTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void SocketClosing()
6767
});
6868

6969
socket.Open();
70-
System.Threading.Thread.Sleep(TimeSpan.FromSeconds(1));
70+
System.Threading.Thread.Sleep(TimeSpan.FromSeconds(5));
7171
//Task.Delay(1000);
7272
Assert.True(closed);
7373
Assert.True(error);

‎Src/EngineIoClientDotNet.Tests.net35/EngineIoClientDotNet.Tests.net35.csproj‎

Lines changed: 16 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -51,51 +51,21 @@
5151
</Reference>
5252
</ItemGroup>
5353
<ItemGroup>
54-
<Compile Include="..\EngineIoClientDotNet.Tests.mono\ClientTests\BinaryPollingTest.cs">
55-
<Link>ClientTests\BinaryPollingTest.cs</Link>
56-
</Compile>
57-
<Compile Include="..\EngineIoClientDotNet.Tests.mono\ClientTests\BinaryWebSocketTest.cs">
58-
<Link>ClientTests\BinaryWebSocketTest.cs</Link>
59-
</Compile>
60-
<Compile Include="..\EngineIoClientDotNet.Tests.mono\ClientTests\Connection.cs">
61-
<Link>ClientTests\Connection.cs</Link>
62-
</Compile>
63-
<Compile Include="..\EngineIoClientDotNet.Tests.mono\ClientTests\ConnectionTest.cs">
64-
<Link>ClientTests\ConnectionTest.cs</Link>
65-
</Compile>
66-
<Compile Include="..\EngineIoClientDotNet.Tests.mono\ClientTests\HandshakeDataTests.cs">
67-
<Link>ClientTests\HandshakeDataTests.cs</Link>
68-
</Compile>
69-
<Compile Include="..\EngineIoClientDotNet.Tests.mono\ClientTests\ServerConnectionTest.cs">
70-
<Link>ClientTests\ServerConnectionTest.cs</Link>
71-
</Compile>
72-
<Compile Include="..\EngineIoClientDotNet.Tests.mono\ClientTests\SocketTest.cs">
73-
<Link>ClientTests\SocketTest.cs</Link>
74-
</Compile>
75-
<Compile Include="..\EngineIoClientDotNet.Tests.mono\ClientTests\SSLServerConnectionTest.cs">
76-
<Link>ClientTests\SSLServerConnectionTest.cs</Link>
77-
</Compile>
78-
<Compile Include="..\EngineIoClientDotNet.Tests.mono\ClientTests\TransportTest.cs">
79-
<Link>ClientTests\TransportTest.cs</Link>
80-
</Compile>
81-
<Compile Include="..\EngineIoClientDotNet.Tests.mono\ClientTests\UsageTest.cs">
82-
<Link>ClientTests\UsageTest.cs</Link>
83-
</Compile>
84-
<Compile Include="..\EngineIoClientDotNet.Tests.mono\ComponentEmitterTests\EmitterTests.cs">
85-
<Link>ComponentEmitterTests\EmitterTests.cs</Link>
86-
</Compile>
87-
<Compile Include="..\EngineIoClientDotNet.Tests.mono\ModulesTests\ParseQSTests.cs">
88-
<Link>ModulesTests\ParseQSTests.cs</Link>
89-
</Compile>
90-
<Compile Include="..\EngineIoClientDotNet.Tests.mono\ModulesTests\UTF8Tests.cs">
91-
<Link>ModulesTests\UTF8Tests.cs</Link>
92-
</Compile>
93-
<Compile Include="..\EngineIoClientDotNet.Tests.mono\ParserTests\DecodeTests.cs">
94-
<Link>ParserTests\DecodeTests.cs</Link>
95-
</Compile>
96-
<Compile Include="..\EngineIoClientDotNet.Tests.mono\ParserTests\TestsParser.cs">
97-
<Link>ParserTests\TestsParser.cs</Link>
98-
</Compile>
54+
<Compile Include="ClientTests\BinaryPollingTest.cs" />
55+
<Compile Include="ClientTests\BinaryWebSocketTest.cs" />
56+
<Compile Include="ClientTests\Connection.cs" />
57+
<Compile Include="ClientTests\ConnectionTest.cs" />
58+
<Compile Include="ClientTests\HandshakeDataTests.cs" />
59+
<Compile Include="ClientTests\ServerConnectionTest.cs" />
60+
<Compile Include="ClientTests\SocketTest.cs" />
61+
<Compile Include="ClientTests\SSLServerConnectionTest.cs" />
62+
<Compile Include="ClientTests\TransportTest.cs" />
63+
<Compile Include="ClientTests\UsageTest.cs" />
64+
<Compile Include="ComponentEmitterTests\EmitterTests.cs" />
65+
<Compile Include="ModulesTests\ParseQSTests.cs" />
66+
<Compile Include="ModulesTests\UTF8Tests.cs" />
67+
<Compile Include="ParserTests\DecodeTests.cs" />
68+
<Compile Include="ParserTests\TestsParser.cs" />
9969
<Compile Include="Properties\AssemblyInfo.cs" />
10070
</ItemGroup>
10171
<ItemGroup>
@@ -107,6 +77,7 @@
10777
<ItemGroup>
10878
<None Include="packages.config" />
10979
</ItemGroup>
80+
<ItemGroup />
11081
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
11182
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
11283
Other similar extension points exist, see Microsoft.Common.targets.

‎Src/EngineIoClientDotNet.mono/ComponentEmitter/Emitter_net35.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class Emitter
1616
{
1717
private ConcurrentDictionary<string, List<IListener>> callbacks;
1818

19-
private ConcurrentDictionary<IListener, IListener> _onceCallbacks;
19+
private ConcurrentDictionary<IListener, IListener> _onceCallbacks;
2020

2121

2222
public Emitter()
@@ -36,8 +36,10 @@ public virtual Emitter Emit(string eventString, params object[] args)
3636
//log.Info("Emitter emit event = " + eventString);
3737
if (this.callbacks.ContainsKey(eventString))
3838
{
39-
List<IListener> callbacksLocal = this.callbacks[eventString];
40-
foreach (var fn in callbacksLocal)
39+
List<IListener> callbacksLocal = this.callbacks[eventString];
40+
var listCopy = new List<IListener>();
41+
listCopy.AddRange(callbacksLocal);
42+
foreach (var fn in listCopy)
4143
{
4244
fn.Call(args);
4345
}

‎Src/EngineIoClientDotNet.net35/EngineIoClientDotNet.net35.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,13 @@
104104
<Compile Include="..\EngineIoClientDotNet.mono\Parser\IEncodeCallback.cs">
105105
<Link>Parser\IEncodeCallback.cs</Link>
106106
</Compile>
107-
<Compile Include="..\EngineIoClientDotNet.mono\Parser\Packet.cs">
108-
<Link>Parser\Packet.cs</Link>
109-
</Compile>
110107
<Compile Include="..\EngineIoClientDotNet.mono\Parser\Parser.cs">
111108
<Link>Parser\Parser.cs</Link>
112109
</Compile>
113110
<Compile Include="..\EngineIoClientDotNet.mono\Thread\EasyTimer_net35.cs">
114111
<Link>Thread\EasyTimer_net35.cs</Link>
115112
</Compile>
113+
<Compile Include="Parser\Packet_net35.cs" />
116114
<Compile Include="Properties\AssemblyInfo.cs" />
117115
</ItemGroup>
118116
<ItemGroup>

‎Src/EngineIoClientDotNet.net35/EngineIoClientDotNet.net35.sln‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,27 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EngineIoClientDotNet.net35"
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EngineIoClientDotNet.Tests.net35", "..\EngineIoClientDotNet.Tests.net35\EngineIoClientDotNet.Tests.net35.csproj", "{35791CEC-7945-4047-AB25-B252851D5131}"
99
EndProject
10+
Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "grunt(1)", "http://localhost:8528", "{07F4D869-5B4C-492E-9882-AAD7F1A1C101}"
11+
ProjectSection(WebsiteProperties) = preProject
12+
UseIISExpress = "true"
13+
TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
14+
Debug.AspNetCompiler.VirtualPath = "/localhost_8528"
15+
Debug.AspNetCompiler.PhysicalPath = "..\..\grunt\"
16+
Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_8528\"
17+
Debug.AspNetCompiler.Updateable = "true"
18+
Debug.AspNetCompiler.ForceOverwrite = "true"
19+
Debug.AspNetCompiler.FixedNames = "false"
20+
Debug.AspNetCompiler.Debug = "True"
21+
Release.AspNetCompiler.VirtualPath = "/localhost_8528"
22+
Release.AspNetCompiler.PhysicalPath = "..\..\grunt\"
23+
Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_8528\"
24+
Release.AspNetCompiler.Updateable = "true"
25+
Release.AspNetCompiler.ForceOverwrite = "true"
26+
Release.AspNetCompiler.FixedNames = "false"
27+
Release.AspNetCompiler.Debug = "False"
28+
SlnRelativePath = "..\..\grunt\"
29+
EndProjectSection
30+
EndProject
1031
Global
1132
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1233
Debug|Any CPU = Debug|Any CPU
@@ -21,6 +42,10 @@ Global
2142
{35791CEC-7945-4047-AB25-B252851D5131}.Debug|Any CPU.Build.0 = Debug|Any CPU
2243
{35791CEC-7945-4047-AB25-B252851D5131}.Release|Any CPU.ActiveCfg = Release|Any CPU
2344
{35791CEC-7945-4047-AB25-B252851D5131}.Release|Any CPU.Build.0 = Release|Any CPU
45+
{07F4D869-5B4C-492E-9882-AAD7F1A1C101}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46+
{07F4D869-5B4C-492E-9882-AAD7F1A1C101}.Debug|Any CPU.Build.0 = Debug|Any CPU
47+
{07F4D869-5B4C-492E-9882-AAD7F1A1C101}.Release|Any CPU.ActiveCfg = Debug|Any CPU
48+
{07F4D869-5B4C-492E-9882-AAD7F1A1C101}.Release|Any CPU.Build.0 = Debug|Any CPU
2449
EndGlobalSection
2550
GlobalSection(SolutionProperties) = preSolution
2651
HideSolutionNode = FALSE

‎Src/EngineIoClientDotNet.net35/Properties/AssemblyInfo.cs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
using System.Reflection;
2-
using System.Runtime.CompilerServices;
32
using System.Runtime.InteropServices;
43

54
// General Information about an assembly is controlled through the following
65
// set of attributes. Change these attribute values to modify the information
76
// associated with an assembly.
8-
[assembly: AssemblyTitle("EngineIoClientDotNet.net35")]
9-
[assembly: AssemblyDescription("")]
7+
[assembly: AssemblyTitle("EngineIoClientDotNet")]
8+
[assembly: AssemblyDescription("Engine.IO Client Library for .Net")]
109
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("EngineIoClientDotNet.net35")]
10+
[assembly: AssemblyCompany("Quobject Software")]
11+
[assembly: AssemblyProduct("EngineIoClientDotNet")]
1312
[assembly: AssemblyCopyright("Copyright © 2014")]
1413
[assembly: AssemblyTrademark("")]
1514
[assembly: AssemblyCulture("")]
@@ -20,7 +19,7 @@
2019
[assembly: ComVisible(false)]
2120

2221
// The following GUID is for the ID of the typelib if this project is exposed to COM
23-
[assembly: Guid("586d4136-2648-499c-8561-ceb88746df38")]
22+
[assembly: Guid("a95e75cd-35e6-4e88-9e22-631e3fd01546")]
2423

2524
// Version information for an assembly consists of the following four values:
2625
//
@@ -32,5 +31,5 @@
3231
// You can specify all the values or you can default the Build and Revision Numbers
3332
// by using the '*' as shown below:
3433
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
34+
[assembly: AssemblyVersion("0.9.8")]
35+
[assembly: AssemblyFileVersion("0.9.8")]

‎grunt/Gruntfile.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ module.exports = function (grunt) {
66
util = require('util'),
77
os = node_os.platform() === 'win32' ? 'win' : 'linux',
88
nuget_builds = [
9+
{ "Name": "EngineIoClientDotNet.net35", "NuGetDir": "net35" },
910
{ "Name": "EngineIoClientDotNet.net45", "NuGetDir": "net45" },
1011
{ "Name": "EngineIoClientDotNet.windowsphone8", "NuGetDir": "windowsphone8" },
1112
{ "Name": "EngineIoClientDotNet.netcore45", "NuGetDir": "netcore45" },

‎grunt/templates/EngineIoClientDotNet.nuspec‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
<group>
1212
<dependency id="Newtonsoft.Json" version="6.0.5" />
1313
</group>
14+
<group targetFramework="net35">
15+
<dependency id="System.Threading.Tasks" version="3.0.1" />
16+
<dependency id="WebSocket4Net" version="0.10" />
17+
</group>
1418
<group targetFramework="net45">
1519
<dependency id="WebSocket4Net" version="0.10" />
1620
</group>

0 commit comments

Comments
 (0)