From 9e627cb7d863e116fe30896782d54f01a5bda2d4 Mon Sep 17 00:00:00 2001
From: michael-mason <cptshiner@gmail.com>
Date: Tue, 11 May 2021 10:53:27 +1000
Subject: [PATCH 1/4] upgrade google apis

---
 .../CollectionsOnline.Import.csproj           | 28 ++++++++---------
 src/CollectionsOnline.Import/packages.config  | 10 +++----
 .../Web.config                                | 20 -------------
 .../CollectionsOnline.Tests.csproj            | 30 +++++++++----------
 src/CollectionsOnline.Tests/app.config        |  2 +-
 src/CollectionsOnline.Tests/packages.config   | 10 +++----
 6 files changed, 40 insertions(+), 60 deletions(-)
 delete mode 100644 src/CollectionsOnline.RedirectWebSite/Web.config

diff --git a/src/CollectionsOnline.Import/CollectionsOnline.Import.csproj b/src/CollectionsOnline.Import/CollectionsOnline.Import.csproj
index de2d5f16..2d7faa46 100644
--- a/src/CollectionsOnline.Import/CollectionsOnline.Import.csproj
+++ b/src/CollectionsOnline.Import/CollectionsOnline.Import.csproj
@@ -46,28 +46,28 @@
       <HintPath>..\packages\BouncyCastle.1.7.0\lib\Net40-Client\BouncyCastle.Crypto.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Google.Apis, Version=1.9.3.19379, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
-      <HintPath>..\packages\Google.Apis.1.9.3\lib\net40\Google.Apis.dll</HintPath>
+    <Reference Include="Google.Apis, Version=1.51.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab">
+      <HintPath>..\packages\Google.Apis.1.51.0\lib\net45\Google.Apis.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Google.Apis.Auth, Version=1.9.3.19379, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
-      <HintPath>..\packages\Google.Apis.Auth.1.9.3\lib\net40\Google.Apis.Auth.dll</HintPath>
+    <Reference Include="Google.Apis.Auth, Version=1.51.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab">
+      <HintPath>..\packages\Google.Apis.Auth.1.51.0\lib\net45\Google.Apis.Auth.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Google.Apis.Auth.PlatformServices, Version=1.9.3.19383, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
-      <HintPath>..\packages\Google.Apis.Auth.1.9.3\lib\net40\Google.Apis.Auth.PlatformServices.dll</HintPath>
+    <Reference Include="Google.Apis.Auth.PlatformServices, Version=1.51.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab">
+      <HintPath>..\packages\Google.Apis.Auth.1.51.0\lib\net45\Google.Apis.Auth.PlatformServices.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Google.Apis.Core, Version=1.9.3.19379, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
-      <HintPath>..\packages\Google.Apis.Core.1.9.3\lib\portable-net40+sl50+win+wpa81+wp80\Google.Apis.Core.dll</HintPath>
+    <Reference Include="Google.Apis.Core, Version=1.51.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab">
+      <HintPath>..\packages\Google.Apis.Core.1.51.0\lib\net45\Google.Apis.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Google.Apis.PlatformServices, Version=1.9.3.19381, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
-      <HintPath>..\packages\Google.Apis.1.9.3\lib\net40\Google.Apis.PlatformServices.dll</HintPath>
+    <Reference Include="Google.Apis.PlatformServices, Version=1.51.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab">
+      <HintPath>..\packages\Google.Apis.1.51.0\lib\net45\Google.Apis.PlatformServices.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Google.Apis.YouTube.v3, Version=1.9.2.154, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
-      <HintPath>..\packages\Google.Apis.YouTube.v3.1.9.2.1540\lib\portable-net40+sl50+win+wpa81+wp80\Google.Apis.YouTube.v3.dll</HintPath>
+    <Reference Include="Google.Apis.YouTube.v3, Version=1.51.0.2294, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab">
+      <HintPath>..\packages\Google.Apis.YouTube.v3.1.51.0.2294\lib\net45\Google.Apis.YouTube.v3.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="imu-1.0.03">
@@ -93,8 +93,8 @@
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Ninject, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
diff --git a/src/CollectionsOnline.Import/packages.config b/src/CollectionsOnline.Import/packages.config
index ea9d3a4d..3f3b2682 100644
--- a/src/CollectionsOnline.Import/packages.config
+++ b/src/CollectionsOnline.Import/packages.config
@@ -2,17 +2,17 @@
 <packages>
   <package id="AutoMapper" version="4.2.1" targetFramework="net451" />
   <package id="BouncyCastle" version="1.7.0" targetFramework="net451" />
