Skip to content

Commit 7484456

Browse files
author
Anouar Hassine
committed
Updating dependencies versions
1 parent fed4e24 commit 7484456

6 files changed

Lines changed: 74 additions & 72 deletions

File tree

‎ReactiveXComponent/ReactiveXComponent.csproj‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,38 +35,30 @@
3535
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
38+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
4242
<Reference Include="RabbitMQ.Client, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
43-
<HintPath>..\packages\RabbitMQ.Client.4.1.1\lib\net451\RabbitMQ.Client.dll</HintPath>
43+
<HintPath>..\packages\RabbitMQ.Client.4.1.3\lib\net451\RabbitMQ.Client.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
46-
<Reference Include="SuperSocket.ClientEngine, Version=0.8.0.12, Culture=neutral, PublicKeyToken=ee9af13f57f00acc, processorArchitecture=MSIL">
47-
<HintPath>..\packages\SuperSocket.ClientEngine.Core.0.8.0.12\lib\net45\SuperSocket.ClientEngine.dll</HintPath>
46+
<Reference Include="SuperSocket.ClientEngine, Version=0.9.0.0, Culture=neutral, PublicKeyToken=ee9af13f57f00acc, processorArchitecture=MSIL">
47+
<HintPath>..\packages\SuperSocket.ClientEngine.Core.0.9.0\lib\net45\SuperSocket.ClientEngine.dll</HintPath>
4848
<Private>True</Private>
4949
</Reference>
5050
<Reference Include="System" />
5151
<Reference Include="System.Core" />
52-
<Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
53-
<HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
52+
<Reference Include="System.Reactive.Core, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
53+
<HintPath>..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll</HintPath>
5454
<Private>True</Private>
5555
</Reference>
56-
<Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
57-
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
56+
<Reference Include="System.Reactive.Interfaces, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
57+
<HintPath>..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll</HintPath>
5858
<Private>True</Private>
5959
</Reference>
60-
<Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
61-
<HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
62-
<Private>True</Private>
63-
</Reference>
64-
<Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
65-
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
66-
<Private>True</Private>
67-
</Reference>
68-
<Reference Include="System.Reactive.Providers, Version=2.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69-
<HintPath>..\packages\Rx-Providers.2.2.4\lib\net45\System.Reactive.Providers.dll</HintPath>
60+
<Reference Include="System.Reactive.Linq, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
61+
<HintPath>..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll</HintPath>
7062
<Private>True</Private>
7163
</Reference>
7264
<Reference Include="System.Xml.Linq" />
@@ -75,8 +67,8 @@
7567
<Reference Include="System.Data" />
7668
<Reference Include="System.Net.Http" />
7769
<Reference Include="System.Xml" />
78-
<Reference Include="WebSocket4Net, Version=0.15.0.9, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
79-
<HintPath>..\packages\WebSocket4Net.0.15.0-beta9\lib\net45\WebSocket4Net.dll</HintPath>
70+
<Reference Include="WebSocket4Net, Version=0.15.1.10, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
71+
<HintPath>..\packages\WebSocket4Net.0.15.1\lib\net45\WebSocket4Net.dll</HintPath>
8072
<Private>True</Private>
8173
</Reference>
8274
</ItemGroup>

‎ReactiveXComponent/packages.config‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
4-
<package id="RabbitMQ.Client" version="4.1.1" targetFramework="net451" />
5-
<package id="Rx-Core" version="2.2.5" targetFramework="net45" />
6-
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
7-
<package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
8-
<package id="Rx-Main" version="2.2.5" targetFramework="net45" />
9-
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
10-
<package id="Rx-Providers" version="2.2.4" targetFramework="net45" />
11-
<package id="SuperSocket.ClientEngine.Core" version="0.8.0.12" targetFramework="net451" />
12-
<package id="WebSocket4Net" version="0.15.0-beta9" targetFramework="net451" />
3+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net451" />
4+
<package id="RabbitMQ.Client" version="4.1.3" targetFramework="net451" />
5+
<package id="SuperSocket.ClientEngine.Core" version="0.9.0" targetFramework="net451" />
6+
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net451" />
7+
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net451" />
8+
<package id="System.Reactive.Linq" version="3.1.1" targetFramework="net451" />
9+
<package id="WebSocket4Net" version="0.15.1" targetFramework="net451" />
1310
</packages>

