From fc80d3709dbae20d81465c738414767060fd4e12 Mon Sep 17 00:00:00 2001 From: David Rolland Date: Wed, 9 May 2018 15:57:15 +0900 Subject: [PATCH] Updated many NuGet packages. --- .hgignore | 3 +-- .../ImagingInterface.Controllers.csproj | 8 +++---- .../packages.config | 4 ++-- ...ImagingInterface.Plugins.Interfaces.csproj | 4 ++-- .../packages.config | 2 +- Core/ImagingInterface/ImagingInterface.csproj | 20 +++++++++--------- Core/ImagingInterface/Program.cs | 2 +- Core/ImagingInterface/packages.config | 10 ++++----- .../ImagingInterface.Controllers.Tests.csproj | 11 ++++++---- .../packages.config | 4 ++-- .../ImageProcessing.Controllers.csproj | 8 +++---- .../Controllers/packages.config | 4 ++-- .../Cudafied/ImageProcessing.Cudafied.csproj | 4 ++-- .../ImageProcessing/Cudafied/packages.config | 2 +- .../ImageProcessing.ObjectDetection.csproj | 8 +++---- .../ObjectDetection/packages.config | 4 ++-- .../ImageProcessing.Controllers.Tests.csproj | 21 +++++++++++++------ .../packages.config | 8 ++++--- .../Views/ImageProcessing.Views.csproj | 12 +++++------ Plugins/ImageProcessing/Views/packages.config | 6 +++--- .../Controllers/Video.Controllers.csproj | 4 ++-- Plugins/Video/Controllers/packages.config | 2 +- .../Video.Controllers.Tests.csproj | 11 ++++++---- .../Video.Controllers.Tests/packages.config | 4 ++-- Plugins/Video/Views/Video.Views.csproj | 12 +++++------ Plugins/Video/Views/packages.config | 6 +++--- 26 files changed, 100 insertions(+), 84 deletions(-) diff --git a/.hgignore b/.hgignore index 962f73c..962c7e4 100644 --- a/.hgignore +++ b/.hgignore @@ -6,7 +6,6 @@ StyleCop.Cache *.opensdf *.user *.sdf -_NCrunch_ImagingInterface/ImagingInterface.crunchsolution.cache -_NCrunch_ImagingInterface/StoredText/* packages/* .vs/* +_NCrunch_ImagingInterface/* diff --git a/Core/ImagingInterface.Controllers/ImagingInterface.Controllers.csproj b/Core/ImagingInterface.Controllers/ImagingInterface.Controllers.csproj index 74ab9cf..b3b32ab 100644 --- a/Core/ImagingInterface.Controllers/ImagingInterface.Controllers.csproj +++ b/Core/ImagingInterface.Controllers/ImagingInterface.Controllers.csproj @@ -62,11 +62,11 @@ MinimumRecommendedRules.ruleset - - ..\..\packages\ImageProcessor.2.5.6\lib\net45\ImageProcessor.dll + + ..\..\packages\ImageProcessor.2.6.1.19\lib\net452\ImageProcessor.dll - - ..\..\packages\Shouldly.2.8.3\lib\net451\Shouldly.dll + + ..\..\packages\Shouldly.3.0.0\lib\net451\Shouldly.dll diff --git a/Core/ImagingInterface.Controllers/packages.config b/Core/ImagingInterface.Controllers/packages.config index abf8bd0..fd4d3a2 100644 --- a/Core/ImagingInterface.Controllers/packages.config +++ b/Core/ImagingInterface.Controllers/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file diff --git a/Core/ImagingInterface.Plugins.Interfaces/ImagingInterface.Plugins.Interfaces.csproj b/Core/ImagingInterface.Plugins.Interfaces/ImagingInterface.Plugins.Interfaces.csproj index 64086c7..79facaf 100644 --- a/Core/ImagingInterface.Plugins.Interfaces/ImagingInterface.Plugins.Interfaces.csproj +++ b/Core/ImagingInterface.Plugins.Interfaces/ImagingInterface.Plugins.Interfaces.csproj @@ -62,8 +62,8 @@ MinimumRecommendedRules.ruleset - - ..\..\packages\Shouldly.2.8.3\lib\net451\Shouldly.dll + + ..\..\packages\Shouldly.3.0.0\lib\net451\Shouldly.dll diff --git a/Core/ImagingInterface.Plugins.Interfaces/packages.config b/Core/ImagingInterface.Plugins.Interfaces/packages.config index b74b170..6ba4fa5 100644 --- a/Core/ImagingInterface.Plugins.Interfaces/packages.config +++ b/Core/ImagingInterface.Plugins.Interfaces/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Core/ImagingInterface/ImagingInterface.csproj b/Core/ImagingInterface/ImagingInterface.csproj index c26beed..8962a86 100644 --- a/Core/ImagingInterface/ImagingInterface.csproj +++ b/Core/ImagingInterface/ImagingInterface.csproj @@ -81,8 +81,8 @@ ..\..\packages\Accord.Statistics.3.8.0\lib\net462\Accord.Statistics.dll - - ..\..\packages\CsvHelper.6.0.0\lib\net45\CsvHelper.dll + + ..\..\packages\CsvHelper.7.1.0\lib\net45\CsvHelper.dll False @@ -94,8 +94,8 @@ ..\..\packages\EMGU.CV.3.3.0.2824\lib\net35\Emgu.CV.World.dll - - ..\..\packages\ImageProcessor.2.5.6\lib\net45\ImageProcessor.dll + + ..\..\packages\ImageProcessor.2.6.1.19\lib\net452\ImageProcessor.dll ..\..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll @@ -103,14 +103,14 @@ ..\..\packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll - - ..\..\packages\Shouldly.2.8.3\lib\net451\Shouldly.dll + + ..\..\packages\Shouldly.3.0.0\lib\net451\Shouldly.dll - - ..\..\packages\SimpleInjector.4.0.12\lib\net45\SimpleInjector.dll + + ..\..\packages\SimpleInjector.4.2.2\lib\net45\SimpleInjector.dll - - ..\..\packages\SimpleInjector.Packaging.4.0.12\lib\net40\SimpleInjector.Packaging.dll + + ..\..\packages\SimpleInjector.Packaging.4.2.2\lib\net40\SimpleInjector.Packaging.dll diff --git a/Core/ImagingInterface/Program.cs b/Core/ImagingInterface/Program.cs index 5ad802a..15a8d2f 100644 --- a/Core/ImagingInterface/Program.cs +++ b/Core/ImagingInterface/Program.cs @@ -138,7 +138,7 @@ private static void Bootstrap() container.Register(); container.Register(); container.Register(); - container.RegisterSingleton>(() => { return container.GetInstance(); }); + container.RegisterInstance>(() => { return container.GetInstance(); }); container.Register(); container.Register(); diff --git a/Core/ImagingInterface/packages.config b/Core/ImagingInterface/packages.config index 2dfc6d2..136a573 100644 --- a/Core/ImagingInterface/packages.config +++ b/Core/ImagingInterface/packages.config @@ -4,15 +4,15 @@ - + - + - - - + + + \ No newline at end of file diff --git a/Core/Tests/ImagingInterface.Controllers.Tests/ImagingInterface.Controllers.Tests.csproj b/Core/Tests/ImagingInterface.Controllers.Tests/ImagingInterface.Controllers.Tests.csproj index 74eaf87..bc6d51c 100644 --- a/Core/Tests/ImagingInterface.Controllers.Tests/ImagingInterface.Controllers.Tests.csproj +++ b/Core/Tests/ImagingInterface.Controllers.Tests/ImagingInterface.Controllers.Tests.csproj @@ -63,11 +63,11 @@ MinimumRecommendedRules.ruleset - - ..\..\..\packages\Shouldly.2.8.3\lib\net451\Shouldly.dll + + ..\..\..\packages\Shouldly.3.0.0\lib\net451\Shouldly.dll - - ..\..\..\packages\SimpleInjector.4.0.12\lib\net45\SimpleInjector.dll + + ..\..\..\packages\SimpleInjector.4.2.2\lib\net45\SimpleInjector.dll @@ -134,6 +134,9 @@ + + + diff --git a/Core/Tests/ImagingInterface.Controllers.Tests/packages.config b/Core/Tests/ImagingInterface.Controllers.Tests/packages.config index be0b790..1c1c990 100644 --- a/Core/Tests/ImagingInterface.Controllers.Tests/packages.config +++ b/Core/Tests/ImagingInterface.Controllers.Tests/packages.config @@ -1,7 +1,7 @@  - - + + diff --git a/Plugins/ImageProcessing/Controllers/ImageProcessing.Controllers.csproj b/Plugins/ImageProcessing/Controllers/ImageProcessing.Controllers.csproj index 66206d0..b1e06d8 100644 --- a/Plugins/ImageProcessing/Controllers/ImageProcessing.Controllers.csproj +++ b/Plugins/ImageProcessing/Controllers/ImageProcessing.Controllers.csproj @@ -74,11 +74,11 @@ ..\..\..\packages\EMGU.CV.3.3.0.2824\lib\net35\Emgu.CV.World.dll - - ..\..\..\packages\ImageProcessor.2.5.6\lib\net45\ImageProcessor.dll + + ..\..\..\packages\ImageProcessor.2.6.1.19\lib\net452\ImageProcessor.dll - - ..\..\..\packages\Shouldly.2.8.3\lib\net451\Shouldly.dll + + ..\..\..\packages\Shouldly.3.0.0\lib\net451\Shouldly.dll diff --git a/Plugins/ImageProcessing/Controllers/packages.config b/Plugins/ImageProcessing/Controllers/packages.config index 8e94e56..18d81c5 100644 --- a/Plugins/ImageProcessing/Controllers/packages.config +++ b/Plugins/ImageProcessing/Controllers/packages.config @@ -2,8 +2,8 @@ - - + + \ No newline at end of file diff --git a/Plugins/ImageProcessing/Cudafied/ImageProcessing.Cudafied.csproj b/Plugins/ImageProcessing/Cudafied/ImageProcessing.Cudafied.csproj index c929c05..bf42350 100644 --- a/Plugins/ImageProcessing/Cudafied/ImageProcessing.Cudafied.csproj +++ b/Plugins/ImageProcessing/Cudafied/ImageProcessing.Cudafied.csproj @@ -66,8 +66,8 @@ False ..\..\..\packages\CUDAfy.NET.1.29.5576.13786\lib\net40\Cudafy.NET.dll - - ..\..\..\packages\Shouldly.2.8.3\lib\net451\Shouldly.dll + + ..\..\..\packages\Shouldly.3.0.0\lib\net451\Shouldly.dll diff --git a/Plugins/ImageProcessing/Cudafied/packages.config b/Plugins/ImageProcessing/Cudafied/packages.config index 50f954f..5a819db 100644 --- a/Plugins/ImageProcessing/Cudafied/packages.config +++ b/Plugins/ImageProcessing/Cudafied/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/Plugins/ImageProcessing/ObjectDetection/ImageProcessing.ObjectDetection.csproj b/Plugins/ImageProcessing/ObjectDetection/ImageProcessing.ObjectDetection.csproj index 89fdea3..94170de 100644 --- a/Plugins/ImageProcessing/ObjectDetection/ImageProcessing.ObjectDetection.csproj +++ b/Plugins/ImageProcessing/ObjectDetection/ImageProcessing.ObjectDetection.csproj @@ -77,8 +77,8 @@ ..\..\..\packages\Accord.Statistics.3.8.0\lib\net462\Accord.Statistics.dll - - ..\..\..\packages\CsvHelper.6.0.0\lib\net45\CsvHelper.dll + + ..\..\..\packages\CsvHelper.7.1.0\lib\net45\CsvHelper.dll ..\..\..\packages\EMGU.CV.3.3.0.2824\lib\net35\Emgu.CV.UI.dll @@ -86,8 +86,8 @@ ..\..\..\packages\EMGU.CV.3.3.0.2824\lib\net35\Emgu.CV.World.dll - - ..\..\..\packages\Shouldly.2.8.3\lib\net451\Shouldly.dll + + ..\..\..\packages\Shouldly.3.0.0\lib\net451\Shouldly.dll diff --git a/Plugins/ImageProcessing/ObjectDetection/packages.config b/Plugins/ImageProcessing/ObjectDetection/packages.config index 1023f24..78de570 100644 --- a/Plugins/ImageProcessing/ObjectDetection/packages.config +++ b/Plugins/ImageProcessing/ObjectDetection/packages.config @@ -4,9 +4,9 @@ - + - + \ No newline at end of file diff --git a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ImageProcessing.Controllers.Tests.csproj b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ImageProcessing.Controllers.Tests.csproj index ee72f80..a51d8da 100644 --- a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ImageProcessing.Controllers.Tests.csproj +++ b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/ImageProcessing.Controllers.Tests.csproj @@ -67,19 +67,25 @@ ..\..\..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll - - ..\..\..\..\packages\Moq.4.7.145\lib\net45\Moq.dll + + ..\..\..\..\packages\Moq.4.8.2\lib\net45\Moq.dll - - ..\..\..\..\packages\Shouldly.2.8.3\lib\net451\Shouldly.dll + + ..\..\..\..\packages\Shouldly.3.0.0\lib\net451\Shouldly.dll - - ..\..\..\..\packages\SimpleInjector.4.0.12\lib\net45\SimpleInjector.dll + + ..\..\..\..\packages\SimpleInjector.4.2.2\lib\net45\SimpleInjector.dll + + ..\..\..\..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll + + + ..\..\..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll + @@ -141,6 +147,9 @@ + + + diff --git a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/packages.config b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/packages.config index 73236ea..90c8d28 100644 --- a/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/packages.config +++ b/Plugins/ImageProcessing/Tests/ImageProcessing.Controllers.Tests/packages.config @@ -1,10 +1,12 @@  - - - + + + + + diff --git a/Plugins/ImageProcessing/Views/ImageProcessing.Views.csproj b/Plugins/ImageProcessing/Views/ImageProcessing.Views.csproj index 34ded9d..286270a 100644 --- a/Plugins/ImageProcessing/Views/ImageProcessing.Views.csproj +++ b/Plugins/ImageProcessing/Views/ImageProcessing.Views.csproj @@ -62,14 +62,14 @@ MinimumRecommendedRules.ruleset - - ..\..\..\packages\Shouldly.2.8.3\lib\net451\Shouldly.dll + + ..\..\..\packages\Shouldly.3.0.0\lib\net451\Shouldly.dll - - ..\..\..\packages\SimpleInjector.4.0.12\lib\net45\SimpleInjector.dll + + ..\..\..\packages\SimpleInjector.4.2.2\lib\net45\SimpleInjector.dll - - ..\..\..\packages\SimpleInjector.Packaging.4.0.12\lib\net40\SimpleInjector.Packaging.dll + + ..\..\..\packages\SimpleInjector.Packaging.4.2.2\lib\net40\SimpleInjector.Packaging.dll diff --git a/Plugins/ImageProcessing/Views/packages.config b/Plugins/ImageProcessing/Views/packages.config index 097b8f7..244af60 100644 --- a/Plugins/ImageProcessing/Views/packages.config +++ b/Plugins/ImageProcessing/Views/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/Plugins/Video/Controllers/Video.Controllers.csproj b/Plugins/Video/Controllers/Video.Controllers.csproj index 88dc238..a91bb88 100644 --- a/Plugins/Video/Controllers/Video.Controllers.csproj +++ b/Plugins/Video/Controllers/Video.Controllers.csproj @@ -68,8 +68,8 @@ ..\..\..\packages\EMGU.CV.3.3.0.2824\lib\net35\Emgu.CV.World.dll - - ..\..\..\packages\Shouldly.2.8.3\lib\net451\Shouldly.dll + + ..\..\..\packages\Shouldly.3.0.0\lib\net451\Shouldly.dll diff --git a/Plugins/Video/Controllers/packages.config b/Plugins/Video/Controllers/packages.config index 4ebd8c4..f872233 100644 --- a/Plugins/Video/Controllers/packages.config +++ b/Plugins/Video/Controllers/packages.config @@ -1,7 +1,7 @@  - + \ No newline at end of file diff --git a/Plugins/Video/Tests/Video.Controllers.Tests/Video.Controllers.Tests.csproj b/Plugins/Video/Tests/Video.Controllers.Tests/Video.Controllers.Tests.csproj index e01f1a0..e037497 100644 --- a/Plugins/Video/Tests/Video.Controllers.Tests/Video.Controllers.Tests.csproj +++ b/Plugins/Video/Tests/Video.Controllers.Tests/Video.Controllers.Tests.csproj @@ -70,11 +70,11 @@ ..\..\..\..\packages\EMGU.CV.3.3.0.2824\lib\net35\Emgu.CV.World.dll - - ..\..\..\..\packages\Shouldly.2.8.3\lib\net451\Shouldly.dll + + ..\..\..\..\packages\Shouldly.3.0.0\lib\net451\Shouldly.dll - - ..\..\..\..\packages\SimpleInjector.4.0.12\lib\net45\SimpleInjector.dll + + ..\..\..\..\packages\SimpleInjector.4.2.2\lib\net45\SimpleInjector.dll @@ -131,6 +131,9 @@ + + + diff --git a/Plugins/Video/Tests/Video.Controllers.Tests/packages.config b/Plugins/Video/Tests/Video.Controllers.Tests/packages.config index 65da28e..6ceeeab 100644 --- a/Plugins/Video/Tests/Video.Controllers.Tests/packages.config +++ b/Plugins/Video/Tests/Video.Controllers.Tests/packages.config @@ -1,8 +1,8 @@  - - + + diff --git a/Plugins/Video/Views/Video.Views.csproj b/Plugins/Video/Views/Video.Views.csproj index 02abe41..fb75e7a 100644 --- a/Plugins/Video/Views/Video.Views.csproj +++ b/Plugins/Video/Views/Video.Views.csproj @@ -62,14 +62,14 @@ MinimumRecommendedRules.ruleset - - ..\..\..\packages\Shouldly.2.8.3\lib\net451\Shouldly.dll + + ..\..\..\packages\Shouldly.3.0.0\lib\net451\Shouldly.dll - - ..\..\..\packages\SimpleInjector.4.0.12\lib\net45\SimpleInjector.dll + + ..\..\..\packages\SimpleInjector.4.2.2\lib\net45\SimpleInjector.dll - - ..\..\..\packages\SimpleInjector.Packaging.4.0.12\lib\net40\SimpleInjector.Packaging.dll + + ..\..\..\packages\SimpleInjector.Packaging.4.2.2\lib\net40\SimpleInjector.Packaging.dll diff --git a/Plugins/Video/Views/packages.config b/Plugins/Video/Views/packages.config index 097b8f7..244af60 100644 --- a/Plugins/Video/Views/packages.config +++ b/Plugins/Video/Views/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file