-  <package id="Google.Apis" version="1.9.3" targetFramework="net451" />
-  <package id="Google.Apis.Auth" version="1.9.3" targetFramework="net451" />
-  <package id="Google.Apis.Core" version="1.9.3" targetFramework="net451" />
-  <package id="Google.Apis.YouTube.v3" version="1.9.2.1540" targetFramework="net451" />
+  <package id="Google.Apis" version="1.51.0" targetFramework="net451" />
+  <package id="Google.Apis.Auth" version="1.51.0" targetFramework="net451" />
+  <package id="Google.Apis.Core" version="1.51.0" targetFramework="net451" />
+  <package id="Google.Apis.YouTube.v3" version="1.51.0.2294" targetFramework="net451" />
   <package id="log4net" version="2.0.4" targetFramework="net451" />
   <package id="Magick.NET-Q16-HDRI-AnyCPU" version="7.0.1.101" targetFramework="net461" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net451" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net451" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net451" />
   <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net451" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net451" />
   <package id="Ninject" version="3.2.2.0" targetFramework="net45" />
   <package id="ninject.extensions.conventions" version="3.2.0.0" targetFramework="net45" />
   <package id="RavenDB.Client" version="3.5.1" targetFramework="net451" />
diff --git a/src/CollectionsOnline.RedirectWebSite/Web.config b/src/CollectionsOnline.RedirectWebSite/Web.config
deleted file mode 100644
index 0098c7e9..00000000
--- a/src/CollectionsOnline.RedirectWebSite/Web.config
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-  <appSettings>
-    <add key="CanonicalSiteBase" value="" />
-  </appSettings>
-  <system.web>
-    <compilation debug="true" targetFramework="4.5.1" />
-    <httpRuntime targetFramework="4.5.1" />
-    <httpHandlers>
-      <add verb="*" type="Nancy.Hosting.Aspnet.NancyHttpRequestHandler" path="*" />
-    </httpHandlers>
-  </system.web>
-  <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <httpErrors existingResponse="PassThrough" />
-    <handlers>
-      <add name="Nancy" verb="*" type="Nancy.Hosting.Aspnet.NancyHttpRequestHandler" path="*" />
-    </handlers>
-  </system.webServer>
-</configuration>
\ No newline at end of file
diff --git a/src/CollectionsOnline.Tests/CollectionsOnline.Tests.csproj b/src/CollectionsOnline.Tests/CollectionsOnline.Tests.csproj
index 4e2f1c00..88ad4f25 100644
--- a/src/CollectionsOnline.Tests/CollectionsOnline.Tests.csproj
+++ b/src/CollectionsOnline.Tests/CollectionsOnline.Tests.csproj
@@ -53,28 +53,28 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
     </Reference>
-    <Reference Include="Google.Apis">
-      <HintPath>..\packages\Google.Apis.1.9.3\lib\net40\Google.Apis.dll</HintPath>
+    <Reference Include="Google.Apis, Version=1.51.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab">
+      <HintPath>..\packages\Google.Apis.1.51.0\lib\net45\Google.Apis.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Google.Apis.Auth">
-      <HintPath>..\packages\Google.Apis.Auth.1.9.3\lib\net40\Google.Apis.Auth.dll</HintPath>
+    <Reference Include="Google.Apis.Auth, Version=1.51.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab">
+      <HintPath>..\packages\Google.Apis.Auth.1.51.0\lib\net45\Google.Apis.Auth.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Google.Apis.Auth.PlatformServices">
-      <HintPath>..\packages\Google.Apis.Auth.1.9.3\lib\net40\Google.Apis.Auth.PlatformServices.dll</HintPath>
+    <Reference Include="Google.Apis.Auth.PlatformServices, Version=1.51.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab">
+      <HintPath>..\packages\Google.Apis.Auth.1.51.0\lib\net45\Google.Apis.Auth.PlatformServices.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Google.Apis.Core">
-      <HintPath>..\packages\Google.Apis.Core.1.9.3\lib\portable-net40+sl50+win+wpa81+wp80\Google.Apis.Core.dll</HintPath>
+    <Reference Include="Google.Apis.Core, Version=1.51.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab">
+      <HintPath>..\packages\Google.Apis.Core.1.51.0\lib\net45\Google.Apis.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Google.Apis.PlatformServices">
-      <HintPath>..\packages\Google.Apis.1.9.3\lib\net40\Google.Apis.PlatformServices.dll</HintPath>
+    <Reference Include="Google.Apis.PlatformServices, Version=1.51.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab">
+      <HintPath>..\packages\Google.Apis.1.51.0\lib\net45\Google.Apis.PlatformServices.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Google.Apis.YouTube.v3, Version=1.9.2.154, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
-      <HintPath>..\packages\Google.Apis.YouTube.v3.1.9.2.1540\lib\portable-net40+sl50+win+wpa81+wp80\Google.Apis.YouTube.v3.dll</HintPath>
+    <Reference Include="Google.Apis.YouTube.v3, Version=1.51.0.2294, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab">
+      <HintPath>..\packages\Google.Apis.YouTube.v3.1.51.0.2294\lib\net45\Google.Apis.YouTube.v3.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="imu-1.0.03, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
@@ -115,9 +115,9 @@
       <HintPath>..\packages\Nancy.Viewengines.Razor.1.4.1\lib\net40\Nancy.ViewEngines.Razor.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Ninject, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
       <HintPath>..\packages\Ninject.3.2.2.0\lib\net45-full\Ninject.dll</HintPath>