‎ReactiveXComponentTest/Configuration/ConfigurationTests.cs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.IO;
1+
using System;
2+
using System.IO;
23
using NFluent;
34
using NUnit.Framework;
45
using ReactiveXComponent.Common;
@@ -10,8 +11,8 @@ namespace ReactiveXComponentTest.Configuration
1011
[TestFixture]
1112
public class ConfigurationTests
1213
{
13-
private const string RabbitMqApiFileName = "RabbitMqTestApi.xcApi";
14-
private const string WebSocketApiFileName = "webSocketTestApi.xcApi";
14+
private readonly string _rabbitMqApiFileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "RabbitMqTestApi.xcApi");
15+
private readonly string _webSocketApiFileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "webSocketTestApi.xcApi");
1516

1617
private IXCConfiguration _rabbitMqConfiguration;
1718
private IXCConfiguration _webSocketConfiguration;
@@ -22,11 +23,11 @@ private string GetApiFileName(ConnectionType connectionType)
2223

2324
if (connectionType == ConnectionType.RabbitMq)
2425
{
25-
apiFileName = RabbitMqApiFileName;
26+
apiFileName = _rabbitMqApiFileName;
2627
}
2728
else if (connectionType == ConnectionType.WebSocket)
2829
{
29-
apiFileName = WebSocketApiFileName;
30+
apiFileName = _webSocketApiFileName;
3031
}
3132

3233
return apiFileName;
@@ -35,11 +36,11 @@ private string GetApiFileName(ConnectionType connectionType)
3536
[SetUp]
3637
public void SetUp()
3738
{
38-
var rabbitMqstream = new FileStream(RabbitMqApiFileName, FileMode.Open, FileAccess.Read);
39+
var rabbitMqstream = new FileStream(_rabbitMqApiFileName, FileMode.Open, FileAccess.Read);
3940
_rabbitMqConfiguration = new XCConfiguration(new XCApiConfigParser());
4041
_rabbitMqConfiguration.Init(rabbitMqstream);
4142

42-
var webSocketstream = new FileStream(WebSocketApiFileName, FileMode.Open, FileAccess.Read);
43+
var webSocketstream = new FileStream(_webSocketApiFileName, FileMode.Open, FileAccess.Read);
4344
_webSocketConfiguration = new XCConfiguration(new XCApiConfigParser());
4445
_webSocketConfiguration.Init(webSocketstream);
4546
}

‎ReactiveXComponentTest/ReactiveXComponentTest.csproj‎

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,38 +34,48 @@
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
38-
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
37+
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
38+
<HintPath>..\packages\Castle.Core.4.2.0\lib\net45\Castle.Core.dll</HintPath>
3939
<Private>True</Private>
4040
</Reference>
41-
<Reference Include="NFluent, Version=1.3.1.0, Culture=neutral, PublicKeyToken=18828b37b84b1437, processorArchitecture=MSIL">
42-
<SpecificVersion>False</SpecificVersion>
43-
<HintPath>..\packages\NFluent.1.2.0.0\lib\portable-net45+sl5+netcore45+MonoAndroid1+MonoTouch1\NFluent.dll</HintPath>
41+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
43+
<Private>True</Private>
4444
</Reference>
45-
<Reference Include="NSubstitute, Version=1.9.2.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
46-
<SpecificVersion>False</SpecificVersion>
47-
<HintPath>..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
45+
<Reference Include="NFluent, Version=2.1.0.99, Culture=neutral, PublicKeyToken=18828b37b84b1437, processorArchitecture=MSIL">
46+
<HintPath>..\packages\NFluent.2.1.0\lib\net45\NFluent.dll</HintPath>
47+
<Private>True</Private>
4848
</Reference>
49-
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
50-
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
49+
<Reference Include="NSubstitute, Version=3.1.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
50+
<HintPath>..\packages\NSubstitute.3.1.0\lib\net45\NSubstitute.dll</HintPath>
51+
<Private>True</Private>
52+
</Reference>
53+
<Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
54+
<HintPath>..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
5155
<Private>True</Private>
5256
</Reference>
5357
<Reference Include="RabbitMQ.Client, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
54-
<HintPath>..\packages\RabbitMQ.Client.4.1.1\lib\net451\RabbitMQ.Client.dll</HintPath>
58+
<HintPath>..\packages\RabbitMQ.Client.4.1.3\lib\net451\RabbitMQ.Client.dll</HintPath>
5559
<Private>True</Private>
5660
</Reference>
5761
<Reference Include="System" />
62+
<Reference Include="System.Configuration" />
5863
<Reference Include="System.Core" />
59-
<Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60-
<SpecificVersion>False</SpecificVersion>
61-
<HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
64+
<Reference Include="System.Reactive.Core, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
65+
<HintPath>..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll</HintPath>
66+
<Private>True</Private>
6267
</Reference>
63-
<Reference Include="System.Reactive.Interfaces">
64-
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
68+
<Reference Include="System.Reactive.Interfaces, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
69+
<HintPath>..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll</HintPath>
70+
<Private>True</Private>
71+
</Reference>
72+
<Reference Include="System.Reactive.Linq, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
73+
<HintPath>..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll</HintPath>
74+
<Private>True</Private>
6575
</Reference>
66-
<Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67-
<SpecificVersion>False</SpecificVersion>
68-
<HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
76+
<Reference Include="System.Threading.Tasks.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
77+
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
78+
<Private>True</Private>
6979
</Reference>
7080
<Reference Include="System.Xaml" />
7181
<Reference Include="System.Xml.Linq" />

