Skip to content

Commit ef40125

Browse files
author
Elad Zelingher
committed
Merge branch 'develop' into wampv2
2 parents 54b8ee2 + f4c73e0 commit ef40125

File tree

484 files changed

+14115
-3226
lines changed

Some content is hidden

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

484 files changed

+14115
-3226
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
language: csharp
44

5-
mono:
6-
- 3.12.0
7-
85
solution: src/mono/WampSharpMono.sln
96

107
install:

‎NuGet/WampSharp.Fleck.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<owners />
77
<dependencies>
88
<dependency id="WampSharp" version="[$version$]" />
9-
<dependency id="Fleck" version="[0.13.0.48]" />
9+
<dependency id="Fleck" version="[0.13.0.57]" />
1010
</dependencies>
1111
<id>WampSharp.Fleck</id>
1212
<title>WampSharp Fleck transport</title>
@@ -21,4 +21,4 @@
2121
<file src="bin\net40\WampSharp.Fleck.dll" target="lib\net40\WampSharp.Fleck.dll" />
2222
<file src="bin\net40\WampSharp.Fleck.xml" target="lib\net40\WampSharp.Fleck.xml" />
2323
</files>
24-
</package>
24+
</package>

‎NuGet/WampSharp.NewtonsoftJson.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<owners />
77
<dependencies>
88
<dependency id="WampSharp" version="[$version$]" />
9-
<dependency id="Newtonsoft.Json" version="[6.0.6]" />
9+
<dependency id="Newtonsoft.Json" version="[6.0.5, 7)" />
1010
</dependencies>
1111
<id>WampSharp.NewtonsoftJson</id>
1212
<title>WampSharp Newtonsoft.Json binding</title>
@@ -23,4 +23,4 @@
2323
<file src="bin\pcl\WampSharp.NewtonsoftJson.dll" target="lib\portable-win81+wpa81\WampSharp.NewtonsoftJson.dll" />
2424
<file src="bin\pcl\WampSharp.NewtonsoftJson.xml" target="lib\portable-win81+wpa81\WampSharp.NewtonsoftJson.xml" />
2525
</files>
26-
</package>
26+
</package>

‎NuGet/WampSharp.NewtonsoftMsgpack.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<dependencies>
88
<dependency id="WampSharp" version="[$version$]" />
99
<dependency id="WampSharp.NewtonsoftJson" version="[$version$]" />
10-
<dependency id="Newtonsoft.Msgpack" version="[0.1.5]" />
10+
<dependency id="Newtonsoft.Msgpack" version="[0.1.6]" />
1111
</dependencies>
1212
<id>WampSharp.NewtonsoftMsgpack</id>
1313
<title>WampSharp Newtonsoft.Msgpack binding</title>
@@ -22,4 +22,4 @@
2222
<file src="bin\net40\WampSharp.NewtonsoftMsgpack.dll" target="lib\net40\WampSharp.NewtonsoftMsgpack.dll" />
2323
<file src="bin\net40\WampSharp.NewtonsoftMsgpack.xml" target="lib\net40\WampSharp.NewtonsoftMsgpack.xml" />
2424
</files>
25-
</package>
25+
</package>

‎NuGet/WampSharp.RawSocket.nuspec‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
<owners />
77
<dependencies>
88
<dependency id="WampSharp" version="[$version$]" />
9-
<dependency id="SuperSocket" version="[1.6.4]" />
10-
<dependency id="log4net" version="[2.0.3]" />
9+
<dependency id="Microsoft.IO.RecyclableMemoryStream" version="[1.1.0.0]" />
1110
</dependencies>
1211
<id>WampSharp.RawSocket</id>
1312
<title>WampSharp RawSocket support</title>
@@ -19,7 +18,5 @@
1918
<files>
2019
<file src="bin\net45\WampSharp.RawSocket.dll" target="lib\net45\WampSharp.RawSocket.dll" />
2120
<file src="bin\net45\WampSharp.RawSocket.xml" target="lib\net45\WampSharp.RawSocket.xml" />
22-
<file src="bin\net40\WampSharp.RawSocket.dll" target="lib\net40\WampSharp.RawSocket.dll" />
23-
<file src="bin\net40\WampSharp.RawSocket.xml" target="lib\net40\WampSharp.RawSocket.xml" />
2421
</files>
2522
</package>

‎NuGet/WampSharp.Vtortola.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<owners />
77
<dependencies>
88
<dependency id="WampSharp" version="[$version$]" />
9-
<dependency id="vtortola.WebSocketListener" version="[2.1.7.0]" />
9+
<dependency id="vtortola.WebSocketListener" version="[2.1.9.0]" />
1010
</dependencies>
1111
<id>WampSharp.Vtortola</id>
1212
<title>WampSharp Vtortola support</title>
@@ -19,4 +19,4 @@
1919
<file src="bin\net45\WampSharp.Vtortola.dll" target="lib\net45\WampSharp.Vtortola.dll" />
2020
<file src="bin\net45\WampSharp.Vtortola.xml" target="lib\net45\WampSharp.Vtortola.xml" />
2121
</files>
22-
</package>
22+
</package>