diff --git a/src/CollectionsOnline.Tests/app.config b/src/CollectionsOnline.Tests/app.config
index d8410b16..acbd8bc3 100644
--- a/src/CollectionsOnline.Tests/app.config
+++ b/src/CollectionsOnline.Tests/app.config
@@ -23,7 +23,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
diff --git a/src/CollectionsOnline.Tests/packages.config b/src/CollectionsOnline.Tests/packages.config
index 7de2eaed..8cd690a6 100644
--- a/src/CollectionsOnline.Tests/packages.config
+++ b/src/CollectionsOnline.Tests/packages.config
@@ -3,10 +3,10 @@
   <package id="AutoMapper" version="4.2.1" targetFramework="net451" />
   <package id="BouncyCastle" version="1.7.0" targetFramework="net451" />
   <package id="CsQuery" version="1.3.4" targetFramework="net45" />
-  <package id="Google.Apis" version="1.9.3" targetFramework="net451" />
-  <package id="Google.Apis.Auth" version="1.9.3" targetFramework="net451" />
-  <package id="Google.Apis.Core" version="1.9.3" targetFramework="net451" />
-  <package id="Google.Apis.YouTube.v3" version="1.9.2.1540" targetFramework="net451" />
+  <package id="Google.Apis" version="1.51.0" targetFramework="net451" />
+  <package id="Google.Apis.Auth" version="1.51.0" targetFramework="net451" />
+  <package id="Google.Apis.Core" version="1.51.0" targetFramework="net451" />
+  <package id="Google.Apis.YouTube.v3" version="1.51.0.2294" targetFramework="net451" />
   <package id="log4net" version="2.0.4" targetFramework="net451" />
   <package id="Magick.NET-Q16-HDRI-AnyCPU" version="7.0.1.101" targetFramework="net461" />
   <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net451" />
@@ -19,7 +19,7 @@
   <package id="Nancy.Testing" version="1.4.1" targetFramework="net451" />
   <package id="Nancy.Viewengines.Razor" version="1.4.1" targetFramework="net451" />
   <package id="NBuilder" version="3.0.1.1" targetFramework="net451" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net451" />
   <package id="Ninject" version="3.2.2.0" targetFramework="net451" />
   <package id="Ninject.Extensions.ChildKernel" version="3.2.0.0" targetFramework="net451" />
   <package id="Ninject.Extensions.Conventions" version="3.2.0.0" targetFramework="net451" />

From ac8d033020159942fbabfadcda6f3d43d51d531d Mon Sep 17 00:00:00 2001
From: michael-mason <cptshiner@gmail.com>
Date: Tue, 11 May 2021 11:06:13 +1000
Subject: [PATCH 2/4] upgrade newtonsoft

---
 .../CollectionsOnline.WebSite.csproj                        | 6 +++---
 src/CollectionsOnline.WebSite/Web.config                    | 2 +-
 src/CollectionsOnline.WebSite/packages.config               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/CollectionsOnline.WebSite/CollectionsOnline.WebSite.csproj b/src/CollectionsOnline.WebSite/CollectionsOnline.WebSite.csproj
index 8a616929..72a25570 100644
--- a/src/CollectionsOnline.WebSite/CollectionsOnline.WebSite.csproj
+++ b/src/CollectionsOnline.WebSite/CollectionsOnline.WebSite.csproj
@@ -81,9 +81,9 @@
       <HintPath>..\packages\Nancy.Viewengines.Razor.1.4.1\lib\net40\Nancy.ViewEngines.Razor.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Ninject, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/CollectionsOnline.WebSite/Web.config b/src/CollectionsOnline.WebSite/Web.config
