Skip to content

Commit f7f71bb

Browse files
darkldarkl
authored
Merge pull request #220 from Code-Sharp/develop
Adding .NETStandard2.0 support
2 parents 233e979 + 710b362 commit f7f71bb

File tree

35 files changed

+643
-57
lines changed

35 files changed

+643
-57
lines changed

‎NuGet/WampSharp.AspNetCore.WebSockets.Server.nuspec‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,7 @@
2020
<files>
2121
<file src="$bin$\netstandard1.3\WampSharp.AspNetCore.WebSockets.Server.dll" target="lib\netstandard1.3\WampSharp.AspNetCore.WebSockets.Server.dll" />
2222
<file src="$bin$\netstandard1.3\WampSharp.AspNetCore.WebSockets.Server.xml" target="lib\netstandard1.3\WampSharp.AspNetCore.WebSockets.Server.xml" />
23+
<file src="$bin$\netstandard2.0\WampSharp.AspNetCore.WebSockets.Server.dll" target="lib\netstandard2.0\WampSharp.AspNetCore.WebSockets.Server.dll" />
24+
<file src="$bin$\netstandard2.0\WampSharp.AspNetCore.WebSockets.Server.xml" target="lib\netstandard2.0\WampSharp.AspNetCore.WebSockets.Server.xml" />
2325
</files>
2426
</package>

‎NuGet/WampSharp.Default.Client.nuspec‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
<dependency id="WampSharp.NewtonsoftMsgpack" version="[$version$]" />
2929
<dependency id="WampSharp.WebSockets" version="[$version$]" />
3030
</group>
31+
<group targetFramework=".NETStandard2.0">
32+
<dependency id="WampSharp.NewtonsoftJson" version="[$version$]" />
33+
<dependency id="WampSharp.NewtonsoftMsgpack" version="[$version$]" />
34+
<dependency id="WampSharp.WebSockets" version="[$version$]" />
35+
</group>
3136
</dependencies>
3237
<id>WampSharp.Default.Client</id>
3338
<title>WampSharp default client binding</title>
@@ -47,5 +52,7 @@
4752
<file src="$bin$\uap10.0\WampSharp.Default.Client.xml" target="lib\uap10.0\WampSharp.Default.Client.xml" />
4853
<file src="$bin$\netstandard1.3\WampSharp.Default.Client.dll" target="lib\netstandard1.3\WampSharp.Default.Client.dll" />
4954
<file src="$bin$\netstandard1.3\WampSharp.Default.Client.xml" target="lib\netstandard1.3\WampSharp.Default.Client.xml" />
55+
<file src="$bin$\netstandard2.0\WampSharp.Default.Client.dll" target="lib\netstandard2.0\WampSharp.Default.Client.dll" />
56+
<file src="$bin$\netstandard2.0\WampSharp.Default.Client.xml" target="lib\netstandard2.0\WampSharp.Default.Client.xml" />
5057
</files>
5158
</package>

‎NuGet/WampSharp.Default.nuspec‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<group targetFramework=".NETStandard1.3">
2020
<dependency id="WampSharp.Default.Client" version="[$version$]" />
2121
</group>
22+
<group targetFramework=".NETStandard2.0">
23+
<dependency id="WampSharp.Default.Client" version="[$version$]" />
24+
</group>
2225
</dependencies>
2326
<id>WampSharp.Default</id>
2427
<title>WampSharp default binding</title>

‎NuGet/WampSharp.NewtonsoftJson.nuspec‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
<dependency id="WampSharp" version="[$version$]" />
2222
<dependency id="Newtonsoft.Json" version="[9.0.1, )" />
2323
</group>
24+
<group targetFramework=".NETStandard2.0">
25+
<dependency id="WampSharp" version="[$version$]" />
26+
<dependency id="Newtonsoft.Json" version="[9.0.1, )" />
27+
</group>
2428
<group targetFramework="uap10.0">
2529
<dependency id="WampSharp" version="[$version$]" />
2630
<dependency id="Newtonsoft.Json" version="[9.0.1, )" />
@@ -42,5 +46,7 @@
4246
<file src="$bin$\pcl\WampSharp.NewtonsoftJson.xml" target="lib\portable-win81+wpa81\WampSharp.NewtonsoftJson.xml" />
4347
<file src="$bin$\netstandard1.3\WampSharp.NewtonsoftJson.dll" target="lib\netstandard1.3\WampSharp.NewtonsoftJson.dll" />
4448
<file src="$bin$\netstandard1.3\WampSharp.NewtonsoftJson.xml" target="lib\netstandard1.3\WampSharp.NewtonsoftJson.xml" />
49+
<file src="$bin$\netstandard2.0\WampSharp.NewtonsoftJson.dll" target="lib\netstandard2.0\WampSharp.NewtonsoftJson.dll" />
50+
<file src="$bin$\netstandard2.0\WampSharp.NewtonsoftJson.xml" target="lib\netstandard2.0\WampSharp.NewtonsoftJson.xml" />
4551
</files>
4652
</package>