‎NuGet/WampSharp.WebSocket4Net.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<owners />
77
<dependencies>
88
<dependency id="WampSharp" version="[$version$]" />
9-
<dependency id="WebSocket4Net" version="[0.12]" />
9+
<dependency id="WebSocket4Net" version="[0.14]" />
1010
</dependencies>
1111
<id>WampSharp.WebSocket4Net</id>
1212
<title>WampSharp WebSocket4Net connection</title>
@@ -21,4 +21,4 @@
2121
<file src="bin\net40\WampSharp.WebSocket4Net.dll" target="lib\net40\WampSharp.WebSocket4Net.dll" />
2222
<file src="bin\net40\WampSharp.WebSocket4Net.xml" target="lib\net40\WampSharp.WebSocket4Net.xml" />
2323
</files>
24-
</package>
24+
</package>

‎README.md‎

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,29 @@ The implementation also supports WAMPv1, both client and server roles.
1313
Master | Provider
1414
------ | --------
1515
[![Build Status][WinImgMaster]][WinLinkMaster] | Windows CI Provided By [CodeBetter][] and [JetBrains][]
16-
[![Build Status][AppVeyorImgMaster]][AppVeyorLinkMaster] | Windows CI Provided By [AppVeyor][]
1716
[![Build Status][MonoImgMaster]][MonoLinkMaster] | Mono CI Provided by [travis-ci][]
1817

19-
## WampSharp v1.2.2.8-beta
2018

