Merge remote-tracking branch 'upstream/dev' into build-system-consolidation

51 files changed, 130 insertions, 133 deletions

diff --git a/MediaBrowser.Controller/Authentication/AuthenticationResult.cs b/MediaBrowser.Controller/Authentication/AuthenticationResult.cs
index 6dd8f02d8..3c65156e3 100644
--- a/MediaBrowser.Controller/Authentication/AuthenticationResult.cs
+++ b/MediaBrowser.Controller/Authentication/AuthenticationResult.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Controller.Session;
+using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Dto;
 
 
diff --git a/MediaBrowser.Controller/Channels/IChannelManager.cs b/MediaBrowser.Controller/Channels/IChannelManager.cs
index a9839e1fb..b345001a6 100644
--- a/MediaBrowser.Controller/Channels/IChannelManager.cs
+++ b/MediaBrowser.Controller/Channels/IChannelManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Channels;
 using MediaBrowser.Model.Dto;
@@ -46,14 +46,12 @@ namespace MediaBrowser.Controller.Channels
         /// Gets the channels internal.
         /// </summary>
         /// <param name="query">The query.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
         QueryResult<Channel> GetChannelsInternal(ChannelQuery query);
 
         /// <summary>
         /// Gets the channels.
         /// </summary>
         /// <param name="query">The query.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
         QueryResult<BaseItemDto> GetChannels(ChannelQuery query);
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Dlna/IDlnaManager.cs b/MediaBrowser.Controller/Dlna/IDlnaManager.cs
index 2f64cd194..70529d062 100644
--- a/MediaBrowser.Controller/Dlna/IDlnaManager.cs
+++ b/MediaBrowser.Controller/Dlna/IDlnaManager.cs
@@ -30,26 +30,26 @@ namespace MediaBrowser.Controller.Dlna
         /// </summary>
         /// <param name="profile">The profile.</param>
         void CreateProfile(DeviceProfile profile);
-        
+
         /// <summary>
         /// Updates the profile.
         /// </summary>
         /// <param name="profile">The profile.</param>
         void UpdateProfile(DeviceProfile profile);
-        
+
         /// <summary>
         /// Deletes the profile.
         /// </summary>
         /// <param name="id">The identifier.</param>
         void DeleteProfile(string id);
-        
+
         /// <summary>
         /// Gets the profile.
         /// </summary>
         /// <param name="id">The identifier.</param>
         /// <returns>DeviceProfile.</returns>
         DeviceProfile GetProfile(string id);
-        
+
         /// <summary>
         /// Gets the profile.
         /// </summary>
diff --git a/MediaBrowser.Controller/Drawing/ImageProcessorExtensions.cs b/MediaBrowser.Controller/Drawing/ImageProcessorExtensions.cs
index 948219bf5..1b1e386e5 100644
--- a/MediaBrowser.Controller/Drawing/ImageProcessorExtensions.cs
+++ b/MediaBrowser.Controller/Drawing/ImageProcessorExtensions.cs
@@ -9,7 +9,7 @@ namespace MediaBrowser.Controller.Drawing
         {
             return processor.GetImageCacheTag(item, imageType, 0);
         }