‎NuGet/WampSharp.NewtonsoftMsgpack.nuspec‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
<dependency id="WampSharp.NewtonsoftJson" version="[$version$]" />
2121
<dependency id="Newtonsoft.Msgpack" version="[0.1.10,)" />
2222
</group>
23+
<group targetFramework=".NETStandard2.0">
24+
<dependency id="WampSharp" version="[$version$]" />
25+
<dependency id="WampSharp.NewtonsoftJson" version="[$version$]" />
26+
<dependency id="Newtonsoft.Msgpack" version="[0.1.10,)" />
27+
</group>
2328
</dependencies>
2429
<id>WampSharp.NewtonsoftMsgpack</id>
2530
<title>WampSharp Newtonsoft.Msgpack binding</title>
@@ -35,5 +40,7 @@
3540
<file src="$bin$\net40\WampSharp.NewtonsoftMsgpack.xml" target="lib\net40\WampSharp.NewtonsoftMsgpack.xml" />
3641
<file src="$bin$\net45\WampSharp.NewtonsoftMsgpack.dll" target="lib\netstandard1.3\WampSharp.NewtonsoftMsgpack.dll" />
3742
<file src="$bin$\net45\WampSharp.NewtonsoftMsgpack.xml" target="lib\netstandard1.3\WampSharp.NewtonsoftMsgpack.xml" />
43+
<file src="$bin$\net45\WampSharp.NewtonsoftMsgpack.dll" target="lib\netstandard2.0\WampSharp.NewtonsoftMsgpack.dll" />
44+
<file src="$bin$\net45\WampSharp.NewtonsoftMsgpack.xml" target="lib\netstandard2.0\WampSharp.NewtonsoftMsgpack.xml" />
3845
</files>
3946
</package>

‎NuGet/WampSharp.RawSocket.nuspec‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
<dependency id="System.Buffers" version="4.3.0" />
1515
<dependency id="System.Net.Sockets" version="4.3.0" />
1616
</group>
17+
<group targetFramework=".NETStandard2.0">
18+
<dependency id="WampSharp" version="[$version$]" />
19+
<dependency id="System.Buffers" version="4.3.0" />
20+
</group>
1721
</dependencies>
1822
<id>WampSharp.RawSocket</id>
1923
<title>WampSharp RawSocket support</title>
@@ -27,5 +31,7 @@
2731
<file src="$bin$\net45\WampSharp.RawSocket.xml" target="lib\net45\WampSharp.RawSocket.xml" />
2832
<file src="$bin$\netstandard1.3\WampSharp.RawSocket.dll" target="lib\netstandard1.3\WampSharp.RawSocket.dll" />
2933
<file src="$bin$\netstandard1.3\WampSharp.RawSocket.xml" target="lib\netstandard1.3\WampSharp.RawSocket.xml" />
34+
<file src="$bin$\netstandard2.0\WampSharp.RawSocket.dll" target="lib\netstandard2.0\WampSharp.RawSocket.dll" />
35+
<file src="$bin$\netstandard2.0\WampSharp.RawSocket.xml" target="lib\netstandard2.0\WampSharp.RawSocket.xml" />
3036
</files>
3137
</package>

