Skip to content

Commit eefb6db

Browse files
mattqsmattqs
committed
json.net 7.0.1
Websocket4net 0.12
1 parent 146fa0e commit eefb6db

File tree

45 files changed

+200
-160
lines changed

Some content is hidden

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

45 files changed

+200
-160
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@
153153
<Folder Include="ThreadTests\" />
154154
</ItemGroup>
155155
<ItemGroup>
156-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
157-
<SpecificVersion>False</SpecificVersion>
158-
<HintPath>..\EngineIoClientDotNet.netcore45\packages\Newtonsoft.Json.6.0.8\lib\netcore45\Newtonsoft.Json.dll</HintPath>
156+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
157+
<HintPath>..\EngineIoClientDotNet.netcore45\packages\Newtonsoft.Json.7.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
158+
<Private>True</Private>
159159
</Reference>
160160
</ItemGroup>
161161
<ItemGroup>

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

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.8" targetFramework="win" />
3+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="win" />
44
</packages>

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
34-
<SpecificVersion>False</SpecificVersion>
35-
<HintPath>..\EngineIoClientDotNet.net35\packages\Newtonsoft.Json.6.0.8\lib\net35\Newtonsoft.Json.dll</HintPath>
33+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
34+
<HintPath>..\EngineIoClientDotNet.net35\packages\Newtonsoft.Json.7.0.1\lib\net35\Newtonsoft.Json.dll</HintPath>
35+
<Private>True</Private>
3636
</Reference>
3737
<Reference Include="System" />
3838
<Reference Include="System.Core" />
@@ -44,12 +44,9 @@
4444
<Reference Include="System.Data.DataSetExtensions" />
4545
<Reference Include="System.Data" />
4646
<Reference Include="System.Xml" />
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>
50-
</Reference>
51-
<Reference Include="xunit">
52-
<HintPath>..\EngineIoClientDotNet.net35\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
47+
<Reference Include="WebSocket4Net, Version=0.12.0.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
48+
<HintPath>..\EngineIoClientDotNet.net35\packages\WebSocket4Net.0.12\lib\net35\WebSocket4Net.dll</HintPath>
49+
<Private>True</Private>
5350
</Reference>
5451
</ItemGroup>
5552
<ItemGroup>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net35" />
3+
<package id="Newtonsoft.Json" version="7.0.1" 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.11" targetFramework="net35" />
7-
<package id="xunit" version="1.9.2" targetFramework="net35" />
6+
<package id="WebSocket4Net" version="0.12" targetFramework="net35" />
87
</packages>

‎Src/EngineIoClientDotNet.Tests.net40/EngineIoClientDotNet.Tests.net40.csproj‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
34-
<SpecificVersion>False</SpecificVersion>
35-
<HintPath>..\EngineIoClientDotNet.net40\packages\Newtonsoft.Json.6.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
33+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
34+
<HintPath>..\EngineIoClientDotNet.net40\packages\Newtonsoft.Json.7.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
35+
<Private>True</Private>
3636
</Reference>
3737
<Reference Include="System" />
3838
<Reference Include="System.Core" />
@@ -41,11 +41,13 @@
4141
<Reference Include="Microsoft.CSharp" />
4242
<Reference Include="System.Data" />
4343
<Reference Include="System.Xml" />
44-
<Reference Include="WebSocket4Net">
45-
<HintPath>..\EngineIoClientDotNet.net40\packages\WebSocket4Net.0.11\lib\net40\WebSocket4Net.dll</HintPath>
44+
<Reference Include="WebSocket4Net, Version=0.12.0.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
45+
<HintPath>..\EngineIoClientDotNet.net40\packages\WebSocket4Net.0.12\lib\net40\WebSocket4Net.dll</HintPath>
46+
<Private>True</Private>
4647
</Reference>
47-
<Reference Include="xunit">
48+
<Reference Include="xunit, Version=1.9.2.1705, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
4849
<HintPath>..\EngineIoClientDotNet.net40\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
50+
<Private>True</Private>
4951
</Reference>
5052
</ItemGroup>
5153
<ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net40" />
4-
<package id="WebSocket4Net" version="0.11" targetFramework="net40" />
3+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net40" />
4+
<package id="WebSocket4Net" version="0.12" targetFramework="net40" />
55
<package id="xunit" version="1.9.2" targetFramework="net40" />
66
</packages>