21-
WampSharp v1.2.2.8-beta released, see version [release notes](https://github.com/Code-Sharp/WampSharp/wiki/WampSharp-v1.2.2.8-beta-release-notes).
19+
## Advanced profile supported features:
20+
21+
The following [Advanced profile features](https://github.com/wamp-proto/wamp-proto/blob/master/spec/advanced.md) are supported
22+
23+
* [Progressive call results](https://github.com/wamp-proto/wamp-proto/blob/master/spec/advanced/progressive-call-results.md): [[caller tutorial|Caller role#progressive-calls]] | [[callee tutorial|Callee role#progressive-callee]]
24+
* [Caller identification](https://github.com/wamp-proto/wamp-proto/blob/master/spec/advanced/caller-identification.md): [[caller tutorial|Caller-role#caller-identification]] | [[callee tutorial|Callee-role#caller-identification]]
25+
* [Session meta api](https://github.com/wamp-proto/wamp-proto/blob/master/spec/advanced/session-meta-api.md), [Registration meta api](https://github.com/wamp-proto/wamp-proto/blob/master/spec/advanced/registration-meta-api.md), [Subscription meta api](https://github.com/wamp-proto/wamp-proto/blob/master/spec/advanced/subscription-meta-api.md)
26+
* [Shared registrations](https://github.com/wamp-proto/wamp-proto/blob/master/spec/advanced/shared-registration.md), see also [here](http://crossbar.io/docs/Shared-Registrations/)
27+
* [Subscriber black and whitelisting](https://github.com/wamp-proto/wamp-proto/blob/master/spec/advanced/subscriber-blackwhite-listing.md)
28+
* [Publisher exclusion](https://github.com/wamp-proto/wamp-proto/blob/master/spec/advanced/publisher-exclusion.md)
29+
* [Publisher identification](https://github.com/wamp-proto/wamp-proto/blob/master/spec/advanced/publisher-identification.md)
30+
* [Pattern-based subscriptions](https://github.com/wamp-proto/wamp-proto/blob/master/spec/advanced/pattern-based-subscription.md) - see also [here](http://crossbar.io/docs/Pattern-Based-Subscriptions/)
31+
* [Pattern-based registrations](https://github.com/wamp-proto/wamp-proto/blob/master/spec/advanced/pattern-based-registration.md) - see also [here](http://crossbar.io/docs/Pattern-Based-Registrations/)
32+
* [RawSocket transport](https://github.com/wamp-proto/wamp-proto/blob/master/spec/advanced/rawsocket-transport.md)
33+
* [Authentication](https://github.com/wamp-proto/wamp-proto/blob/master/spec/advanced/authentication.md)
34+
* [WAMP-CRA](https://github.com/wamp-proto/wamp-proto/blob/master/spec/advanced/challenge-response-authentication.md)
35+
36+
## WampSharp v1.2.1.6-beta
37+
38+
WampSharp v1.2.1.6-beta released, see version [release notes](https://github.com/Code-Sharp/WampSharp/wiki/WampSharp-v1.2.1.6-beta-release-notes).
2239

2340
## Get Started
2441

@@ -35,8 +52,6 @@ See [Wiki documentation](https://github.com/Code-Sharp/WampSharp/wiki) for more
3552

3653
WAMPv1 support is still available. You can read about it at the [Wiki](https://github.com/Code-Sharp/WampSharp/wiki).
3754

38-
In order to use it, Install WampSharp.WAMP1.Default from NuGet.
39-
4055
If you're updating from a previous WampSharp version and you're not interested yet in updating your application to WAMPv2, please read the following [notes](https://github.com/Code-Sharp/WampSharp/wiki/Notes-for-WAMPv1-users).
4156

4257
## Donations
@@ -47,16 +62,12 @@ Your donations help keep this project development alive.
4762

4863
[WampLink]:http://wamp.ws
4964

50-
[NuGetImgMaster]:http://img.shields.io/nuget/v/WampSharp.Default.svg
51-
[NuGetLinkMaster]:http://www.nuget.org/packages/WampSharp.Default/
52-
[WinImgMaster]:https://img.shields.io/teamcity/codebetter/WampSharp_Wampv2_Build.svg
53-
[WinLinkMaster]:http://teamcity.codebetter.com/project.html?projectId=WampSharp_Wampv2&guest=1
54-
[MonoImgMaster]:https://img.shields.io/travis/Code-Sharp/WampSharp/wampv2.svg
65+
[WinImgMaster]:http://teamcity.codebetter.com/app/rest/builds/buildType:\(id:WampSharp_Dev_Build\)/statusIcon
66+
[WinLinkMaster]:http://teamcity.codebetter.com/project.html?projectId=WampSharp_Dev&guest=1
67+
[MonoImgMaster]:https://travis-ci.org/Code-Sharp/WampSharp.png?branch=develop
5568
[MonoLinkMaster]:https://travis-ci.org/Code-Sharp/WampSharp
56-
[AppVeyorLinkMaster]:https://ci.appveyor.com/project/darkl/wampsharp-759
57-
[AppVeyorImgMaster]:https://ci.appveyor.com/api/projects/status/fgbqbgwqx4j8jain
5869

5970
[JetBrains]:http://www.jetbrains.com/
6071
[CodeBetter]:http://codebetter.com/
6172
[travis-ci]:https://travis-ci.org/
62-
[AppVeyor]:http://www.appveyor.com/
73+
[AppVeyor]:http://www.appveyor.com/

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

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Fleck, Version=0.13.0.48, Culture=neutral, processorArchitecture=MSIL">
40-
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>..\..\packages\Fleck.0.13.0.48\lib\net40\Fleck.dll</HintPath>
39+
<Reference Include="Fleck, Version=0.13.0.57, Culture=neutral, processorArchitecture=MSIL">
40+
<HintPath>..\..\packages\Fleck.0.13.0.57\lib\net40\Fleck.dll</HintPath>
41+
<Private>True</Private>
4242
</Reference>
4343
<Reference Include="System" />
4444
<Reference Include="System.Core" />
@@ -51,13 +51,26 @@
5151
<Reference Include="System.Reactive.Linq">
5252
<Private>True</Private>
5353
</Reference>
54+
<Reference Include="System.Runtime.Serialization" />
5455
<Reference Include="System.Xml.Linq" />
5556
<Reference Include="System.Data.DataSetExtensions" />
5657
<Reference Include="Microsoft.CSharp" />
5758
<Reference Include="System.Data" />
5859
<Reference Include="System.Xml" />
5960
</ItemGroup>
6061
<ItemGroup>
62+
<Compile Include="..\..\..\net45\Default\WampSharp.Fleck\Fleck\FleckTransportDetails.cs">
63+
<Link>Fleck\FleckTransportDetails.cs</Link>
64+
</Compile>
65+
<Compile Include="..\..\..\net45\Default\WampSharp.Fleck\Fleck\FleckAuthenticatedWebSocketTransport.cs">
66+
<Link>Fleck\FleckAuthenticatedWebSocketTransport.cs</Link>
67+
</Compile>
68+
<Compile Include="..\..\..\net45\Default\WampSharp.Fleck\Fleck\FleckCookieProvider.cs">
69+
<Link>Fleck\FleckCookieProvider.cs</Link>
70+
</Compile>
71+
<Compile Include="..\..\..\net45\Default\WampSharp.Fleck\Fleck\FleckPinger.cs">
72+
<Link>Fleck\FleckPinger.cs</Link>
73+
</Compile>
6174
<Compile Include="..\..\..\net45\Default\WampSharp.Fleck\Fleck\FleckWampBinaryConnection.cs">
6275
<Link>Fleck\FleckWampBinaryConnection.cs</Link>
6376
</Compile>

‎src/mono/Default/WampSharp.Fleck/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="Fleck" version="0.13.0.48" targetFramework="net45" />
3+
<package id="Fleck" version="0.13.0.57" targetFramework="net45" />
44
</packages>

0 commit comments

Comments
 (0)