Replaced all usages of DisposableObject with DisposableObjectSlim

src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs

@@ -146,7 +146,7 @@ namespace Umbraco.Core.Cache
         #region Insert
         #endregion
 
-        private class NoopLocker : DisposableObject
+        private class NoopLocker : DisposableObjectSlim
         {
             protected override void DisposeResources()
             { }

src/Umbraco.Core/DisposableTimer.cs

@@ -11,8 +11,8 @@ namespace Umbraco.Core
 	/// <summary>
 	/// Starts the timer and invokes a  callback upon disposal. Provides a simple way of timing an operation by wrapping it in a <code>using</code> (C#) statement.
 	/// </summary>
-	public class DisposableTimer : DisposableObject
-	{
+	public class DisposableTimer : DisposableObjectSlim
+    {
 	    private readonly ILogger _logger;
 	    private readonly LogType? _logType;
 	    private readonly IProfiler _profiler;
@@ -209,13 +209,13 @@ namespace Umbraco.Core
                 loggerType,
                 startMessage(),
                 completeMessage());
-        } 
+        }
         #endregion
-
-		/// <summary>
-		/// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObject"/> which handles common required locking logic.
-		/// </summary>
-		protected override void DisposeResources()
+
+        /// <summary>
+        /// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObjectSlim"/> which handles common required locking logic.
+        /// </summary>
+        protected override void DisposeResources()
 		{
             if (_profiler != null)
             {

src/Umbraco.Core/Events/EventMessages.cs

@@ -5,7 +5,7 @@ namespace Umbraco.Core.Events
     /// <summary>
     /// Event messages collection
     /// </summary>
-    public sealed class EventMessages : DisposableObject
+    public sealed class EventMessages : DisposableObjectSlim
     {
         private readonly List<EventMessage> _msgs = new List<EventMessage>();
 

src/Umbraco.Core/HashGenerator.cs

@@ -14,7 +14,7 @@ namespace Umbraco.Core
     /// This will use the crypto libs to generate the hash and will try to ensure that 
     /// strings, etc... are not re-allocated so it's not consuming much memory.
     /// </remarks>
-    internal class HashGenerator : DisposableObject
+    internal class HashGenerator : DisposableObjectSlim
     {
         public HashGenerator()
         {

src/Umbraco.Core/Manifest/ManifestWatcher.cs

@@ -6,7 +6,7 @@ using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Manifest
 {
-    internal class ManifestWatcher : DisposableObject
+    internal class ManifestWatcher : DisposableObjectSlim
     {
         private readonly ILogger _logger;
         private readonly List<FileSystemWatcher> _fws = new List<FileSystemWatcher>();

src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs

@@ -12,7 +12,7 @@ namespace Umbraco.Core.Persistence
 	/// it will create one per context, otherwise it will be a global singleton object which is NOT thread safe
 	/// since we need (at least) a new instance of the database object per thread.
 	/// </remarks>
-	internal class DefaultDatabaseFactory : DisposableObject, IDatabaseFactory2
+	internal class DefaultDatabaseFactory : DisposableObjectSlim, IDatabaseFactory2
 	{
 	    private readonly string _connectionStringName;
 	    private readonly ILogger _logger;

src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs

@@ -18,7 +18,7 @@ namespace Umbraco.Core.Persistence.Repositories
     /// <remarks>
     /// This is limited to objects that are based in the umbracoNode-table.
     /// </remarks>
-    internal class EntityRepository : DisposableObject, IEntityRepository
+    internal class EntityRepository : DisposableObjectSlim, IEntityRepository
     {
         private readonly IDatabaseUnitOfWork _work;
 

src/Umbraco.Core/Persistence/Repositories/FileRepository.cs

@@ -9,7 +9,7 @@ using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    internal abstract class FileRepository<TId, TEntity> : DisposableObject, IUnitOfWorkRepository, IRepository<TId, TEntity> 
+    internal abstract class FileRepository<TId, TEntity> : DisposableObjectSlim, IUnitOfWorkRepository, IRepository<TId, TEntity> 
         where TEntity : IFile
     {
         private IUnitOfWork _work;

src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs

@@ -10,7 +10,7 @@ using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    internal abstract class RepositoryBase : DisposableObject
+    internal abstract class RepositoryBase : DisposableObjectSlim
     {
         private readonly IScopeUnitOfWork _work;
         private readonly CacheHelper _globalCache;

src/Umbraco.Core/Persistence/UnitOfWork/ScopeUnitOfWork.cs

@@ -10,7 +10,7 @@ namespace Umbraco.Core.Persistence.UnitOfWork
 	/// <summary>
 	/// Represents a scoped unit of work.
 	/// </summary>
-	internal class ScopeUnitOfWork : DisposableObject, IScopeUnitOfWork
+	internal class ScopeUnitOfWork : DisposableObjectSlim, IScopeUnitOfWork
     {
         private readonly Queue<Operation> _operations = new Queue<Operation>();
 	    private readonly IsolationLevel _isolationLevel;

src/Umbraco.Core/Security/BackOfficeUserStore.cs

@@ -18,7 +18,7 @@ using Task = System.Threading.Tasks.Task;
 
 namespace Umbraco.Core.Security
 {
-    public class BackOfficeUserStore : DisposableObject, 
+    public class BackOfficeUserStore : DisposableObjectSlim, 
         IUserStore<BackOfficeIdentityUser, int>, 
         IUserPasswordStore<BackOfficeIdentityUser, int>, 
         IUserEmailStore<BackOfficeIdentityUser, int>, 
@@ -58,7 +58,7 @@ namespace Umbraco.Core.Security
         }
 
         /// <summary>
-        /// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObject"/> which handles common required locking logic.
+        /// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObjectSlim"/> which handles common required locking logic.
         /// </summary>
         protected override void DisposeResources()
         {

src/Umbraco.Core/Umbraco.Core.csproj

@@ -348,6 +348,7 @@
     <Compile Include="Deploy\Direction.cs" />
     <Compile Include="Deploy\IFileType.cs" />
     <Compile Include="Deploy\IFileTypeCollection.cs" />
+    <Compile Include="DisposableObjectSlim.cs" />
     <Compile Include="EmailSender.cs" />
     <Compile Include="Events\EventDefinitionFilter.cs" />
     <Compile Include="Events\IDeletingMediaFilesEventArgs.cs" />

src/Umbraco.Web/Scheduling/LatchedBackgroundTaskBase.cs

@@ -12,7 +12,7 @@ namespace Umbraco.Web.Scheduling
     /// depending on whether the task is implemented as a sync or async method, and then
     /// optionnally overriding RunsOnShutdown, to indicate whether the latched task should run
     /// immediately on shutdown, or just be abandonned (default).</remarks>
-    public abstract class LatchedBackgroundTaskBase : DisposableObject, ILatchedBackgroundTask
+    public abstract class LatchedBackgroundTaskBase : DisposableObjectSlim, ILatchedBackgroundTask
     {
         private TaskCompletionSource<bool> _latch;
 

src/Umbraco.Web/Security/WebSecurity.cs

@@ -23,7 +23,7 @@ namespace Umbraco.Web.Security
     /// <summary>
     /// A utility class used for dealing with USER security in Umbraco
     /// </summary>
-    public class WebSecurity : DisposableObject
+    public class WebSecurity : DisposableObjectSlim
     {
         private HttpContextBase _httpContext;
         private ApplicationContext _applicationContext;

src/Umbraco.Web/UmbracoContext.cs

@@ -20,7 +20,7 @@ namespace Umbraco.Web
     /// <summary>
     /// Class that encapsulates Umbraco information of a specific HTTP request
     /// </summary>
-    public class UmbracoContext : DisposableObject, IDisposeOnRequestEnd
+    public class UmbracoContext : DisposableObjectSlim, IDisposeOnRequestEnd
     {
         internal const string HttpContextItemName = "Umbraco.Web.UmbracoContext";
         private static readonly object Locker = new object();

src/umbraco.cms/businesslogic/Packager/Repositories/Repository.cs

@@ -14,7 +14,7 @@ using Umbraco.Core.IO;
 namespace umbraco.cms.businesslogic.packager.repositories
 {
     [Obsolete("This should not be used and will be removed in future Umbraco versions")]
-    public class Repository : DisposableObject
+    public class Repository : DisposableObjectSlim
     {        
         public string Guid { get; private set; }
 
@@ -289,7 +289,7 @@ namespace umbraco.cms.businesslogic.packager.repositories
         }
 
         /// <summary>
-        /// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObject"/> which handles common required locking logic.
+        /// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObjectSlim"/> which handles common required locking logic.
         /// </summary>
         protected override void DisposeResources()
         {