‎Src/EngineIoClientDotNet.Tests.net45/EngineIoClientDotNet.Tests.net45.csproj‎

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\EngineIoClientDotNet.net45\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\EngineIoClientDotNet.net45\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
4+
<Import Project="..\EngineIoClientDotNet.net45\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\EngineIoClientDotNet.net45\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" />
35
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
46
<PropertyGroup>
57
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,6 +13,7 @@
1113
<AssemblyName>EngineIoClientDotNet.Tests.net45</AssemblyName>
1214
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1315
<FileAlignment>512</FileAlignment>
16+
<NuGetPackageImportStamp>818d8613</NuGetPackageImportStamp>
1417
</PropertyGroup>
1518
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1619
<DebugSymbols>true</DebugSymbols>
@@ -30,14 +33,23 @@
3033
<WarningLevel>4</WarningLevel>
3134
</PropertyGroup>
3235
<ItemGroup>
33-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
34-
<SpecificVersion>False</SpecificVersion>
35-
<HintPath>..\EngineIoClientDotNet.net45\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
36+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
37+
<HintPath>..\EngineIoClientDotNet.net45\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
38+
<Private>True</Private>
3639
</Reference>
3740
<Reference Include="System" />
3841
<Reference Include="System.Core" />
39-
<Reference Include="xunit">
40-
<HintPath>..\EngineIoClientDotNet.net45\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
42+
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
43+
<HintPath>..\EngineIoClientDotNet.net45\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
44+
<Private>True</Private>
45+
</Reference>
46+
<Reference Include="xunit.assert, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
47+
<HintPath>..\EngineIoClientDotNet.net45\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
48+
<Private>True</Private>
49+
</Reference>
50+
<Reference Include="xunit.core, Version=2.0.0.2929, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
51+
<HintPath>..\EngineIoClientDotNet.net45\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
52+
<Private>True</Private>
4153
</Reference>
4254
</ItemGroup>
4355
<ItemGroup>
@@ -100,7 +112,17 @@
100112
<ItemGroup>
101113
<None Include="packages.config" />
102114
</ItemGroup>
115+
<ItemGroup>
116+
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
117+
</ItemGroup>
103118
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
119+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
120+
<PropertyGroup>
121+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
122+
</PropertyGroup>
123+
<Error Condition="!Exists('..\EngineIoClientDotNet.net45\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\EngineIoClientDotNet.net45\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
124+
<Error Condition="!Exists('..\EngineIoClientDotNet.net45\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\EngineIoClientDotNet.net45\packages\xunit.core.2.0.0\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
125+
</Target>
104126
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
105127
Other similar extension points exist, see Microsoft.Common.targets.
106128
<Target Name="BeforeBuild">

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[assembly: AssemblyConfiguration("")]
1010
[assembly: AssemblyCompany("Quobject Software")]
1111
[assembly: AssemblyProduct("EngineIoClientDotNet")]
12-
[assembly: AssemblyCopyright("Copyright © 2014")]
12+
[assembly: AssemblyCopyright("Copyright © 2015")]
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.15")]
35-
[assembly: AssemblyFileVersion("0.9.15")]
34+
[assembly: AssemblyVersion("0.9.18")]
35+
[assembly: AssemblyFileVersion("0.9.18")]

‎Src/EngineIoClientDotNet.Tests.net45/packages.config‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="6.0.6" targetFramework="net45" />
4-
<package id="xunit" version="1.9.2" targetFramework="net45" />
3+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
4+
<package id="xunit" version="2.0.0" targetFramework="net45" />
5+
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
6+
<package id="xunit.assert" version="2.0.0" targetFramework="net45" />
7+
<package id="xunit.core" version="2.0.0" targetFramework="net45" />
8+
<package id="xunit.extensibility.core" version="2.0.0" targetFramework="net45" />
9+
<package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net45" />
510
</packages>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,9 @@
142142
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
143143
</ItemGroup>
144144
<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>
145+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
146+
<HintPath>..\EngineIoClientDotNet.portable-win81+wpa81\packages\Newtonsoft.Json.7.0.1\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
147+
<Private>True</Private>
148148
</Reference>
149149
</ItemGroup>
150150
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">

0 commit comments

Comments
 (0)