Permalink
Browse files

Updated SignalR

  • Loading branch information...
1 parent 1485251 commit d1fc4bff666710d1ab98f1fa610fb10c1fb6a4b7 Steven Houben committed Feb 5, 2013
Showing with 1,476 additions and 42 deletions.
  1. +7 −2 NooSphere/ActivityBar/ActivityUI.csproj
  2. +2 −2 NooSphere/ActivityBar/Xaml/ActivityBar.xaml.cs
  3. +1 −1 NooSphere/ActivityBar/packages.config
  4. +38 −6 NooSphere/DistributedActivitySystem.sln
  5. +1 −1 NooSphere/NooSphere.ActivitySystem/Base/Client/ActivityClient.cs
  6. +29 −20 NooSphere/NooSphere.ActivitySystem/Base/Service/ActivityCloudConnector.cs
  7. +4 −2 NooSphere/NooSphere.ActivitySystem/Base/Service/ActivityManager.cs
  8. +6 −6 NooSphere/NooSphere.ActivitySystem/NooSphere.ActivitySystem.csproj
  9. +2 −2 NooSphere/NooSphere.ActivitySystem/packages.config
  10. +105 −0 NooSphere/Virtual-Desktop-Manager-API-master/.gitignore
  11. +674 −0 NooSphere/Virtual-Desktop-Manager-API-master/COPYING.txt
  12. +193 −0 NooSphere/Virtual-Desktop-Manager-API-master/DesktopManager.cs
  13. +44 −0 NooSphere/Virtual-Desktop-Manager-API-master/Libraries/Framework Class Library Extension/LICENSE.txt
  14. BIN ...rtual-Desktop-Manager-API-master/Libraries/Framework Class Library Extension/TriAxis.RunSharp.dll
  15. BIN ...tual-Desktop-Manager-API-master/Libraries/Framework Class Library Extension/Whathecode.System.dll
  16. +44 −0 NooSphere/Virtual-Desktop-Manager-API-master/README.txt
  17. +42 −0 NooSphere/Virtual-Desktop-Manager-API-master/StoredSession.cs
  18. +20 −0 NooSphere/Virtual-Desktop-Manager-API-master/Virtual Desktop Manager API.sln
  19. +153 −0 NooSphere/Virtual-Desktop-Manager-API-master/VirtualDesktop.cs
  20. +111 −0 NooSphere/Virtual-Desktop-Manager-API-master/Whathecode.VirtualDesktopManagerAPI.csproj
@@ -52,7 +52,8 @@
<HintPath>..\packages\Mono.Zeroconf.0.9.0.0\lib\Net20\Mono.Zeroconf.Providers.Bonjour.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <HintPath>..\packages\Newtonsoft.Json.4.5.7\lib\net40\Newtonsoft.Json.dll</HintPath>
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="PresentationFramework.Aero" />
<Reference Include="System" />
@@ -191,9 +192,13 @@
<Name>NooSphere.Core</Name>
</ProjectReference>
<ProjectReference Include="..\NooSphere.Platform.Windows\NooSphere.Platform.Windows.csproj">
- <Project>{B3333919-EE66-441A-8AB3-6E6601A8A0B1}</Project>
+ <Project>{b3333919-ee66-441a-8ab3-6e6601a8a0b1}</Project>
<Name>NooSphere.Platform.Windows</Name>
</ProjectReference>
+ <ProjectReference Include="..\Virtual-Desktop-Manager-API-master\Whathecode.VirtualDesktopManagerAPI.csproj">
+ <Project>{6ca7ab2c-2d8d-422a-9fd4-2992be62720a}</Project>
+ <Name>Whathecode.VirtualDesktopManagerAPI</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<Resource Include="Images\add.png" />
@@ -96,8 +96,8 @@ public ActivityBar()
_deviceWindow = new DeviceWindow(this);
_popUpWindows.Add(_deviceWindow);
- MouseHook.Register();
- MouseHook.MouseDown += MouseHookMouseClick;
+ //MouseHook.Register();
+ //MouseHook.MouseDown += MouseHookMouseClick;
//MouseHook.MouseMove += MouseHookMouseMove;
DisableUi();
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Mono.Zeroconf" version="0.9.0.0" targetFramework="net40" />
- <package id="Newtonsoft.Json" version="4.5.7" targetFramework="net40" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
</packages>
@@ -1,6 +1,6 @@

