Skip to content

Commit 2f1029e

Browse files
kn100kn100
authored
Merge pull request #56 from pusher-community/feature/dotNetStandardSupport
Feature/dot net standard support
2 parents 2dfd3e5 + aa75ace commit 2f1029e

31 files changed

+223
-903
lines changed

‎AuthHost/AuthHost.csproj

+1-55
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>AuthHost</RootNamespace>
1111
<AssemblyName>AuthHost</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
<NuGetPackageImportStamp>
@@ -39,85 +39,31 @@
3939
<ItemGroup>
4040
<Reference Include="Nancy, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
4141
<HintPath>..\packages\Nancy.1.4.4\lib\net40\Nancy.dll</HintPath>
42-
<Private>True</Private>
4342
</Reference>
4443
<Reference Include="Nancy.Hosting.Self, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
4544
<HintPath>..\packages\Nancy.Hosting.Self.1.4.1\lib\net40\Nancy.Hosting.Self.dll</HintPath>
46-
<Private>True</Private>
4745
</Reference>
4846
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4947
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
50-
<Private>True</Private>
5148
</Reference>
5249
<Reference Include="PusherServer, Version=4.1.0.0, Culture=neutral, processorArchitecture=MSIL">
5350
<HintPath>..\packages\PusherServer.4.1.0\lib\net45\PusherServer.dll</HintPath>
54-
<Private>True</Private>
5551
</Reference>
5652
<Reference Include="SuperSocket.ClientEngine, Version=0.10.0.0, Culture=neutral, PublicKeyToken=ee9af13f57f00acc, processorArchitecture=MSIL">
5753
<HintPath>..\packages\SuperSocket.ClientEngine.Core.0.10.0\lib\net45\SuperSocket.ClientEngine.dll</HintPath>
58-
<Private>True</Private>
5954
</Reference>
6055
<Reference Include="System" />
61-
<Reference Include="System.Collections.Specialized, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
62-
<HintPath>..\packages\System.Collections.Specialized.4.3.0\lib\net46\System.Collections.Specialized.dll</HintPath>
63-
<Private>True</Private>
64-
</Reference>
6556
<Reference Include="System.ComponentModel.Composition" />
6657
<Reference Include="System.Configuration" />
67-
<Reference Include="System.Configuration.ConfigurationManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
68-
<HintPath>..\packages\System.Configuration.ConfigurationManager.4.4.1\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
69-
<Private>True</Private>
70-
</Reference>
7158
<Reference Include="System.Core" />
7259
<Reference Include="System.Net" />
73-
<Reference Include="System.Net.NameResolution, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
74-
<HintPath>..\packages\System.Net.NameResolution.4.3.0\lib\net46\System.Net.NameResolution.dll</HintPath>
75-
<Private>True</Private>
76-
</Reference>
77-
<Reference Include="System.Net.Security, Version=4.0.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
78-
<HintPath>..\packages\System.Net.Security.4.3.2\lib\net46\System.Net.Security.dll</HintPath>
79-
<Private>True</Private>
80-
</Reference>
81-
<Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
82-
<HintPath>..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
83-
<Private>True</Private>
84-
</Reference>
85-
<Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
86-
<HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
87-
<Private>True</Private>
88-
</Reference>
89-
<Reference Include="System.Runtime.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
90-
<HintPath>..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll</HintPath>
91-
<Private>True</Private>
92-
</Reference>
93-
<Reference Include="System.Runtime.InteropServices, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
94-
<HintPath>..\packages\System.Runtime.InteropServices.4.3.0\lib\net462\System.Runtime.InteropServices.dll</HintPath>
95-
<Private>True</Private>
96-
</Reference>
97-
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
98-
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
99-
<Private>True</Private>
100-
</Reference>
101-
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
102-
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
103-
<Private>True</Private>
104-
</Reference>
105-
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
106-
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
107-
<Private>True</Private>
108-
</Reference>
109-
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
110-
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
111-
<Private>True</Private>
112-
</Reference>
11360
<Reference Include="System.Xml.Linq" />
11461
<Reference Include="System.Data.DataSetExtensions" />
11562
<Reference Include="Microsoft.CSharp" />
11663
<Reference Include="System.Data" />
11764
<Reference Include="System.Xml" />
11865
<Reference Include="WebSocket4Net, Version=0.15.2.11, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
11966
<HintPath>..\packages\WebSocket4Net.0.15.2\lib\net45\WebSocket4Net.dll</HintPath>
120-
<Private>True</Private>
12167
</Reference>
12268
</ItemGroup>
12369
<ItemGroup>

