diff --git a/Debugger/Debugger.csproj b/Debugger/Debugger.csproj index 4f8c58fd..085d3553 100644 --- a/Debugger/Debugger.csproj +++ b/Debugger/Debugger.csproj @@ -105,9 +105,9 @@ - + False - ..\libs\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll diff --git a/Debugger/app.config b/Debugger/app.config index 666ceba1..4a101e0e 100644 --- a/Debugger/app.config +++ b/Debugger/app.config @@ -26,7 +26,7 @@ - + diff --git a/MSI/Files.wxs b/MSI/Files.wxs index c7b0fe17..d137953f 100644 --- a/MSI/Files.wxs +++ b/MSI/Files.wxs @@ -45,7 +45,7 @@ - + diff --git a/Modules/Modules.csproj b/Modules/Modules.csproj index aa6ef858..999e4f92 100644 --- a/Modules/Modules.csproj +++ b/Modules/Modules.csproj @@ -100,9 +100,9 @@ ..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll - + False - ..\libs\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll ..\libs\ProcessPrivileges.dll diff --git a/Modules/app.config b/Modules/app.config index d3a40fd7..45386390 100644 --- a/Modules/app.config +++ b/Modules/app.config @@ -8,7 +8,7 @@ - + diff --git a/PrinterManagerHelper/App.config b/PrinterManagerHelper/App.config index 22b7d039..6e9c5af7 100644 --- a/PrinterManagerHelper/App.config +++ b/PrinterManagerHelper/App.config @@ -7,7 +7,7 @@ - + diff --git a/PrinterManagerHelper/PrinterManagerHelper.csproj b/PrinterManagerHelper/PrinterManagerHelper.csproj index 98a85ee2..fd970f01 100644 --- a/PrinterManagerHelper/PrinterManagerHelper.csproj +++ b/PrinterManagerHelper/PrinterManagerHelper.csproj @@ -58,7 +58,7 @@ - ..\libs\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll diff --git a/Service/Service.csproj b/Service/Service.csproj index 9e098aea..025f6bec 100644 --- a/Service/Service.csproj +++ b/Service/Service.csproj @@ -127,9 +127,9 @@ ..\libs\log4net.dll - + False - ..\libs\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll False diff --git a/Service/app.config b/Service/app.config index be458571..cd36f532 100644 --- a/Service/app.config +++ b/Service/app.config @@ -23,7 +23,7 @@ - + diff --git a/SetupHelper/SetupHelper.csproj b/SetupHelper/SetupHelper.csproj index 3d234431..10f9b87c 100644 --- a/SetupHelper/SetupHelper.csproj +++ b/SetupHelper/SetupHelper.csproj @@ -41,9 +41,9 @@ False ..\libs\Microsoft.Win32.TaskScheduler.dll - + False - ..\libs\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll diff --git a/SetupHelper/app.config b/SetupHelper/app.config index 3b95b8cf..f72efaee 100644 --- a/SetupHelper/app.config +++ b/SetupHelper/app.config @@ -8,7 +8,7 @@ - + diff --git a/ShutdownGUI/ShutdownGUI.csproj b/ShutdownGUI/ShutdownGUI.csproj index 96658cc5..5d3f3dfe 100644 --- a/ShutdownGUI/ShutdownGUI.csproj +++ b/ShutdownGUI/ShutdownGUI.csproj @@ -116,9 +116,9 @@ ..\libs\MetroFramework.Fonts.dll - + False - ..\libs\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll diff --git a/ShutdownGUI/app.config b/ShutdownGUI/app.config index 146ce760..64039667 100644 --- a/ShutdownGUI/app.config +++ b/ShutdownGUI/app.config @@ -11,7 +11,7 @@ - + diff --git a/Tray/Tray.csproj b/Tray/Tray.csproj index d65d3dbf..fc87a365 100644 --- a/Tray/Tray.csproj +++ b/Tray/Tray.csproj @@ -99,9 +99,9 @@ - + False - ..\libs\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll diff --git a/Tray/app.config b/Tray/app.config index 593b96bc..a21c1fb4 100644 --- a/Tray/app.config +++ b/Tray/app.config @@ -11,7 +11,7 @@ - + diff --git a/UniversalInstaller/App.config b/UniversalInstaller/App.config index 226986c0..b954fdde 100644 --- a/UniversalInstaller/App.config +++ b/UniversalInstaller/App.config @@ -7,7 +7,7 @@ - + diff --git a/UniversalInstaller/UniversalInstaller.csproj b/UniversalInstaller/UniversalInstaller.csproj index 7342a1e5..404d870d 100644 --- a/UniversalInstaller/UniversalInstaller.csproj +++ b/UniversalInstaller/UniversalInstaller.csproj @@ -92,8 +92,8 @@ False ..\libs\MetroFramework.Fonts.dll - - ..\libs\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll diff --git a/UniversalInstaller/packages.config b/UniversalInstaller/packages.config index f3d4c844..ad78f5c4 100644 --- a/UniversalInstaller/packages.config +++ b/UniversalInstaller/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/UpdateHelper/UpdateHelper.csproj b/UpdateHelper/UpdateHelper.csproj index 44c98fc9..8ab21320 100644 --- a/UpdateHelper/UpdateHelper.csproj +++ b/UpdateHelper/UpdateHelper.csproj @@ -98,9 +98,9 @@ - + False - ..\libs\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll diff --git a/UpdateHelper/app.config b/UpdateHelper/app.config index 593b96bc..a21c1fb4 100644 --- a/UpdateHelper/app.config +++ b/UpdateHelper/app.config @@ -11,7 +11,7 @@ - + diff --git a/UpdateWaiter/app.config b/UpdateWaiter/app.config index 593b96bc..a21c1fb4 100644 --- a/UpdateWaiter/app.config +++ b/UpdateWaiter/app.config @@ -11,7 +11,7 @@ - + diff --git a/UserService/UserService.csproj b/UserService/UserService.csproj index d34d98aa..d1a67055 100644 --- a/UserService/UserService.csproj +++ b/UserService/UserService.csproj @@ -103,9 +103,9 @@ - + False - ..\libs\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll diff --git a/UserService/app.config b/UserService/app.config index 76ddf90d..f108339d 100644 --- a/UserService/app.config +++ b/UserService/app.config @@ -8,7 +8,7 @@ - + diff --git a/libs/Newtonsoft.Json.dll b/libs/Newtonsoft.Json.dll deleted file mode 100644 index 628aaf03..00000000 Binary files a/libs/Newtonsoft.Json.dll and /dev/null differ