‎NuGet/WampSharp.Vtortola.nuspec‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@
55
<authors>CodeSharp</authors>
66
<owners />
77
<dependencies>
8-
<dependency id="WampSharp" version="[$version$]" />
9-
<dependency id="vtortola.WebSocketListener" version="[2.2.2]" />
8+
<group targetFramework="net45">
9+
<dependency id="WampSharp" version="[$version$]" />
10+
<dependency id="vtortola.WebSocketListener" version="[2.2.2]" />
11+
</group>
12+
<group targetFramework="netstandard2.0">
13+
<dependency id="WampSharp" version="[$version$]" />
14+
<dependency id="vtortola.WebSocketListener" version="[3.0.0-beta]" />
15+
</group>
1016
</dependencies>
1117
<id>WampSharp.Vtortola</id>
1218
<title>WampSharp Vtortola support</title>
@@ -18,5 +24,7 @@
1824
<files>
1925
<file src="$bin$\net45\WampSharp.Vtortola.dll" target="lib\net45\WampSharp.Vtortola.dll" />
2026
<file src="$bin$\net45\WampSharp.Vtortola.xml" target="lib\net45\WampSharp.Vtortola.xml" />
27+
<file src="$bin$\netstandard2.0\WampSharp.Vtortola.dll" target="lib\netstandard2.0\WampSharp.Vtortola.dll" />
28+
<file src="$bin$\netstandard2.0\WampSharp.Vtortola.xml" target="lib\netstandard2.0\WampSharp.Vtortola.xml" />
2129
</files>
2230
</package>

‎NuGet/WampSharp.WebSocket4Net.nuspec‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
<dependency id="WampSharp" version="[$version$]" />
1818
<dependency id="WebSocket4Net" version="[0.15.0-beta9, )" />
1919
</group>
20+
<group targetFramework=".NETStandard2.0">
21+
<dependency id="WampSharp" version="[$version$]" />
22+
<dependency id="WebSocket4Net" version="[0.15.0-beta9, )" />
23+
</group>
2024
</dependencies>
2125
<id>WampSharp.WebSocket4Net</id>
2226
<title>WampSharp WebSocket4Net connection</title>
@@ -32,5 +36,7 @@
3236
<file src="$bin$\net40\WampSharp.WebSocket4Net.xml" target="lib\net40\WampSharp.WebSocket4Net.xml" />
3337
<file src="$bin$\netstandard1.3\WampSharp.WebSocket4Net.dll" target="lib\netstandard1.3\WampSharp.WebSocket4Net.dll" />
3438
<file src="$bin$\netstandard1.3\WampSharp.WebSocket4Net.xml" target="lib\netstandard1.3\WampSharp.WebSocket4Net.xml" />
39+
<file src="$bin$\netstandard2.0\WampSharp.WebSocket4Net.dll" target="lib\netstandard2.0\WampSharp.WebSocket4Net.dll" />
40+
<file src="$bin$\netstandard2.0\WampSharp.WebSocket4Net.xml" target="lib\netstandard2.0\WampSharp.WebSocket4Net.xml" />
3541
</files>
3642
</package>

‎NuGet/WampSharp.WebSockets.nuspec‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@
1010
<description>WampSharp System.Net.WebSockets.WebSocket support</description>
1111
<tags>websockets,wampws,rpc,pubsub,wampv1,wampv2</tags>
1212
<dependencies>
13+
<group targetFramework="net45">
14+
<dependency id="WampSharp" version="[$version$]" />
15+
</group>
1316
<group targetFramework=".NETStandard1.3">
1417
<dependency id="System.Net.WebSockets.Client" version="[4.3.1, )" />
1518
<dependency id="WampSharp" version="[$version$]" />
1619
</group>
17-
<group targetFramework="net45">
20+
<group targetFramework=".NETStandard2.0">
1821
<dependency id="WampSharp" version="[$version$]" />
1922
</group>
2023
</dependencies>
@@ -24,5 +27,7 @@
2427
<file src="$bin$\net45\WampSharp.WebSockets.xml" target="lib\net45\WampSharp.WebSockets.xml" />
2528
<file src="$bin$\netstandard1.3\WampSharp.WebSockets.dll" target="lib\netstandard1.3\WampSharp.WebSockets.dll" />
2629
<file src="$bin$\netstandard1.3\WampSharp.WebSockets.xml" target="lib\netstandard1.3\WampSharp.WebSockets.xml" />
30+
<file src="$bin$\netstandard2.0\WampSharp.WebSockets.dll" target="lib\netstandard2.0\WampSharp.WebSockets.dll" />
31+
<file src="$bin$\netstandard2.0\WampSharp.WebSockets.xml" target="lib\netstandard2.0\WampSharp.WebSockets.xml" />
2732
</files>
2833
</package>