index 195deb08..866f9314 100644
--- a/src/CollectionsOnline.WebSite/Web.config
+++ b/src/CollectionsOnline.WebSite/Web.config
@@ -55,7 +55,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
diff --git a/src/CollectionsOnline.WebSite/packages.config b/src/CollectionsOnline.WebSite/packages.config
index 29552bac..73277e31 100644
--- a/src/CollectionsOnline.WebSite/packages.config
+++ b/src/CollectionsOnline.WebSite/packages.config
@@ -10,7 +10,7 @@
   <package id="Nancy.Metadata.Modules" version="1.4.1" targetFramework="net451" />
   <package id="Nancy.Serialization.JsonNet" version="1.4.1" targetFramework="net451" />
   <package id="Nancy.Viewengines.Razor" version="1.4.1" targetFramework="net451" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net451" />
   <package id="Ninject" version="3.2.2.0" targetFramework="net45" />
   <package id="Ninject.Extensions.ChildKernel" version="3.2.0.0" targetFramework="net45" />
   <package id="Ninject.Extensions.Conventions" version="3.2.0.0" targetFramework="net45" />

From 70947bb83fb0f11c8324c3b385e944f7531914fc Mon Sep 17 00:00:00 2001
From: michael-mason <cptshiner@gmail.com>
Date: Tue, 11 May 2021 15:02:13 +1000
Subject: [PATCH 3/4] upgrade to .net framework 4.7.2

---
 .../CollectionsOnline.Core.csproj             |  2 +-
 src/CollectionsOnline.Import/App.config       | 68 +++++++-------
 .../CollectionsOnline.Import.csproj           |  2 +-
 .../CollectionsOnline.Tests.csproj            |  2 +-
 src/CollectionsOnline.Tests/app.config        | 72 +++++++--------
 .../CollectionsOnline.WebSite.csproj          |  2 +-
 src/CollectionsOnline.WebSite/Web.config      | 92 +++++++++----------
 7 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/src/CollectionsOnline.Core/CollectionsOnline.Core.csproj b/src/CollectionsOnline.Core/CollectionsOnline.Core.csproj
index d50dff96..6c43d175 100644
--- a/src/CollectionsOnline.Core/CollectionsOnline.Core.csproj
+++ b/src/CollectionsOnline.Core/CollectionsOnline.Core.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CollectionsOnline.Core</RootNamespace>
     <AssemblyName>CollectionsOnline.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
diff --git a/src/CollectionsOnline.Import/App.config b/src/CollectionsOnline.Import/App.config
index 945cc6c7..6391566c 100644
--- a/src/CollectionsOnline.Import/App.config
+++ b/src/CollectionsOnline.Import/App.config
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
   </startup>
   <appSettings>
-    <add key="DatabaseUrl" value="" />
-    <add key="DatabaseName" value="" />
-    <add key="EmuServerHost" value="" />
-    <add key="EmuServerPort" value="" />
-    <add key="WebSitePath" value="" />
-    <add key="WebSiteUser" value="" />
-    <add key="WebSitePassword" value="" />
-    <add key="WebSiteComputer" value="" />
-    <add key="WebSiteDomain" value="" />
-    <add key="GoogleApiKey" value="" />
-    <add key="OverwriteExistingMedia" value="false" />
-    <add key="SkipExistingDocuments" value="false" />
-    <add key="SeqUrl" value="" />
-    <add key="serilog:minimum-level" value="Debug" />
-    <add key="serilog:enrich:with-property:Environment" value="Development" />
-    <add key="serilog:enrich:with-property:Application" value="MV Collections Import" />
+    <add key="DatabaseUrl" value=""/>
+    <add key="DatabaseName" value=""/>
+    <add key="EmuServerHost" value=""/>
+    <add key="EmuServerPort" value=""/>
+    <add key="WebSitePath" value=""/>
+    <add key="WebSiteUser" value=""/>
+    <add key="WebSitePassword" value=""/>
+    <add key="WebSiteComputer" value=""/>
+    <add key="WebSiteDomain" value=""/>
+    <add key="GoogleApiKey" value=""/>
+    <add key="OverwriteExistingMedia" value="false"/>
+    <add key="SkipExistingDocuments" value="false"/>
+    <add key="SeqUrl" value=""/>
+    <add key="serilog:minimum-level" value="Debug"/>
+    <add key="serilog:enrich:with-property:Environment" value="Development"/>
+    <add key="serilog:enrich:with-property:Application" value="MV Collections Import"/>
   </appSettings>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="MiniProfiler" publicKeyToken="b44f9351044011a3" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.10.0" newVersion="3.0.10.0" />
