Code cleanup for warnings.

23 files changed, 40 insertions, 57 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
index 8366a3e83..fc762d77d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
@@ -155,7 +155,7 @@ namespace Tango.MachineStudio.DB.ViewModels
                 catch (Exception ex)
                 {
                     Adapter.Invalidate();
-                    _notification.ShowError("Could not delete entity.");
+                    _notification.ShowError("Could not delete entity." + Environment.NewLine + ex.Message);
                 }
 
                 SelectedEntity = null;
@@ -251,7 +251,7 @@ namespace Tango.MachineStudio.DB.ViewModels
                     Adapter.Invalidate();
                     _notification.ShowError("Could not save entity." + Environment.NewLine + ex.InnerException.InnerException != null ? ex.InnerException.InnerException.Message : ex.InnerException.Message);
                 }
-                catch (Exception ex)
+                catch (Exception)
                 {
                     Adapter.Invalidate();
                     _notification.ShowError("Could not save entity." + Environment.NewLine + "Please make sure all fields are properly populated.");
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/ApplicationLogFileParser.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/ApplicationLogFileParser.cs
index 64f1913fb..4717196df 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/ApplicationLogFileParser.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/ApplicationLogFileParser.cs
@@ -58,7 +58,7 @@ namespace Tango.MachineStudio.Logging.Parsing
                 }
                 catch (Exception ex)
                 {
-                    //TODO: What to do now ?
+                    LogManager.Default.Log(ex, "Could not parse log line: " + logs[i]);
                 }
             }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs
index d663d6088..ca68334bf 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs
@@ -67,7 +67,7 @@ namespace Tango.MachineStudio.Logging.Parsing
                 }
                 catch (Exception ex)
                 {
-                    //TODO: What to do now ?
+                    LogManager.Default.Log(ex, "Could not parse log line: " + logs[i]);
                 }
             }
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveColorPickerControl.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveColorPickerControl.xaml.cs
index b8ebe9f6a..26629003a 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveColorPickerControl.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveColorPickerControl.xaml.cs
@@ -26,7 +26,6 @@ namespace Tango.MachineStudio.Common.Controls
         public event EventHandler<Color> SelectedHiveColorChanged;
         public event EventHandler<HexagonControl> SelectedHexagonChanged;
         public event EventHandler<int> LAxisValueChanged;