‎NuGet/WampSharp.nuspec‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<owners />
77
<dependencies>
88
<group targetFramework="net45">
9-
<dependency id="System.Reactive" version="[3.0.0, )" />
9+
<dependency id="System.Reactive" version="[3.0.0, 4)" />
1010
<dependency id="System.Collections.Immutable" version="[1.3.1, )" />
1111
<dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, )" />
1212
<dependency id="Castle.Core" version="[4.1.1, )" />
@@ -19,35 +19,35 @@
1919
<dependency id="Rackspace.Collections.Immutable" version="[1.1.36]" />
2020
</group>
2121
<group targetFramework="portable-win81+wpa81">
22-
<dependency id="System.Reactive" version="[3.0.0, )" />
22+
<dependency id="System.Reactive" version="[3.0.0, 4)" />
2323
<dependency id="System.Collections.Immutable" version="[1.3.1, )" />
2424
<dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, )" />
2525
<dependency id="System.ValueTuple" version="[4.4.0, )" />
2626
</group>
2727
<group targetFramework=".NETStandard1.3">
28-
<dependency id="Microsoft.CSharp" version="[4.3.0, )" />
2928
<dependency id="Castle.Core" version="[4.1.1, )" />
30-
<dependency id="System.Collections.Concurrent" version="[4.3.0, )" />
3129
<dependency id="System.Collections.Immutable" version="[1.3.1, )" />
32-
<dependency id="System.ComponentModel" version="[4.3.0, )" />
33-
<dependency id="System.Net.Primitives" version="[4.3.0, )" />
34-
<dependency id="System.Reactive" version="[3.1.1, )" />
35-
<dependency id="System.Reflection.Extensions" version="[4.3.0, )" />
36-
<dependency id="System.Reflection.TypeExtensions" version="[4.3.0, )" />
37-
<dependency id="System.Runtime" version="[4.3.0, )" />
30+
<dependency id="System.Reactive" version="[3.0.0, 4)" />
3831
<dependency id="System.Runtime.Serialization.Primitives" version="[4.3.0, )" />
39-
<dependency id="System.Security.Cryptography.Algorithms" version="[4.3.0, )" />
40-
<dependency id="System.Text.RegularExpressions" version="[4.3.0, )" />
32+
<dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, )" />
33+
<dependency id="System.ValueTuple" version="[4.4.0, )" />
34+
<dependency id="NETStandard.Library" version="[1.6.1, )" />
35+
</group>
36+
<group targetFramework=".NETStandard2.0">
37+
<dependency id="Microsoft.CSharp" version="[4.3.0, )" />
38+
<dependency id="Castle.Core" version="[4.1.1, )" />
39+
<dependency id="System.Collections.Immutable" version="[1.3.1, )" />
40+
<dependency id="System.Reactive" version="[3.0.0, 4)" />
4141
<dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, )" />
4242
<dependency id="System.ValueTuple" version="[4.4.0, )" />
4343
</group>
4444
<group targetFramework="UAP10.0">
4545
<dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="[5.2.2 , )" />
46-
<dependency id="System.Reactive" version="[3.0.0, )" />
46+
<dependency id="System.Reactive" version="[3.0.0, 4)" />
4747
<dependency id="System.ValueTuple" version="[4.4.0, )" />
4848
</group>
4949
<group targetFramework="Xamarin.iOS10">
50-
<dependency id="System.Reactive" version="[3.0.0, )" />
50+
<dependency id="System.Reactive" version="[3.0.0, 4)" />
5151
<dependency id="System.Collections.Immutable" version="[1.3.1, )" />
5252
<dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, )" />
5353
<dependency id="System.ValueTuple" version="[4.4.0, )" />
@@ -71,6 +71,8 @@
7171
<file src="$bin$\pcl\WampSharp.xml" target="lib\Xamarin.iOS10\WampSharp.xml" />
7272
<file src="$bin$\netstandard1.3\WampSharp.dll" target="lib\netstandard1.3\WampSharp.dll" />
7373
<file src="$bin$\netstandard1.3\WampSharp.xml" target="lib\netstandard1.3\WampSharp.xml" />
74+
<file src="$bin$\netstandard2.0\WampSharp.dll" target="lib\netstandard2.0\WampSharp.dll" />
75+
<file src="$bin$\netstandard2.0\WampSharp.xml" target="lib\netstandard2.0\WampSharp.xml" />
7476
<file src="$bin$\uap10.0\WampSharp.dll" target="lib\uap10.0\WampSharp.dll" />
7577
<file src="$bin$\uap10.0\WampSharp.xml" target="lib\uap10.0\WampSharp.xml" />
7678
</files>

0 commit comments

Comments
 (0)