+        <assemblyIdentity name="MiniProfiler" publicKeyToken="b44f9351044011a3" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.0.10.0" newVersion="3.0.10.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.29.0" newVersion="4.2.29.0" />
+        <assemblyIdentity name="System.Net.Http.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.2.29.0" newVersion="4.2.29.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Google.Apis" publicKeyToken="4b01fa6e34db77ab" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.9.3.19379" newVersion="1.9.3.19379" />
+        <assemblyIdentity name="Google.Apis" publicKeyToken="4b01fa6e34db77ab" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.9.3.19379" newVersion="1.9.3.19379"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Google.Apis.Core" publicKeyToken="4b01fa6e34db77ab" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.9.3.19379" newVersion="1.9.3.19379" />
+        <assemblyIdentity name="Google.Apis.Core" publicKeyToken="4b01fa6e34db77ab" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.9.3.19379" newVersion="1.9.3.19379"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Google.Apis.PlatformServices" publicKeyToken="4b01fa6e34db77ab" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.9.3.19381" newVersion="1.9.3.19381" />
+        <assemblyIdentity name="Google.Apis.PlatformServices" publicKeyToken="4b01fa6e34db77ab" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.9.3.19381" newVersion="1.9.3.19381"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Serilog" publicKeyToken="24c2f752a8e58a10" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0" />
+        <assemblyIdentity name="Serilog" publicKeyToken="24c2f752a8e58a10" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.14.0" newVersion="1.2.14.0" />
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.2.14.0" newVersion="1.2.14.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/src/CollectionsOnline.Import/CollectionsOnline.Import.csproj b/src/CollectionsOnline.Import/CollectionsOnline.Import.csproj
index 2d7faa46..1a493ec4 100644
--- a/src/CollectionsOnline.Import/CollectionsOnline.Import.csproj
+++ b/src/CollectionsOnline.Import/CollectionsOnline.Import.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CollectionsOnline.Import</RootNamespace>
     <AssemblyName>CollectionsOnline.Import</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
diff --git a/src/CollectionsOnline.Tests/CollectionsOnline.Tests.csproj b/src/CollectionsOnline.Tests/CollectionsOnline.Tests.csproj
index 88ad4f25..92c49956 100644
--- a/src/CollectionsOnline.Tests/CollectionsOnline.Tests.csproj
+++ b/src/CollectionsOnline.Tests/CollectionsOnline.Tests.csproj
@@ -11,7 +11,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CollectionsOnline.Tests</RootNamespace>
     <AssemblyName>CollectionsOnline.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
diff --git a/src/CollectionsOnline.Tests/app.config b/src/CollectionsOnline.Tests/app.config
index acbd8bc3..fb7d4b81 100644
--- a/src/CollectionsOnline.Tests/app.config
+++ b/src/CollectionsOnline.Tests/app.config
@@ -1,77 +1,77 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
   </startup>
   <appSettings>
-    <add key="WebSitePath" value="" />
-    <add key="GoogleApiKey" value="" />
+    <add key="WebSitePath" value=""/>
+    <add key="GoogleApiKey" value=""/>
   </appSettings>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" />
+        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" />
+        <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" />
+        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
+        <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" />
+        <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Ninject.Extensions.ChildKernel" publicKeyToken="c7192dc5380945e7" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" />
+        <assemblyIdentity name="Ninject.Extensions.ChildKernel" publicKeyToken="c7192dc5380945e7" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+        <assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Raven.Client.Lightweight" publicKeyToken="37f41c7f99471593" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.5.1.0" newVersion="3.5.1.0" />
+        <assemblyIdentity name="Raven.Client.Lightweight" publicKeyToken="37f41c7f99471593" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.5.1.0" newVersion="3.5.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Raven.Abstractions" publicKeyToken="37f41c7f99471593" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.5.1.0" newVersion="3.5.1.0" />
+        <assemblyIdentity name="Raven.Abstractions" publicKeyToken="37f41c7f99471593" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.5.1.0" newVersion="3.5.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.29.0" newVersion="4.2.29.0" />
+        <assemblyIdentity name="System.Net.Http.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.2.29.0" newVersion="4.2.29.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="MiniProfiler" publicKeyToken="b44f9351044011a3" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.2.0.157" newVersion="3.2.0.157" />
+        <assemblyIdentity name="MiniProfiler" publicKeyToken="b44f9351044011a3" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.2.0.157" newVersion="3.2.0.157"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Google.Apis" publicKeyToken="4b01fa6e34db77ab" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.9.3.19379" newVersion="1.9.3.19379" />
+        <assemblyIdentity name="Google.Apis" publicKeyToken="4b01fa6e34db77ab" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.9.3.19379" newVersion="1.9.3.19379"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Google.Apis.Core" publicKeyToken="4b01fa6e34db77ab" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.9.3.19379" newVersion="1.9.3.19379" />
+        <assemblyIdentity name="Google.Apis.Core" publicKeyToken="4b01fa6e34db77ab" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.9.3.19379" newVersion="1.9.3.19379"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Serilog" publicKeyToken="24c2f752a8e58a10" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0" />
+        <assemblyIdentity name="Serilog" publicKeyToken="24c2f752a8e58a10" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.14.0" newVersion="1.2.14.0" />
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.2.14.0" newVersion="1.2.14.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/src/CollectionsOnline.WebSite/CollectionsOnline.WebSite.csproj b/src/CollectionsOnline.WebSite/CollectionsOnline.WebSite.csproj
index 72a25570..da296e28 100644
--- a/src/CollectionsOnline.WebSite/CollectionsOnline.WebSite.csproj
+++ b/src/CollectionsOnline.WebSite/CollectionsOnline.WebSite.csproj
@@ -13,7 +13,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CollectionsOnline.WebSite</RootNamespace>
     <AssemblyName>CollectionsOnline.WebSite</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
