Skip to content

WampSharp v1.2.5.21-beta #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 52 commits into from
Aug 29, 2016
Merged

WampSharp v1.2.5.21-beta #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
f7d9003
Allowing Func<> registration
Oct 22, 2015
6b19955
Adding overloads and runtime checks
Oct 31, 2015
dff24f6
Adding formatting to logs
Apr 28, 2016
92b1baf
Updating liblog
Apr 28, 2016
400e921
Initial Tuples work
Aug 3, 2016
1b5838f
Adding tests and fixing a bug
Aug 3, 2016
230476d
Adding CalleeProxy Tuple support
Aug 4, 2016
c037007
Creating a global ValueTupleArrayConverter
Aug 4, 2016
be64d44
Supporting loooooong tuples
Aug 5, 2016
ba3820c
Throwing an exception if the given array is short
Aug 6, 2016
2374825
Fixing framework 4.5 solution
Aug 12, 2016
1dc0c1f
Fixing PCL and Mono slns
Aug 12, 2016
e529d68
Fixing NET40 csprojs, those don't compile yet
Aug 12, 2016
e9e4ab5
Doing some magic to make this compile on NET40
Aug 12, 2016
0637e0c
Adding tuple validation
Aug 12, 2016
4ef2356
Fixing progressive method validation
Aug 12, 2016
e7e463e
Adding a callee proxy positional tuple result test
Aug 12, 2016
1116c16
Adding a comment.
Aug 12, 2016
8bac9c0
Merge from develop
Aug 20, 2016
f8882da
Merge from func-support
Aug 20, 2016
7106f46
Updating project.json, nuspec
Aug 20, 2016
860f83c
Updating .gitignore
Aug 20, 2016
ed61c1b
Fixing PCL build and logical error
Aug 20, 2016
962c9f3
Adding CalleeProxyBase methods that return delegates
Aug 20, 2016
dba8c89
Making code generator work with ValueTuples
Aug 20, 2016
3c584cd
Merge from formatted-logging
Aug 20, 2016
bbf08d0
Merge branch 'wampv2' into develop
Aug 20, 2016
4f2c648
Merge from wampv2
Aug 24, 2016
531a15f
Adding security fluent syntax for WebSocket4Net
Aug 24, 2016
39e11ec
Mono and NET40
Aug 24, 2016
4eb4f0f
Removing redundant field
Aug 24, 2016
e4fe4fa
Removing orig files
Aug 24, 2016
9fe0475
Adding options to setup options for WebSocket connections
Aug 24, 2016
37dc02f
Introducing WampEventValueTupleConverter, wow!
Aug 26, 2016
59ebf7e
Adding rx support
Aug 26, 2016
8501e24
Adding csprojs
Aug 26, 2016
f93d53a
Generating ValueTupleConverter delegates once per ValueTuple type
Aug 26, 2016
e07bdcb
Updating csprojs
Aug 26, 2016
5dfcbb9
Fixing dotnet core build
Aug 26, 2016
5bb405a
Fixing framework 4 build, adding further validation
Aug 26, 2016
f6cc689
Yet another optimization
Aug 26, 2016
e8fabc1
Unit tests for new features
Aug 27, 2016
d8a971a
Added a missing assert
Aug 27, 2016
eea7303
Unwrapping return type to get ValueTuple type
Aug 27, 2016
261af14
Treating long tuples as well
Aug 28, 2016
8376c47
Adding tests for ValueTuples
Aug 28, 2016
813196d
Updating csprojs
Aug 28, 2016
bd5d478
Fixing .NET Core build
Aug 28, 2016
c5237c3
Disallow invalid ValueTuple types.
Aug 28, 2016
e912cc1
Fixing IsValidTupleType recursion
Aug 28, 2016
4c01e86
Fixing PCL unit tests
Aug 28, 2016
f41d897
Updating WebSocket4Net
Aug 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,4 +250,5 @@ paket-files/

