From d03227b77d8e0f6bf5f3b29551b87f3b4f4c84ee Mon Sep 17 00:00:00 2001
From: Mark Roffey <mark.roffey@dotcentric.co.uk>
Date: Wed, 29 Jan 2020 09:11:20 +0000
Subject: [PATCH 1/4] Upgraded to 8.5.3.

---
 .../UmbracoIdentityAccountController.cs       | 23 ++++----
 .../App_Start/UmbracoIdentityOwinStartup.cs   |  4 +-
 .../UmbracoIdentity.Web.csproj                | 57 +++++++++++--------
 src/UmbracoIdentity.Web/Views/Web.config      | 20 ++++---
 src/UmbracoIdentity.Web/Web.config            | 32 +++++++----
 src/UmbracoIdentity.Web/packages.config       | 18 +++---
 src/UmbracoIdentity/UmbracoIdentity.csproj    | 28 ++++++---
 src/UmbracoIdentity/packages.config           | 12 ++--
 8 files changed, 115 insertions(+), 79 deletions(-)

diff --git a/src/UmbracoIdentity.Web/App_Start/Controllers/UmbracoIdentityAccountController.cs b/src/UmbracoIdentity.Web/App_Start/Controllers/UmbracoIdentityAccountController.cs
index 587764d..d8c6db9 100644
--- a/src/UmbracoIdentity.Web/App_Start/Controllers/UmbracoIdentityAccountController.cs
+++ b/src/UmbracoIdentity.Web/App_Start/Controllers/UmbracoIdentityAccountController.cs
@@ -1,26 +1,25 @@
-using System;
+using Microsoft.AspNet.Identity;
+using Microsoft.Owin;
+using Microsoft.Owin.Security;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Web;
 using System.Web.Mvc;
-using Microsoft.AspNet.Identity;
-using Microsoft.AspNet.Identity.Owin;
-using Microsoft.Owin;
-using Microsoft.Owin.Security;
-using UmbracoIdentity.Web.Models.UmbracoIdentity;
-using Umbraco.Web;
 using Umbraco.Core;
-using Umbraco.Web.Models;
-using Umbraco.Web.Mvc;
-using UmbracoIdentity.Models;
-using UmbracoIdentity;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Services;
+using Umbraco.Web;
+using Umbraco.Web.Models;
+using Umbraco.Web.Mvc;
+using UmbracoIdentity.Models;
 