diff --git a/src/CollectionsOnline.WebSite/Web.config b/src/CollectionsOnline.WebSite/Web.config
index 866f9314..a2244002 100644
--- a/src/CollectionsOnline.WebSite/Web.config
+++ b/src/CollectionsOnline.WebSite/Web.config
@@ -1,97 +1,97 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <configuration>
   <configSections>
-    <section name="razor" type="Nancy.ViewEngines.Razor.RazorConfigurationSection" />
+    <section name="razor" type="Nancy.ViewEngines.Razor.RazorConfigurationSection"/>
     <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
-      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false"/>
     </sectionGroup>
   </configSections>
   <appSettings>
-    <add key="DatabaseUrl" value="" />
-    <add key="DatabaseName" value="" />
-    <add key="FacebookAppId" value="" />
-    <add key="CanonicalSiteBase" value="" />
-    <add key="SeqUrl" value="" />
-    <add key="serilog:minimum-level" value="Debug" />
-    <add key="serilog:enrich:with-property:Environment" value="Development" />
-    <add key="serilog:enrich:with-property:Application" value="MV Collections Website" />
-    <add key="webPages:Enabled" value="false" />
+    <add key="DatabaseUrl" value=""/>
+    <add key="DatabaseName" value=""/>
+    <add key="FacebookAppId" value=""/>
+    <add key="CanonicalSiteBase" value=""/>
+    <add key="SeqUrl" value=""/>
+    <add key="serilog:minimum-level" value="Debug"/>
+    <add key="serilog:enrich:with-property:Environment" value="Development"/>
+    <add key="serilog:enrich:with-property:Application" value="MV Collections Website"/>
+    <add key="webPages:Enabled" value="false"/>
   </appSettings>
   <system.web>
-    <customErrors mode="Off" />
-    <compilation debug="true" targetFramework="4.5.1">
+    <customErrors mode="Off"/>
+    <compilation debug="true" targetFramework="4.7.2">
       <buildProviders>
-        <add extension=".cshtml" type="Nancy.ViewEngines.Razor.BuildProviders.NancyCSharpRazorBuildProvider, Nancy.ViewEngines.Razor.BuildProviders" />
-        <add extension=".vbhtml" type="Nancy.ViewEngines.Razor.BuildProviders.NancyVisualBasicRazorBuildProvider, Nancy.ViewEngines.Razor.BuildProviders" />
+        <add extension=".cshtml" type="Nancy.ViewEngines.Razor.BuildProviders.NancyCSharpRazorBuildProvider, Nancy.ViewEngines.Razor.BuildProviders"/>
+        <add extension=".vbhtml" type="Nancy.ViewEngines.Razor.BuildProviders.NancyVisualBasicRazorBuildProvider, Nancy.ViewEngines.Razor.BuildProviders"/>
       </buildProviders>
     </compilation>
-    <httpRuntime targetFramework="4.5.1" />
+    <httpRuntime targetFramework="4.7.2" />
     <httpHandlers>
-      <add verb="*" type="Nancy.Hosting.Aspnet.NancyHttpRequestHandler" path="*" />
+      <add verb="*" type="Nancy.Hosting.Aspnet.NancyHttpRequestHandler" path="*"/>
     </httpHandlers>
   </system.web>
   <system.web.webPages.razor>
     <pages pageBaseType="Nancy.ViewEngines.Razor.NancyRazorViewBase">
       <namespaces>
-        <add namespace="Nancy.Helpers" />
-        <add namespace="System.Linq" />
-        <add namespace="Nancy.ViewEngines.Razor" />
+        <add namespace="Nancy.Helpers"/>
+        <add namespace="System.Linq"/>
+        <add namespace="Nancy.ViewEngines.Razor"/>
       </namespaces>
     </pages>
   </system.web.webPages.razor>
   <razor disableAutoIncludeModelNamespace="false">
     <assemblies>