‎AuthHost/packages.config

+14-24
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net462" />
4-
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net462" />
5-
<package id="Nancy" version="1.4.4" targetFramework="net462" />
6-
<package id="Nancy.Hosting.Self" version="1.4.1" targetFramework="net462" />
7-
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net462" />
8-
<package id="PusherServer" version="4.1.0" targetFramework="net462" />
9-
<package id="SuperSocket.ClientEngine.Core" version="0.10.0" targetFramework="net462" />
10-
<package id="System.Collections.Specialized" version="4.3.0" targetFramework="net462" />
11-
<package id="System.Configuration.ConfigurationManager" version="4.4.1" targetFramework="net462" />
12-
<package id="System.Linq" version="4.3.0" targetFramework="net462" />
13-
<package id="System.Net.NameResolution" version="4.3.0" targetFramework="net462" />
14-
<package id="System.Net.Security" version="4.3.2" targetFramework="net462" />
15-
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net462" />
16-
<package id="System.Runtime" version="4.3.0" targetFramework="net462" />
17-
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net462" />
18-
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net462" />
19-
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" />
20-
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
21-
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
22-
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net462" />
23-
<package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net462" />
24-
<package id="System.Threading" version="4.3.0" targetFramework="net462" />
25-
<package id="System.Threading.Timer" version="4.3.0" targetFramework="net462" />
26-
<package id="WebSocket4Net" version="0.15.2" targetFramework="net462" />
3+
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
4+
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
5+
<package id="Nancy" version="1.4.4" targetFramework="net45" />
6+
<package id="Nancy.Hosting.Self" version="1.4.1" targetFramework="net45" />
7+
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
8+
<package id="PusherServer" version="4.1.0" targetFramework="net45" />
9+
<package id="SuperSocket.ClientEngine.Core" version="0.10.0" targetFramework="net45" />
10+
<package id="System.Linq" version="4.3.0" targetFramework="net45" />
11+
<package id="System.Runtime" version="4.3.0" targetFramework="net45" />
12+
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net45" />
13+
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net45" />
14+
<package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net45" />
15+
<package id="System.Threading" version="4.3.0" targetFramework="net45" />
16+
<package id="WebSocket4Net" version="0.15.2" targetFramework="net45" />
2717
</packages>

‎ExampleApplication/ExampleApplication.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>ExampleApplication</RootNamespace>
1111
<AssemblyName>ExampleApplication</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
<NuGetPackageImportStamp>
@@ -131,7 +131,7 @@
131131
<Name>PusherClient.Tests.Utilities</Name>
132132
</ProjectReference>
133133
<ProjectReference Include="..\PusherClient\PusherClient.csproj">
134-
<Project>{9E30E755-C00E-4BF7-B56B-8F2D836FBA60}</Project>
134+
<Project>{a325bb9f-6476-4422-aef4-c22fa53890dd}</Project>
135135
<Name>PusherClient</Name>
136136
</ProjectReference>
137137
</ItemGroup>

‎ExampleApplication/Program.cs

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4+
using System.Threading.Tasks;
45
using System.Web;
56
using PusherClient;
67

@@ -19,7 +20,8 @@ static void Main(string[] args)
1920
Console.WriteLine("What is your name?");
2021
_name = Console.ReadLine();
2122

22-
InitPusher();
23+
var connectResult = Task.Run(() => InitPusher());
24+
Task.WaitAll(connectResult);
2325