-        public event EventHandler<int> ResolutionChanged;
 
         private bool _preventColorCanvasEvent;
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml.cs
index ceba52826..baa44bc28 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/HiveComboControl.xaml.cs
@@ -23,7 +23,6 @@ namespace Tango.MachineStudio.Common.Controls
     /// </summary>
     public partial class HiveComboControl : UserControl
     {
-        public event EventHandler<Color> SelectedColorChanged;
         public event EventHandler<HexagonControl> SelectedHexagonChanged;
         public event EventHandler<int> LAxisValueChanged;
         public event EventHandler<int> ResolutionChanged;
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
index 3531985d6..a9944a92d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
@@ -36,7 +36,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>design.ico</ApplicationIcon>
+    <ApplicationIcon>machine.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Dragablz, Version=0.0.3.197, Culture=neutral, processorArchitecture=MSIL">
@@ -484,6 +484,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Html\HTML Templates\Thread Break.html" />
+    <Resource Include="machine.ico" />
     <Resource Include="Images\bug-resolved.png" />
     <EmbeddedResource Include="TFS\SystemInformationTemplate.cshtml" />
     <Resource Include="Images\bug.png" />
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/machine.ico b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/machine.ico
new file mode 100644
index 000000000..fb24158ed
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/machine.ico
diff --git a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Icon.cs b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Icon.cs
index 5d270d8e5..987479ef5 100644
--- a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Icon.cs
+++ b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/Icon.cs
@@ -3,13 +3,6 @@ using System.Windows.Controls;
 
 namespace MaterialDesignThemes.Wpf
 {
-    /// <summary>
-    /// Displays an icon image/path, according to the specified <see cref="Type"/> name.
-    /// </summary>
-    /// <remarks>
-    /// All icons sourced from Material Design Icons Font - <see cref="https://materialdesignicons.com/"/> - in accordance of 
-    /// <see cref="https://github.com/Templarian/MaterialDesign/blob/master/license.txt"/>.
-    /// </remarks>
     public class Icon : Control
     {
         public static readonly DependencyProperty TypeProperty = DependencyProperty.Register(
diff --git a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/IconType.cs b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/IconType.cs
index b463ac51a..a75b6eb1b 100644
--- a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/IconType.cs
+++ b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/IconType.cs
@@ -1,12 +1,5 @@
 namespace MaterialDesignThemes.Wpf
 {
-    /// <summary>
-    /// List of available icons for use with <see cref="Icon"/>.
-    /// </summary>
-    /// <remarks>
-    /// All icons sourced from Material Design Icons Font - <see cref="https://materialdesignicons.com/"/> - in accordance of 
-    /// <see cref="https://github.com/Templarian/MaterialDesign/blob/master/license.txt"/>.
-    /// </remarks>
     public enum IconType
     {
         AutoGeneratedDoNotAmend
diff --git a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj
index 987ec47e3..12d19d44b 100644
--- a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj
+++ b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj
@@ -22,7 +22,7 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <WarningLevel>0</WarningLevel>
     <DocumentationFile>bin\Debug\MaterialDesignThemes.Wpf.XML</DocumentationFile>
     <NoWarn>CS1591;CS1574</NoWarn>
   </PropertyGroup>
diff --git a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/PackIcon.cs b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/PackIcon.cs
index dc19938ca..bb8614df3 100644
--- a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/PackIcon.cs
+++ b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/PackIcon.cs
@@ -9,9 +9,6 @@ using ControlzEx;
 
 namespace MaterialDesignThemes.Wpf
 {
-    /// <summary>
-    /// Icon from the Material Design Icons project, <see cref="https://materialdesignicons.com/"/>.
-    /// </summary>
     public class PackIcon : PackIconBase<PackIconKind>
     {        
         static PackIcon()
diff --git a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/PackIconKind.cs b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/PackIconKind.cs
index 61efc70af..a4aef302c 100644
--- a/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/PackIconKind.cs
+++ b/Software/Visual_Studio/SideChains/MaterialDesignInXamlToolkit-master/MaterialDesignThemes.Wpf/PackIconKind.cs
@@ -1,16 +1,5 @@
 namespace MaterialDesignThemes.Wpf
 {
-    /// ******************************************
-    /// This code is auto generated. Do not amend.
-    /// ******************************************
-
-    /// <summary>
-    /// List of available icons for use with <see cref="PackIcon" />.
-    /// </summary>
-    /// <remarks>
-    /// All icons sourced from Material Design Icons Font - <see cref="https://materialdesignicons.com/"/> - in accordance of 
-    /// <see cref="https://github.com/Templarian/MaterialDesign/blob/master/license.txt"/>.
-    /// </remarks>
     public enum PackIconKind
     {
         AccessPoint,
diff --git a/Software/Visual_Studio/Tango.Synchronization/Conversion/SqlServerToSQLiteConverter.cs b/Software/Visual_Studio/Tango.Synchronization/Conversion/SqlServerToSQLiteConverter.cs
index de961e24d..0daa7a0d2 100644
--- a/Software/Visual_Studio/Tango.Synchronization/Conversion/SqlServerToSQLiteConverter.cs
+++ b/Software/Visual_Studio/Tango.Synchronization/Conversion/SqlServerToSQLiteConverter.cs
@@ -320,10 +320,10 @@ namespace Tango.Synchronization.Conversion
             {
                 return new Guid(str);
             }
-            catch (Exception ex)
+            catch
             {
                 return Guid.Empty;
-            } // catch
+            }
         }
 
         /// <summary>
@@ -544,7 +544,7 @@ namespace Tango.Synchronization.Conversion
 
                 tx.Commit();
             }
-            catch (SQLiteException ex)
+            catch (SQLiteException)
             {
                 tx.Rollback();
 
@@ -1080,10 +1080,10 @@ namespace Tango.Synchronization.Conversion
                     } // while
                 } // using
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 LogManager.Log("failed to read index information for table [" + tableName + "]");
-            } // catch
+            }
 
             return res;
         }
diff --git a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj
index d0fa1add9..8af97771c 100644
--- a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj
+++ b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj
@@ -28,7 +28,7 @@
     <OutputPath>..\Build\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <WarningLevel>0</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
diff --git a/Software/Visual_Studio/Tango.Visuals/Knob/Knob.xaml.cs b/Software/Visual_Studio/Tango.Visuals/Knob/Knob.xaml.cs
index dab75f2a4..44b9a7fa4 100644
--- a/Software/Visual_Studio/Tango.Visuals/Knob/Knob.xaml.cs
+++ b/Software/Visual_Studio/Tango.Visuals/Knob/Knob.xaml.cs
@@ -31,9 +31,7 @@ namespace Tango.Visuals
         private Line markLine;
         private Brush oldTicksHighlightBrush;
         private double initialAngle;
-        private bool _showBigMarkers;
         private bool _showSmallMarkers;
-        private double _initialValue;
 
         #region Events
 
@@ -131,7 +129,7 @@ namespace Tango.Visuals
                     line.StrokeThickness = TicksWidth;
                     line.Stroke = TicksBrush;
                     line.X1 = this.ActualWidth / 2;
-                    if ((marksCounter == markChange || marksCounter == 0) && _showBigMarkers)
+                    if ((marksCounter == markChange || marksCounter == 0))
                     {
                         line.Y1 = 0;
                         marksCounter = 0;
diff --git a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/RemoteDebugCommand.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/RemoteDebugCommand.cs
index 4bc972fbb..a5ded9906 100644
--- a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/RemoteDebugCommand.cs
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/RemoteDebugCommand.cs
@@ -109,7 +109,9 @@ namespace Tango.BuildExtensions
             }
         }
 
+#pragma warning disable VSTHRD100 // Avoid async void methods
         private async void _dteDebuggerEvents_OnEnterDesignMode(dbgEventReason Reason)
+#pragma warning restore VSTHRD100 // Avoid async void methods
         {
             if (_attached)
             {
@@ -190,7 +192,9 @@ namespace Tango.BuildExtensions
 
                 if (dlg.ShowDialog() == System.Windows.Forms.DialogResult.OK)
                 {
+#pragma warning disable VSTHRD105 // Avoid method overloads that assume TaskScheduler.Current
                     System.Threading.Tasks.Task.Factory.StartNew(async () =>
+#pragma warning restore VSTHRD105 // Avoid method overloads that assume TaskScheduler.Current
                     {
                         try
                         {
diff --git a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommand.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommand.cs
index f2fb09c36..9de557117 100644
--- a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommand.cs
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommand.cs
@@ -30,7 +30,6 @@ namespace Tango.BuildExtensions
     internal sealed class TangoBuildCommand : VSIXBase
     {
         private IList<Project> _projects;
-        private SelectForm _form;
         private TestStack.White.Application _application;
         private TestStack.White.UIItems.WindowItems.Window _window;
         private System.Diagnostics.Process _vsProcess;
@@ -130,12 +129,12 @@ namespace Tango.BuildExtensions
 
         private void Start()
         {
-            _form = null;
-
             BuildForm buildForm = new BuildForm();
             if (buildForm.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
 
+#pragma warning disable VSTHRD105 // Avoid method overloads that assume TaskScheduler.Current
             System.Threading.Tasks.Task.Factory.StartNew(() =>
+#pragma warning restore VSTHRD105 // Avoid method overloads that assume TaskScheduler.Current
             {
                 _projects = GetSolutionProjects().ToList();
 
diff --git a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommandPackage.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommandPackage.cs
index 305dfc4e2..520b2d2e1 100644
--- a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommandPackage.cs
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/TangoBuildCommandPackage.cs
@@ -40,7 +40,9 @@ namespace Tango.BuildExtensions
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [Guid(TangoBuildCommandPackage.PackageGuidString)]
     [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "pkgdef, VS and vsixmanifest are valid VS terms")]
+#pragma warning disable VSSDK004 // Use BackgroundLoad flag in ProvideAutoLoad attribute for asynchronous auto load.
     [ProvideAutoLoad(UIContextGuids.SolutionExists)]
+#pragma warning restore VSSDK004 // Use BackgroundLoad flag in ProvideAutoLoad attribute for asynchronous auto load.
     public sealed class TangoBuildCommandPackage : Package
     {
         /// <summary>
diff --git a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/VSIXBase.cs b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/VSIXBase.cs
index b5e5dd0a0..50860cfa3 100644
--- a/Software/Visual_Studio/VSIX/Tango.BuildExtensions/VSIXBase.cs
+++ b/Software/Visual_Studio/VSIX/Tango.BuildExtensions/VSIXBase.cs
@@ -134,6 +134,7 @@ namespace Tango.BuildExtensions
 
         public void WriteToConsole(String text)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Get the output window
             var outputWindow = Package.GetGlobalService(typeof(SVsOutputWindow)) as IVsOutputWindow;
 
@@ -199,9 +200,12 @@ namespace Tango.BuildExtensions
 
         protected void OpenVSProgress(String title, String message, bool intermediate)
         {
-            Microsoft.VisualStudio.Shell.ThreadHelper.Generic.Invoke(() => 
+#pragma warning disable VSTHRD001 // Avoid legacy thread switching APIs
+            ThreadHelper.Generic.Invoke(() =>
+#pragma warning restore VSTHRD001 // Avoid legacy thread switching APIs
             {
                 _vsProgress = null;
+                ThreadHelper.ThrowIfNotOnUIThread();
                 IVsThreadedWaitDialogFactory dialogFactory = BaseServiceProvider.GetService(typeof(SVsThreadedWaitDialogFactory)) as IVsThreadedWaitDialogFactory;
                 dialogFactory.CreateInstance(out _vsProgress);
 
@@ -221,8 +225,11 @@ namespace Tango.BuildExtensions
 
         protected void SetVSProgress(String message, String progressText = null, int current = 0, int total = 0)
         {
-            Microsoft.VisualStudio.Shell.ThreadHelper.Generic.Invoke(() =>
+#pragma warning disable VSTHRD001 // Avoid legacy thread switching APIs
+            ThreadHelper.Generic.Invoke(() =>
+#pragma warning restore VSTHRD001 // Avoid legacy thread switching APIs
             {
+                ThreadHelper.ThrowIfNotOnUIThread();
                 bool c;
                 _vsProgress.UpdateProgress(message, progressText, null, current, total, true, out c);
             });
@@ -230,7 +237,9 @@ namespace Tango.BuildExtensions
 
         protected void CloseVSProgress()
         {
-            Microsoft.VisualStudio.Shell.ThreadHelper.Generic.Invoke(() =>
+#pragma warning disable VSTHRD001 // Avoid legacy thread switching APIs
+            ThreadHelper.Generic.Invoke(() =>
+#pragma warning restore VSTHRD001 // Avoid legacy thread switching APIs
             {
                 _vsProgress.EndWaitDialog();
             });
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/HomeController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/HomeController.cs
index 1e67c6845..a7c526f67 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/HomeController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/HomeController.cs
@@ -6,7 +6,7 @@ using System.Web.Mvc;
 
 namespace Tango.MachineService.Controllers
 {
-    public class HomeController : Controller
+    public class HomeController : Controller  
     {
         public String Index()
         {
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
index 3439b8c09..7a6629752 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
@@ -59,6 +59,9 @@
       <HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.3\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -90,9 +93,6 @@
       <Private>True</Private>
       <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="System.Net.Http">
     </Reference>
     <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Web.config b/Software/Visual_Studio/Web/Tango.MachineService/Web.config
index e843f132a..88fb2afc4 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Web.config
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Web.config
@@ -46,7 +46,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/packages.config b/Software/Visual_Studio/Web/Tango.MachineService/packages.config
index fe23842ac..a9c0d3f6c 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/packages.config
+++ b/Software/Visual_Studio/Web/Tango.MachineService/packages.config
@@ -23,7 +23,7 @@
   <package id="Microsoft.Net.Compilers" version="2.4.0" targetFramework="net46" developmentDependency="true" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="Modernizr" version="2.6.2" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net46" />
   <package id="Respond" version="1.2.0" targetFramework="net45" />
   <package id="System.Data.SQLite" version="1.0.108.0" targetFramework="net46" />
   <package id="System.Data.SQLite.Core" version="1.0.108.0" targetFramework="net46" />