-namespace UmbracoIdentity.Web.Controllers 
+namespace UmbracoIdentity.Web.Controllers
 {
+    using Models.UmbracoIdentity;
+
     [Authorize]
     public class UmbracoIdentityAccountController : SurfaceController
     {
diff --git a/src/UmbracoIdentity.Web/App_Start/UmbracoIdentityOwinStartup.cs b/src/UmbracoIdentity.Web/App_Start/UmbracoIdentityOwinStartup.cs
index a466707..cd475bc 100644
--- a/src/UmbracoIdentity.Web/App_Start/UmbracoIdentityOwinStartup.cs
+++ b/src/UmbracoIdentity.Web/App_Start/UmbracoIdentityOwinStartup.cs
@@ -6,13 +6,13 @@
 using System;
 using System.Configuration;
 using System.Linq;
-using UmbracoIdentity; 
 using UmbracoIdentity.Web;
-using UmbracoIdentity.Web.Models.UmbracoIdentity;
+
 
 [assembly: OwinStartup("UmbracoIdentityStartup", typeof(UmbracoIdentityOwinStartup))]
 namespace UmbracoIdentity.Web
 {
+    using Models.UmbracoIdentity;
 
     /// <summary>
     /// OWIN Startup class for UmbracoIdentity 
diff --git a/src/UmbracoIdentity.Web/UmbracoIdentity.Web.csproj b/src/UmbracoIdentity.Web/UmbracoIdentity.Web.csproj
index 735c1c8..bd77251 100644
--- a/src/UmbracoIdentity.Web/UmbracoIdentity.Web.csproj
+++ b/src/UmbracoIdentity.Web/UmbracoIdentity.Web.csproj
@@ -1,5 +1,5 @@
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\UmbracoCms.8.0.2\build\UmbracoCms.props" Condition="Exists('..\packages\UmbracoCms.8.0.2\build\UmbracoCms.props')" />
+  <Import Project="..\packages\UmbracoCms.8.5.3\build\UmbracoCms.props" Condition="Exists('..\packages\UmbracoCms.8.5.3\build\UmbracoCms.props')" />
   <Import Project="..\packages\Microsoft.Net.Compilers.2.10.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.2.10.0\build\Microsoft.Net.Compilers.props')" />
   <Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -48,17 +48,17 @@
     <Reference Include="AutoMapper, Version=8.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
       <HintPath>..\packages\AutoMapper.8.0.0\lib\net461\AutoMapper.dll</HintPath>
     </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.8\lib\net45\ClientDependency.Core.dll</HintPath>
     </Reference>
-    <Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
+    <Reference Include="ClientDependency.Core.Mvc, Version=1.9.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency-Mvc5.1.9.3\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="CSharpTest.Net.Collections, Version=14.906.1403.1082, Culture=neutral, PublicKeyToken=06aee00cce822474, processorArchitecture=MSIL">
       <HintPath>..\packages\CSharpTest.Net.Collections.14.906.1403.1082\lib\net40\CSharpTest.Net.Collections.dll</HintPath>
     </Reference>
-    <Reference Include="Examine, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.1.0.0\lib\net452\Examine.dll</HintPath>
+    <Reference Include="Examine, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.1.0.1\lib\net452\Examine.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.8.14.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlAgilityPack.1.8.14\lib\Net45\HtmlAgilityPack.dll</HintPath>
@@ -181,9 +181,15 @@
     <Reference Include="Serilog.Settings.AppSettings, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
       <HintPath>..\packages\Serilog.Settings.AppSettings.2.2.2\lib\net45\Serilog.Settings.AppSettings.dll</HintPath>
     </Reference>
+    <Reference Include="Serilog.Sinks.Async, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Sinks.Async.1.3.0\lib\net45\Serilog.Sinks.Async.dll</HintPath>
+    </Reference>
     <Reference Include="Serilog.Sinks.File, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
       <HintPath>..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
     </Reference>
+    <Reference Include="Serilog.Sinks.Map, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Sinks.Map.1.0.0\lib\netstandard2.0\Serilog.Sinks.Map.dll</HintPath>
+    </Reference>
     <Reference Include="Superpower, Version=1.0.0.0, Culture=neutral, PublicKeyToken=aec39280ded1b3a7, processorArchitecture=MSIL">
       <HintPath>..\packages\Superpower.2.0.0\lib\net45\Superpower.dll</HintPath>
     </Reference>
@@ -383,19 +389,22 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Umbraco.Core, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.8.0.2\lib\net472\Umbraco.Core.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.8.5.3\lib\net472\Umbraco.Core.dll</HintPath>
     </Reference>
     <Reference Include="Umbraco.Examine, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Web.8.0.2\lib\net472\Umbraco.Examine.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Web.8.5.3\lib\net472\Umbraco.Examine.dll</HintPath>
     </Reference>
     <Reference Include="Umbraco.ModelsBuilder, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Umbraco.ModelsBuilder.8.0.4\lib\net472\Umbraco.ModelsBuilder.dll</HintPath>
+      <HintPath>..\packages\Umbraco.ModelsBuilder.8.1.0\lib\net472\Umbraco.ModelsBuilder.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.ModelsBuilder.Embedded, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Web.8.5.3\lib\net472\Umbraco.ModelsBuilder.Embedded.dll</HintPath>
     </Reference>
     <Reference Include="Umbraco.Web, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Web.8.0.2\lib\net472\Umbraco.Web.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Web.8.5.3\lib\net472\Umbraco.Web.dll</HintPath>
     </Reference>
     <Reference Include="Umbraco.Web.UI, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Web.8.0.2\lib\net472\Umbraco.Web.UI.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Web.8.5.3\lib\net472\Umbraco.Web.UI.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -450,8 +459,8 @@
     <Content Include="config\imageprocessor\processing.config" />
     <Content Include="config\imageprocessor\cache.config" />
     <Content Include="App_Plugins\ModelsBuilder\package.manifest" />
-    <Content Include="Media\Web.config" />
     <Content Include="config\umbracoSettings.config" />
+    <Content Include="Media\Web.config" />
     <Content Include="config\tinyMceConfig.config" />
     <Content Include="config\serilog.user.config" />
     <Content Include="config\serilog.config" />
@@ -460,14 +469,6 @@
     <Content Include="config\BackOfficeTours\getting-started.json" />
     <None Include="packages.config" />
     <Content Include="Views\Web.config" />
-    <Content Include="Views\Partials\Grid\Editors\Textstring.cshtml" />
-    <Content Include="Views\Partials\Grid\Editors\Rte.cshtml" />
-    <Content Include="Views\Partials\Grid\Editors\Media.cshtml" />
-    <Content Include="Views\Partials\Grid\Editors\Macro.cshtml" />
-    <Content Include="Views\Partials\Grid\Editors\Embed.cshtml" />
-    <Content Include="Views\Partials\Grid\Editors\Base.cshtml" />
-    <Content Include="Views\Partials\Grid\Bootstrap3.cshtml" />
-    <Content Include="Views\Partials\Grid\Bootstrap3-Fluid.cshtml" />
     <Content Include="Views\UmbracoIdentityAccount\ExternalLoginConfirmation.cshtml" />
     <Content Include="Views\UmbracoIdentityAccount\ExternalLoginFailure.cshtml" />
     <Content Include="Views\UmbracoIdentityAccount\ExternalLoginsList.cshtml" />
@@ -486,6 +487,14 @@
     <Content Include="Views\UmbracoIdentityAccount\_ViewStart.cshtml" />
     <Content Include="Views\AccountLayout.cshtml" />
     <Content Include="Views\Account.cshtml" />
+    <Content Include="Views\Partials\Grid\Editors\Textstring.cshtml" />
+    <Content Include="Views\Partials\Grid\Editors\Rte.cshtml" />
+    <Content Include="Views\Partials\Grid\Editors\Media.cshtml" />
+    <Content Include="Views\Partials\Grid\Editors\Macro.cshtml" />
+    <Content Include="Views\Partials\Grid\Editors\Embed.cshtml" />
+    <Content Include="Views\Partials\Grid\Editors\Base.cshtml" />
+    <Content Include="Views\Partials\Grid\Bootstrap3.cshtml" />
+    <Content Include="Views\Partials\Grid\Bootstrap3-Fluid.cshtml" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>
@@ -535,11 +544,11 @@
     <Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.2.10.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.2.10.0\build\Microsoft.Net.Compilers.props'))" />
     <Error Condition="!Exists('..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets'))" />
-    <Error Condition="!Exists('..\packages\UmbracoCms.8.0.2\build\UmbracoCms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\UmbracoCms.8.0.2\build\UmbracoCms.props'))" />
-    <Error Condition="!Exists('..\packages\UmbracoCms.8.0.2\build\UmbracoCms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\UmbracoCms.8.0.2\build\UmbracoCms.targets'))" />
+    <Error Condition="!Exists('..\packages\UmbracoCms.8.5.3\build\UmbracoCms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\UmbracoCms.8.5.3\build\UmbracoCms.props'))" />
+    <Error Condition="!Exists('..\packages\UmbracoCms.8.5.3\build\UmbracoCms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\UmbracoCms.8.5.3\build\UmbracoCms.targets'))" />
   </Target>
   <Import Project="..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets" Condition="Exists('..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets')" />
-  <Import Project="..\packages\UmbracoCms.8.0.2\build\UmbracoCms.targets" Condition="Exists('..\packages\UmbracoCms.8.0.2\build\UmbracoCms.targets')" />
+  <Import Project="..\packages\UmbracoCms.8.5.3\build\UmbracoCms.targets" Condition="Exists('..\packages\UmbracoCms.8.5.3\build\UmbracoCms.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/UmbracoIdentity.Web/Views/Web.config b/src/UmbracoIdentity.Web/Views/Web.config
index 1b33af6..4ac79cb 100644
--- a/src/UmbracoIdentity.Web/Views/Web.config
+++ b/src/UmbracoIdentity.Web/Views/Web.config
@@ -6,7 +6,13 @@
             <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
         </sectionGroup>
     </configSections>
-  <system.web.webPages.razor>
+  
+  
+  
+  
+  
+  
+<system.web.webPages.razor>
         <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
         <pages pageBaseType="System.Web.Mvc.WebViewPage">
             <namespaces>
@@ -23,17 +29,14 @@
                 <add namespace="Umbraco.Web.PublishedModels" />
             </namespaces>
         </pages>
-    </system.web.webPages.razor>
-  <appSettings>
+    </system.web.webPages.razor><appSettings>
         <add key="webpages:Enabled" value="false" />
-    </appSettings>
-  <system.webServer>
+    </appSettings><system.webServer>
         <handlers>
             <remove name="BlockViewHandler" />
             <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
         </handlers>
-    </system.webServer>
-  <system.web>
+    </system.webServer><system.web>
         <compilation targetFramework="4.7.2">
             <assemblies>
                 <add assembly="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
@@ -65,5 +68,4 @@
                 <add assembly="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />                
             </assemblies>
         </compilation>
-    </system.web>
-</configuration>
\ No newline at end of file
+    </system.web></configuration>
\ No newline at end of file
diff --git a/src/UmbracoIdentity.Web/Web.config b/src/UmbracoIdentity.Web/Web.config
index 7863853..6dbed8b 100644
--- a/src/UmbracoIdentity.Web/Web.config
+++ b/src/UmbracoIdentity.Web/Web.config
@@ -90,8 +90,8 @@
         <httpModules>
             <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
             <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,Umbraco.Web" />
-            <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
             <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
+            <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
         </httpModules>
 
         <httpHandlers>
@@ -99,10 +99,14 @@
             <add verb="*" path="*.asmx" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
             <add verb="*" path="*_AppService.axd" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
             <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
-            <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
+            <add verb="GET" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
         </httpHandlers>
 
-        <compilation defaultLanguage="c#" debug="true" batch="true" targetFramework="4.7.2" numRecompilesBeforeAppRestart="50" />
+        <compilation defaultLanguage="c#" debug="true" batch="true" targetFramework="4.7.2" numRecompilesBeforeAppRestart="50">
+            <assemblies>
+                <add assembly="Umbraco.ModelsBuilder" />
+            </assemblies>
+        </compilation>
 
         <authentication mode="Forms">
             <forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/" />
@@ -128,8 +132,12 @@
                 <add name="UmbracoRoleProvider" type="Umbraco.Web.Security.Providers.MembersRoleProvider" />
             </providers>
         </roleManager>
+        <pages>
+            <namespaces>
+                <add namespace="ClientDependency.Core" />
+            <add namespace="ClientDependency.Core.Mvc" /></namespaces>
+        </pages>
 
-    </system.web>
 
     <system.webServer>
         <validation validateIntegratedModeConfiguration="false" />
@@ -138,15 +146,15 @@
             <remove name="WebDAVModule" />
             <remove name="UmbracoModule" />
             <remove name="ScriptModule" />
-            <remove name="ClientDependencyModule" />
             <!--We're using OWIN auth!-->
             <remove name="FormsAuthentication" />
             <remove name="ImageProcessorModule" />
 
             <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,Umbraco.Web" />
-            <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-            <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />            
+            <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />            
             <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
+            <remove name="ClientDependencyModule" />
+            <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
         </modules>
 
         <handlers accessPolicy="Read, Write, Script, Execute">
@@ -166,6 +174,8 @@
             <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core" />
             <add name="MiniProfiler" path="mini-profiler-resources/*" verb="*" type="System.Web.Routing.UrlRoutingModule" resourceType="Unspecified" preCondition="integratedMode" />
             <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+            <remove name="DependencyHandler" />
+            <add name="DependencyHandler" preCondition="integratedMode" verb="GET" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
         </handlers>
 
         <staticContent>
@@ -212,6 +222,10 @@
 
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly>
+                <assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-3.6.1.0" newVersion="3.6.1.0" />
+            </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
                 <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
@@ -252,10 +266,6 @@
                 <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" />
                 <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
             </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-3.6.1.0" newVersion="3.6.1.0" />
-            </dependentAssembly>
         </assemblyBinding>
     </runtime>
 
diff --git a/src/UmbracoIdentity.Web/packages.config b/src/UmbracoIdentity.Web/packages.config
index 5b15c4b..c022dd0 100644
--- a/src/UmbracoIdentity.Web/packages.config
+++ b/src/UmbracoIdentity.Web/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="8.0.0" targetFramework="net472" />
-  <package id="ClientDependency" version="1.9.7" targetFramework="net472" />
-  <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net472" />
+  <package id="ClientDependency" version="1.9.8" targetFramework="net472" />
+  <package id="ClientDependency-Mvc5" version="1.9.3" targetFramework="net472" />
   <package id="CSharpTest.Net.Collections" version="14.906.1403.1082" targetFramework="net472" />
-  <package id="Examine" version="1.0.0" targetFramework="net472" />
+  <package id="Examine" version="1.0.1" targetFramework="net472" />
   <package id="HtmlAgilityPack" version="1.8.14" targetFramework="net472" />
   <package id="ImageProcessor" version="2.7.0.100" targetFramework="net472" />
   <package id="ImageProcessor.Web" version="4.10.0.100" targetFramework="net472" />
@@ -54,7 +54,9 @@
   <package id="Serilog.Formatting.Compact" version="1.0.0" targetFramework="net472" />
   <package id="Serilog.Formatting.Compact.Reader" version="1.0.3" targetFramework="net472" />
   <package id="Serilog.Settings.AppSettings" version="2.2.2" targetFramework="net472" />
+  <package id="Serilog.Sinks.Async" version="1.3.0" targetFramework="net472" />
   <package id="Serilog.Sinks.File" version="4.0.0" targetFramework="net472" />
+  <package id="Serilog.Sinks.Map" version="1.0.0" targetFramework="net472" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net472" />
   <package id="Superpower" version="2.0.0" targetFramework="net472" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net472" />
@@ -101,10 +103,10 @@
   <package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net472" />
   <package id="System.Xml.XPath" version="4.3.0" targetFramework="net472" />
   <package id="System.Xml.XPath.XDocument" version="4.3.0" targetFramework="net472" />
-  <package id="Umbraco.ModelsBuilder" version="8.0.4" targetFramework="net472" />
-  <package id="Umbraco.ModelsBuilder.Ui" version="8.0.4" targetFramework="net472" />
+  <package id="Umbraco.ModelsBuilder" version="8.1.0" targetFramework="net472" />
+  <package id="Umbraco.ModelsBuilder.Ui" version="8.1.0" targetFramework="net472" />
   <package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
-  <package id="UmbracoCms" version="8.0.2" targetFramework="net472" />
-  <package id="UmbracoCms.Core" version="8.0.2" targetFramework="net472" />
-  <package id="UmbracoCms.Web" version="8.0.2" targetFramework="net472" />
+  <package id="UmbracoCms" version="8.5.3" targetFramework="net472" />
+  <package id="UmbracoCms.Core" version="8.5.3" targetFramework="net472" />
+  <package id="UmbracoCms.Web" version="8.5.3" targetFramework="net472" />
 </packages>
\ No newline at end of file
diff --git a/src/UmbracoIdentity/UmbracoIdentity.csproj b/src/UmbracoIdentity/UmbracoIdentity.csproj
index c840b1e..f7f696b 100644
--- a/src/UmbracoIdentity/UmbracoIdentity.csproj
+++ b/src/UmbracoIdentity/UmbracoIdentity.csproj
@@ -39,14 +39,17 @@
     <Reference Include="AutoMapper, Version=8.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
       <HintPath>..\packages\AutoMapper.8.0.0\lib\net461\AutoMapper.dll</HintPath>
     </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.7\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.8\lib\net45\ClientDependency.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="ClientDependency.Core.Mvc, Version=1.9.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency-Mvc5.1.9.3\lib\net45\ClientDependency.Core.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="CSharpTest.Net.Collections, Version=14.906.1403.1082, Culture=neutral, PublicKeyToken=06aee00cce822474, processorArchitecture=MSIL">
       <HintPath>..\packages\CSharpTest.Net.Collections.14.906.1403.1082\lib\net40\CSharpTest.Net.Collections.dll</HintPath>
     </Reference>
-    <Reference Include="Examine, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Examine.1.0.0\lib\net452\Examine.dll</HintPath>
+    <Reference Include="Examine, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Examine.1.0.1\lib\net452\Examine.dll</HintPath>
     </Reference>
     <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
       <HintPath>..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
@@ -160,9 +163,15 @@
     <Reference Include="Serilog.Settings.AppSettings, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
       <HintPath>..\packages\Serilog.Settings.AppSettings.2.2.2\lib\net45\Serilog.Settings.AppSettings.dll</HintPath>
     </Reference>
+    <Reference Include="Serilog.Sinks.Async, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Sinks.Async.1.3.0\lib\net45\Serilog.Sinks.Async.dll</HintPath>
+    </Reference>
     <Reference Include="Serilog.Sinks.File, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
       <HintPath>..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
     </Reference>
+    <Reference Include="Serilog.Sinks.Map, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Sinks.Map.1.0.0\lib\netstandard2.0\Serilog.Sinks.Map.dll</HintPath>
+    </Reference>
     <Reference Include="Superpower, Version=1.0.0.0, Culture=neutral, PublicKeyToken=aec39280ded1b3a7, processorArchitecture=MSIL">
       <HintPath>..\packages\Superpower.2.2.0\lib\net45\Superpower.dll</HintPath>
     </Reference>
@@ -236,16 +245,19 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="Umbraco.Core, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Core.8.0.0\lib\net472\Umbraco.Core.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Core.8.5.3\lib\net472\Umbraco.Core.dll</HintPath>
     </Reference>
     <Reference Include="Umbraco.Examine, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Web.8.0.0\lib\net472\Umbraco.Examine.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Web.8.5.3\lib\net472\Umbraco.Examine.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.ModelsBuilder.Embedded, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UmbracoCms.Web.8.5.3\lib\net472\Umbraco.ModelsBuilder.Embedded.dll</HintPath>
     </Reference>
     <Reference Include="Umbraco.Web, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Web.8.0.0\lib\net472\Umbraco.Web.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Web.8.5.3\lib\net472\Umbraco.Web.dll</HintPath>
     </Reference>
     <Reference Include="Umbraco.Web.UI, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UmbracoCms.Web.8.0.0\lib\net472\Umbraco.Web.UI.dll</HintPath>
+      <HintPath>..\packages\UmbracoCms.Web.8.5.3\lib\net472\Umbraco.Web.UI.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/UmbracoIdentity/packages.config b/src/UmbracoIdentity/packages.config
index ed3ef65..d1c2518 100644
--- a/src/UmbracoIdentity/packages.config
+++ b/src/UmbracoIdentity/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="8.0.0" targetFramework="net472" />
-  <package id="ClientDependency" version="1.9.7" targetFramework="net472" />
-  <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net472" />
+  <package id="ClientDependency" version="1.9.8" targetFramework="net472" />
+  <package id="ClientDependency-Mvc5" version="1.9.3" targetFramework="net472" />
   <package id="CSharpTest.Net.Collections" version="14.906.1403.1082" targetFramework="net472" />
-  <package id="Examine" version="1.0.0" targetFramework="net472" />
+  <package id="Examine" version="1.0.1" targetFramework="net472" />
   <package id="Google.Protobuf" version="3.6.1" targetFramework="net472" />
   <package id="HtmlAgilityPack" version="1.9.0" targetFramework="net472" />
   <package id="ImageProcessor" version="2.7.0.100" targetFramework="net472" />
@@ -49,13 +49,15 @@
   <package id="Serilog.Formatting.Compact" version="1.0.0" targetFramework="net472" />
   <package id="Serilog.Formatting.Compact.Reader" version="1.0.3" targetFramework="net472" />
   <package id="Serilog.Settings.AppSettings" version="2.2.2" targetFramework="net472" />
+  <package id="Serilog.Sinks.Async" version="1.3.0" targetFramework="net472" />
   <package id="Serilog.Sinks.File" version="4.0.0" targetFramework="net472" />
+  <package id="Serilog.Sinks.Map" version="1.0.0" targetFramework="net472" />
   <package id="SharpZipLib" version="1.1.0" targetFramework="net472" />
   <package id="Superpower" version="2.2.0" targetFramework="net472" />
   <package id="System.Diagnostics.DiagnosticSource" version="4.5.1" targetFramework="net472" />
   <package id="System.Threading.Tasks.Dataflow" version="4.9.0" targetFramework="net472" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
   <package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
-  <package id="UmbracoCms.Core" version="8.0.0" targetFramework="net472" />
-  <package id="UmbracoCms.Web" version="8.0.0" targetFramework="net472" />
+  <package id="UmbracoCms.Core" version="8.5.3" targetFramework="net472" />
+  <package id="UmbracoCms.Web" version="8.5.3" targetFramework="net472" />
 </packages>
\ No newline at end of file

From 7c0eda465f41f57038c77e53db0666e00556daf0 Mon Sep 17 00:00:00 2001
From: Mark Roffey <mark.roffey@dotcentric.co.uk>
Date: Wed, 29 Jan 2020 09:24:01 +0000
Subject: [PATCH 2/4] Added missing system.web closing tag

---
 src/UmbracoIdentity.Web/Web.config | 293 +++++++++++++++--------------
 1 file changed, 147 insertions(+), 146 deletions(-)

diff --git a/src/UmbracoIdentity.Web/Web.config b/src/UmbracoIdentity.Web/Web.config
index 6dbed8b..aff386d 100644
--- a/src/UmbracoIdentity.Web/Web.config
+++ b/src/UmbracoIdentity.Web/Web.config
@@ -135,162 +135,163 @@
         <pages>
             <namespaces>
                 <add namespace="ClientDependency.Core" />
-            <add namespace="ClientDependency.Core.Mvc" /></namespaces>
+                <add namespace="ClientDependency.Core.Mvc" />
+            </namespaces>
         </pages>
+    </system.web>
 
+        <system.webServer>
+            <validation validateIntegratedModeConfiguration="false" />
+
+            <modules runAllManagedModulesForAllRequests="true">
+                <remove name="WebDAVModule" />
+                <remove name="UmbracoModule" />
+                <remove name="ScriptModule" />
+                <!--We're using OWIN auth!-->
+                <remove name="FormsAuthentication" />
+                <remove name="ImageProcessorModule" />
+
+                <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,Umbraco.Web" />
+                <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+                <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
+                <remove name="ClientDependencyModule" />
+                <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
+            </modules>
+
+            <handlers accessPolicy="Read, Write, Script, Execute">
+                <remove name="WebServiceHandlerFactory-Integrated" />
+                <remove name="ScriptHandlerFactory" />
+                <remove name="ScriptHandlerFactoryAppServices" />
+                <remove name="ScriptResource" />
+                <remove name="ClientDependency" />
+                <remove name="MiniProfiler" />
+                <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
+                <remove name="OPTIONSVerbHandler" />
+                <remove name="TRACEVerbHandler" />
+
+                <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+                <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+                <add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+                <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core" />
+                <add name="MiniProfiler" path="mini-profiler-resources/*" verb="*" type="System.Web.Routing.UrlRoutingModule" resourceType="Unspecified" preCondition="integratedMode" />
+                <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+                <remove name="DependencyHandler" />
+                <add name="DependencyHandler" preCondition="integratedMode" verb="GET" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
+            </handlers>
+
+            <staticContent>
+                <remove fileExtension=".air" />
+                <mimeMap fileExtension=".air" mimeType="application/vnd.adobe.air-application-installer-package+zip" />
+                <remove fileExtension=".svg" />
+                <mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
+                <remove fileExtension=".woff" />
+                <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
+                <remove fileExtension=".woff2" />
+                <mimeMap fileExtension=".woff2" mimeType="application/x-font-woff2" />
+                <remove fileExtension=".less" />
+                <mimeMap fileExtension=".less" mimeType="text/css" />
+                <remove fileExtension=".mp4" />
+                <mimeMap fileExtension=".mp4" mimeType="video/mp4" />
+                <remove fileExtension=".json" />
+                <mimeMap fileExtension=".json" mimeType="application/json" />
+            </staticContent>
+
+            <!-- Ensure the powered by header is not returned -->
+            <httpProtocol>
+                <customHeaders>
+                    <remove name="X-Powered-By" />
+                </customHeaders>
+            </httpProtocol>
+
+            <!-- Increase the default upload file size limit -->
+            <security>
+                <requestFiltering>
+                    <requestLimits maxAllowedContentLength="52428800" />
+                </requestFiltering>
+            </security>
 
-    <system.webServer>
-        <validation validateIntegratedModeConfiguration="false" />
-
-        <modules runAllManagedModulesForAllRequests="true">
-            <remove name="WebDAVModule" />
-            <remove name="UmbracoModule" />
-            <remove name="ScriptModule" />
-            <!--We're using OWIN auth!-->
-            <remove name="FormsAuthentication" />
-            <remove name="ImageProcessorModule" />
-
-            <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,Umbraco.Web" />
-            <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />            
-            <add name="ImageProcessorModule" type="ImageProcessor.Web.HttpModules.ImageProcessingModule, ImageProcessor.Web" />
-            <remove name="ClientDependencyModule" />
-            <add name="ClientDependencyModule" type="ClientDependency.Core.Module.ClientDependencyModule, ClientDependency.Core" />
-        </modules>
-
-        <handlers accessPolicy="Read, Write, Script, Execute">
-            <remove name="WebServiceHandlerFactory-Integrated" />
-            <remove name="ScriptHandlerFactory" />
-            <remove name="ScriptHandlerFactoryAppServices" />
-            <remove name="ScriptResource" />
-            <remove name="ClientDependency" />
-            <remove name="MiniProfiler" />
-            <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
-            <remove name="OPTIONSVerbHandler" />
-            <remove name="TRACEVerbHandler" />
-
-            <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-            <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-            <add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
-            <add verb="*" name="ClientDependency" preCondition="integratedMode" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core" />
-            <add name="MiniProfiler" path="mini-profiler-resources/*" verb="*" type="System.Web.Routing.UrlRoutingModule" resourceType="Unspecified" preCondition="integratedMode" />
-            <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
-            <remove name="DependencyHandler" />
-            <add name="DependencyHandler" preCondition="integratedMode" verb="GET" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
-        </handlers>
-
-        <staticContent>
-            <remove fileExtension=".air" />
-            <mimeMap fileExtension=".air" mimeType="application/vnd.adobe.air-application-installer-package+zip" />
-            <remove fileExtension=".svg" />
-            <mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
-            <remove fileExtension=".woff" />
-            <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
-            <remove fileExtension=".woff2" />
-            <mimeMap fileExtension=".woff2" mimeType="application/x-font-woff2" />
-            <remove fileExtension=".less" />
-            <mimeMap fileExtension=".less" mimeType="text/css" />
-            <remove fileExtension=".mp4" />
-            <mimeMap fileExtension=".mp4" mimeType="video/mp4" />
-            <remove fileExtension=".json" />
-            <mimeMap fileExtension=".json" mimeType="application/json" />
-        </staticContent>
-
-        <!-- Ensure the powered by header is not returned -->
-        <httpProtocol>
-            <customHeaders>
-                <remove name="X-Powered-By" />
-            </customHeaders>
-        </httpProtocol>
-
-        <!-- Increase the default upload file size limit -->
-        <security>
-            <requestFiltering>
-                <requestLimits maxAllowedContentLength="52428800" />
-            </requestFiltering>
-        </security>
-
-        <!--
+            <!--
       If you wish to use IIS rewrite rules, see the documentation here:
 		  https://our.umbraco.com/documentation/Reference/Routing/IISRewriteRules
     -->
-        <!--
+            <!--
     <rewrite>
       <rules></rules>
     </rewrite>
     -->
-    </system.webServer>
-
-    <runtime>
-        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-            <dependentAssembly>
-                <assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-3.6.1.0" newVersion="3.6.1.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.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" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" />
-                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
-            </dependentAssembly>
-        </assemblyBinding>
-    </runtime>
-
-    <location path="umbraco">
-        <system.webServer>
-            <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" />
-        </system.webServer>
-    </location>
-    <location path="App_Plugins">
-        <system.webServer>
-            <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" />
         </system.webServer>
-    </location>
-
-    <imageProcessor>
-        <security configSource="config\imageprocessor\security.config" />
-        <caching configSource="config\imageprocessor\cache.config" />
-        <processing configSource="config\imageprocessor\processing.config" />
-    </imageProcessor>
-
-    <system.codedom>
-        <compilers>
-            <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:7 /nowarn:1659;1699;1701" />
-            <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
-        </compilers>
-    </system.codedom>
 
+        <runtime>
+            <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+                <dependentAssembly>
+                    <assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
+                    <bindingRedirect oldVersion="0.0.0.0-3.6.1.0" newVersion="3.6.1.0" />
+                </dependentAssembly>
+                <dependentAssembly>
+                    <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                    <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+                </dependentAssembly>
+                <dependentAssembly>
+                    <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                    <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+                </dependentAssembly>
+                <dependentAssembly>
+                    <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                    <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+                </dependentAssembly>
+                <dependentAssembly>
+                    <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                    <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.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" />
+                </dependentAssembly>
+                <dependentAssembly>
+                    <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+                    <bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
+                </dependentAssembly>
+                <dependentAssembly>
+                    <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                    <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+                </dependentAssembly>
+                <dependentAssembly>
+                    <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                    <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+                </dependentAssembly>
+                <dependentAssembly>
+                    <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+                    <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+                </dependentAssembly>
+                <dependentAssembly>
+                    <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" />
+                    <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+                </dependentAssembly>
+            </assemblyBinding>
+        </runtime>
+
+        <location path="umbraco">
+            <system.webServer>
+                <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" />
+            </system.webServer>
+        </location>
+        <location path="App_Plugins">
+            <system.webServer>
+                <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" />
+            </system.webServer>
+        </location>
+
+        <imageProcessor>
+            <security configSource="config\imageprocessor\security.config" />
+            <caching configSource="config\imageprocessor\cache.config" />
+            <processing configSource="config\imageprocessor\processing.config" />
+        </imageProcessor>
+
+        <system.codedom>
+            <compilers>
+                <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:7 /nowarn:1659;1699;1701" />
+                <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
+            </compilers>
+        </system.codedom>
+    
 </configuration>

From c633fb72bbec20cc94121a4c5beddfcf009cbcc5 Mon Sep 17 00:00:00 2001
From: Mark Roffey <mark.roffey@dotcentric.co.uk>
Date: Wed, 29 Jan 2020 15:48:35 +0000
Subject: [PATCH 3/4] #112 Fixed error

---
 .../UmbracoIdentityAccountController.cs       | 21 +++++++++++++------
 ...dentityEnabledMembersMembershipProvider.cs |  4 ++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/UmbracoIdentity.Web/App_Start/Controllers/UmbracoIdentityAccountController.cs b/src/UmbracoIdentity.Web/App_Start/Controllers/UmbracoIdentityAccountController.cs
index d8c6db9..ec177c7 100644
--- a/src/UmbracoIdentity.Web/App_Start/Controllers/UmbracoIdentityAccountController.cs
+++ b/src/UmbracoIdentity.Web/App_Start/Controllers/UmbracoIdentityAccountController.cs
@@ -312,17 +312,26 @@ public async Task<ActionResult> ManagePassword([Bind(Prefix = "managePasswordMod
         [AllowAnonymous]
         public async Task<ActionResult> HandleLogin([Bind(Prefix = "loginModel")] LoginModel model)
         {
-            if (ModelState.IsValid)
+            if (!ModelState.IsValid)
+                return CurrentUmbracoPage();
+
+            var user = await _userManager.FindAsync(model.Username, model.Password);
+
+            if (user != null)
             {
-                var user = await _userManager.FindAsync(model.Username, model.Password);
-                if (user != null)
+                //member exits but registered with social login.
+                if (user.PasswordHash == null)
                 {
-                    await SignInAsync(user, true);
-                    return RedirectToCurrentUmbracoPage();
+                    ModelState.AddModelError("loginModel", "Social Account registered");
+                    return CurrentUmbracoPage();
                 }
-                ModelState.AddModelError("loginModel", "Invalid username or password");
+
+                await SignInAsync(user, true);
+                return RedirectToCurrentUmbracoPage();
             }
 
+            ModelState.AddModelError("loginModel", "Invalid username or password");
+
             return CurrentUmbracoPage();
         }
 
diff --git a/src/UmbracoIdentity/IdentityEnabledMembersMembershipProvider.cs b/src/UmbracoIdentity/IdentityEnabledMembersMembershipProvider.cs
index 8e75b0d..d22f5e5 100644
--- a/src/UmbracoIdentity/IdentityEnabledMembersMembershipProvider.cs
+++ b/src/UmbracoIdentity/IdentityEnabledMembersMembershipProvider.cs
@@ -49,6 +49,10 @@ public class IdentityEnabledMembersMembershipProvider : MembersMembershipProvide
 
         public new bool VerifyPassword(string password, string hashedPassword)
         {
+            //member exits but registered with social login.
+            if (hashedPassword == null)
+               return true;
+
             return CheckPassword(password, hashedPassword);
         }
 

From 2073a39007aa70f8c705a3efc8655e10a234a72b Mon Sep 17 00:00:00 2001
From: Mark Roffey <mark.roffey@dotcentric.co.uk>
Date: Thu, 30 Jan 2020 11:41:24 +0000
Subject: [PATCH 4/4] Changed to built in Umbraco IsNullOrWhiteSpace()

---
 .../App_Start/Controllers/UmbracoIdentityAccountController.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/UmbracoIdentity.Web/App_Start/Controllers/UmbracoIdentityAccountController.cs b/src/UmbracoIdentity.Web/App_Start/Controllers/UmbracoIdentityAccountController.cs
index ec177c7..c2941e9 100644
--- a/src/UmbracoIdentity.Web/App_Start/Controllers/UmbracoIdentityAccountController.cs
+++ b/src/UmbracoIdentity.Web/App_Start/Controllers/UmbracoIdentityAccountController.cs
@@ -319,8 +319,8 @@ public async Task<ActionResult> HandleLogin([Bind(Prefix = "loginModel")] LoginM
 
             if (user != null)
             {
-                //member exits but registered with social login.
-                if (user.PasswordHash == null)
+                //member exists but registered with social login.
+                if (user.PasswordHash.IsNullOrWhiteSpace())
                 {
                     ModelState.AddModelError("loginModel", "Social Account registered");
                     return CurrentUmbracoPage();