Skip to content

Commit 3c8922e

Browse files
darkldarkl
authored
Merge pull request #144 from Code-Sharp/develop
WampSharp v1.2.5.21-beta
2 parents ada6927 + f41d897 commit 3c8922e

File tree

168 files changed

+3359
-363
lines changed

Some content is hidden

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

168 files changed

+3359
-363
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,4 +250,5 @@ paket-files/
250250

251251
# JetBrains Rider
252252
.idea/
253-
*.sln.iml
253+
*.sln.iml
254+
*.project.lock.json

‎NuGet/WampSharp.WebSocket4Net.nuspec‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
</group>
1616
<group targetFramework=".NETStandard1.3">
1717
<dependency id="WampSharp" version="[$version$]" />
18-
<dependency id="WebSocket4Net" version="[0.15.0-beta4, )" />
19-
<!--This line is temporary here, until WebSocket4Net fixes its dependencies-->
20-
<dependency id="SuperSocket.ClientEngine.Core" version="[0.8.0.6, )" />
18+
<dependency id="WebSocket4Net" version="[0.15.0-beta5, )" />
2119
</group>
2220
</dependencies>
2321
<id>WampSharp.WebSocket4Net</id>

‎NuGet/WampSharp.nuspec‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<dependency id="System.Collections.Immutable" version="[1.2.0, )" />
1111
<dependency id="System.Threading.Tasks.Dataflow" version="[4.6.0, )" />
1212
<dependency id="Castle.Core" version="[3.3.1, )" />
13+
<dependency id="System.ValueTuple" version="[4.0.0-rc3-24212-01, )" />
1314
</group>
1415
<group targetFramework="net40">
1516
<dependency id="rx-main" version="[2.2.5]" />
@@ -21,6 +22,7 @@
2122
<dependency id="System.Reactive" version="[3.0.0, )" />
2223
<dependency id="System.Collections.Immutable" version="[1.2.0, )" />
2324
<dependency id="System.Threading.Tasks.Dataflow" version="[4.6.0, )" />
25+
<dependency id="System.ValueTuple" version="[4.0.0-rc3-24212-01, )" />
2426
</group>
2527
<group targetFramework=".NETStandard1.3">
2628
<dependency id="Microsoft.CSharp" version="[4.0.1, )" />
@@ -37,6 +39,7 @@
3739
<dependency id="System.Runtime.Serialization.Primitives" version="[4.1.1, )" />
3840
<dependency id="System.Security.Cryptography.Algorithms" version="[4.2.0, )" />
3941
<dependency id="System.Text.RegularExpressions" version="[4.1.0, )" />
42+
<dependency id="System.ValueTuple" version="[4.0.0-rc3-24212-01, )" />
4043
</group>
4144
<group targetFramework="UAP10.0">
4245
<dependency id="Microsoft.CSharp" version="[4.0.1, )" />
@@ -53,6 +56,7 @@
5356
<dependency id="System.Runtime.Serialization.Primitives" version="[4.1.1, )" />
5457
<dependency id="System.Security.Cryptography.Algorithms" version="[4.2.0, )" />
5558
<dependency id="System.Text.RegularExpressions" version="[4.1.0, )" />
59+
<dependency id="System.ValueTuple" version="[4.0.0-rc3-24212-01, )" />
5660
</group>
5761
</dependencies>
5862
<id>WampSharp</id>

