Skip to content

Commit ff09236

Browse files
author
Elad Zelingher
committed
Mono and Framework 4.0
1 parent 89b2e08 commit ff09236

File tree

50 files changed

+171
-160
lines changed

Some content is hidden

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

50 files changed

+171
-160
lines changed

‎src/mono/Extensions/WampSharp.SignalR/WampSharp.SignalR.csproj‎

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,35 +32,44 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="Microsoft.AspNet.SignalR.Client, Version=2.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
35+
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
3636
<SpecificVersion>False</SpecificVersion>
37-
<HintPath>..\..\packages\Microsoft.AspNet.SignalR.Client.2.1.1\lib\net45\Microsoft.AspNet.SignalR.Client.dll</HintPath>
37+
<HintPath>..\..\packages\Castle.Core.3.3.1\lib\net45\Castle.Core.dll</HintPath>
3838
</Reference>
39-
<Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
39+
<Reference Include="Microsoft.AspNet.SignalR.Client, Version=2.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4040
<SpecificVersion>False</SpecificVersion>
41-
<HintPath>..\..\packages\Microsoft.AspNet.SignalR.Core.2.1.1\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
41+
<HintPath>..\..\packages\Microsoft.AspNet.SignalR.Client.2.1.2\lib\net45\Microsoft.AspNet.SignalR.Client.dll</HintPath>
4242
</Reference>
43-
<Reference Include="Microsoft.Owin, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
43+
<Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4444
<SpecificVersion>False</SpecificVersion>
45-
<HintPath>..\..\packages\Microsoft.Owin.3.0.0\lib\net45\Microsoft.Owin.dll</HintPath>
45+
<HintPath>..\..\packages\Microsoft.AspNet.SignalR.Core.2.1.2\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Microsoft.Owin.Diagnostics, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47+
<Reference Include="Microsoft.Owin, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
4848
<SpecificVersion>False</SpecificVersion>
49-
<HintPath>..\..\packages\Microsoft.Owin.Diagnostics.3.0.0\lib\net45\Microsoft.Owin.Diagnostics.dll</HintPath>
49+
<HintPath>..\..\packages\Microsoft.Owin.2.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
5050
</Reference>
51-
<Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51+
<Reference Include="Microsoft.Owin.Diagnostics, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5252
<SpecificVersion>False</SpecificVersion>
53-
<HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.3.0.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
53+
<HintPath>..\..\packages\Microsoft.Owin.Diagnostics.2.0.1\lib\net40\Microsoft.Owin.Diagnostics.dll</HintPath>
5454
</Reference>
55-
<Reference Include="Microsoft.Owin.Hosting, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55+
<Reference Include="Microsoft.Owin.Host.HttpListener, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5656
<SpecificVersion>False</SpecificVersion>
57-
<HintPath>..\..\packages\Microsoft.Owin.Hosting.3.0.0\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
57+
<HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.2.0.1\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
5858
</Reference>
59-
<Reference Include="Microsoft.Owin.Security, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59+
<Reference Include="Microsoft.Owin.Hosting, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6060
<SpecificVersion>False</SpecificVersion>
61-
<HintPath>..\..\packages\Microsoft.Owin.Security.3.0.0\lib\net45\Microsoft.Owin.Security.dll</HintPath>
61+
<HintPath>..\..\packages\Microsoft.Owin.Hosting.2.0.1\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
6262
</Reference>
63-
<Reference Include="Owin">
63+
<Reference Include="Microsoft.Owin.Security, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64+
<SpecificVersion>False</SpecificVersion>
65+
<HintPath>..\..\packages\Microsoft.Owin.Security.2.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
66+
</Reference>
67+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
68+
<SpecificVersion>False</SpecificVersion>
69+
<HintPath>..\..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
70+
</Reference>
71+
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
72+
<SpecificVersion>False</SpecificVersion>
6473
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
6574
</Reference>
6675
<Reference Include="System" />
@@ -74,6 +83,9 @@
7483
<Reference Include="System.Reactive.Linq">
7584
<Private>True</Private>
7685
</Reference>
86+
<Reference Include="System.Reactive.PlatformServices">
87+
<Private>True</Private>
88+
</Reference>
7789
<Reference Include="System.Xml.Linq" />
7890
<Reference Include="System.Data.DataSetExtensions" />
7991
<Reference Include="Microsoft.CSharp" />
@@ -90,6 +102,9 @@
90102
<Compile Include="..\..\..\net45\Extensions\WampSharp.SignalR\Server\ISignalRConnectionListenerAdapter.cs">
91103
<Link>Server\ISignalRConnectionListenerAdapter.cs</Link>
92104
</Compile>
105+
<Compile Include="..\..\..\net45\Extensions\WampSharp.SignalR\Server\ISignalRListener.cs">
106+
<Link>Server\ISignalRListener.cs</Link>
107+
</Compile>
93108
<Compile Include="..\..\..\net45\Extensions\WampSharp.SignalR\Server\PersistentConnectionListener.cs">
94109
<Link>Server\PersistentConnectionListener.cs</Link>
95110
</Compile>
@@ -99,6 +114,9 @@
99114
<Compile Include="..\..\..\net45\Extensions\WampSharp.SignalR\Server\SignalRConnectionListenerAdapter.cs">
100115
<Link>Server\SignalRConnectionListenerAdapter.cs</Link>
101116
</Compile>
117+
<Compile Include="..\..\..\net45\Extensions\WampSharp.SignalR\Server\SignalRTransport.cs">
118+
<Link>Server\SignalRTransport.cs</Link>
119+
</Compile>
102120
<Compile Include="..\..\..\net45\Extensions\WampSharp.SignalR\Server\Startup.cs">
103121
<Link>Server\Startup.cs</Link>
104122
</Compile>

