From 2dd6b9aedde32611802e7a94ade0d3cd1710d7f3 Mon Sep 17 00:00:00 2001 From: Greg Burri Date: Wed, 1 Jul 2020 18:02:13 +0200 Subject: [PATCH 1/1] Update dependencies --- Parasitemia/Logger/Logger.fsproj | 4 ++-- .../ParasitemiaCore/ParasitemiaCore.fsproj | 20 +++++++++++-------- Parasitemia/ParasitemiaCore/packages.config | 15 +++++++------- Parasitemia/ParasitemiaUI/App.config | 2 +- .../ParasitemiaUI/ParasitemiaUI.fsproj | 12 +++++------ Parasitemia/ParasitemiaUI/packages.config | 10 +++++----- .../ParasitemiaCore.Tests.fsproj | 4 ++-- .../ParasitemiaCore.Tests/packages.config | 4 ++-- Parasitemia/WPF/WPF.csproj | 13 +++++++----- Parasitemia/WPF/app.config | 16 +++++++++------ Parasitemia/WPF/packages.config | 4 ++-- 11 files changed, 58 insertions(+), 46 deletions(-) diff --git a/Parasitemia/Logger/Logger.fsproj b/Parasitemia/Logger/Logger.fsproj index a9fd374..e4645c4 100644 --- a/Parasitemia/Logger/Logger.fsproj +++ b/Parasitemia/Logger/Logger.fsproj @@ -9,8 +9,8 @@ Library Logger Logger - v4.5.2 - 4.4.1.0 + v4.7.1 + 4.4.3.0 true Logger diff --git a/Parasitemia/ParasitemiaCore/ParasitemiaCore.fsproj b/Parasitemia/ParasitemiaCore/ParasitemiaCore.fsproj index f6262e2..3eb0d4d 100644 --- a/Parasitemia/ParasitemiaCore/ParasitemiaCore.fsproj +++ b/Parasitemia/ParasitemiaCore/ParasitemiaCore.fsproj @@ -10,7 +10,7 @@ Library ParasitemiaCore ParasitemiaCore - v4.5.2 + v4.7.1 4.4.1.0 true ParasitemiaCore @@ -87,29 +87,33 @@ ..\packages\EmguCV.3.1.0.1\lib\net30\Emgu.CV.World.dll - ..\packages\FSharp.Collections.ParallelSeq.1.0.2\lib\net40\FSharp.Collections.ParallelSeq.dll - True + ..\packages\FSharp.Collections.ParallelSeq.1.1.0\lib\net45\FSharp.Collections.ParallelSeq.dll - ..\packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.dll + ..\packages\FSharp.Core.4.3.4\lib\net45\FSharp.Core.dll - ..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll + ..\packages\MathNet.Numerics.4.4.1\lib\net40\MathNet.Numerics.dll - ..\packages\MathNet.Numerics.FSharp.3.20.0\lib\net40\MathNet.Numerics.FSharp.dll + ..\packages\MathNet.Numerics.FSharp.4.4.1\lib\net45\MathNet.Numerics.FSharp.dll - ..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll + ..\packages\OpenTK.3.0.0\lib\net20\OpenTK.dll - ..\packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll + ..\packages\OpenTK.GLControl.3.0.0\lib\net20\OpenTK.GLControl.dll + + + True + + ..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll diff --git a/Parasitemia/ParasitemiaCore/packages.config b/Parasitemia/ParasitemiaCore/packages.config index 87c6b51..daa1f85 100644 --- a/Parasitemia/ParasitemiaCore/packages.config +++ b/Parasitemia/ParasitemiaCore/packages.config @@ -1,12 +1,13 @@  - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/Parasitemia/ParasitemiaUI/App.config b/Parasitemia/ParasitemiaUI/App.config index e5e7f9f..8ff7404 100644 --- a/Parasitemia/ParasitemiaUI/App.config +++ b/Parasitemia/ParasitemiaUI/App.config @@ -1,7 +1,7 @@  - + diff --git a/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj b/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj index 429ceaa..847cba1 100644 --- a/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj +++ b/Parasitemia/ParasitemiaUI/ParasitemiaUI.fsproj @@ -10,7 +10,7 @@ WinExe ParasitemiaUI ParasitemiaUI - v4.5.2 + v4.7.1 true 4.4.1.0 ParasitemiaUI @@ -100,8 +100,8 @@ - + @@ -114,7 +114,7 @@ ..\packages\EmguCV.3.1.0.1\lib\net30\Emgu.CV.World.dll - ..\packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.dll + ..\packages\FSharp.Core.4.3.4\lib\net45\FSharp.Core.dll ..\packages\FSharp.ViewModule.Core.1.0.7.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\FSharp.ViewModule.dll @@ -127,13 +127,13 @@ - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - ..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll + ..\packages\OpenTK.3.0.0\lib\net20\OpenTK.dll - ..\packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll + ..\packages\OpenTK.GLControl.3.0.0\lib\net20\OpenTK.GLControl.dll diff --git a/Parasitemia/ParasitemiaUI/packages.config b/Parasitemia/ParasitemiaUI/packages.config index 7e4b4ac..31ddf78 100644 --- a/Parasitemia/ParasitemiaUI/packages.config +++ b/Parasitemia/ParasitemiaUI/packages.config @@ -2,12 +2,12 @@ - + - - - - + + + + \ No newline at end of file diff --git a/Parasitemia/Tests/ParasitemiaCore.Tests/ParasitemiaCore.Tests.fsproj b/Parasitemia/Tests/ParasitemiaCore.Tests/ParasitemiaCore.Tests.fsproj index 2725e0d..8664c23 100644 --- a/Parasitemia/Tests/ParasitemiaCore.Tests/ParasitemiaCore.Tests.fsproj +++ b/Parasitemia/Tests/ParasitemiaCore.Tests/ParasitemiaCore.Tests.fsproj @@ -11,7 +11,7 @@ Library ParasitemiaCore.Tests ParasitemiaCore.Tests - v4.5.2 + v4.7.1 4.4.1.0 true ParasitemiaCore.Tests @@ -55,7 +55,7 @@ - ..\..\packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.dll + ..\..\packages\FSharp.Core.4.3.4\lib\net45\FSharp.Core.dll diff --git a/Parasitemia/Tests/ParasitemiaCore.Tests/packages.config b/Parasitemia/Tests/ParasitemiaCore.Tests/packages.config index 4ffcb24..94492a2 100644 --- a/Parasitemia/Tests/ParasitemiaCore.Tests/packages.config +++ b/Parasitemia/Tests/ParasitemiaCore.Tests/packages.config @@ -1,7 +1,7 @@  - - + + diff --git a/Parasitemia/WPF/WPF.csproj b/Parasitemia/WPF/WPF.csproj index c6f6f53..2789088 100644 --- a/Parasitemia/WPF/WPF.csproj +++ b/Parasitemia/WPF/WPF.csproj @@ -10,10 +10,11 @@ Properties WPF WPF - v4.0 + v4.7.1 512 + true @@ -25,6 +26,7 @@ 4 false AnyCPU + false pdbonly @@ -34,6 +36,7 @@ prompt 4 AnyCPU + false @@ -45,11 +48,11 @@ ..\packages\EmguCV.3.1.0.1\lib\net30\Emgu.CV.World.dll - - ..\packages\OpenTK.2.0.0\lib\net20\OpenTK.dll + + ..\packages\OpenTK.3.0.0\lib\net20\OpenTK.dll - - ..\packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll + + ..\packages\OpenTK.GLControl.3.0.0\lib\net20\OpenTK.GLControl.dll diff --git a/Parasitemia/WPF/app.config b/Parasitemia/WPF/app.config index b5c58b8..777ec75 100644 --- a/Parasitemia/WPF/app.config +++ b/Parasitemia/WPF/app.config @@ -1,15 +1,19 @@ - + - - + + - - + + + + + + - \ No newline at end of file + diff --git a/Parasitemia/WPF/packages.config b/Parasitemia/WPF/packages.config index 61bd4d2..a4814e2 100644 --- a/Parasitemia/WPF/packages.config +++ b/Parasitemia/WPF/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file -- 2.45.2