diff --git a/MatterControl.csproj b/MatterControl.csproj index 70a66864d..7d9179fd0 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -401,9 +401,9 @@ packages\Mindscape.Raygun4Net.5.0.0\lib\net40\Mindscape.Raygun4Net4.dll True - - False - packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll + + packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + True PdfSharp.dll diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index e76e827b9..7ddbda49e 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit e76e827b9724ee4363d1b74e53ddfa61a342bb6d +Subproject commit 7ddbda49e561516e6ebb1ad1deba2e2e426808fb diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 7d6caf59e..de466dfaa 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 7d6caf59efc2af50971616c26db7348aa1153f5b +Subproject commit de466dfaa256f22aa8aaeb07e7e311928ed8c260 diff --git a/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj b/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj index 0eafc8c05..69a3aa465 100644 --- a/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj +++ b/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj @@ -32,8 +32,8 @@ x86 - - ..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll True diff --git a/Tests/MatterControl.AutomationTests/app.config b/Tests/MatterControl.AutomationTests/app.config index 6feedb05f..74054640f 100644 --- a/Tests/MatterControl.AutomationTests/app.config +++ b/Tests/MatterControl.AutomationTests/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file diff --git a/Tests/MatterControl.AutomationTests/packages.config b/Tests/MatterControl.AutomationTests/packages.config index a7228117b..734b6c9c4 100644 --- a/Tests/MatterControl.AutomationTests/packages.config +++ b/Tests/MatterControl.AutomationTests/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/Tests/MatterControl.Tests/MatterControl.Tests.csproj b/Tests/MatterControl.Tests/MatterControl.Tests.csproj index e2382445c..1f6f4dedd 100644 --- a/Tests/MatterControl.Tests/MatterControl.Tests.csproj +++ b/Tests/MatterControl.Tests/MatterControl.Tests.csproj @@ -33,8 +33,8 @@ x86 - - ..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll True diff --git a/Tests/MatterControl.Tests/packages.config b/Tests/MatterControl.Tests/packages.config index d26f6c4dd..9ed35234d 100644 --- a/Tests/MatterControl.Tests/packages.config +++ b/Tests/MatterControl.Tests/packages.config @@ -1,6 +1,6 @@  - + diff --git a/packages.config b/packages.config index cee43fb0e..2b5a11e38 100644 --- a/packages.config +++ b/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file