‎src/mono/Default/WampSharp.WebSocket4Net/WampSharp.WebSocket4Net.csproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,26 @@
4646
<Reference Include="System.Data" />
4747
<Reference Include="System.Xml" />
4848
<Reference Include="WebSocket4Net, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\..\packages\WebSocket4Net.0.15.0-beta4\lib\net45\WebSocket4Net.dll</HintPath>
49+
<HintPath>..\..\packages\WebSocket4Net.0.15.0-beta5\lib\net45\WebSocket4Net.dll</HintPath>
5050
<Private>True</Private>
5151
</Reference>
5252
</ItemGroup>
5353
<ItemGroup>
5454
<Compile Include="..\..\..\net45\Default\WampSharp.WebSocket4Net\Properties\AssemblyInfo.cs">
5555
<Link>Properties\AssemblyInfo.cs</Link>
5656
</Compile>
57+
<Compile Include="..\..\..\net45\Default\WampSharp.WebSocket4Net\WAMP2\V2\Fluent\IWebSocket4NetTransportSyntax.cs">
58+
<Link>WAMP2\V2\Fluent\IWebSocket4NetTransportSyntax.cs</Link>
59+
</Compile>
5760
<Compile Include="..\..\..\net45\Default\WampSharp.WebSocket4Net\WAMP2\V2\Fluent\WebSocket4NetActivator.cs">
5861
<Link>WAMP2\V2\Fluent\WebSocket4NetActivator.cs</Link>
5962
</Compile>
6063
<Compile Include="..\..\..\net45\Default\WampSharp.WebSocket4Net\WAMP2\V2\Fluent\WebSocket4NetChannelFactoryExtensions.cs">
6164
<Link>WAMP2\V2\Fluent\WebSocket4NetChannelFactoryExtensions.cs</Link>
6265
</Compile>
66+
<Compile Include="..\..\..\net45\Default\WampSharp.WebSocket4Net\WAMP2\V2\Fluent\WebSocket4NetTransportSyntax.cs">
67+
<Link>WAMP2\V2\Fluent\WebSocket4NetTransportSyntax.cs</Link>
68+
</Compile>
6369
<Compile Include="..\..\..\net45\Default\WampSharp.WebSocket4Net\WebSocket4Net\WebSocket4NetBinaryConnection.cs">
6470
<Link>WebSocket4Net\WebSocket4NetBinaryConnection.cs</Link>
6571
</Compile>

‎src/mono/Default/WampSharp.WebSocket4Net/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="SuperSocket.ClientEngine.Core" version="0.8.0.6" targetFramework="net45" />
4-
<package id="WebSocket4Net" version="0.15.0-beta4" targetFramework="net45" />
4+
<package id="WebSocket4Net" version="0.15.0-beta5" targetFramework="net45" />
55
</packages>

‎src/mono/Samples/WAMP1/WampSharp.CraClientSample/WampSharp.CraClientSample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<Reference Include="System.Data" />
6060
<Reference Include="System.Xml" />
6161
<Reference Include="WebSocket4Net, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
62-
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta4\lib\net45\WebSocket4Net.dll</HintPath>
62+
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta5\lib\net45\WebSocket4Net.dll</HintPath>
6363
<Private>True</Private>
6464
</Reference>
6565
</ItemGroup>

‎src/mono/Samples/WAMP1/WampSharp.CraClientSample/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<packages>
33
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
44
<package id="SuperSocket.ClientEngine.Core" version="0.8.0.6" targetFramework="net45" />
5-
<package id="WebSocket4Net" version="0.15.0-beta4" targetFramework="net45" />
5+
<package id="WebSocket4Net" version="0.15.0-beta5" targetFramework="net45" />
66
</packages>

‎src/mono/Samples/WAMP1/WampSharp.RpcClientSample/WampSharp.RpcClientSample.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<Reference Include="System.Data" />
6161
<Reference Include="System.Xml" />
6262
<Reference Include="WebSocket4Net, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
63-
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta4\lib\net45\WebSocket4Net.dll</HintPath>
63+
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta5\lib\net45\WebSocket4Net.dll</HintPath>
6464
<Private>True</Private>
6565
</Reference>
6666
</ItemGroup>

‎src/mono/Samples/WAMP1/WampSharp.RpcClientSample/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<packages>
33
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
44
<package id="SuperSocket.ClientEngine.Core" version="0.8.0.6" targetFramework="net45" />
5-
<package id="WebSocket4Net" version="0.15.0-beta4" targetFramework="net45" />
5+
<package id="WebSocket4Net" version="0.15.0-beta5" targetFramework="net45" />
66
</packages>

‎src/mono/Samples/WAMP2/WampSharp.Samples.Callee/WampSharp.Samples.Callee.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<Reference Include="System.Data" />
7777
<Reference Include="System.Xml" />
7878
<Reference Include="WebSocket4Net, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
79-
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta4\lib\net45\WebSocket4Net.dll</HintPath>
79+
<HintPath>..\..\..\packages\WebSocket4Net.0.15.0-beta5\lib\net45\WebSocket4Net.dll</HintPath>
8080
<Private>True</Private>
8181
</Reference>
8282
</ItemGroup>

0 commit comments

Comments
 (0)