Skip to content

Commit 4a3194a

Browse files
mattqsmattqs
committed
0.10.0-beta1
1 parent 5a413bd commit 4a3194a

File tree

40 files changed

+1357
-169
lines changed

40 files changed

+1357
-169
lines changed

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

+18-6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<AssemblyName>SocketIoClientDotNet.Tests.net40</AssemblyName>
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<TargetFrameworkProfile />
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<DebugSymbols>true</DebugSymbols>
@@ -20,6 +21,7 @@
2021
<DefineConstants>DEBUG;TRACE</DefineConstants>
2122
<ErrorReport>prompt</ErrorReport>
2223
<WarningLevel>4</WarningLevel>
24+
<Prefer32Bit>false</Prefer32Bit>
2325
</PropertyGroup>
2426
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2527
<DebugType>pdbonly</DebugType>
@@ -28,25 +30,31 @@
2830
<DefineConstants>TRACE</DefineConstants>
2931
<ErrorReport>prompt</ErrorReport>
3032
<WarningLevel>4</WarningLevel>
33+
<Prefer32Bit>false</Prefer32Bit>
3134
</PropertyGroup>
3235
<ItemGroup>
33-
<Reference Include="EngineIoClientDotNet, Version=0.9.21.0, Culture=neutral, processorArchitecture=MSIL">
34-
<HintPath>..\SocketIoClientDotNet.net40\packages\EngineIoClientDotNet.0.9.21\lib\net40\EngineIoClientDotNet.dll</HintPath>
36+
<Reference Include="EngineIoClientDotNet, Version=0.10.0.0, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\SocketIoClientDotNet.net40\packages\EngineIoClientDotNet.0.10.0-beta1\lib\net40\EngineIoClientDotNet.dll</HintPath>
3538
<Private>True</Private>
3639
</Reference>
37-
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
38-
<HintPath>..\SocketIoClientDotNet.net40\packages\Newtonsoft.Json.7.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
40+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
41+
<HintPath>..\SocketIoClientDotNet.net40\packages\Newtonsoft.Json.10.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
42+
<Private>True</Private>
43+
</Reference>
44+
<Reference Include="SuperSocket.ClientEngine, Version=0.8.0.8, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\SocketIoClientDotNet.net40\packages\SuperSocket.ClientEngine.Core.0.8.0.8\lib\net40-client\SuperSocket.ClientEngine.dll</HintPath>
3946
<Private>True</Private>
4047
</Reference>
4148
<Reference Include="System" />
4249
<Reference Include="System.Core" />
50+
<Reference Include="System.Web" />
4351
<Reference Include="System.Xml.Linq" />
4452
<Reference Include="System.Data.DataSetExtensions" />
4553
<Reference Include="Microsoft.CSharp" />
4654
<Reference Include="System.Data" />
4755
<Reference Include="System.Xml" />
48-
<Reference Include="WebSocket4Net, Version=0.12.0.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
49-
<HintPath>..\SocketIoClientDotNet.net40\packages\WebSocket4Net.0.13.1\lib\net40\WebSocket4Net.dll</HintPath>
56+
<Reference Include="WebSocket4Net, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
57+
<HintPath>..\SocketIoClientDotNet.net40\packages\WebSocket4Net.0.15.0-beta6\lib\net40\WebSocket4Net.dll</HintPath>
5058
<Private>True</Private>
5159
</Reference>
5260
<Reference Include="xunit, Version=1.9.2.1705, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
@@ -85,6 +93,10 @@
8593
</ProjectReference>
8694
</ItemGroup>
8795
<ItemGroup>
96+
<None Include="app.config" />
97+
<None Include="config.json">
98+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
99+
</None>
88100
<None Include="packages.config" />
89101
</ItemGroup>
90102
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" /></startup></configuration>

