Merge pull request #6 from EyeTribe/henrik

Updated to latest C# SDK and JSON, fixed minor issue in Scroll demo
EyeTribe · Nov 28, 2016 · 48756e9 · 48756e9
2 parents f25a578 + af5d621
commit 48756e9
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Change Log #
 ---
 
+0.9.77.1 (2016-11-28)
+---
+- Updated C# SDK
+- Updated JSON
+- Fixed minor issue in Scroll demo where the aplication would crash if server was not running
+
 0.9.77 (2016-05-18)
 ---
 - Removing embedded dependencies, using NuGet for 'EyeTribe WPF Tools' instead

diff --git a/Calibration/CalibrationSample.csproj b/Calibration/CalibrationSample.csproj
@@ -40,16 +40,17 @@
     <ApplicationIcon>favicon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EyeTribe.ClientSdk">
-      <HintPath>$(SolutionDir)packages\EyeTribe.ClientSdk.0.9.77\lib\net45\EyeTribe.ClientSdk.dll</HintPath>
+    <Reference Include="EyeTribe.ClientSdk, Version=0.9.77.30231, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)packages\EyeTribe.ClientSdk.0.9.77.6\lib\net45\EyeTribe.ClientSdk.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="EyeTribe.Controls, Version=0.9.77.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(SolutionDir)packages\EyeTribe.Controls.0.9.77\lib\net45\EyeTribe.Controls.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\EyeTribe.Controls.0.9.77.2\lib\net45\EyeTribe.Controls.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(SolutionDir)packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
@@ -121,4 +122,5 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
+
diff --git a/Calibration/packages.config b/Calibration/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EyeTribe.ClientSdk" version="0.9.77" targetFramework="net45" />
-  <package id="EyeTribe.Controls" version="0.9.77" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
+  <package id="EyeTribe.ClientSdk" version="0.9.77.6" targetFramework="net45" />
+  <package id="EyeTribe.Controls" version="0.9.77.2" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
 </packages>
diff --git a/Scroll/MainWindow.xaml.cs b/Scroll/MainWindow.xaml.cs
@@ -36,6 +36,7 @@ public partial class MainWindow : IGazeListener
         private readonly Timer scrollTimer;
         private double scrollLevel;
         private bool canScroll;
+        private bool connectedOk = true;
         enum Direction { Up = -1, Down = 1 }
 
         #endregion
@@ -66,7 +67,6 @@ public enum DeviceCap
 
         public MainWindow()
         {
-            var connectedOk = true;
             GazeManager.Instance.Activate(GazeManager.ApiVersion.VERSION_1_0, GazeManager.ClientMode.Push);
             GazeManager.Instance.AddGazeListener(this);
 
@@ -345,7 +345,8 @@ private void CleanUp()
 
         protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
         {
-            CleanUp();
+            if (connectedOk)
+                CleanUp();
             base.OnClosing(e);
         }
 

diff --git a/Scroll/Scroll.csproj b/Scroll/Scroll.csproj
@@ -40,15 +40,17 @@
     <ApplicationIcon>Browser.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EyeTribe.ClientSdk">
-      <HintPath>$(SolutionDir)packages\EyeTribe.ClientSdk.0.9.77\lib\net45\EyeTribe.ClientSdk.dll</HintPath>
+    <Reference Include="EyeTribe.ClientSdk, Version=0.9.77.30231, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)packages\EyeTribe.ClientSdk.0.9.77.6\lib\net45\EyeTribe.ClientSdk.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="EyeTribe.Controls">
-      <HintPath>$(SolutionDir)packages\EyeTribe.Controls.0.9.77\lib\net45\EyeTribe.Controls.dll</HintPath>
+    <Reference Include="EyeTribe.Controls, Version=0.9.77.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)packages\EyeTribe.Controls.0.9.77.2\lib\net45\EyeTribe.Controls.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(SolutionDir)packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
@@ -142,4 +144,5 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
+
diff --git a/Scroll/packages.config b/Scroll/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EyeTribe.ClientSdk" version="0.9.77" targetFramework="net45" />
-  <package id="EyeTribe.Controls" version="0.9.77" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
+  <package id="EyeTribe.ClientSdk" version="0.9.77.6" targetFramework="net45" />
+  <package id="EyeTribe.Controls" version="0.9.77.2" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
 </packages>