-      <add assembly="CollectionsOnline.Core" />
-      <add assembly="System.Configuration" />
-      <add assembly="System" />
+      <add assembly="CollectionsOnline.Core"/>
+      <add assembly="System.Configuration"/>
+      <add assembly="System"/>
     </assemblies>
     <namespaces>
-      <add namespace="Nancy.Helpers" />
-      <add namespace="System.Linq" />
-      <add namespace="System.Configuration" />
+      <add namespace="Nancy.Helpers"/>
+      <add namespace="System.Linq"/>
+      <add namespace="System.Configuration"/>
     </namespaces>
   </razor>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" />
+        <assemblyIdentity name="Ninject" publicKeyToken="c7192dc5380945e7" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Ninject.Extensions.ChildKernel" publicKeyToken="c7192dc5380945e7" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" />
+        <assemblyIdentity name="Ninject.Extensions.ChildKernel" publicKeyToken="c7192dc5380945e7" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+        <assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Raven.Client.Lightweight" publicKeyToken="37f41c7f99471593" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.5.1.0" newVersion="3.5.1.0" />
+        <assemblyIdentity name="Raven.Client.Lightweight" publicKeyToken="37f41c7f99471593" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.5.1.0" newVersion="3.5.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Raven.Abstractions" publicKeyToken="37f41c7f99471593" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.5.1.0" newVersion="3.5.1.0" />
+        <assemblyIdentity name="Raven.Abstractions" publicKeyToken="37f41c7f99471593" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.5.1.0" newVersion="3.5.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="MiniProfiler" publicKeyToken="b44f9351044011a3" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.2.0.157" newVersion="3.2.0.157" />
+        <assemblyIdentity name="MiniProfiler" publicKeyToken="b44f9351044011a3" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.2.0.157" newVersion="3.2.0.157"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Serilog" publicKeyToken="24c2f752a8e58a10" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0" />
+        <assemblyIdentity name="Serilog" publicKeyToken="24c2f752a8e58a10" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <system.webServer>
-    <validation validateIntegratedModeConfiguration="false" />
-    <httpErrors existingResponse="PassThrough" />
+    <validation validateIntegratedModeConfiguration="false"/>
+    <httpErrors existingResponse="PassThrough"/>
     <handlers>
-      <add name="Nancy" verb="*" type="Nancy.Hosting.Aspnet.NancyHttpRequestHandler" path="*" />
+      <add name="Nancy" verb="*" type="Nancy.Hosting.Aspnet.NancyHttpRequestHandler" path="*"/>
     </handlers>
   </system.webServer>
 </configuration>
\ No newline at end of file

From 4a2b233c923fa7200e704e147ebab53405528983 Mon Sep 17 00:00:00 2001
From: michael-mason <cptshiner@gmail.com>
Date: Tue, 11 May 2021 15:21:23 +1000
Subject: [PATCH 4/4] upgraded and modified htmlsanitizer

- html sanitizer now keeps child nodes to avoid removing potentially relevant markup
- added new test for html converter
---
 .../CollectionsOnline.Core.csproj             | 22 +++++++++++++++++--
 .../Utilities/HtmlConverter.cs                |  8 ++++---
 src/CollectionsOnline.Core/packages.config    |  6 ++++-
 .../Core/Utilities/HtmlConverterTests.cs      | 13 +++++++++++
 4 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/src/CollectionsOnline.Core/CollectionsOnline.Core.csproj b/src/CollectionsOnline.Core/CollectionsOnline.Core.csproj
index 6c43d175..2e79c428 100644
--- a/src/CollectionsOnline.Core/CollectionsOnline.Core.csproj
+++ b/src/CollectionsOnline.Core/CollectionsOnline.Core.csproj
@@ -33,16 +33,26 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="AngleSharp, Version=0.15.0.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea">
+      <HintPath>..\packages\AngleSharp.0.15.0\lib\net472\AngleSharp.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="AngleSharp.Css, Version=0.15.0.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea">
+      <HintPath>..\packages\AngleSharp.Css.0.15.0\lib\net472\AngleSharp.Css.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="CsQuery">
       <HintPath>..\packages\CsQuery.1.3.4\lib\net40\CsQuery.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack">
       <HintPath>..\packages\HtmlAgilityPack.1.4.9\lib\Net45\HtmlAgilityPack.dll</HintPath>
     </Reference>