‎ReactiveXComponentTest/packages.config‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
4-
<package id="NFluent" version="1.2.0.0" targetFramework="net45" />
5-
<package id="NSubstitute" version="1.10.0.0" targetFramework="net45" />
6-
<package id="NUnit" version="2.6.4" targetFramework="net45" />
7-
<package id="RabbitMQ.Client" version="4.1.1" targetFramework="net451" />
8-
<package id="Rx-Core" version="2.2.5" targetFramework="net45" />
9-
<package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
10-
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
3+
<package id="Castle.Core" version="4.2.0" targetFramework="net451" />
4+
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net451" />
5+
<package id="NFluent" version="2.1.0" targetFramework="net451" />
6+
<package id="NSubstitute" version="3.1.0" targetFramework="net451" />
7+
<package id="NUnit" version="3.9.0" targetFramework="net451" />
8+
<package id="RabbitMQ.Client" version="4.1.3" targetFramework="net451" />
9+
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net451" />
10+
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net451" />
11+
<package id="System.Reactive.Linq" version="3.1.1" targetFramework="net451" />
12+
<package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net451" />
1113
</packages>

‎build.cake‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#tool "nuget:?package=NUnit.Runners&version=2.6.4"
1+
#tool "nuget:?package=NUnit.Runners&version=3.7.0&include=./**/*"
22
#tool "nuget:?package=ILRepack"
33
#addin "Cake.FileHelpers&version=2.0.0"
44
#addin "Cake.Incubator&version=1.6.0"
@@ -47,8 +47,8 @@ Task("Test")
4747
};
4848

4949
var testAssemblies = GetFiles(testAssembliesPatterns);
50-
var nunitSettings = new NUnitSettings(){ ResultsFile = "TestResults.xml" };
51-
NUnit(testAssemblies, nunitSettings);
50+
var nunitSettings = new NUnit3Settings(){ Results = new[] { new NUnit3Result { FileName = "TestResults.xml" } } };
51+
NUnit3(testAssemblies, nunitSettings);
5252
});
5353

5454
Task("Merge")
@@ -80,10 +80,10 @@ Task("CreatePackage")
8080
var formattedNugetVersion = FormatNugetVersion(version);
8181

8282
var filesToPackPatterns = new string[]
83-
{
84-
"./packaging/*.dll",
85-
"./packaging/*.pdb"
86-
};
83+
{
84+
"./packaging/*.dll",
85+
"./packaging/*.pdb"
86+
};
8787

8888
var filesToPack = GetFiles(filesToPackPatterns);
8989

0 commit comments

Comments
 (0)