# JetBrains Rider
.idea/
*.sln.iml
*.sln.iml
*.project.lock.json
4 changes: 1 addition & 3 deletions NuGet/WampSharp.WebSocket4Net.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
</group>
<group targetFramework=".NETStandard1.3">
<dependency id="WampSharp" version="[$version$]" />
<dependency id="WebSocket4Net" version="[0.15.0-beta4, )" />
<!--This line is temporary here, until WebSocket4Net fixes its dependencies-->
<dependency id="SuperSocket.ClientEngine.Core" version="[0.8.0.6, )" />
<dependency id="WebSocket4Net" version="[0.15.0-beta5, )" />
</group>
</dependencies>
<id>WampSharp.WebSocket4Net</id>
Expand Down
4 changes: 4 additions & 0 deletions NuGet/WampSharp.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<dependency id="System.Collections.Immutable" version="[1.2.0, )" />
<dependency id="System.Threading.Tasks.Dataflow" version="[4.6.0, )" />
<dependency id="Castle.Core" version="[3.3.1, )" />
<dependency id="System.ValueTuple" version="[4.0.0-rc3-24212-01, )" />
</group>
<group targetFramework="net40">
<dependency id="rx-main" version="[2.2.5]" />
Expand All @@ -21,6 +22,7 @@
<dependency id="System.Reactive" version="[3.0.0, )" />
<dependency id="System.Collections.Immutable" version="[1.2.0, )" />
<dependency id="System.Threading.Tasks.Dataflow" version="[4.6.0, )" />
<dependency id="System.ValueTuple" version="[4.0.0-rc3-24212-01, )" />
</group>
<group targetFramework=".NETStandard1.3">
<dependency id="Microsoft.CSharp" version="[4.0.1, )" />
Expand All @@ -37,6 +39,7 @@
<dependency id="System.Runtime.Serialization.Primitives" version="[4.1.1, )" />
<dependency id="System.Security.Cryptography.Algorithms" version="[4.2.0, )" />
<dependency id="System.Text.RegularExpressions" version="[4.1.0, )" />
<dependency id="System.ValueTuple" version="[4.0.0-rc3-24212-01, )" />
</group>
<group targetFramework="UAP10.0">
<dependency id="Microsoft.CSharp" version="[4.0.1, )" />
Expand All @@ -53,6 +56,7 @@
<dependency id="System.Runtime.Serialization.Primitives" version="[4.1.1, )" />
<dependency id="System.Security.Cryptography.Algorithms" version="[4.2.0, )" />
<dependency id="System.Text.RegularExpressions" version="[4.1.0, )" />
<dependency id="System.ValueTuple" version="[4.0.0-rc3-24212-01, )" />
</group>
</dependencies>
<id>WampSharp</id>
Expand Down
8 changes: 7 additions & 1 deletion src/mono/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,26 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WebSocket4Net, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\WebSocket4Net.0.15.0-beta4\lib\net45\WebSocket4Net.dll</HintPath>
<HintPath>..\..\packages\WebSocket4Net.0.15.0-beta5\lib\net45\WebSocket4Net.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\..\net45\Default\WampSharp.WebSocket4Net\Properties\AssemblyInfo.cs">
<Link>Properties\AssemblyInfo.cs</Link>
</Compile>
<Compile Include="..\..\..\net45\Default\WampSharp.WebSocket4Net\WAMP2\V2\Fluent\IWebSocket4NetTransportSyntax.cs">
<Link>WAMP2\V2\Fluent\IWebSocket4NetTransportSyntax.cs</Link>
</Compile>
<Compile Include="..\..\..\net45\Default\WampSharp.WebSocket4Net\WAMP2\V2\Fluent\WebSocket4NetActivator.cs">
<Link>WAMP2\V2\Fluent\WebSocket4NetActivator.cs</Link>
</Compile>
<Compile Include="..\..\..\net45\Default\WampSharp.WebSocket4Net\WAMP2\V2\Fluent\WebSocket4NetChannelFactoryExtensions.cs">
<Link>WAMP2\V2\Fluent\WebSocket4NetChannelFactoryExtensions.cs</Link>
</Compile>
<Compile Include="..\..\..\net45\Default\WampSharp.WebSocket4Net\WAMP2\V2\Fluent\WebSocket4NetTransportSyntax.cs">
<Link>WAMP2\V2\Fluent\WebSocket4NetTransportSyntax.cs</Link>
</Compile>
<Compile Include="..\..\..\net45\Default\WampSharp.WebSocket4Net\WebSocket4Net\WebSocket4NetBinaryConnection.cs">
<Link>WebSocket4Net\WebSocket4NetBinaryConnection.cs</Link>
</Compile>
Expand Down
2 changes: 1 addition & 1 deletion src/mono/Default/WampSharp.WebSocket4Net/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SuperSocket.ClientEngine.Core" version="0.8.0.6" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta4" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta5" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion src/mono/Samples/WAMP1/WampSharp.CraClientSample/WampSharp.CraClientSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WebSocket4Net, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta4\lib\net45\WebSocket4Net.dll</HintPath>
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta5\lib\net45\WebSocket4Net.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/mono/Samples/WAMP1/WampSharp.CraClientSample/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<packages>
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
<package id="SuperSocket.ClientEngine.Core" version="0.8.0.6" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta4" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta5" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion src/mono/Samples/WAMP1/WampSharp.RpcClientSample/WampSharp.RpcClientSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WebSocket4Net, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta4\lib\net45\WebSocket4Net.dll</HintPath>
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta5\lib\net45\WebSocket4Net.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/mono/Samples/WAMP1/WampSharp.RpcClientSample/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<packages>
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
<package id="SuperSocket.ClientEngine.Core" version="0.8.0.6" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta4" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta5" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion src/mono/Samples/WAMP2/WampSharp.Samples.Callee/WampSharp.Samples.Callee.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WebSocket4Net, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta4\lib\net45\WebSocket4Net.dll</HintPath>
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta5\lib\net45\WebSocket4Net.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/mono/Samples/WAMP2/WampSharp.Samples.Callee/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
<package id="Newtonsoft.Msgpack" version="0.1.10" targetFramework="net45" />
<package id="SuperSocket.ClientEngine.Core" version="0.8.0.6" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta4" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta5" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion src/mono/Samples/WAMP2/WampSharp.Samples.Caller/WampSharp.Samples.Caller.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WebSocket4Net, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta4\lib\net45\WebSocket4Net.dll</HintPath>
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta5\lib\net45\WebSocket4Net.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/mono/Samples/WAMP2/WampSharp.Samples.Caller/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
<package id="Newtonsoft.Msgpack" version="0.1.10" targetFramework="net45" />
<package id="SuperSocket.ClientEngine.Core" version="0.8.0.6" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta4" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta5" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion src/mono/Samples/WAMP2/WampSharp.Samples.EdgeJs/WampSharp.Samples.EdgeJs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WebSocket4Net, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta4\lib\net45\WebSocket4Net.dll</HintPath>
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta5\lib\net45\WebSocket4Net.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/mono/Samples/WAMP2/WampSharp.Samples.EdgeJs/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
<package id="Newtonsoft.Msgpack" version="0.1.10" targetFramework="net45" />
<package id="SuperSocket.ClientEngine.Core" version="0.8.0.6" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta4" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta5" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion src/mono/Samples/WAMP2/WampSharp.Samples.Publisher/WampSharp.Samples.Publisher.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WebSocket4Net, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta4\lib\net45\WebSocket4Net.dll</HintPath>
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta5\lib\net45\WebSocket4Net.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/mono/Samples/WAMP2/WampSharp.Samples.Publisher/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
<package id="Newtonsoft.Msgpack" version="0.1.10" targetFramework="net45" />
<package id="SuperSocket.ClientEngine.Core" version="0.8.0.6" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta4" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta5" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion src/mono/Samples/WAMP2/WampSharp.Samples.Subscriber/WampSharp.Samples.Subscriber.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WebSocket4Net, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta4\lib\net45\WebSocket4Net.dll</HintPath>
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta5\lib\net45\WebSocket4Net.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/mono/Samples/WAMP2/WampSharp.Samples.Subscriber/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
<package id="Newtonsoft.Msgpack" version="0.1.10" targetFramework="net45" />
<package id="SuperSocket.ClientEngine.Core" version="0.8.0.6" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta4" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta5" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion ...no/Samples/WAMP2/WampSharp.Samples.WampCra.Client/WampSharp.Samples.WampCra.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="WebSocket4Net, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta4\lib\net45\WebSocket4Net.dll</HintPath>
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta5\lib\net45\WebSocket4Net.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/mono/Samples/WAMP2/WampSharp.Samples.WampCra.Client/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SuperSocket.ClientEngine.Core" version="0.8.0.6" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta4" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta5" targetFramework="net45" />
</packages>
30 changes: 28 additions & 2 deletions src/mono/Tests/WampSharp.Tests.Wampv2/WampSharp.Tests.Wampv2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;NET45;MONO</DefineConstants>
<DefineConstants>TRACE;DEBUG;NET45;MONO WAMPCRA</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;NET45;MONO</DefineConstants>
<DefineConstants>TRACE;NET45;MONO WAMPCRA</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
Expand Down Expand Up @@ -60,6 +61,10 @@
<Private>True</Private>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ValueTuple, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
Expand Down Expand Up @@ -136,6 +141,12 @@
<Compile Include="..\..\..\net45\Tests\WampSharp.Tests.Wampv2\Integration\RpcProxies\IErrorsService.cs">
<Link>Integration\RpcProxies\IErrorsService.cs</Link>
</Compile>
<Compile Include="..\..\..\net45\Tests\WampSharp.Tests.Wampv2\Integration\RpcProxies\ILongValueTuplesServiceProxy.cs">
<Link>Integration\RpcProxies\ILongValueTuplesServiceProxy.cs</Link>
</Compile>
<Compile Include="..\..\..\net45\Tests\WampSharp.Tests.Wampv2\Integration\RpcProxies\INamedTupleComplexResultService.cs">
<Link>Integration\RpcProxies\INamedTupleComplexResultService.cs</Link>
</Compile>
<Compile Include="..\..\..\net45\Tests\WampSharp.Tests.Wampv2\Integration\RpcProxies\ISlowSquareService.cs">
<Link>Integration\RpcProxies\ISlowSquareService.cs</Link>
</Compile>
Expand All @@ -151,12 +162,27 @@
<Compile Include="..\..\..\net45\Tests\WampSharp.Tests.Wampv2\Integration\RpcServices\ErrorsService.cs">
<Link>Integration\RpcServices\ErrorsService.cs</Link>
</Compile>
<Compile Include="..\..\..\net45\Tests\WampSharp.Tests.Wampv2\Integration\RpcServices\LongValueTuplesCalleeService.cs">
<Link>Integration\RpcServices\LongValueTuplesCalleeService.cs</Link>
</Compile>
<Compile Include="..\..\..\net45\Tests\WampSharp.Tests.Wampv2\Integration\RpcServices\LongValueTuplesService.cs">
<Link>Integration\RpcServices\LongValueTuplesService.cs</Link>
</Compile>
<Compile Include="..\..\..\net45\Tests\WampSharp.Tests.Wampv2\Integration\RpcServices\NamedTupleComplexResultService.cs">
<Link>Integration\RpcServices\NamedTupleComplexResultService.cs</Link>
</Compile>
<Compile Include="..\..\..\net45\Tests\WampSharp.Tests.Wampv2\Integration\RpcServices\PositionalTupleComplexResultService.cs">
<Link>Integration\RpcServices\PositionalTupleComplexResultService.cs</Link>
</Compile>
<Compile Include="..\..\..\net45\Tests\WampSharp.Tests.Wampv2\Integration\RpcServices\SlowSquareService.cs">
<Link>Integration\RpcServices\SlowSquareService.cs</Link>
</Compile>
<Compile Include="..\..\..\net45\Tests\WampSharp.Tests.Wampv2\Integration\RpcServices\TimeService.cs">
<Link>Integration\RpcServices\TimeService.cs</Link>
</Compile>
<Compile Include="..\..\..\net45\Tests\WampSharp.Tests.Wampv2\Integration\PubSubSubjectTupleTests.cs">
<Link>Integration\PubSubSubjectTupleTests.cs</Link>
</Compile>
<Compile Include="..\..\..\net45\Tests\WampSharp.Tests.Wampv2\Integration\SerializedValue.cs">
<Link>Integration\SerializedValue.cs</Link>
</Compile>
Expand Down
1 change: 1 addition & 0 deletions src/mono/Tests/WampSharp.Tests.Wampv2/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
<package id="Moq" version="4.2.1502.0911" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
<package id="NUnit" version="2.6.4" targetFramework="net45" />
<package id="System.ValueTuple" version="4.0.0-rc3-24212-01" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion src/mono/WampSharp.Default.Client/WampSharp.Default.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WebSocket4Net, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\WebSocket4Net.0.15.0-beta4\lib\net45\WebSocket4Net.dll</HintPath>
<HintPath>..\packages\WebSocket4Net.0.15.0-beta5\lib\net45\WebSocket4Net.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/mono/WampSharp.Default.Client/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<packages>
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
<package id="SuperSocket.ClientEngine.Core" version="0.8.0.6" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta4" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta5" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion src/mono/WampSharp.WAMP1.Default/WampSharp.WAMP1.Default.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WebSocket4Net, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\WebSocket4Net.0.15.0-beta4\lib\net45\WebSocket4Net.dll</HintPath>
<HintPath>..\packages\WebSocket4Net.0.15.0-beta5\lib\net45\WebSocket4Net.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/mono/WampSharp.WAMP1.Default/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<package id="Fleck" version="0.13.0.57" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
<package id="SuperSocket.ClientEngine.Core" version="0.8.0.6" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta4" targetFramework="net45" />
<package id="WebSocket4Net" version="0.15.0-beta5" targetFramework="net45" />
</packages>
Loading