-    <Reference Include="HtmlSanitizer, Version=2.0.5735.24296, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\HtmlSanitizer.2.0.5735.24296\lib\net40\HtmlSanitizer.dll</HintPath>
+    <Reference Include="HtmlSanitizer, Version=5.0.0.0, Culture=neutral, PublicKeyToken=61c49a1a9e79cc28">
+      <HintPath>..\packages\HtmlSanitizer.5.0.404\lib\net46\HtmlSanitizer.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="mscorlib" />
     <Reference Include="Ninject, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Ninject.3.2.2.0\lib\net45-full\Ninject.dll</HintPath>
@@ -75,6 +85,14 @@
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Text.Encoding.CodePages, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\packages\System.Text.Encoding.CodePages.5.0.0\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/CollectionsOnline.Core/Utilities/HtmlConverter.cs b/src/CollectionsOnline.Core/Utilities/HtmlConverter.cs
index 7fa41ac6..7cb148b4 100644
--- a/src/CollectionsOnline.Core/Utilities/HtmlConverter.cs
+++ b/src/CollectionsOnline.Core/Utilities/HtmlConverter.cs
@@ -29,11 +29,13 @@ public static HtmlSanitizerResult HtmlSanitizer(string html)
         {
             var sanitizer = new HtmlSanitizer(DefaultAllowedTags, allowedAttributes:DefaultAllowedAttributes);
 
+            sanitizer.KeepChildNodes = true;
+
             var result = new HtmlSanitizerResult();
 
-            sanitizer.RemovingTag += ((s, e) => { result.HasRemovedTag = true; });
-            sanitizer.RemovingStyle += ((s, e) => { result.HasRemovedStyle = true; });
-            sanitizer.RemovingAttribute += ((s, e) => { result.HasRemovedAttribute = true; });
+            sanitizer.RemovingTag += (s, e) => { result.HasRemovedTag = true; };
+            sanitizer.RemovingStyle += (s, e) => { result.HasRemovedStyle = true; };
+            sanitizer.RemovingAttribute += (s, e) => { result.HasRemovedAttribute = true; };
 
             result.Html = sanitizer.Sanitize(html);
 
diff --git a/src/CollectionsOnline.Core/packages.config b/src/CollectionsOnline.Core/packages.config
index 21e9538a..540e30a3 100644
--- a/src/CollectionsOnline.Core/packages.config
+++ b/src/CollectionsOnline.Core/packages.config
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="HtmlSanitizer" version="5.0.404" targetFramework="net472" />
+  <package id="AngleSharp" version="0.15.0" targetFramework="net472" />
+  <package id="AngleSharp.Css" version="0.15.0" targetFramework="net472" />
   <package id="CsQuery" version="1.3.4" targetFramework="net451" />
   <package id="HtmlAgilityPack" version="1.4.9" targetFramework="net451" />
-  <package id="HtmlSanitizer" version="2.0.5735.24296" targetFramework="net451" />
   <package id="Ninject" version="3.2.2.0" targetFramework="net45" />
   <package id="RavenDB.Client" version="3.5.1" targetFramework="net451" />
   <package id="Serilog" version="1.5.14" targetFramework="net451" />
   <package id="Serilog.Sinks.Seq" version="1.5.27" targetFramework="net451" />
   <package id="SerilogMetrics" version="1.0.33" targetFramework="net451" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net472" />
+  <package id="System.Text.Encoding.CodePages" version="5.0.0" targetFramework="net472" />
 </packages>
\ No newline at end of file
diff --git a/src/CollectionsOnline.Tests/Core/Utilities/HtmlConverterTests.cs b/src/CollectionsOnline.Tests/Core/Utilities/HtmlConverterTests.cs
index 6edc1784..fef80255 100644
--- a/src/CollectionsOnline.Tests/Core/Utilities/HtmlConverterTests.cs
+++ b/src/CollectionsOnline.Tests/Core/Utilities/HtmlConverterTests.cs
@@ -19,5 +19,18 @@ public void HtmlToText_WithScientificName_ReturnsOnlyText()
             // Then
             result.ShouldBe("df Austriella corrugata (Deshayes, 1843)");
         }
+
+        [Fact]
+        public void HtmlSanitizer_WithMalformedHTML_ReturnsSanitizedHTML()
+        {
+            // Given
+            string result;
+            var html = @"<h3><font size=""3"">Peter Hunter OAM, Kodak Australasia Pty Ltd: Public Relations, 1961 - 1995</font></h3><h3><font size=""3"">Early career in England</font></h3>";
+            
+            // When
+            result = HtmlConverter.HtmlSanitizer(html).Html;
+            
+            result.ShouldBe("<h3>Peter Hunter OAM, Kodak Australasia Pty Ltd: Public Relations, 1961 - 1995</h3><h3>Early career in England</h3>");
+        }
     }
 }
\ No newline at end of file