2426
// Read input in loop
2527
string line;
@@ -36,7 +38,8 @@ static void Main(string[] args)
3638
_chatChannel.Trigger("client-my-event", new {message = line, name = _name});
3739
} while (line != null);
3840

39-
_pusher.Disconnect();
41+
var disconnectResult = Task.Run(() => _pusher.DisconnectAsync());
42+
Task.WaitAll(disconnectResult);
4043
}
4144

4245
static void ListMembers()
@@ -52,7 +55,7 @@ static void ListMembers()
5255
}
5356

5457
// Pusher Initiation / Connection
55-
private static void InitPusher()
58+
private static async Task InitPusher()
5659
{
5760
_pusher = new Pusher(Config.AppKey, new PusherOptions
5861
{
@@ -62,7 +65,7 @@ private static void InitPusher()
6265
_pusher.Error += _pusher_Error;
6366

6467
// Setup private channel
65-
_chatChannel = _pusher.Subscribe("private-channel");
68+
_chatChannel = _pusher.SubscribeAsync("private-channel").Result;
6669
_chatChannel.Subscribed += ChatChannel_Subscribed;
6770

6871
// Inline binding!
@@ -72,12 +75,12 @@ private static void InitPusher()
7275
});
7376

7477
// Setup presence channel
75-
_presenceChannel = (PresenceChannel)_pusher.Subscribe("presence-channel");
78+
_presenceChannel = (PresenceChannel)_pusher.SubscribeAsync("presence-channel").Result;
7679
_presenceChannel.Subscribed += PresenceChannel_Subscribed;
7780
_presenceChannel.MemberAdded += PresenceChannel_MemberAdded;
7881
_presenceChannel.MemberRemoved += PresenceChannel_MemberRemoved;
7982

80-
_pusher.Connect();
83+
await _pusher.ConnectAsync();
8184
}
8285

8386
static void _pusher_Error(object sender, PusherException error)

‎ExampleApplication/packages.config

+13-13
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net462" />
55
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net462" />
66
<package id="SuperSocket.ClientEngine.Core" version="0.10.0" targetFramework="net462" />
7-
<package id="System.Collections.Specialized" version="4.3.0" targetFramework="net462" />
7+
<package id="System.Collections.Specialized" version="4.3.0" targetFramework="net462" requireReinstallation="true" />
88
<package id="System.Linq" version="4.3.0" targetFramework="net462" />
9-
<package id="System.Net.NameResolution" version="4.3.0" targetFramework="net462" />
10-
<package id="System.Net.Security" version="4.3.2" targetFramework="net462" />
11-
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net462" />
12-
<package id="System.Runtime" version="4.3.0" targetFramework="net462" />
13-
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net462" />
14-
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net462" />
15-
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" />
16-
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
17-
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
18-
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net462" />
9+
<package id="System.Net.NameResolution" version="4.3.0" targetFramework="net462" requireReinstallation="true" />
10+
<package id="System.Net.Security" version="4.3.2" targetFramework="net462" requireReinstallation="true" />
11+
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net462" requireReinstallation="true" />
12+
<package id="System.Runtime" version="4.3.0" targetFramework="net462" requireReinstallation="true" />
13+
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net462" requireReinstallation="true" />
14+
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net462" requireReinstallation="true" />
15+
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" requireReinstallation="true" />
16+
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" requireReinstallation="true" />
17+
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" requireReinstallation="true" />
18+
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net462" requireReinstallation="true" />
1919
<package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net462" />
2020
<package id="System.Threading" version="4.3.0" targetFramework="net462" />
21-
<package id="System.Threading.Timer" version="4.3.0" targetFramework="net462" />
21+
<package id="System.Threading.Timer" version="4.3.0" targetFramework="net462" requireReinstallation="true" />
2222
<package id="WebSocket4Net" version="0.15.2" targetFramework="net462" />
23-
</packages>
23+
</packages>

‎PusherClient.0.5.1.nupkg

-15.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)