‎Src/SocketIoClientDotNet.Tests.net40/config.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"version":"0.10.0",
3+
"server":{
4+
"port":80,
5+
"ssl_port":443,
6+
"hostname":"127.0.0.1"
7+
},
8+
"win":{
9+
"powershell":"C:/WINDOWS/System32/WindowsPowerShell/v1.0/powershell.exe",
10+
"msbuild":"C:/Windows/Microsoft.NET/Framework/v4.0.30319/msbuild.exe",
11+
"xunit_path":"C:/Development/quobject.visualstudio.com/EngineIoClientDotNet/Src/EngineIoClientDotNet.net45/packages/xunit.runner.console.2.0.0/tools",
12+
"nuget":"C:/ProgramData/chocolatey/bin/NuGet.exe",
13+
"xamarin_component":"xamarin-component.exe"
14+
},
15+
"linux":{
16+
"msbuild":"xbuild",
17+
"xunit_path":"/home/apollo/vendors/xunit",
18+
"xamarin_component":"xamarin-component"
19+
}
20+
}

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EngineIoClientDotNet" version="0.9.21" targetFramework="net4" />
4-
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net4" />
5-
<package id="WebSocket4Net" version="0.13.1" targetFramework="net4" />
6-
<package id="xunit" version="1.9.2" targetFramework="net4" />
3+
<package id="EngineIoClientDotNet" version="0.10.0-beta1" targetFramework="net40" />
4+
<package id="Newtonsoft.Json" version="10.0.1" targetFramework="net40" />
5+
<package id="SuperSocket.ClientEngine.Core" version="0.8.0.8" targetFramework="net40" />
6+
<package id="WebSocket4Net" version="0.15.0-beta6" targetFramework="net40" />
7+
<package id="xunit" version="1.9.2" targetFramework="net40" />
78
</packages>

‎Src/SocketIoClientDotNet.Tests.net45/ClientTests/Connection.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class ConfigBase
5959

