Skip to content

Commit 0bbfc3a

Browse files
committed
0.9.15
1 parent f6e52cf commit 0bbfc3a

File tree

38 files changed

+188
-157
lines changed

38 files changed

+188
-157
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="win" />
3+
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="win" />
44
</packages>

Src/EngineIoClientDotNet.Tests.mono/ParserTests/DecodeTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void DecodeInvalidUTF8()
3939
var log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod());
4040
log.Info("Start");
4141

42-
Packet p = Parser.DecodePacket("4\uffff");
42+
Packet p = Parser.DecodePacket("4\uffff", true);
4343
Assert.Equal(Packet.ERROR, p.Type);
4444
Assert.Equal(PARSER_ERROR, p.Data);
4545
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<ItemGroup>
3333
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
3434
<SpecificVersion>False</SpecificVersion>
35-
<HintPath>..\EngineIoClientDotNet.net35\packages\Newtonsoft.Json.6.0.6\lib\net35\Newtonsoft.Json.dll</HintPath>
35+
<HintPath>..\EngineIoClientDotNet.net35\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll</HintPath>
3636
</Reference>
3737
<Reference Include="System" />
3838
<Reference Include="System.Core" />
@@ -44,8 +44,9 @@
4444
<Reference Include="System.Data.DataSetExtensions" />
4545
<Reference Include="System.Data" />
4646
<Reference Include="System.Xml" />
47-
<Reference Include="WebSocket4Net">
48-
<HintPath>..\EngineIoClientDotNet.net35\packages\WebSocket4Net.0.10\lib\net35\WebSocket4Net.dll</HintPath>
47+
<Reference Include="WebSocket4Net, Version=0.11.0.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
48+
<SpecificVersion>False</SpecificVersion>
49+
<HintPath>..\EngineIoClientDotNet.net35\packages\WebSocket4Net.0.11\lib\net35\WebSocket4Net.dll</HintPath>
4950
</Reference>
5051
<Reference Include="xunit">
5152
<HintPath>..\EngineIoClientDotNet.net35\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>

Src/EngineIoClientDotNet.Tests.net35/ParserTests/DecodeTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void DecodeInvalidUTF8()
3939
var log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod());
4040
log.Info("Start");
4141

42-
Packet p = Parser.DecodePacket("4\uffff");
42+
Packet p = Parser.DecodePacket("4\uffff", true);
4343
Assert.Equal(Packet.ERROR, p.Type);
4444
Assert.Equal(PARSER_ERROR, p.Data);
4545
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net35" />
3+
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net35" />
44
<package id="System.Threading.Tasks" version="3.1.1" targetFramework="net35" />
55
<package id="System.Threading.Tasks.Unofficial" version="3.1" targetFramework="net35" />
6-
<package id="WebSocket4Net" version="0.10" targetFramework="net35" />
6+
<package id="WebSocket4Net" version="0.11" targetFramework="net35" />
77
<package id="xunit" version="1.9.2" targetFramework="net35" />
88
</packages>

Src/EngineIoClientDotNet.Tests.net45/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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.14")]
35-
[assembly: AssemblyFileVersion("0.9.14")]
34+
[assembly: AssemblyVersion("0.9.15")]
35+
[assembly: AssemblyFileVersion("0.9.15")]

Src/EngineIoClientDotNet.Tests.portable-win81+wp81.TestApp/EngineIoClientDotNet.Tests.portable-win81+wp81.TestApp.csproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,6 @@
132132
<Content Include="Assets\StoreLogo.scale-240.png" />
133133
<Content Include="Assets\WideLogo.scale-240.png" />
134134
</ItemGroup>
135-
<ItemGroup>
136-
<Reference Include="Newtonsoft.Json">
137-
<HintPath>..\EngineIoClientDotNet.portable-win81+wpa81\packages\Newtonsoft.Json.6.0.5\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
138-
</Reference>
139-
</ItemGroup>
140135
<ItemGroup>
141136
<ProjectReference Include="..\EngineIoClientDotNet.portable-win81+wpa81\EngineIoClientDotNet.portable-win81+wpa81.csproj">
142137
<Project>{9faabc51-3020-444f-b0fe-2d84ee2a26b1}</Project>
@@ -146,6 +141,12 @@
146141
<ItemGroup>
147142
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
148143
</ItemGroup>
144+
<ItemGroup>
145+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
146+
<SpecificVersion>False</SpecificVersion>
147+
<HintPath>..\EngineIoClientDotNet.portable-win81+wpa81\packages\Newtonsoft.Json.6.0.8\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
148+
</Reference>
149+
</ItemGroup>
149150
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">
150151
<VisualStudioVersion>12.0</VisualStudioVersion>
151152
</PropertyGroup>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="wpa81" />
3+
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="wpa81" />
44
</packages>

Src/EngineIoClientDotNet.Tests.portable-wpa81+wp81.TestApp/EngineIoClientDotNet.Tests.portable-wpa81+wp81.TestApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
<ItemGroup>
146146
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
147147
<SpecificVersion>False</SpecificVersion>
148-
<HintPath>..\EngineIoClientDotNet.portable-wpa81+wp81\packages\Newtonsoft.Json.6.0.6\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
148+
<HintPath>..\EngineIoClientDotNet.portable-wpa81+wp81\packages\Newtonsoft.Json.6.0.8\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
149149
</Reference>
150150
</ItemGroup>
151151
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="wpa81" />
3+
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="wpa81" />
44
</packages>

0 commit comments

Comments
 (0)