From 989767b0533a930a308ac0295cfeffc735198254 Mon Sep 17 00:00:00 2001
From: Scott Brady <scott@scottbrady91.com>
Date: Thu, 16 Apr 2020 11:16:35 +0100
Subject: [PATCH] Merge fixes

---
 src/Umbraco.Web/Security/BackOfficeUserManager.cs | 1 +
 src/Umbraco.Web/Umbraco.Web.csproj                | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web/Security/BackOfficeUserManager.cs b/src/Umbraco.Web/Security/BackOfficeUserManager.cs
index ee4c36e268..ab69349afc 100644
--- a/src/Umbraco.Web/Security/BackOfficeUserManager.cs
+++ b/src/Umbraco.Web/Security/BackOfficeUserManager.cs
@@ -12,6 +12,7 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.Mapping;
 using Umbraco.Core.Security;
 using Umbraco.Core.Services;
+using Umbraco.Net;
 using Umbraco.Web.Models.Identity;
 
 namespace Umbraco.Web.Security
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index a9d0b93ab6..11923b7b55 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -139,7 +139,6 @@
     <Compile Include="AspNet\AspNetSessionManager.cs" />
     <Compile Include="AspNet\AspNetUserAgentProvider.cs" />
     <Compile Include="AspNet\FrameworkMarchal.cs" />
-    <Compile Include="Cache\WebCachingAppCache.cs" />
     <Compile Include="ClaimsIdentityExtensions.cs" />
     <Compile Include="AspNet\AspNetUmbracoApplicationLifetime.cs" />
     <Compile Include="Compose\AuditEventsComponent.cs" />
@@ -196,8 +195,6 @@
     <Compile Include="Profiling\WebProfilingController.cs" />
     <Compile Include="RoutableDocumentFilter.cs" />
     <Compile Include="Runtime\AspNetUmbracoBootPermissionChecker.cs" />
-    <Compile Include="Scheduling\SchedulerComponent.cs" />
-    <Compile Include="Scheduling\SchedulerComposer.cs" />
     <Compile Include="Security\BackOfficeClaimsPrincipalFactory.cs" />
     <Compile Include="Security\BackOfficeSignInManager.cs" />
     <Compile Include="Security\BackOfficeUserManager.cs" />