-        
+
         public static string GetImageCacheTag(this IImageProcessor processor, BaseItem item, ImageType imageType, int imageIndex)
         {
             var imageInfo = item.GetImageInfo(imageType, imageIndex);
diff --git a/MediaBrowser.Controller/Entities/AggregateFolder.cs b/MediaBrowser.Controller/Entities/AggregateFolder.cs
index a4601c270..6425fa41b 100644
--- a/MediaBrowser.Controller/Entities/AggregateFolder.cs
+++ b/MediaBrowser.Controller/Entities/AggregateFolder.cs
@@ -187,7 +187,7 @@ namespace MediaBrowser.Controller.Entities
         {
             if (child == null)
             {
-                throw new ArgumentNullException();
+                throw new ArgumentNullException(nameof(child));
             }
 
             _virtualChildren.Add(child);
@@ -203,7 +203,7 @@ namespace MediaBrowser.Controller.Entities
         {
             if (id.Equals(Guid.Empty))
             {
-                throw new ArgumentNullException("id");
+                throw new ArgumentNullException(nameof(id));
             }
 
             foreach (var child in _virtualChildren)
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index a268e6d76..8298f4087 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1139,7 +1139,7 @@ namespace MediaBrowser.Controller.Entities
         {
             if (item == null)
             {
-                throw new ArgumentNullException("media");
+                throw new ArgumentNullException(nameof(item));
             }
 
             var protocol = item.PathProtocol;
@@ -1756,7 +1756,7 @@ namespace MediaBrowser.Controller.Entities
         {
             if (user == null)
             {
-                throw new ArgumentNullException("user");
+                throw new ArgumentNullException(nameof(user));
             }
 
             if (!IsVisibleViaTags(user))
@@ -1906,7 +1906,7 @@ namespace MediaBrowser.Controller.Entities
         {
             if (user == null)
             {
-                throw new ArgumentNullException("user");
+                throw new ArgumentNullException(nameof(user));
             }
 
             return IsParentalAllowed(user);
@@ -2087,7 +2087,7 @@ namespace MediaBrowser.Controller.Entities
         {
             if (string.IsNullOrEmpty(name))
             {
-                throw new ArgumentNullException("name");
+                throw new ArgumentNullException(nameof(name));
             }
 
             var current = Studios;
@@ -2100,7 +2100,7 @@ namespace MediaBrowser.Controller.Entities
                 }
                 else
                 {
-                    var list = 
+                    var list =
                     Studios = current.Concat(new [] { name }).ToArray();
                 }
             }
@@ -2120,7 +2120,7 @@ namespace MediaBrowser.Controller.Entities
         {
             if (string.IsNullOrEmpty(name))
             {
-                throw new ArgumentNullException("name");
+                throw new ArgumentNullException(nameof(name));
             }
 
             var genres = Genres;
@@ -2146,7 +2146,7 @@ namespace MediaBrowser.Controller.Entities
         {
             if (user == null)
             {
-                throw new ArgumentNullException();
+                throw new ArgumentNullException(nameof(user));
             }
 
             var data = UserDataManager.GetUserData(user, this);
@@ -2181,7 +2181,7 @@ namespace MediaBrowser.Controller.Entities
         {
             if (user == null)
             {
-                throw new ArgumentNullException();
+                throw new ArgumentNullException(nameof(user));
             }
 
             var data = UserDataManager.GetUserData(user, this);
@@ -2579,7 +2579,7 @@ namespace MediaBrowser.Controller.Entities
         {
             if (user == null)
             {
-                throw new ArgumentNullException("user");
+                throw new ArgumentNullException(nameof(user));
             }
 
             var userdata = UserDataManager.GetUserData(user, this);
@@ -2915,7 +2915,7 @@ namespace MediaBrowser.Controller.Entities
             return GetExtras();
         }
 
-        public virtual bool IsHD { 
+        public virtual bool IsHD {
             get
             {
                 return Height >= 720;
diff --git a/MediaBrowser.Controller/Entities/BaseItemExtensions.cs b/MediaBrowser.Controller/Entities/BaseItemExtensions.cs
index 8ab1788b5..bfd832d34 100644
--- a/MediaBrowser.Controller/Entities/BaseItemExtensions.cs
+++ b/MediaBrowser.Controller/Entities/BaseItemExtensions.cs
@@ -62,13 +62,13 @@ namespace MediaBrowser.Controller.Entities
                 item.SetImagePath(imageType, BaseItem.FileSystem.GetFileInfo(file));
             }
         }
-        
+
         /// <summary>
         /// Copies all properties on object. Skips properties that do not exist.
         /// </summary>
         /// <param name="source">The source object.</param>
         /// <param name="dest">The destination object.</param>
-        public static void DeepCopy<T, TU>(this T source, TU dest) 
+        public static void DeepCopy<T, TU>(this T source, TU dest)
         where T : BaseItem
         where TU : BaseItem
         {
@@ -82,7 +82,7 @@ namespace MediaBrowser.Controller.Entities
                 if (destProps.Any(x => x.Name == sourceProp.Name))
                 {
                     var p = destProps.First(x => x.Name == sourceProp.Name);
-                    p.SetValue(dest, sourceProp.GetValue(source, null), null);                    
+                    p.SetValue(dest, sourceProp.GetValue(source, null), null);
                 }
 
             }
@@ -93,7 +93,7 @@ namespace MediaBrowser.Controller.Entities
         /// Copies all properties on newly created object. Skips properties that do not exist.
         /// </summary>
         /// <param name="source">The source object.</param>
-        public static TU DeepCopy<T, TU>(this T source) 
+        public static TU DeepCopy<T, TU>(this T source)
         where T : BaseItem
         where TU : BaseItem, new()
         {
diff --git a/MediaBrowser.Controller/Entities/Extensions.cs b/MediaBrowser.Controller/Entities/Extensions.cs
index ee135a14e..91f78b902 100644
--- a/MediaBrowser.Controller/Entities/Extensions.cs
+++ b/MediaBrowser.Controller/Entities/Extensions.cs
@@ -17,7 +17,7 @@ namespace MediaBrowser.Controller.Entities
         {
             if (string.IsNullOrEmpty(url))
             {
-                throw new ArgumentNullException("url");
+                throw new ArgumentNullException(nameof(url));
             }
 
             var current = item.RemoteTrailers.FirstOrDefault(i => string.Equals(i.Url, url, StringComparison.OrdinalIgnoreCase));
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index dbe30f9a5..d9952cea8 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -997,7 +997,7 @@ namespace MediaBrowser.Controller.Entities
         {
             if (items == null)
             {
-                throw new ArgumentNullException("items");
+                throw new ArgumentNullException(nameof(items));
             }
 
             if (CollapseBoxSetItems(query, queryParent, user, configurationManager))
@@ -1252,7 +1252,7 @@ namespace MediaBrowser.Controller.Entities
         {
             if (user == null)
             {
-                throw new ArgumentNullException();
+                throw new ArgumentNullException(nameof(user));
             }
 
             //the true root should return our users root folder children
@@ -1332,7 +1332,7 @@ namespace MediaBrowser.Controller.Entities
         {
             if (user == null)
             {
-                throw new ArgumentNullException("user");
+                throw new ArgumentNullException(nameof(user));
             }
 
             var result = new Dictionary<Guid, BaseItem>();
@@ -1705,7 +1705,7 @@ namespace MediaBrowser.Controller.Entities
         {
             get
             {
-                // These are just far too slow. 
+                // These are just far too slow.
                 if (this is ICollectionFolder)
                 {
                     return false;
diff --git a/MediaBrowser.Controller/Entities/ISupportsBoxSetGrouping.cs b/MediaBrowser.Controller/Entities/ISupportsBoxSetGrouping.cs
index fbe5a06d0..7eede6708 100644
--- a/MediaBrowser.Controller/Entities/ISupportsBoxSetGrouping.cs
+++ b/MediaBrowser.Controller/Entities/ISupportsBoxSetGrouping.cs
@@ -3,7 +3,7 @@ namespace MediaBrowser.Controller.Entities
 {
     /// <summary>
     /// Marker interface to denote a class that supports being hidden underneath it's boxset.
-    /// Just about anything can be placed into a boxset, 
+    /// Just about anything can be placed into a boxset,
     /// but movies should also only appear underneath and not outside separately (subject to configuration).
     /// </summary>
     public interface ISupportsBoxSetGrouping
diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
index bb99c0a84..b35e36e1b 100644
--- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
+++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
@@ -158,7 +158,7 @@ namespace MediaBrowser.Controller.Entities
         public bool EnableGroupByMetadataKey { get; set; }
         public bool? HasChapterImages { get; set; }
 
-        public ValueTuple<string, SortOrder>[] OrderBy { get; set; } 
+        public ValueTuple<string, SortOrder>[] OrderBy { get; set; }
 
         public DateTime? MinDateCreated { get; set; }
         public DateTime? MinDateLastSaved { get; set; }
diff --git a/MediaBrowser.Controller/Entities/PeopleHelper.cs b/MediaBrowser.Controller/Entities/PeopleHelper.cs
index 9f85b2aea..d09ef3a15 100644
--- a/MediaBrowser.Controller/Entities/PeopleHelper.cs
+++ b/MediaBrowser.Controller/Entities/PeopleHelper.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,12 +11,12 @@ namespace MediaBrowser.Controller.Entities
         {
             if (person == null)
             {
-                throw new ArgumentNullException("person");
+                throw new ArgumentNullException(nameof(person));
             }
 
             if (string.IsNullOrEmpty(person.Name))
             {
-                throw new ArgumentNullException();
+                throw new ArgumentException("The person's name was empty or null.", nameof(person));
             }
 
             // Normalize
@@ -103,7 +103,7 @@ namespace MediaBrowser.Controller.Entities
         {
             if (string.IsNullOrEmpty(name))
             {
-                throw new ArgumentNullException("name");
+                throw new ArgumentNullException(nameof(name));
             }
 
             foreach (var i in people)
diff --git a/MediaBrowser.Controller/Entities/TagExtensions.cs b/MediaBrowser.Controller/Entities/TagExtensions.cs
index 84e61be4f..3e079a2a8 100644
--- a/MediaBrowser.Controller/Entities/TagExtensions.cs
+++ b/MediaBrowser.Controller/Entities/TagExtensions.cs
@@ -9,7 +9,7 @@ namespace MediaBrowser.Controller.Entities
         {
             if (string.IsNullOrWhiteSpace(name))
             {
-                throw new ArgumentNullException("name");
+                throw new ArgumentNullException(nameof(name));
             }
 
             var current = item.Tags;
diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs
index f569c8021..57e3210a1 100644
--- a/MediaBrowser.Controller/Entities/User.cs
+++ b/MediaBrowser.Controller/Entities/User.cs
@@ -19,7 +19,7 @@ namespace MediaBrowser.Controller.Entities
         public static IXmlSerializer XmlSerializer { get; set; }
 
         /// <summary>
-        /// From now on all user paths will be Id-based. 
+        /// From now on all user paths will be Id-based.
         /// This is for backwards compatibility.
         /// </summary>
         public bool UsesIdForConfigurationPath { get; set; }
@@ -182,7 +182,7 @@ namespace MediaBrowser.Controller.Entities
         {
             if (string.IsNullOrEmpty(newName))
             {
-                throw new ArgumentNullException("newName");
+                throw new ArgumentNullException(nameof(newName));
             }
 
             // If only the casing is changing, leave the file system alone
@@ -259,7 +259,7 @@ namespace MediaBrowser.Controller.Entities
             {
                 if (string.IsNullOrEmpty(username))
                 {
-                    throw new ArgumentNullException("username");
+                    throw new ArgumentNullException(nameof(username));
                 }
 
                 var safeFolderName = FileSystem.GetValidFilename(username);
diff --git a/MediaBrowser.Controller/Entities/UserItemData.cs b/MediaBrowser.Controller/Entities/UserItemData.cs
index 0e1326949..9bd58417a 100644
--- a/MediaBrowser.Controller/Entities/UserItemData.cs
+++ b/MediaBrowser.Controller/Entities/UserItemData.cs
@@ -41,7 +41,7 @@ namespace MediaBrowser.Controller.Entities
                 {
                     if (value.Value < 0 || value.Value > 10)
                     {
-                        throw new ArgumentOutOfRangeException("value", "A 0 to 10 rating is required for UserItemData.");
+                        throw new ArgumentOutOfRangeException(nameof(value), "A 0 to 10 rating is required for UserItemData.");
                     }
                 }
 
@@ -90,7 +90,7 @@ namespace MediaBrowser.Controller.Entities
         public int? SubtitleStreamIndex { get; set; }
 
         public const double MinLikeValue = 6.5;
-    
+
         /// <summary>
         /// This is an interpreted property to indicate likes or dislikes
         /// This should never be serialized.
diff --git a/MediaBrowser.Controller/Entities/UserRootFolder.cs b/MediaBrowser.Controller/Entities/UserRootFolder.cs
index f8e843d92..abfcd7984 100644
--- a/MediaBrowser.Controller/Entities/UserRootFolder.cs
+++ b/MediaBrowser.Controller/Entities/UserRootFolder.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Serialization;
+using MediaBrowser.Model.Serialization;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Library;
 using MediaBrowser.Model.Querying;
@@ -78,7 +78,7 @@ namespace MediaBrowser.Controller.Entities
             return new QueryResult<BaseItem>
             {
                 TotalRecordCount = totalCount,
-                Items = itemsArray
+                Items = itemsArray //TODO Fix The co-variant conversion between Folder[] and BaseItem[], this can generate runtime issues.
             };
         }
 
diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index b50a12d52..284ff2a53 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
@@ -412,7 +412,7 @@ namespace MediaBrowser.Controller.Entities
         {
             return new QueryResult<BaseItem>
             {
-                Items = result.Items,
+                Items = result.Items, //TODO Fix The co-variant conversion between T[] and BaseItem[], this can generate runtime issues if T is not BaseItem.
                 TotalRecordCount = result.TotalRecordCount
             };
         }
diff --git a/MediaBrowser.Controller/IO/FileData.cs b/MediaBrowser.Controller/IO/FileData.cs
index c0cf51ab2..a95d562a2 100644
--- a/MediaBrowser.Controller/IO/FileData.cs
+++ b/MediaBrowser.Controller/IO/FileData.cs
@@ -46,11 +46,11 @@ namespace MediaBrowser.Controller.IO
         {
             if (string.IsNullOrEmpty(path))
             {
-                throw new ArgumentNullException("path");
+                throw new ArgumentNullException(nameof(path));
             }
             if (args == null)
             {
-                throw new ArgumentNullException("args");
+                throw new ArgumentNullException(nameof(args));
             }
 
             var entries = directoryService.GetFileSystemEntries(path);
diff --git a/MediaBrowser.Controller/IServerApplicationHost.cs b/MediaBrowser.Controller/IServerApplicationHost.cs
index 4dc559031..57a3bbc0a 100644
--- a/MediaBrowser.Controller/IServerApplicationHost.cs
+++ b/MediaBrowser.Controller/IServerApplicationHost.cs
@@ -37,7 +37,7 @@ namespace MediaBrowser.Controller
         /// </summary>
         /// <value>The HTTPS port.</value>
         int HttpsPort { get; }
-        
+
         /// <summary>
         /// Gets a value indicating whether [supports HTTPS].
         /// </summary>
diff --git a/MediaBrowser.Controller/IServerApplicationPaths.cs b/MediaBrowser.Controller/IServerApplicationPaths.cs
index e97943cbe..0358b9264 100644
--- a/MediaBrowser.Controller/IServerApplicationPaths.cs
+++ b/MediaBrowser.Controller/IServerApplicationPaths.cs
@@ -15,7 +15,7 @@ namespace MediaBrowser.Controller
         /// </summary>
         /// <value>The application resources path.</value>
         string ApplicationResourcesPath { get; }
-        
+
         /// <summary>
         /// Gets the path to the default user view directory.  Used if no specific user view is defined.
         /// </summary>
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index d572716fa..cefa9ebdf 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Providers;
@@ -163,7 +163,6 @@ namespace MediaBrowser.Controller.Library
         /// Adds the parts.
         /// </summary>
         /// <param name="rules">The rules.</param>
-        /// <param name="pluginFolders">The plugin folders.</param>
         /// <param name="resolvers">The resolvers.</param>
         /// <param name="introProviders">The intro providers.</param>
         /// <param name="itemComparers">The item comparers.</param>
@@ -298,7 +297,7 @@ namespace MediaBrowser.Controller.Library
             string name,
             Guid parentId,
             string viewType,
-            string sortNamen);
+            string sortName);
 
         /// <summary>
         /// Gets the named view.
@@ -547,4 +546,4 @@ namespace MediaBrowser.Controller.Library
             string videoPath,
             string[] files);
     }
-}
\ No newline at end of file
+}
diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs
index d29b164ef..154ef3b05 100644
--- a/MediaBrowser.Controller/Library/IUserManager.cs
+++ b/MediaBrowser.Controller/Library/IUserManager.cs
@@ -123,7 +123,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="user">The user.</param>
         /// <returns>Task.</returns>
         void ResetEasyPassword(User user);
-        
+
         /// <summary>
         /// Changes the password.
         /// </summary>
@@ -133,7 +133,7 @@ namespace MediaBrowser.Controller.Library
         /// Changes the easy password.
         /// </summary>
         void ChangeEasyPassword(User user, string newPassword, string newPasswordSha1);
-        
+
         /// <summary>
         /// Gets the user dto.
         /// </summary>
diff --git a/MediaBrowser.Controller/Library/ItemResolveArgs.cs b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
index 9812802e7..4d1a4ed2f 100644
--- a/MediaBrowser.Controller/Library/ItemResolveArgs.cs
+++ b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
 using System;
 using System.Collections.Generic;
@@ -126,7 +126,7 @@ namespace MediaBrowser.Controller.Library
             {
                 var item = parent as T;
 
-                // Just in case the user decided to nest episodes. 
+                // Just in case the user decided to nest episodes.
                 // Not officially supported but in some cases we can handle it.
                 if (item == null)
                 {
@@ -155,7 +155,7 @@ namespace MediaBrowser.Controller.Library
         {
             if (string.IsNullOrEmpty(path))
             {
-                throw new ArgumentNullException();
+                throw new ArgumentException("The path was empty or null.", nameof(path));
             }
 
             if (AdditionalLocations == null)
@@ -190,7 +190,7 @@ namespace MediaBrowser.Controller.Library
         {
             if (string.IsNullOrEmpty(name))
             {
-                throw new ArgumentNullException();
+                throw new ArgumentException("The name was empty or null.", nameof(name));
             }
 
             return GetFileSystemEntryByPath(System.IO.Path.Combine(Path, name));
@@ -206,7 +206,7 @@ namespace MediaBrowser.Controller.Library
         {
             if (string.IsNullOrEmpty(path))
             {
-                throw new ArgumentNullException();
+                throw new ArgumentException("The path was empty or null.", nameof(path));
             }
 
             foreach (var file in FileSystemChildren)
diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs
index dc95ba112..162ebc75e 100644
--- a/MediaBrowser.Controller/Library/TVUtils.cs
+++ b/MediaBrowser.Controller/Library/TVUtils.cs
@@ -11,7 +11,7 @@ namespace MediaBrowser.Controller.Library
         /// <summary>
         /// The TVDB API key
         /// </summary>
-        public static readonly string TvdbApiKey = "B89CE93890E9419B";
+        public static readonly string TvdbApiKey = "OG4V3YJ3FAP7FP2K";
         public static readonly string TvdbBaseUrl = "https://www.thetvdb.com/";
         /// <summary>
         /// The banner URL
diff --git a/MediaBrowser.Controller/LiveTv/ChannelInfo.cs b/MediaBrowser.Controller/LiveTv/ChannelInfo.cs
index c000da852..f45c7b71a 100644
--- a/MediaBrowser.Controller/LiveTv/ChannelInfo.cs
+++ b/MediaBrowser.Controller/LiveTv/ChannelInfo.cs
@@ -36,7 +36,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value>The tuner host identifier.</value>
         public string TunerHostId { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the type of the channel.
         /// </summary>
diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvService.cs b/MediaBrowser.Controller/LiveTv/ILiveTvService.cs
index 601fb69aa..5986474d8 100644
--- a/MediaBrowser.Controller/LiveTv/ILiveTvService.cs
+++ b/MediaBrowser.Controller/LiveTv/ILiveTvService.cs
@@ -99,7 +99,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// <param name="program">The program.</param>
         /// <returns>Task{SeriesTimerInfo}.</returns>
         Task<SeriesTimerInfo> GetNewTimerDefaultsAsync(CancellationToken cancellationToken, ProgramInfo program = null);
-        
+
         /// <summary>
         /// Gets the series timers asynchronous.
         /// </summary>
diff --git a/MediaBrowser.Controller/LiveTv/LiveTvServiceStatusInfo.cs b/MediaBrowser.Controller/LiveTv/LiveTvServiceStatusInfo.cs
index 4da238acf..20e5d228b 100644
--- a/MediaBrowser.Controller/LiveTv/LiveTvServiceStatusInfo.cs
+++ b/MediaBrowser.Controller/LiveTv/LiveTvServiceStatusInfo.cs
@@ -39,7 +39,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value><c>true</c> if this instance is visible; otherwise, <c>false</c>.</value>
         public bool IsVisible { get; set; }
-        
+
         public LiveTvServiceStatusInfo()
         {
             Tuners = new List<LiveTvTunerInfo>();
diff --git a/MediaBrowser.Controller/LiveTv/LiveTvTunerInfo.cs b/MediaBrowser.Controller/LiveTv/LiveTvTunerInfo.cs
index 5c001f288..ade25abdc 100644
--- a/MediaBrowser.Controller/LiveTv/LiveTvTunerInfo.cs
+++ b/MediaBrowser.Controller/LiveTv/LiveTvTunerInfo.cs
@@ -28,7 +28,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value>The URL.</value>
         public string Url { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the status.
         /// </summary>
@@ -52,7 +52,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value>The name of the program.</value>
         public string ProgramName { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the clients.
         /// </summary>
@@ -64,7 +64,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value><c>true</c> if this instance can reset; otherwise, <c>false</c>.</value>
         public bool CanReset { get; set; }
-        
+
         public LiveTvTunerInfo()
         {
             Clients = new List<string>();
diff --git a/MediaBrowser.Controller/LiveTv/RecordingInfo.cs b/MediaBrowser.Controller/LiveTv/RecordingInfo.cs
index 3006b9bbe..0ca4749d7 100644
--- a/MediaBrowser.Controller/LiveTv/RecordingInfo.cs
+++ b/MediaBrowser.Controller/LiveTv/RecordingInfo.cs
@@ -22,7 +22,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value>The timer identifier.</value>
         public string TimerId { get; set; }
-        
+
         /// <summary>
         /// ChannelId of the recording.
         /// </summary>
@@ -33,7 +33,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value>The type of the channel.</value>
         public ChannelType ChannelType { get; set; }
-     
+
         /// <summary>
         /// Name of the recording.
         /// </summary>
@@ -50,7 +50,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value>The URL.</value>
         public string Url { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the overview.
         /// </summary>
diff --git a/MediaBrowser.Controller/LiveTv/SeriesTimerInfo.cs b/MediaBrowser.Controller/LiveTv/SeriesTimerInfo.cs
index 5c73ed833..a9bb9f4e8 100644
--- a/MediaBrowser.Controller/LiveTv/SeriesTimerInfo.cs
+++ b/MediaBrowser.Controller/LiveTv/SeriesTimerInfo.cs
@@ -15,13 +15,13 @@ namespace MediaBrowser.Controller.LiveTv
         /// ChannelId of the recording.
         /// </summary>
         public string ChannelId { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the program identifier.
         /// </summary>
         /// <value>The program identifier.</value>
         public string ProgramId { get; set; }
-        
+
         /// <summary>
         /// Name of the recording.
         /// </summary>
@@ -66,7 +66,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value><c>true</c> if [record new only]; otherwise, <c>false</c>.</value>
         public bool RecordNewOnly { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the days.
         /// </summary>
@@ -108,7 +108,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value>The series identifier.</value>
         public string SeriesId { get; set; }
-        
+
         public SeriesTimerInfo()
         {
             Days = new List<DayOfWeek>();
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 3decbc42f..5898d8f98 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -3,6 +3,8 @@
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
     <PackageId>Jellyfin.Controller</PackageId>
+    <PackageLicenseUrl>https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt</PackageLicenseUrl>
+    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 4fb9a711e..5dca45c1e 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -740,7 +740,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 level = NormalizeTranscodingLevel(state.OutputVideoCodec, level);
 
                 // h264_qsv and h264_nvenc expect levels to be expressed as a decimal. libx264 supports decimal and non-decimal format
-                // also needed for libx264 due to https://trac.ffmpeg.org/ticket/3307                
+                // also needed for libx264 due to https://trac.ffmpeg.org/ticket/3307
                 if (string.Equals(videoEncoder, "h264_qsv", StringComparison.OrdinalIgnoreCase) ||
                     string.Equals(videoEncoder, "libx264", StringComparison.OrdinalIgnoreCase))
                 {
@@ -1137,7 +1137,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         /// <summary>
         /// Gets the number of audio channels to specify on the command line
         /// </summary>
-        /// <param name="request">The request.</param>
+        /// <param name="state">The state.</param>
         /// <param name="audioStream">The audio stream.</param>
         /// <param name="outputAudioCodec">The output audio codec.</param>
         /// <returns>System.Nullable{System.Int32}.</returns>
@@ -1706,7 +1706,8 @@ namespace MediaBrowser.Controller.MediaEncoding
             if (string.Equals(outputVideoCodec, "libvpx", StringComparison.OrdinalIgnoreCase))
             {
                 // per docs:
-                // -threads	number of threads to use for encoding, can't be 0 [auto] with VP8	(recommended value : number of real cores - 1)
+                // -threads    number of threads to use for encoding, can't be 0 [auto] with VP8
+                //             (recommended value : number of real cores - 1)
                 return Math.Max(Environment.ProcessorCount - 1, 1);
             }
 
@@ -1907,11 +1908,11 @@ namespace MediaBrowser.Controller.MediaEncoding
         {
             if (state == null)
             {
-                throw new ArgumentNullException("state");
+                throw new ArgumentNullException(nameof(state));
             }
             if (mediaSource == null)
             {
-                throw new ArgumentNullException("mediaSource");
+                throw new ArgumentNullException(nameof(mediaSource));
             }
 
             var path = mediaSource.Path;
diff --git a/MediaBrowser.Controller/MediaEncoding/ImageEncodingOptions.cs b/MediaBrowser.Controller/MediaEncoding/ImageEncodingOptions.cs
index a8d1e5a0f..d69c2e47d 100644
--- a/MediaBrowser.Controller/MediaEncoding/ImageEncodingOptions.cs
+++ b/MediaBrowser.Controller/MediaEncoding/ImageEncodingOptions.cs
@@ -4,7 +4,7 @@ namespace MediaBrowser.Controller.MediaEncoding
     public class ImageEncodingOptions
     {
         public string InputPath { get; set; }
-        
+
         public int? Width { get; set; }
 
         public int? Height { get; set; }
@@ -14,7 +14,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         public int? MaxHeight { get; set; }
 
         public int? Quality { get; set; }
-        
+
         public string Format { get; set; }
     }
 }
diff --git a/MediaBrowser.Controller/MediaEncoding/JobLogger.cs b/MediaBrowser.Controller/MediaEncoding/JobLogger.cs
index 8bb826bd1..0554822a8 100644
--- a/MediaBrowser.Controller/MediaEncoding/JobLogger.cs
+++ b/MediaBrowser.Controller/MediaEncoding/JobLogger.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.Extensions;
 using System;
 using System.Globalization;
 using System.IO;
@@ -39,6 +39,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             }
             catch (ObjectDisposedException)
             {
+                //TODO Investigate and properly fix.
                 // Don't spam the log. This doesn't seem to throw in windows, but sometimes under linux
             }
             catch (Exception ex)
diff --git a/MediaBrowser.Controller/Net/AuthorizationInfo.cs b/MediaBrowser.Controller/Net/AuthorizationInfo.cs
index 848d8fa15..86c7b7e0f 100644
--- a/MediaBrowser.Controller/Net/AuthorizationInfo.cs
+++ b/MediaBrowser.Controller/Net/AuthorizationInfo.cs
@@ -9,12 +9,12 @@ namespace MediaBrowser.Controller.Net
         /// Gets or sets the user identifier.
         /// </summary>
         /// <value>The user identifier.</value>
-        public Guid UserId { 
+        public Guid UserId {
             get {
                 return User == null ? Guid.Empty : User.Id;
             }
         }
-                
+
         /// <summary>
         /// Gets or sets the device identifier.
         /// </summary>
diff --git a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
index 31ec149bf..b97b2f97d 100644
--- a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
+++ b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Threading;
 using System.Collections.Generic;
 using System.Globalization;
@@ -50,7 +50,7 @@ namespace MediaBrowser.Controller.Net
         {
             if (logger == null)
             {
-                throw new ArgumentNullException("logger");
+                throw new ArgumentNullException(nameof(logger));
             }
 
             Logger = logger;
@@ -65,7 +65,7 @@ namespace MediaBrowser.Controller.Net
         {
             if (message == null)
             {
-                throw new ArgumentNullException("message");
+                throw new ArgumentNullException(nameof(message));
             }
 
             if (string.Equals(message.MessageType, Name + "Start", StringComparison.OrdinalIgnoreCase))
@@ -93,7 +93,7 @@ namespace MediaBrowser.Controller.Net
 
         protected virtual void ParseMessageParams(string[] values)
         {
-            
+
         }
 
         /// <summary>
@@ -269,7 +269,7 @@ namespace MediaBrowser.Controller.Net
                 }
                 catch (ObjectDisposedException)
                 {
-
+                    //TODO Investigate and properly fix.
                 }
             }
 
@@ -280,10 +280,13 @@ namespace MediaBrowser.Controller.Net
             }
             catch (ObjectDisposedException)
             {
-
+                //TODO Investigate and properly fix.
             }
 
-            ActiveConnections.Remove(connection);
+            lock (ActiveConnections)
+            {
+                ActiveConnections.Remove(connection);
+            }
         }
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Net/IAuthorizationContext.cs b/MediaBrowser.Controller/Net/IAuthorizationContext.cs
index 5a9d0aa30..9b9b2226a 100644
--- a/MediaBrowser.Controller/Net/IAuthorizationContext.cs
+++ b/MediaBrowser.Controller/Net/IAuthorizationContext.cs
@@ -10,7 +10,7 @@ namespace MediaBrowser.Controller.Net
         /// <param name="requestContext">The request context.</param>
         /// <returns>AuthorizationInfo.</returns>
         AuthorizationInfo GetAuthorizationInfo(object requestContext);
-        
+
         /// <summary>
         /// Gets the authorization information.
         /// </summary>
diff --git a/MediaBrowser.Controller/Net/IHttpResultFactory.cs b/MediaBrowser.Controller/Net/IHttpResultFactory.cs
index f8e631de3..d23733f5e 100644
--- a/MediaBrowser.Controller/Net/IHttpResultFactory.cs
+++ b/MediaBrowser.Controller/Net/IHttpResultFactory.cs
@@ -24,7 +24,7 @@ namespace MediaBrowser.Controller.Net
 
         object GetResult(IRequest requestContext, byte[] content, string contentType, IDictionary<string, string> responseHeaders = null);
         object GetResult(IRequest requestContext, Stream content, string contentType, IDictionary<string, string> responseHeaders = null);
-		object GetResult(IRequest requestContext, string content, string contentType, IDictionary<string, string> responseHeaders = null);
+        object GetResult(IRequest requestContext, string content, string contentType, IDictionary<string, string> responseHeaders = null);
 
         object GetRedirectResult(string url);
 
@@ -43,10 +43,10 @@ namespace MediaBrowser.Controller.Net
         /// <param name="responseHeaders">The response headers.</param>
         /// <param name="isHeadRequest">if set to <c>true</c> [is head request].</param>
         /// <returns>System.Object.</returns>
-        Task<object> GetStaticResult(IRequest requestContext, 
-            Guid cacheKey, 
+        Task<object> GetStaticResult(IRequest requestContext,
+            Guid cacheKey,
             DateTime? lastDateModified,
-            TimeSpan? cacheDuration, 
+            TimeSpan? cacheDuration,
             string contentType, Func<Task<Stream>> factoryFn,
             IDictionary<string, string> responseHeaders = null,
             bool isHeadRequest = false);
@@ -74,7 +74,7 @@ namespace MediaBrowser.Controller.Net
         /// <param name="requestContext">The request context.</param>
         /// <param name="options">The options.</param>
         /// <returns>System.Object.</returns>
-        Task<object> GetStaticFileResult(IRequest requestContext, 
+        Task<object> GetStaticFileResult(IRequest requestContext,
             StaticFileResultOptions options);
     }
 }
diff --git a/MediaBrowser.Controller/Net/ISessionContext.cs b/MediaBrowser.Controller/Net/ISessionContext.cs
index 37ddbc2b3..40e76c252 100644
--- a/MediaBrowser.Controller/Net/ISessionContext.cs
+++ b/MediaBrowser.Controller/Net/ISessionContext.cs
@@ -5,7 +5,7 @@ using MediaBrowser.Model.Services;
 
 namespace MediaBrowser.Controller.Net
 {
-    public interface ISessionContext 
+    public interface ISessionContext
     {
         SessionInfo GetSession(object requestContext);
         User GetUser(object requestContext);
diff --git a/MediaBrowser.Controller/Persistence/IUserRepository.cs b/MediaBrowser.Controller/Persistence/IUserRepository.cs
index 2817c4255..7d56924b6 100644
--- a/MediaBrowser.Controller/Persistence/IUserRepository.cs
+++ b/MediaBrowser.Controller/Persistence/IUserRepository.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using System.Collections.Generic;
 using System.Threading;
 
@@ -13,7 +13,6 @@ namespace MediaBrowser.Controller.Persistence
         /// Deletes the user.
         /// </summary>
         /// <param name="user">The user.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
         void DeleteUser(User user);
 
diff --git a/MediaBrowser.Controller/Plugins/ILocalizablePlugin.cs b/MediaBrowser.Controller/Plugins/ILocalizablePlugin.cs
index d294107d7..e914fc200 100644
--- a/MediaBrowser.Controller/Plugins/ILocalizablePlugin.cs
+++ b/MediaBrowser.Controller/Plugins/ILocalizablePlugin.cs
@@ -15,6 +15,6 @@ namespace MediaBrowser.Controller.Plugins
             // Find all dictionaries using GetManifestResourceNames, start start with the prefix
             // Return the one for the culture if exists, otherwise return the default
             return null;
-        } 
+        }
     }
 }
diff --git a/MediaBrowser.Controller/Properties/AssemblyInfo.cs b/MediaBrowser.Controller/Properties/AssemblyInfo.cs
index 844b93f37..007a1d739 100644
--- a/MediaBrowser.Controller/Properties/AssemblyInfo.cs
+++ b/MediaBrowser.Controller/Properties/AssemblyInfo.cs
@@ -1,27 +1,21 @@
-using System.Reflection;
+using System.Reflection;
+using System.Resources;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("MediaBrowser.Controller")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("MediaBrowser.Controller")]
-[assembly: AssemblyCopyright("Copyright ©  2012")]
+[assembly: AssemblyCompany("Jellyfin Project")]
+[assembly: AssemblyProduct("Jellyfin: The Free Software Media System")]
+[assembly: AssemblyCopyright("Copyright ©  2019 Jellyfin Contributors. Code released under the GNU General Public License Version 2")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Providers/ILocalMetadataProvider.cs b/MediaBrowser.Controller/Providers/ILocalMetadataProvider.cs
index fc4cca19c..68f1ae589 100644
--- a/MediaBrowser.Controller/Providers/ILocalMetadataProvider.cs
+++ b/MediaBrowser.Controller/Providers/ILocalMetadataProvider.cs
@@ -18,7 +18,7 @@ namespace MediaBrowser.Controller.Providers
         /// <param name="directoryService">The directory service.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{MetadataResult{`0}}.</returns>
-        Task<MetadataResult<TItemType>> GetMetadata(ItemInfo info, 
+        Task<MetadataResult<TItemType>> GetMetadata(ItemInfo info,
             IDirectoryService directoryService,
             CancellationToken cancellationToken);
     }
diff --git a/MediaBrowser.Controller/Providers/IPreRefreshProvider.cs b/MediaBrowser.Controller/Providers/IPreRefreshProvider.cs
index 608674905..4170bb375 100644
--- a/MediaBrowser.Controller/Providers/IPreRefreshProvider.cs
+++ b/MediaBrowser.Controller/Providers/IPreRefreshProvider.cs
@@ -2,6 +2,6 @@ namespace MediaBrowser.Controller.Providers
 {
     public interface IPreRefreshProvider : ICustomMetadataProvider
     {
-        
+
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Providers/IRemoteImageProvider.cs b/MediaBrowser.Controller/Providers/IRemoteImageProvider.cs
index 5db5ddbb2..32f51c650 100644
--- a/MediaBrowser.Controller/Providers/IRemoteImageProvider.cs
+++ b/MediaBrowser.Controller/Providers/IRemoteImageProvider.cs
@@ -19,7 +19,7 @@ namespace MediaBrowser.Controller.Providers
         /// <param name="item">The item.</param>
         /// <returns>IEnumerable{ImageType}.</returns>
         IEnumerable<ImageType> GetSupportedImages(BaseItem item);
-        
+
         /// <summary>
         /// Gets the images.
         /// </summary>
diff --git a/MediaBrowser.Controller/Providers/RemoteSearchQuery.cs b/MediaBrowser.Controller/Providers/RemoteSearchQuery.cs
index 77cf9e255..9fe6f96bc 100644
--- a/MediaBrowser.Controller/Providers/RemoteSearchQuery.cs
+++ b/MediaBrowser.Controller/Providers/RemoteSearchQuery.cs
@@ -1,3 +1,5 @@
+using System;
+
 namespace MediaBrowser.Controller.Providers
 {
     public class RemoteSearchQuery<T>
@@ -5,7 +7,7 @@ namespace MediaBrowser.Controller.Providers
     {
         public T SearchInfo { get; set; }
 
-        public string ItemId { get; set; }
+        public Guid ItemId { get; set; }
 
         /// <summary>
         /// If set will only search within the given provider
diff --git a/MediaBrowser.Controller/Resolvers/IItemResolver.cs b/MediaBrowser.Controller/Resolvers/IItemResolver.cs
index 3af5d5f7f..298ec248a 100644
--- a/MediaBrowser.Controller/Resolvers/IItemResolver.cs
+++ b/MediaBrowser.Controller/Resolvers/IItemResolver.cs
@@ -29,7 +29,7 @@ namespace MediaBrowser.Controller.Resolvers
     public interface IMultiItemResolver
     {
         MultiItemResolverResult ResolveMultiple(Folder parent,
-            List<FileSystemMetadata> files, 
+            List<FileSystemMetadata> files,
             string collectionType,
             IDirectoryService directoryService);
     }
diff --git a/MediaBrowser.Controller/Security/AuthenticationInfo.cs b/MediaBrowser.Controller/Security/AuthenticationInfo.cs
index c75bf89e4..ecb3866d0 100644
--- a/MediaBrowser.Controller/Security/AuthenticationInfo.cs
+++ b/MediaBrowser.Controller/Security/AuthenticationInfo.cs
@@ -33,7 +33,7 @@ namespace MediaBrowser.Controller.Security
         /// </summary>
         /// <value>The application version.</value>
         public string AppVersion { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the name of the device.
         /// </summary>
diff --git a/MediaBrowser.Controller/Security/AuthenticationInfoQuery.cs b/MediaBrowser.Controller/Security/AuthenticationInfoQuery.cs
index 125534c46..2fa988ec1 100644
--- a/MediaBrowser.Controller/Security/AuthenticationInfoQuery.cs
+++ b/MediaBrowser.Controller/Security/AuthenticationInfoQuery.cs
@@ -21,7 +21,7 @@ namespace MediaBrowser.Controller.Security
         /// </summary>
         /// <value>The access token.</value>
         public string AccessToken { get; set; }
-        
+
         /// <summary>
         /// Gets or sets a value indicating whether this instance is active.
         /// </summary>
@@ -33,7 +33,7 @@ namespace MediaBrowser.Controller.Security
         /// </summary>
         /// <value><c>null</c> if [has user] contains no value, <c>true</c> if [has user]; otherwise, <c>false</c>.</value>
         public bool? HasUser { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the start index.
         /// </summary>
diff --git a/MediaBrowser.Controller/Security/IAuthenticationRepository.cs b/MediaBrowser.Controller/Security/IAuthenticationRepository.cs
index 2843c6b73..4f454f895 100644
--- a/MediaBrowser.Controller/Security/IAuthenticationRepository.cs
+++ b/MediaBrowser.Controller/Security/IAuthenticationRepository.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Devices;
+using MediaBrowser.Model.Devices;
 using MediaBrowser.Model.Querying;
 using System.Threading;
 
@@ -10,7 +10,6 @@ namespace MediaBrowser.Controller.Security
         /// Creates the specified information.
         /// </summary>
         /// <param name="info">The information.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
         void Create(AuthenticationInfo info);
 
@@ -18,7 +17,6 @@ namespace MediaBrowser.Controller.Security
         /// Updates the specified information.
         /// </summary>
         /// <param name="info">The information.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
         void Update(AuthenticationInfo info);
 
diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs
index eca345cbc..1b51ddc16 100644
--- a/MediaBrowser.Controller/Session/ISessionManager.cs
+++ b/MediaBrowser.Controller/Session/ISessionManager.cs
@@ -43,7 +43,7 @@ namespace MediaBrowser.Controller.Session
         event EventHandler<SessionEventArgs> SessionEnded;
 
         event EventHandler<SessionEventArgs> SessionActivity;
-        
+
         /// <summary>
         /// Occurs when [capabilities changed].
         /// </summary>
@@ -58,7 +58,7 @@ namespace MediaBrowser.Controller.Session
         /// Occurs when [authentication succeeded].
         /// </summary>
         event EventHandler<GenericEventArgs<AuthenticationResult>> AuthenticationSucceeded;
-        
+
         /// <summary>
         /// Gets the sessions.
         /// </summary>
@@ -119,7 +119,7 @@ namespace MediaBrowser.Controller.Session
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
         Task SendGeneralCommand(string controllingSessionId, string sessionId, GeneralCommand command, CancellationToken cancellationToken);
-        
+
         /// <summary>
         /// Sends the message command.
         /// </summary>
@@ -189,7 +189,7 @@ namespace MediaBrowser.Controller.Session
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
         Task SendMessageToUserDeviceSessions<T>(string deviceId, string name, T data, CancellationToken cancellationToken);
-        
+
         /// <summary>
         /// Sends the restart required message.
         /// </summary>