6060
public static ConfigBase Load()
6161
{
62-
var configString = File.ReadAllText("./../../../../grunt/config.json");
62+
var configString = File.ReadAllText("config.json");
6363

6464
var config = JsonConvert.DeserializeObject<ConfigBase>(configString);
6565
return config;

‎Src/SocketIoClientDotNet.Tests.netcore45.UnitTestLibrary/SocketIoClientDotNet.Tests.netcore45.UnitTestLibrary.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,12 @@
150150
</ProjectReference>
151151
</ItemGroup>
152152
<ItemGroup>
153-
<Reference Include="EngineIoClientDotNet, Version=0.9.21.0, Culture=neutral, processorArchitecture=MSIL">
154-
<HintPath>..\SocketIoClientDotNet.netcore45\packages\EngineIoClientDotNet.0.9.21\lib\netcore45\EngineIoClientDotNet.dll</HintPath>
153+
<Reference Include="EngineIoClientDotNet, Version=0.10.1.0, Culture=neutral, processorArchitecture=MSIL">
154+
<HintPath>..\SocketIoClientDotNet.netcore45\packages\EngineIoClientDotNet.0.10.1-beta2\lib\netcore45\EngineIoClientDotNet.dll</HintPath>
155155
<Private>True</Private>
156156
</Reference>
157-
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
158-
<HintPath>..\SocketIoClientDotNet.netcore45\packages\Newtonsoft.Json.7.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
157+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
158+
<HintPath>..\SocketIoClientDotNet.netcore45\packages\Newtonsoft.Json.10.0.1\lib\portable-net45+win8+wpa81+wp8\Newtonsoft.Json.dll</HintPath>
159159
<Private>True</Private>
160160
</Reference>
161161
</ItemGroup>

‎Src/SocketIoClientDotNet.Tests.netcore45.UnitTestLibrary/packages.config

+2-2
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="EngineIoClientDotNet" version="0.9.21" targetFramework="win81" />
4-
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="win81" />
3+
<package id="EngineIoClientDotNet" version="0.10.1-beta2" targetFramework="win81" />
4+
<package id="Newtonsoft.Json" version="10.0.1" targetFramework="win81" />
55
</packages>

‎Src/SocketIoClientDotNet.Tests.portable-wpa81+wp81.UnitTest/SocketIoClientDotNet.Tests.portable-wpa81+wp81.UnitTest.csproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -108,18 +108,12 @@
108108
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
109109
</ItemGroup>
110110
<ItemGroup>
111-
<ProjectReference Include="..\SocketIoClientDotNet.portable-win81+wpa81\SocketIoClientDotNet.portable-win81+wpa81.csproj">
112-
<Project>{e092f6fa-7477-484f-92fb-cc4d586af1b9}</Project>
113-
<Name>SocketIoClientDotNet.portable-win81+wpa81</Name>
114-
</ProjectReference>
115-
</ItemGroup>
116-
<ItemGroup>
117-
<Reference Include="EngineIoClientDotNet, Version=0.9.18.0, Culture=neutral, processorArchitecture=MSIL">
118-
<HintPath>..\SocketIoClientDotNet.portable-win81+wpa81\packages\EngineIoClientDotNet.0.9.18\lib\portable-win81+wpa81\EngineIoClientDotNet.dll</HintPath>
111+
<Reference Include="EngineIoClientDotNet, Version=0.10.1.0, Culture=neutral, processorArchitecture=MSIL">
112+
<HintPath>..\SocketIoClientDotNet.portable-wpa81+wp81\packages\EngineIoClientDotNet.0.10.1-beta2\lib\portable-win81+wpa81\EngineIoClientDotNet.dll</HintPath>
119113
<Private>True</Private>
120114
</Reference>
121-
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
122-
<HintPath>..\SocketIoClientDotNet.portable-win81+wpa81\packages\Newtonsoft.Json.7.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
115+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
116+
<HintPath>..\SocketIoClientDotNet.portable-wpa81+wp81\packages\Newtonsoft.Json.10.0.1\lib\portable-net45+win8+wpa81+wp8\Newtonsoft.Json.dll</HintPath>
123117
<Private>True</Private>
124118
</Reference>
125119
</ItemGroup>
@@ -135,6 +129,12 @@
135129
<Name>Microsoft Visual Studio Test Core</Name>
136130
</SDKReference>
137131
</ItemGroup>
132+
<ItemGroup>
133+
<ProjectReference Include="..\SocketIoClientDotNet.portable-win81+wpa81\SocketIoClientDotNet.portable-win81+wpa81.csproj">
134+
<Project>{e092f6fa-7477-484f-92fb-cc4d586af1b9}</Project>
135+
<Name>SocketIoClientDotNet.portable-win81+wpa81</Name>
136+
</ProjectReference>
137+
</ItemGroup>
138138
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">
139139
<VisualStudioVersion>12.0</VisualStudioVersion>
140140
</PropertyGroup>

‎Src/SocketIoClientDotNet.Tests.portable-wpa81+wp81.UnitTest/packages.config

+2-2
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="EngineIoClientDotNet" version="0.9.18" targetFramework="wpa81" />
4-
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="wpa81" />
3+
<package id="EngineIoClientDotNet" version="0.10.1-beta2" targetFramework="wpa81" />
4+
<package id="Newtonsoft.Json" version="10.0.1" targetFramework="wpa81" />
55
</packages>

‎Src/SocketIoClientDotNet.Tests.windowsphone8.TestApp/SocketIoClientDotNet.Tests.windowsphone8.TestApp.csproj

+10-7
Original file line numberDiff line numberDiff line change
@@ -140,18 +140,21 @@
140140
<Name>SocketIoClientDotNet.windowsphone8</Name>
141141
</ProjectReference>
142142
</ItemGroup>
143-
<ItemGroup />
144143
<ItemGroup>
145-
<Reference Include="EngineIoClientDotNet, Version=0.9.21.0, Culture=neutral, processorArchitecture=MSIL">
146-
<HintPath>..\SocketIoClientDotNet.windowsphone8\packages\EngineIoClientDotNet.0.9.21\lib\windowsphone8\EngineIoClientDotNet.dll</HintPath>
144+
<Reference Include="EngineIoClientDotNet, Version=0.10.1.0, Culture=neutral, processorArchitecture=MSIL">
145+
<HintPath>..\SocketIoClientDotNet.windowsphone8\packages\EngineIoClientDotNet.0.10.1-beta2\lib\windowsphone8\EngineIoClientDotNet.dll</HintPath>
147146
<Private>True</Private>
148147
</Reference>
149-
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
150-
<HintPath>..\SocketIoClientDotNet.windowsphone8\packages\Newtonsoft.Json.7.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
148+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
149+
<HintPath>..\SocketIoClientDotNet.windowsphone8\packages\Newtonsoft.Json.10.0.1\lib\portable-net45+win8+wpa81+wp8\Newtonsoft.Json.dll</HintPath>
151150
<Private>True</Private>
152151
</Reference>
153-
<Reference Include="WebSocket4Net, Version=0.12.0.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
154-
<HintPath>..\SocketIoClientDotNet.windowsphone8\packages\WebSocket4Net.0.12\lib\sl40-windowsphone71\WebSocket4Net.dll</HintPath>
152+
<Reference Include="SuperSocket.ClientEngine, Version=0.8.0.6, Culture=neutral, processorArchitecture=MSIL">
153+
<HintPath>..\SocketIoClientDotNet.windowsphone8\packages\SuperSocket.ClientEngine.Core.0.8.0.6\lib\wp80\SuperSocket.ClientEngine.dll</HintPath>
154+
<Private>True</Private>
155+
</Reference>
156+
<Reference Include="WebSocket4Net, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
157+
<HintPath>..\SocketIoClientDotNet.windowsphone8\packages\WebSocket4Net.0.15.0-beta6\lib\wp80\WebSocket4Net.dll</HintPath>
155158
<Private>True</Private>
156159
</Reference>
157160
</ItemGroup>

‎Src/SocketIoClientDotNet.Tests.windowsphone8.TestApp/packages.config

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EngineIoClientDotNet" version="0.9.21" targetFramework="wp8" />
4-
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="wp8" />
5-
<package id="WebSocket4Net" version="0.12" targetFramework="wp8" />
3+
<package id="EngineIoClientDotNet" version="0.10.1-beta2" targetFramework="wp8" />
4+
<package id="Newtonsoft.Json" version="10.0.1" targetFramework="wp8" />
5+
<package id="SuperSocket.ClientEngine.Core" version="0.8.0.6" targetFramework="wp8" />
6+
<package id="WebSocket4Net" version="0.15.0-beta6" targetFramework="wp8" />
67
</packages>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[assembly: AssemblyConfiguration("")]
1010
[assembly: AssemblyCompany("Quobject Software")]
1111
[assembly: AssemblyProduct("SocketIoClientDotNet")]
12-
[assembly: AssemblyCopyright("Copyright © 2016")]
12+
[assembly: AssemblyCopyright("Copyright © 2017")]
1313
[assembly: AssemblyTrademark("")]
1414
[assembly: AssemblyCulture("")]
1515

@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("0.9.13")]
35-
[assembly: AssemblyFileVersion("0.9.13")]
34+
[assembly: AssemblyVersion("0.10.0")]
35+
[assembly: AssemblyFileVersion("0.10.0")]

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