-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2012 for Windows Desktop
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NooSphere.Core", "NooSphere.Core\NooSphere.Core.csproj", "{03C072A4-5960-4A5D-B0CC-98EBD854E970}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ActivityUI", "ActivityBar\ActivityUI.csproj", "{B885C84D-D2C7-4B1A-8167-2D6544AF99E3}"
@@ -20,83 +20,115 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{F71DAA
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NooSphere.ActivitySystem", "NooSphere.ActivitySystem\NooSphere.ActivitySystem.csproj", "{5CD6DD93-3EA1-425F-89D7-A80FD23BBC71}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Whathecode.VirtualDesktopManagerAPI", "Virtual-Desktop-Manager-API-master\Whathecode.VirtualDesktopManagerAPI.csproj", "{6CA7AB2C-2D8D-422A-9FD4-2992BE62720A}"
+EndProject
Global
- GlobalSection(SubversionScc) = preSolution
- Svn-Managed = True
- Manager = AnkhSVN - Subversion Support for Visual Studio
- EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
+ Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|Mixed Platforms = Release|Mixed Platforms
+ Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{03C072A4-5960-4A5D-B0CC-98EBD854E970}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{03C072A4-5960-4A5D-B0CC-98EBD854E970}.Debug|Any CPU.Build.0 = Debug|Any CPU
{03C072A4-5960-4A5D-B0CC-98EBD854E970}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{03C072A4-5960-4A5D-B0CC-98EBD854E970}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {03C072A4-5960-4A5D-B0CC-98EBD854E970}.Debug|x64.ActiveCfg = Debug|Any CPU
{03C072A4-5960-4A5D-B0CC-98EBD854E970}.Debug|x86.ActiveCfg = Debug|Any CPU
{03C072A4-5960-4A5D-B0CC-98EBD854E970}.Release|Any CPU.ActiveCfg = Release|Any CPU
{03C072A4-5960-4A5D-B0CC-98EBD854E970}.Release|Any CPU.Build.0 = Release|Any CPU
{03C072A4-5960-4A5D-B0CC-98EBD854E970}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{03C072A4-5960-4A5D-B0CC-98EBD854E970}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {03C072A4-5960-4A5D-B0CC-98EBD854E970}.Release|x64.ActiveCfg = Release|Any CPU
{03C072A4-5960-4A5D-B0CC-98EBD854E970}.Release|x86.ActiveCfg = Release|Any CPU
{B885C84D-D2C7-4B1A-8167-2D6544AF99E3}.Debug|Any CPU.ActiveCfg = Debug|x86
{B885C84D-D2C7-4B1A-8167-2D6544AF99E3}.Debug|Any CPU.Build.0 = Debug|x86
{B885C84D-D2C7-4B1A-8167-2D6544AF99E3}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{B885C84D-D2C7-4B1A-8167-2D6544AF99E3}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {B885C84D-D2C7-4B1A-8167-2D6544AF99E3}.Debug|x64.ActiveCfg = Debug|x86
{B885C84D-D2C7-4B1A-8167-2D6544AF99E3}.Debug|x86.ActiveCfg = Debug|x86
{B885C84D-D2C7-4B1A-8167-2D6544AF99E3}.Debug|x86.Build.0 = Debug|x86
{B885C84D-D2C7-4B1A-8167-2D6544AF99E3}.Release|Any CPU.ActiveCfg = Release|x86
{B885C84D-D2C7-4B1A-8167-2D6544AF99E3}.Release|Mixed Platforms.ActiveCfg = Release|x86
{B885C84D-D2C7-4B1A-8167-2D6544AF99E3}.Release|Mixed Platforms.Build.0 = Release|x86
+ {B885C84D-D2C7-4B1A-8167-2D6544AF99E3}.Release|x64.ActiveCfg = Release|x86
{B885C84D-D2C7-4B1A-8167-2D6544AF99E3}.Release|x86.ActiveCfg = Release|x86
{B885C84D-D2C7-4B1A-8167-2D6544AF99E3}.Release|x86.Build.0 = Release|x86
{B3333919-EE66-441A-8AB3-6E6601A8A0B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B3333919-EE66-441A-8AB3-6E6601A8A0B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B3333919-EE66-441A-8AB3-6E6601A8A0B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{B3333919-EE66-441A-8AB3-6E6601A8A0B1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {B3333919-EE66-441A-8AB3-6E6601A8A0B1}.Debug|x64.ActiveCfg = Debug|Any CPU
{B3333919-EE66-441A-8AB3-6E6601A8A0B1}.Debug|x86.ActiveCfg = Debug|Any CPU
{B3333919-EE66-441A-8AB3-6E6601A8A0B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B3333919-EE66-441A-8AB3-6E6601A8A0B1}.Release|Any CPU.Build.0 = Release|Any CPU
{B3333919-EE66-441A-8AB3-6E6601A8A0B1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{B3333919-EE66-441A-8AB3-6E6601A8A0B1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {B3333919-EE66-441A-8AB3-6E6601A8A0B1}.Release|x64.ActiveCfg = Release|Any CPU
{B3333919-EE66-441A-8AB3-6E6601A8A0B1}.Release|x86.ActiveCfg = Release|Any CPU
{94919648-ACAC-4E13-817C-5F41B9123C77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{94919648-ACAC-4E13-817C-5F41B9123C77}.Debug|Any CPU.Build.0 = Debug|Any CPU
{94919648-ACAC-4E13-817C-5F41B9123C77}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{94919648-ACAC-4E13-817C-5F41B9123C77}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {94919648-ACAC-4E13-817C-5F41B9123C77}.Debug|x64.ActiveCfg = Debug|Any CPU
{94919648-ACAC-4E13-817C-5F41B9123C77}.Debug|x86.ActiveCfg = Debug|Any CPU
{94919648-ACAC-4E13-817C-5F41B9123C77}.Release|Any CPU.ActiveCfg = Release|Any CPU
{94919648-ACAC-4E13-817C-5F41B9123C77}.Release|Any CPU.Build.0 = Release|Any CPU
{94919648-ACAC-4E13-817C-5F41B9123C77}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{94919648-ACAC-4E13-817C-5F41B9123C77}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {94919648-ACAC-4E13-817C-5F41B9123C77}.Release|x64.ActiveCfg = Release|Any CPU
{94919648-ACAC-4E13-817C-5F41B9123C77}.Release|x86.ActiveCfg = Release|Any CPU
{B6356A30-18D3-4B74-8608-B855B2C7BFD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B6356A30-18D3-4B74-8608-B855B2C7BFD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B6356A30-18D3-4B74-8608-B855B2C7BFD7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{B6356A30-18D3-4B74-8608-B855B2C7BFD7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {B6356A30-18D3-4B74-8608-B855B2C7BFD7}.Debug|x64.ActiveCfg = Debug|Any CPU
{B6356A30-18D3-4B74-8608-B855B2C7BFD7}.Debug|x86.ActiveCfg = Debug|Any CPU
{B6356A30-18D3-4B74-8608-B855B2C7BFD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B6356A30-18D3-4B74-8608-B855B2C7BFD7}.Release|Any CPU.Build.0 = Release|Any CPU
{B6356A30-18D3-4B74-8608-B855B2C7BFD7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{B6356A30-18D3-4B74-8608-B855B2C7BFD7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {B6356A30-18D3-4B74-8608-B855B2C7BFD7}.Release|x64.ActiveCfg = Release|Any CPU
{B6356A30-18D3-4B74-8608-B855B2C7BFD7}.Release|x86.ActiveCfg = Release|Any CPU
{5CD6DD93-3EA1-425F-89D7-A80FD23BBC71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5CD6DD93-3EA1-425F-89D7-A80FD23BBC71}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5CD6DD93-3EA1-425F-89D7-A80FD23BBC71}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{5CD6DD93-3EA1-425F-89D7-A80FD23BBC71}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {5CD6DD93-3EA1-425F-89D7-A80FD23BBC71}.Debug|x64.ActiveCfg = Debug|Any CPU
{5CD6DD93-3EA1-425F-89D7-A80FD23BBC71}.Debug|x86.ActiveCfg = Debug|Any CPU
{5CD6DD93-3EA1-425F-89D7-A80FD23BBC71}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5CD6DD93-3EA1-425F-89D7-A80FD23BBC71}.Release|Any CPU.Build.0 = Release|Any CPU
{5CD6DD93-3EA1-425F-89D7-A80FD23BBC71}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{5CD6DD93-3EA1-425F-89D7-A80FD23BBC71}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {5CD6DD93-3EA1-425F-89D7-A80FD23BBC71}.Release|x64.ActiveCfg = Release|Any CPU
{5CD6DD93-3EA1-425F-89D7-A80FD23BBC71}.Release|x86.ActiveCfg = Release|Any CPU
+ {6CA7AB2C-2D8D-422A-9FD4-2992BE62720A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6CA7AB2C-2D8D-422A-9FD4-2992BE62720A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6CA7AB2C-2D8D-422A-9FD4-2992BE62720A}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {6CA7AB2C-2D8D-422A-9FD4-2992BE62720A}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {6CA7AB2C-2D8D-422A-9FD4-2992BE62720A}.Debug|x64.ActiveCfg = Debug|x64
+ {6CA7AB2C-2D8D-422A-9FD4-2992BE62720A}.Debug|x64.Build.0 = Debug|x64
+ {6CA7AB2C-2D8D-422A-9FD4-2992BE62720A}.Debug|x86.ActiveCfg = Debug|x86
+ {6CA7AB2C-2D8D-422A-9FD4-2992BE62720A}.Debug|x86.Build.0 = Debug|x86
+ {6CA7AB2C-2D8D-422A-9FD4-2992BE62720A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6CA7AB2C-2D8D-422A-9FD4-2992BE62720A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6CA7AB2C-2D8D-422A-9FD4-2992BE62720A}.Release|Mixed Platforms.ActiveCfg = Release|x86
+ {6CA7AB2C-2D8D-422A-9FD4-2992BE62720A}.Release|Mixed Platforms.Build.0 = Release|x86
+ {6CA7AB2C-2D8D-422A-9FD4-2992BE62720A}.Release|x64.ActiveCfg = Release|x64
+ {6CA7AB2C-2D8D-422A-9FD4-2992BE62720A}.Release|x64.Build.0 = Release|x64
+ {6CA7AB2C-2D8D-422A-9FD4-2992BE62720A}.Release|x86.ActiveCfg = Release|x86
+ {6CA7AB2C-2D8D-422A-9FD4-2992BE62720A}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(SubversionScc) = preSolution
+ Svn-Managed = True
+ Manager = AnkhSVN - Subversion Support for Visual Studio
+ EndGlobalSection
EndGlobal
@@ -132,7 +132,7 @@ private bool TestConnection(string addr,int reconnectAttempts)
ServiceAddress = addr;
_connected = JsonConvert.DeserializeObject<bool>(Rest.Get(ServiceAddress));
Log.Out("ActivityClient", string.Format("Service active? -> {0}", _connected), LogCode.Net);
- Thread.Sleep(200);
+ Thread.Sleep(2000);
attempts++;
}
while (_connected == false && attempts < reconnectAttempts);
@@ -17,10 +17,10 @@
using System.Threading.Tasks;
using System.Web;
using NooSphere.ActivitySystem.Helpers;
-using SignalR.Client;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using NooSphere.Core.ActivityModel;
+using Microsoft.AspNet.SignalR.Client;
#if ANDROID
#else
#endif
@@ -30,7 +30,7 @@ namespace NooSphere.ActivitySystem.Base.Service
public class ActivityCloudConnector
{
#region Private Members
- private readonly Connection _connection;
+ private Connection _connection;
#if ANDROID
#else
private readonly HttpClient _httpClient = new HttpClient();
@@ -69,11 +69,16 @@ public string ConnectionId
#endregion
#region Constructor
- public ActivityCloudConnector(string baseUrl,User user)
+ public ActivityCloudConnector()
+ {
+
+
+ }
+ public void ConnectToCloud(string baseUrl,User user)
{
BaseUrl = baseUrl;
- _connection = new Connection(baseUrl + "Connect");
- Connect(user);
+ _connection = new Connection(baseUrl+ "Connect");
+ Connect(user);
}
~ActivityCloudConnector()
{
@@ -172,21 +177,25 @@ public void RespondToFriendRequest(Guid userId,Guid friendId,bool approve)
#region Private Members
private void Connect(User user)
{
- _connection.Start().ContinueWith(task =>
- {
- if (task.IsFaulted)
- {
- if (task.Exception != null)
- Console.WriteLine("Failed to start: {0}", task.Exception.GetBaseException());
- }
- else
- {
- Register(user.Id);
- if (ConnectionSetup != null)
- ConnectionSetup(this, new EventArgs());
- _connection.Received += SignalRecieved;
- }
- });
+ _connection.Received += SignalRecieved;
+ _connection.Start().Wait();
+ Register(user.Id);
+ if (ConnectionSetup != null)
+ ConnectionSetup(this, new EventArgs());
+ //_connection.Start().ContinueWith(task =>
+ //{
+ // if (task.IsFaulted)
+ // {
+ // if (task.Exception != null)
+ // Console.WriteLine("Failed to start: {0}", task.Exception.InnerException.ToString());
+ // }
+ // else
+ // {
+ // Register(user.Id);
+ // if (ConnectionSetup != null)
+ // ConnectionSetup(this, new EventArgs());
+ // }
+ //});
}
private void Disconnect()
{
@@ -88,7 +88,7 @@ private void InitializeActivityService(User owner)
if (!_useCloud) return;
var serviceAddress = _useLocalCloud ? "http://localhost:56002" : "http://activitycloud-1.apphb.com";
- _activityCloudConnector = new ActivityCloudConnector(serviceAddress + "/Api/", owner);
+ _activityCloudConnector = new ActivityCloudConnector();
_activityCloudConnector.ConnectionSetup += ActivityCloudConnectorConnectionSetup;
_activityCloudConnector.ActivityAdded += ActivityCloudConnectorActivityAdded;
_activityCloudConnector.ActivityDeleted += ActivityCloudConnectorActivityDeleted;
@@ -104,8 +104,10 @@ private void InitializeActivityService(User owner)
_activityCloudConnector.ParticipantAdded += ActivityCloudConnectorParticipantAdded;
_activityCloudConnector.ParticipantRemoved += ActivityCloudConnectorParticipantRemoved;
- Log.Out("ActivityManager", string.Format("Cloud connector connected to {0}", serviceAddress), LogCode.Net);
+ _activityCloudConnector.ConnectToCloud(serviceAddress + "/Api/",owner);
+ _connectionActive = true;
+ Log.Out("ActivityManager", string.Format("Cloud connector connected to {0}", serviceAddress), LogCode.Net);
}
/// <summary>
@@ -33,17 +33,18 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="Microsoft.AspNet.SignalR.Client">
+ <HintPath>..\packages\Microsoft.AspNet.SignalR.Client.1.0.0-rc2\lib\net40\Microsoft.AspNet.SignalR.Client.dll</HintPath>
+ </Reference>
<Reference Include="Mono.Zeroconf, Version=4.0.0.90, Culture=neutral, PublicKeyToken=e60c4f4a95e1099e, processorArchitecture=MSIL">
<HintPath>..\packages\Mono.Zeroconf.0.9.0.0\lib\Net20\Mono.Zeroconf.dll</HintPath>
</Reference>
<Reference Include="Mono.Zeroconf.Providers.Bonjour, Version=4.0.0.90, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Mono.Zeroconf.0.9.0.0\lib\Net20\Mono.Zeroconf.Providers.Bonjour.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json">
- <HintPath>..\packages\Newtonsoft.Json.4.5.7\lib\net40\Newtonsoft.Json.dll</HintPath>
- </Reference>
- <Reference Include="SignalR.Client">
- <HintPath>..\packages\SignalR.Client.0.5.2\lib\net40\SignalR.Client.dll</HintPath>
+ <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -138,7 +139,6 @@
<Name>NooSphere.Core</Name>
</ProjectReference>
</ItemGroup>
- <ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="Microsoft.AspNet.SignalR.Client" version="1.0.0-rc2" targetFramework="net40" />
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
<package id="Mono.Zeroconf" version="0.9.0.0" targetFramework="net40" />
- <package id="Newtonsoft.Json" version="4.5.7" targetFramework="net40" />
- <package id="SignalR.Client" version="0.5.2" targetFramework="net40" />
+ <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
<package id="System.Net.Http" version="2.0.20710.0" targetFramework="net40" />
</packages>
Oops, something went wrong.

0 comments on commit d1fc4bf

Please sign in to comment.