Merge remote-tracking branch 'remotes/jellyfin/api-migration' into api-audio

# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Jellyfin.Api/Helpers/TranscodingJobHelper.cs

1 files changed, 4 insertions, 14 deletions

diff --git a/RSSDP/DisposableManagedObjectBase.cs b/RSSDP/DisposableManagedObjectBase.cs
index 39589f022..66a0c5ec4 100644
--- a/RSSDP/DisposableManagedObjectBase.cs
+++ b/RSSDP/DisposableManagedObjectBase.cs
@@ -9,9 +9,6 @@ namespace Rssdp.Infrastructure
     /// </summary>
     public abstract class DisposableManagedObjectBase : IDisposable
     {
-
-        #region Public Methods
-
         /// <summary>
         /// Override this method and dispose any objects you own the lifetime of if disposing is true;
         /// </summary>
@@ -26,13 +23,12 @@ namespace Rssdp.Infrastructure
         /// <seealso cref="Dispose()"/>
         protected virtual void ThrowIfDisposed()
         {
-            if (this.IsDisposed) throw new ObjectDisposedException(this.GetType().FullName);
+            if (this.IsDisposed)
+            {
+                throw new ObjectDisposedException(this.GetType().FullName);
+            }
         }
 
-        #endregion
-
-        #region Public Properties
-
         /// <summary>
         /// Sets or returns a boolean indicating whether or not this instance has been disposed.
         /// </summary>
@@ -43,8 +39,6 @@ namespace Rssdp.Infrastructure
             private set;
         }
 
-        #endregion
-
         public string BuildMessage(string header, Dictionary<string, string> values)
         {
             var builder = new StringBuilder();
@@ -63,8 +57,6 @@ namespace Rssdp.Infrastructure
             return builder.ToString();
         }
 
-        #region IDisposable Members
-
         /// <summary>
         /// Disposes this object instance and all internally managed resources.
         /// </summary>
@@ -79,7 +71,5 @@ namespace Rssdp.Infrastructure
 
             Dispose(true);
         }
-
-        #endregion
     }
 }