Merge pull request #8 from jellyfin/master

rebase to latest master

4 files changed, 16 insertions, 26 deletions

diff --git a/MediaBrowser.Common/Net/HttpRequestOptions.cs b/MediaBrowser.Common/Net/HttpRequestOptions.cs
index c61e88c87..dadac5e03 100644
--- a/MediaBrowser.Common/Net/HttpRequestOptions.cs
+++ b/MediaBrowser.Common/Net/HttpRequestOptions.cs
@@ -1,9 +1,7 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
 using System.Threading;
-using System.Text;
 
 namespace MediaBrowser.Common.Net
 {
@@ -26,11 +24,8 @@ namespace MediaBrowser.Common.Net
         /// <value>The accept header.</value>
         public string AcceptHeader
         {
-            get { return GetHeaderValue("Accept"); }
-            set
-            {
-                RequestHeaders["Accept"] = value;
-            }
+            get => GetHeaderValue("Accept");
+            set => RequestHeaders["Accept"] = value;
         }
         /// <summary>
         /// Gets or sets the cancellation token.
@@ -50,11 +45,8 @@ namespace MediaBrowser.Common.Net
         /// <value>The user agent.</value>
         public string UserAgent
         {
-            get { return GetHeaderValue("User-Agent"); }
-            set
-            {
-                RequestHeaders["User-Agent"] = value;
-            }
+            get => GetHeaderValue("User-Agent");
+            set => RequestHeaders["User-Agent"] = value;
         }
 
         /// <summary>
@@ -110,9 +102,7 @@ namespace MediaBrowser.Common.Net
 
         private string GetHeaderValue(string name)
         {
-            string value;
-
-            RequestHeaders.TryGetValue(name, out value);
+            RequestHeaders.TryGetValue(name, out var value);
 
             return value;
         }
@@ -133,7 +123,7 @@ namespace MediaBrowser.Common.Net
             TimeoutMs = 20000;
         }
 
-        public void SetPostData(IDictionary<string,string> values)
+        public void SetPostData(IDictionary<string, string> values)
         {
             var strings = values.Keys.Select(key => string.Format("{0}={1}", key, values[key]));
             var postContent = string.Join("&", strings.ToArray());
diff --git a/MediaBrowser.Common/Net/HttpResponseInfo.cs b/MediaBrowser.Common/Net/HttpResponseInfo.cs
index ed941a447..186674167 100644
--- a/MediaBrowser.Common/Net/HttpResponseInfo.cs
+++ b/MediaBrowser.Common/Net/HttpResponseInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net;
@@ -21,7 +21,7 @@ namespace MediaBrowser.Common.Net
         /// </summary>
         /// <value>The response URL.</value>
         public string ResponseUrl { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the content.
         /// </summary>
@@ -50,7 +50,7 @@ namespace MediaBrowser.Common.Net
         /// Gets or sets the headers.
         /// </summary>
         /// <value>The headers.</value>
-        public Dictionary<string,string> Headers { get; set; }
+        public Dictionary<string, string> Headers { get; set; }
 
         private readonly IDisposable _disposable;
 
diff --git a/MediaBrowser.Common/Net/IHttpClient.cs b/MediaBrowser.Common/Net/IHttpClient.cs
index f88cfbb2b..5aaf7e0be 100644
--- a/MediaBrowser.Common/Net/IHttpClient.cs
+++ b/MediaBrowser.Common/Net/IHttpClient.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Threading.Tasks;
 
 namespace MediaBrowser.Common.Net
@@ -43,7 +43,7 @@ namespace MediaBrowser.Common.Net
         /// <param name="options">The options.</param>
         /// <returns>Task{System.String}.</returns>
         /// <exception cref="System.ArgumentNullException">progress</exception>
-        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
+        /// <exception cref="Model.Net.HttpException"></exception>
         Task<string> GetTempFile(HttpRequestOptions options);
 
         /// <summary>
diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs
index b2ff797bc..72fb6e2b8 100644
--- a/MediaBrowser.Common/Net/INetworkManager.cs
+++ b/MediaBrowser.Common/Net/INetworkManager.cs
@@ -1,8 +1,8 @@
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Net;
-using System.Collections.Generic;
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Net;
 
 namespace MediaBrowser.Common.Net
 {
@@ -63,4 +63,4 @@ namespace MediaBrowser.Common.Net
 
         bool IsAddressInSubnets(string addressString, string[] subnets);
     }
-}
\ No newline at end of file
+}