‎src/mono/Extensions/WampSharp.SignalR/packages.config‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.SignalR.Client" version="2.1.1" targetFramework="net45" />
4-
<package id="Microsoft.AspNet.SignalR.Core" version="2.1.1" targetFramework="net45" />
5-
<package id="Microsoft.AspNet.SignalR.SelfHost" version="2.1.1" targetFramework="net45" />
6-
<package id="Microsoft.Owin" version="3.0.0" targetFramework="net45" />
7-
<package id="Microsoft.Owin.Diagnostics" version="3.0.0" targetFramework="net45" />
8-
<package id="Microsoft.Owin.Host.HttpListener" version="3.0.0" targetFramework="net45" />
9-
<package id="Microsoft.Owin.Hosting" version="3.0.0" targetFramework="net45" />
10-
<package id="Microsoft.Owin.Security" version="3.0.0" targetFramework="net45" />
11-
<package id="Microsoft.Owin.SelfHost" version="3.0.0" targetFramework="net45" />
3+
<package id="Castle.Core" version="3.3.1" targetFramework="net45" />
4+
<package id="Microsoft.AspNet.SignalR.Client" version="2.1.2" targetFramework="net45" />
5+
<package id="Microsoft.AspNet.SignalR.Core" version="2.1.2" targetFramework="net45" />
6+
<package id="Microsoft.AspNet.SignalR.SelfHost" version="2.1.2" targetFramework="net45" />
7+
<package id="Microsoft.Owin" version="2.0.1" targetFramework="net45" />
8+
<package id="Microsoft.Owin.Diagnostics" version="2.0.1" targetFramework="net45" />
9+
<package id="Microsoft.Owin.Host.HttpListener" version="2.0.1" targetFramework="net45" />
10+
<package id="Microsoft.Owin.Hosting" version="2.0.1" targetFramework="net45" />
11+
<package id="Microsoft.Owin.Security" version="2.0.1" targetFramework="net45" />
12+
<package id="Microsoft.Owin.SelfHost" version="2.0.1" targetFramework="net45" />
1213
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
1314
<package id="Owin" version="1.0" targetFramework="net45" />
1415
</packages>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="Fleck, Version=0.11.0.30, Culture=neutral, processorArchitecture=MSIL">
37+
<Reference Include="Fleck, Version=0.11.1.32, Culture=neutral, processorArchitecture=MSIL">
3838
<SpecificVersion>False</SpecificVersion>
39-
<HintPath>..\..\..\packages\Fleck.0.11.0.30\lib\net40\Fleck.dll</HintPath>
39+
<HintPath>..\..\..\packages\Fleck.0.11.1.32\lib\net40\Fleck.dll</HintPath>
4040
</Reference>
4141
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4242
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Fleck" version="0.11.0.30" targetFramework="net45" />
3+
<package id="Fleck" version="0.11.1.32" targetFramework="net45" />
44
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
55
<package id="WebSocket4Net" version="0.10" targetFramework="net45" />
66
</packages>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="Fleck, Version=0.11.0.30, Culture=neutral, processorArchitecture=MSIL">
37+
<Reference Include="Fleck, Version=0.11.1.32, Culture=neutral, processorArchitecture=MSIL">
3838
<SpecificVersion>False</SpecificVersion>
39-
<HintPath>..\..\..\packages\Fleck.0.11.0.30\lib\net40\Fleck.dll</HintPath>
39+
<HintPath>..\..\..\packages\Fleck.0.11.1.32\lib\net40\Fleck.dll</HintPath>
4040
</Reference>
4141
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4242
<SpecificVersion>False</SpecificVersion>

‎src/mono/Samples/WAMP1/WampSharp.CraServerSample/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>
3-
<package id="Fleck" version="0.11.0.30" targetFramework="net45" />
3+
<package id="Fleck" version="0.11.1.32" targetFramework="net45" />
44
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
55
</packages>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="Fleck, Version=0.11.0.30, Culture=neutral, processorArchitecture=MSIL">
37+
<Reference Include="Fleck, Version=0.11.1.32, Culture=neutral, processorArchitecture=MSIL">
3838
<SpecificVersion>False</SpecificVersion>
39-
<HintPath>..\..\..\packages\Fleck.0.11.0.30\lib\net40\Fleck.dll</HintPath>
39+
<HintPath>..\..\..\packages\Fleck.0.11.1.32\lib\net40\Fleck.dll</HintPath>
4040
</Reference>
4141
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4242
<SpecificVersion>False</SpecificVersion>

‎src/mono/Samples/WAMP1/WampSharp.PubSubServerSample/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>
3-
<package id="Fleck" version="0.11.0.30" targetFramework="net45" />
3+
<package id="Fleck" version="0.11.1.32" targetFramework="net45" />
44
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
55
</packages>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="MsgPack, Version=0.5.0.0, Culture=neutral, PublicKeyToken=a2625990d5dc0167, processorArchitecture=MSIL">
38-
<SpecificVersion>False</SpecificVersion>
39-
<HintPath>..\..\..\packages\MsgPack.Cli.0.5.2\lib\net45\MsgPack.dll</HintPath>
40-
</Reference>
4137
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4238
<SpecificVersion>False</SpecificVersion>
4339
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MsgPack.Cli" version="0.5.2" targetFramework="net45" />
43
<package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
54
</packages>

0 commit comments

Comments
 (0)