+10-6
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,16 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="EngineIoClientDotNet, Version=0.9.22.0, Culture=neutral, processorArchitecture=MSIL">
34-
<HintPath>packages\EngineIoClientDotNet.0.9.22\lib\net35\EngineIoClientDotNet.dll</HintPath>
33+
<Reference Include="EngineIoClientDotNet, Version=0.10.1.0, Culture=neutral, processorArchitecture=MSIL">
34+
<HintPath>packages\EngineIoClientDotNet.0.10.1-beta2\lib\net35\EngineIoClientDotNet.dll</HintPath>
3535
<Private>True</Private>
3636
</Reference>
37-
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
38-
<HintPath>packages\Newtonsoft.Json.8.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
37+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
38+
<HintPath>packages\Newtonsoft.Json.10.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
39+
<Private>True</Private>
40+
</Reference>
41+
<Reference Include="SuperSocket.ClientEngine, Version=0.8.0.6, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>packages\SuperSocket.ClientEngine.Core.0.8.0.6\lib\net35-client\SuperSocket.ClientEngine.dll</HintPath>
3943
<Private>True</Private>
4044
</Reference>
4145
<Reference Include="System" />
@@ -48,8 +52,8 @@
4852
<Reference Include="System.Data.DataSetExtensions" />
4953
<Reference Include="System.Data" />
5054
<Reference Include="System.Xml" />
51-
<Reference Include="WebSocket4Net, Version=0.14.1.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
52-
<HintPath>packages\WebSocket4Net.0.14.1\lib\net35\WebSocket4Net.dll</HintPath>
55+
<Reference Include="WebSocket4Net, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
56+
<HintPath>packages\WebSocket4Net.0.15.0-beta6\lib\net35\WebSocket4Net.dll</HintPath>
5357
<Private>True</Private>
5458
</Reference>
5559
</ItemGroup>

‎Src/SocketIoClientDotNet.net35/packages.config

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EngineIoClientDotNet" version="0.9.22" targetFramework="net35" />
4-
<package id="Newtonsoft.Json" version="8.0.1" targetFramework="net35" />
3+
<package id="EngineIoClientDotNet" version="0.10.1-beta2" targetFramework="net35" />
4+
<package id="Newtonsoft.Json" version="10.0.1" targetFramework="net35" />
5+
<package id="SuperSocket.ClientEngine.Core" version="0.8.0.6" targetFramework="net35" />
56
<package id="System.Threading.Tasks.Unofficial" version="3.1" targetFramework="net35" />
6-
<package id="WebSocket4Net" version="0.14.1" targetFramework="net35" />
7+
<package id="WebSocket4Net" version="0.15.0-beta6" targetFramework="net35" />
78
</packages>

0 commit comments

Comments
 (0)