diff --git a/DeathSocket/DeathSocket.fsproj b/DeathSocket/DeathSocket.fsproj
index 5d47875..43bf2da 100644
--- a/DeathSocket/DeathSocket.fsproj
+++ b/DeathSocket/DeathSocket.fsproj
@@ -33,12 +33,13 @@
+
-
+
-
+
diff --git a/DeathSocketCLI/DeathSocketCLI.fsproj b/DeathSocketCLI/DeathSocketCLI.fsproj
index 27d4d1f..d207ea5 100644
--- a/DeathSocketCLI/DeathSocketCLI.fsproj
+++ b/DeathSocketCLI/DeathSocketCLI.fsproj
@@ -59,21 +59,27 @@
- ..\packages\Console.Waterworks.1.0.0.2\lib\net47\Console.Waterworks.dll
+ ..\packages\Console.Waterworks.2.0.0\lib\net47\Console.Waterworks.dll
+
- ..\packages\FSharp.Core.4.6.1\lib\net45\FSharp.Core.dll
+ ..\packages\FSharp.Core.4.7.0\lib\net45\FSharp.Core.dll
+
+
..\packages\SkiaSharp.1.60.3\lib\net45\SkiaSharp.dll
+
+
- ..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll
+ ..\packages\System.Drawing.Common.4.7.0\lib\net461\System.Drawing.Common.dll
+
True
diff --git a/DeathSocketCLI/packages.config b/DeathSocketCLI/packages.config
index 8874daf..b17442a 100644
--- a/DeathSocketCLI/packages.config
+++ b/DeathSocketCLI/packages.config
@@ -1,8 +1,8 @@
-
-
+
+
-
+
\ No newline at end of file
diff --git a/TestCentre/Script.fsx b/TestCentre/Script.fsx
index f4b0999..c7d2985 100644
--- a/TestCentre/Script.fsx
+++ b/TestCentre/Script.fsx
@@ -1,6 +1,6 @@
// These DLL's must be built before you can use them in this script.
#r "bin\Debug\System.Drawing.Common.dll"
-#r @"..\packages\SmoulderingBeachBall.1.0.0\lib\netstandard2.0\SmoulderingBeachBall.dll"
+#r @"..\packages\SmoulderingBeachBall.2.0.0\lib\netstandard2.0\SmoulderingBeachBall.dll"
open System
open System.Drawing
diff --git a/TestCentre/TestCentre.fsproj b/TestCentre/TestCentre.fsproj
index e40317e..87b209c 100644
--- a/TestCentre/TestCentre.fsproj
+++ b/TestCentre/TestCentre.fsproj
@@ -52,145 +52,206 @@
+
+ ..\packages\Console.Waterworks.2.0.0\lib\net47\Console.Waterworks.dll
+
- ..\packages\FsCheck.2.13.0\lib\net452\FsCheck.dll
+ ..\packages\FsCheck.2.14.0\lib\net452\FsCheck.dll
+
- ..\packages\FsCheck.Xunit.2.13.0\lib\net452\FsCheck.Xunit.dll
+ ..\packages\FsCheck.Xunit.2.14.0\lib\net452\FsCheck.Xunit.dll
+
- ..\packages\FSharp.Core.4.6.1\lib\net45\FSharp.Core.dll
+ ..\packages\FSharp.Core.4.7.0\lib\net45\FSharp.Core.dll
+
- ..\packages\Microsoft.Win32.Registry.4.5.0\lib\net461\Microsoft.Win32.Registry.dll
+ ..\packages\Microsoft.Win32.Registry.4.7.0\lib\net461\Microsoft.Win32.Registry.dll
+
- ..\packages\Microsoft.Win32.Registry.AccessControl.4.5.0\lib\net461\Microsoft.Win32.Registry.AccessControl.dll
+ ..\packages\Microsoft.Win32.Registry.AccessControl.4.7.0\lib\net461\Microsoft.Win32.Registry.AccessControl.dll
+
- ..\packages\Microsoft.Win32.SystemEvents.4.5.0\lib\net461\Microsoft.Win32.SystemEvents.dll
+ ..\packages\Microsoft.Win32.SystemEvents.4.7.0\lib\net461\Microsoft.Win32.SystemEvents.dll
+
+
..\packages\SkiaSharp.1.60.3\lib\net45\SkiaSharp.dll
- ..\packages\SmoulderingBeachBall.1.0.0\lib\netstandard2.0\SmoulderingBeachBall.dll
+ ..\packages\SmoulderingBeachBall.2.0.0\lib\netstandard2.0\SmoulderingBeachBall.dll
+
+
- ..\packages\System.CodeDom.4.5.0\lib\net461\System.CodeDom.dll
+ ..\packages\System.CodeDom.4.7.0\lib\net461\System.CodeDom.dll
+
True
+
- ..\packages\System.Configuration.ConfigurationManager.4.5.0\lib\net461\System.Configuration.ConfigurationManager.dll
+ ..\packages\System.Configuration.ConfigurationManager.4.7.0\lib\net461\System.Configuration.ConfigurationManager.dll
+
+
+
- ..\packages\System.Data.Odbc.4.5.0\lib\net461\System.Data.Odbc.dll
+ ..\packages\System.Data.Odbc.4.7.0\lib\net461\System.Data.Odbc.dll
+
+
+ ..\packages\System.Data.OleDb.4.7.0\lib\net461\System.Data.OleDb.dll
+
+
- ..\packages\System.Data.SqlClient.4.6.0\lib\net461\System.Data.SqlClient.dll
+ ..\packages\System.Data.SqlClient.4.8.0\lib\net461\System.Data.SqlClient.dll
+
- ..\packages\System.Diagnostics.EventLog.4.5.0\lib\net461\System.Diagnostics.EventLog.dll
+ ..\packages\System.Diagnostics.EventLog.4.7.0\lib\net461\System.Diagnostics.EventLog.dll
+
- ..\packages\System.Diagnostics.PerformanceCounter.4.5.0\lib\net461\System.Diagnostics.PerformanceCounter.dll
+ ..\packages\System.Diagnostics.PerformanceCounter.4.7.0\lib\net461\System.Diagnostics.PerformanceCounter.dll
+
+
+
+
+
- ..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll
+ ..\packages\System.Drawing.Common.4.7.0\lib\net461\System.Drawing.Common.dll
+
+
- ..\packages\System.IO.FileSystem.AccessControl.4.5.0\lib\net461\System.IO.FileSystem.AccessControl.dll
+ ..\packages\System.IO.FileSystem.AccessControl.4.7.0\lib\net461\System.IO.FileSystem.AccessControl.dll
+
True
- ..\packages\System.IO.Packaging.4.5.0\lib\net46\System.IO.Packaging.dll
+ ..\packages\System.IO.Packaging.4.7.0\lib\net46\System.IO.Packaging.dll
+
..\packages\System.IO.Pipes.AccessControl.4.5.1\lib\net461\System.IO.Pipes.AccessControl.dll
- ..\packages\System.IO.Ports.4.5.0\lib\net461\System.IO.Ports.dll
+ ..\packages\System.IO.Ports.4.7.0\lib\net461\System.IO.Ports.dll
+
+
+
+
- ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll
+ ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll
+
+
+
- ..\packages\System.Security.AccessControl.4.5.0\lib\net461\System.Security.AccessControl.dll
+ ..\packages\System.Security.AccessControl.4.7.0\lib\net461\System.Security.AccessControl.dll
+
- ..\packages\System.Security.Cryptography.Cng.4.5.0\lib\net47\System.Security.Cryptography.Cng.dll
+ ..\packages\System.Security.Cryptography.Cng.4.7.0\lib\net47\System.Security.Cryptography.Cng.dll
+
- ..\packages\System.Security.Cryptography.Pkcs.4.5.2\lib\net461\System.Security.Cryptography.Pkcs.dll
+ ..\packages\System.Security.Cryptography.Pkcs.4.7.0\lib\net461\System.Security.Cryptography.Pkcs.dll
+
- ..\packages\System.Security.Cryptography.ProtectedData.4.5.0\lib\net461\System.Security.Cryptography.ProtectedData.dll
+ ..\packages\System.Security.Cryptography.ProtectedData.4.7.0\lib\net461\System.Security.Cryptography.ProtectedData.dll
+
- ..\packages\System.Security.Cryptography.Xml.4.5.0\lib\net461\System.Security.Cryptography.Xml.dll
+ ..\packages\System.Security.Cryptography.Xml.4.7.0\lib\net461\System.Security.Cryptography.Xml.dll
+
- ..\packages\System.Security.Permissions.4.5.0\lib\net461\System.Security.Permissions.dll
+ ..\packages\System.Security.Permissions.4.7.0\lib\net461\System.Security.Permissions.dll
+
- ..\packages\System.Security.Principal.Windows.4.5.1\lib\net461\System.Security.Principal.Windows.dll
+ ..\packages\System.Security.Principal.Windows.4.7.0\lib\net461\System.Security.Principal.Windows.dll
+
+
True
+
True
+
True
+
True
+
True
+
- ..\packages\System.ServiceModel.Syndication.4.5.0\lib\net461\System.ServiceModel.Syndication.dll
+ ..\packages\System.ServiceModel.Syndication.4.7.0\lib\net461\System.ServiceModel.Syndication.dll
+
+
- ..\packages\System.ServiceProcess.ServiceController.4.5.0\lib\net461\System.ServiceProcess.ServiceController.dll
+ ..\packages\System.ServiceProcess.ServiceController.4.7.0\lib\net461\System.ServiceProcess.ServiceController.dll
+
- ..\packages\System.Text.Encoding.CodePages.4.5.1\lib\net461\System.Text.Encoding.CodePages.dll
+ ..\packages\System.Text.Encoding.CodePages.4.7.0\lib\net461\System.Text.Encoding.CodePages.dll
+
- ..\packages\System.Threading.AccessControl.4.5.0\lib\net461\System.Threading.AccessControl.dll
+ ..\packages\System.Threading.AccessControl.4.7.0\lib\net461\System.Threading.AccessControl.dll
+
+
True
+
+
..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll
diff --git a/TestCentre/packages.config b/TestCentre/packages.config
index 68c6812..d65b3a9 100644
--- a/TestCentre/packages.config
+++ b/TestCentre/packages.config
@@ -1,50 +1,55 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+