Merge branch 'master' into nullable2

5 files changed, 27 insertions, 5 deletions

diff --git a/MediaBrowser.Model/Devices/ContentUploadHistory.cs b/MediaBrowser.Model/Devices/ContentUploadHistory.cs
index 5dd9bf2d0..7b58eadf7 100644
--- a/MediaBrowser.Model/Devices/ContentUploadHistory.cs
+++ b/MediaBrowser.Model/Devices/ContentUploadHistory.cs
@@ -1,3 +1,6 @@
+#pragma warning disable CS1591
+#pragma warning disable SA1600
+
 namespace MediaBrowser.Model.Devices
 {
     public class ContentUploadHistory
diff --git a/MediaBrowser.Model/Devices/DeviceInfo.cs b/MediaBrowser.Model/Devices/DeviceInfo.cs
index 214c49e5e..55149a02d 100644
--- a/MediaBrowser.Model/Devices/DeviceInfo.cs
+++ b/MediaBrowser.Model/Devices/DeviceInfo.cs
@@ -1,3 +1,6 @@
+#pragma warning disable CS1591
+#pragma warning disable SA1600
+
 using System;
 using MediaBrowser.Model.Session;
 
@@ -5,6 +8,11 @@ namespace MediaBrowser.Model.Devices
 {
     public class DeviceInfo
     {
+        public DeviceInfo()
+        {
+            Capabilities = new ClientCapabilities();
+        }
+        
         public string Name { get; set; }
 
         /// <summary>
@@ -12,42 +20,43 @@ namespace MediaBrowser.Model.Devices
         /// </summary>
         /// <value>The identifier.</value>
         public string Id { get; set; }
+
         /// <summary>
         /// Gets or sets the last name of the user.
         /// </summary>
         /// <value>The last name of the user.</value>
         public string LastUserName { get; set; }
+
         /// <summary>
         /// Gets or sets the name of the application.
         /// </summary>
         /// <value>The name of the application.</value>
         public string AppName { get; set; }
+
         /// <summary>
         /// Gets or sets the application version.
         /// </summary>
         /// <value>The application version.</value>
         public string AppVersion { get; set; }
+
         /// <summary>
         /// Gets or sets the last user identifier.
         /// </summary>
         /// <value>The last user identifier.</value>
         public Guid LastUserId { get; set; }
+
         /// <summary>
         /// Gets or sets the date last modified.
         /// </summary>
         /// <value>The date last modified.</value>
         public DateTime DateLastActivity { get; set; }
+
         /// <summary>
         /// Gets or sets the capabilities.
         /// </summary>
         /// <value>The capabilities.</value>
         public ClientCapabilities Capabilities { get; set; }
 
-        public DeviceInfo()
-        {
-            Capabilities = new ClientCapabilities();
-        }
-
         public string IconUrl { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Devices/DeviceQuery.cs b/MediaBrowser.Model/Devices/DeviceQuery.cs
index 48d7ec142..56b9c201a 100644
--- a/MediaBrowser.Model/Devices/DeviceQuery.cs
+++ b/MediaBrowser.Model/Devices/DeviceQuery.cs
@@ -1,3 +1,6 @@
+#pragma warning disable CS1591
+#pragma warning disable SA1600
+
 using System;
 
 namespace MediaBrowser.Model.Devices
@@ -9,6 +12,7 @@ namespace MediaBrowser.Model.Devices
         /// </summary>
         /// <value><c>null</c> if [supports synchronize] contains no value, <c>true</c> if [supports synchronize]; otherwise, <c>false</c>.</value>
         public bool? SupportsSync { get; set; }
+
         /// <summary>
         /// Gets or sets the user identifier.
         /// </summary>
diff --git a/MediaBrowser.Model/Devices/DevicesOptions.cs b/MediaBrowser.Model/Devices/DevicesOptions.cs
index 5bbd33b73..95bccd559 100644
--- a/MediaBrowser.Model/Devices/DevicesOptions.cs
+++ b/MediaBrowser.Model/Devices/DevicesOptions.cs
@@ -1,3 +1,6 @@
+#pragma warning disable CS1591
+#pragma warning disable SA1600
+
 using System;
 
 namespace MediaBrowser.Model.Devices
diff --git a/MediaBrowser.Model/Devices/LocalFileInfo.cs b/MediaBrowser.Model/Devices/LocalFileInfo.cs
index cc5c9250b..7a8e31f41 100644
--- a/MediaBrowser.Model/Devices/LocalFileInfo.cs
+++ b/MediaBrowser.Model/Devices/LocalFileInfo.cs
@@ -1,3 +1,6 @@
+#pragma warning disable CS1591
+#pragma warning disable SA1600
+
 namespace MediaBrowser.Model.Devices
 {
     public class LocalFileInfo