Merge pull request #651 from jellyfin/release-10.1.0

Release 10.1.0

4 files changed, 12 insertions, 18 deletions

diff --git a/Emby.Dlna/Service/BaseControlHandler.cs b/Emby.Dlna/Service/BaseControlHandler.cs
index ae094cc2f6..5f78674b88 100644
--- a/Emby.Dlna/Service/BaseControlHandler.cs
+++ b/Emby.Dlna/Service/BaseControlHandler.cs
@@ -1,7 +1,3 @@
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Dlna;
-using Emby.Dlna.Server;
-using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -9,9 +5,10 @@ using System.Linq;
 using System.Text;
 using System.Xml;
 using Emby.Dlna.Didl;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Extensions;
 using MediaBrowser.Model.Xml;
-using MediaBrowser.Model.Extensions;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.Service
 {
@@ -88,7 +85,7 @@ namespace Emby.Dlna.Service
 
             StringWriter builder = new StringWriterWithEncoding(Encoding.UTF8);
 
-            using (XmlWriter writer = XmlWriter.Create(builder, settings))
+            using (var writer = XmlWriter.Create(builder, settings))
             {
                 writer.WriteStartDocument(true);
 
@@ -205,7 +202,7 @@ namespace Emby.Dlna.Service
             return result;
         }
 
-        private void ParseFirstBodyChild(XmlReader reader, IDictionary<string,string> headers)
+        private void ParseFirstBodyChild(XmlReader reader, IDictionary<string, string> headers)
         {
             reader.MoveToContent();
             reader.Read();
@@ -229,7 +226,7 @@ namespace Emby.Dlna.Service
         {
             public string LocalName;
             public string NamespaceURI;
-            public IDictionary<string, string> Headers = new Dictionary<string,string>(StringComparer.OrdinalIgnoreCase);
+            public IDictionary<string, string> Headers = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
         }
 
         protected abstract IEnumerable<KeyValuePair<string, string>> GetResult(string methodName, IDictionary<string, string> methodParams);
diff --git a/Emby.Dlna/Service/BaseService.cs b/Emby.Dlna/Service/BaseService.cs
index 92b81a7acc..5359e94c44 100644
--- a/Emby.Dlna/Service/BaseService.cs
+++ b/Emby.Dlna/Service/BaseService.cs
@@ -1,6 +1,5 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Dlna;
 using Emby.Dlna.Eventing;
+using MediaBrowser.Common.Net;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.Service
@@ -14,7 +13,7 @@ namespace Emby.Dlna.Service
         protected BaseService(ILogger logger, IHttpClient httpClient)
         {
             Logger = logger;
-            HttpClient = httpClient;  
+            HttpClient = httpClient;
 
             EventManager = new EventManager(Logger, HttpClient);
         }
diff --git a/Emby.Dlna/Service/ControlErrorHandler.cs b/Emby.Dlna/Service/ControlErrorHandler.cs
index a3cd77f0fb..d5eb4a8879 100644
--- a/Emby.Dlna/Service/ControlErrorHandler.cs
+++ b/Emby.Dlna/Service/ControlErrorHandler.cs
@@ -1,4 +1,3 @@
-using MediaBrowser.Controller.Dlna;
 using System;
 using System.IO;
 using System.Text;
@@ -10,7 +9,7 @@ namespace Emby.Dlna.Service
     public class ControlErrorHandler
     {
         private const string NS_SOAPENV = "http://schemas.xmlsoap.org/soap/envelope/";
-        
+
         public ControlResponse GetResponse(Exception ex)
         {
             var settings = new XmlWriterSettings
@@ -21,7 +20,7 @@ namespace Emby.Dlna.Service
 
             StringWriter builder = new StringWriterWithEncoding(Encoding.UTF8);
 
-            using (XmlWriter writer = XmlWriter.Create(builder, settings))
+            using (var writer = XmlWriter.Create(builder, settings))
             {
                 writer.WriteStartDocument(true);
 
diff --git a/Emby.Dlna/Service/ServiceXmlBuilder.cs b/Emby.Dlna/Service/ServiceXmlBuilder.cs
index c41f1b3bed..bd1f0bf05c 100644
--- a/Emby.Dlna/Service/ServiceXmlBuilder.cs
+++ b/Emby.Dlna/Service/ServiceXmlBuilder.cs
@@ -1,7 +1,6 @@
-using Emby.Dlna.Common;
 using System.Collections.Generic;
-using System.Security;
 using System.Text;
+using Emby.Dlna.Common;
 using Emby.Dlna.Server;
 
 namespace Emby.Dlna.Service
@@ -28,7 +27,7 @@ namespace Emby.Dlna.Service
             return builder.ToString();
         }
 
-        private void AppendActionList(StringBuilder builder, IEnumerable<ServiceAction> actions)
+        private static void AppendActionList(StringBuilder builder, IEnumerable<ServiceAction> actions)
         {
             builder.Append("<actionList>");
 
@@ -59,7 +58,7 @@ namespace Emby.Dlna.Service
             builder.Append("</actionList>");
         }
 
-        private void AppendServiceStateTable(StringBuilder builder, IEnumerable<StateVariable> stateVariables)
+        private static void AppendServiceStateTable(StringBuilder builder, IEnumerable<StateVariable> stateVariables)
         {
             builder.Append("<serviceStateTable>");