Merge remote-tracking branch 'upstream/master' into external-id-type

4 files changed, 2 insertions, 28 deletions

diff --git a/MediaBrowser.Model/Devices/ContentUploadHistory.cs b/MediaBrowser.Model/Devices/ContentUploadHistory.cs
deleted file mode 100644
index c493760d51..0000000000
--- a/MediaBrowser.Model/Devices/ContentUploadHistory.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Model.Devices
-{
-    public class ContentUploadHistory
-    {
-        public string DeviceId { get; set; }
-        public LocalFileInfo[] FilesUploaded { get; set; }
-
-        public ContentUploadHistory()
-        {
-            FilesUploaded = new LocalFileInfo[] { };
-        }
-    }
-}
diff --git a/MediaBrowser.Model/Devices/DeviceInfo.cs b/MediaBrowser.Model/Devices/DeviceInfo.cs
index d2563d1d0f..0cccf931c4 100644
--- a/MediaBrowser.Model/Devices/DeviceInfo.cs
+++ b/MediaBrowser.Model/Devices/DeviceInfo.cs
@@ -1,3 +1,4 @@
+#nullable disable
 #pragma warning disable CS1591
 
 using System;
diff --git a/MediaBrowser.Model/Devices/DeviceOptions.cs b/MediaBrowser.Model/Devices/DeviceOptions.cs
index 8b77fd7fc3..037ffeb5e8 100644
--- a/MediaBrowser.Model/Devices/DeviceOptions.cs
+++ b/MediaBrowser.Model/Devices/DeviceOptions.cs
@@ -4,6 +4,6 @@ namespace MediaBrowser.Model.Devices
 {
     public class DeviceOptions
     {
-        public string CustomName { get; set; }
+        public string? CustomName { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Devices/LocalFileInfo.cs b/MediaBrowser.Model/Devices/LocalFileInfo.cs
deleted file mode 100644
index 63a8dc2aa5..0000000000
--- a/MediaBrowser.Model/Devices/LocalFileInfo.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Model.Devices
-{
-    public class LocalFileInfo
-    {
-        public string Name { get; set; }
-        public string Id { get; set; }
-        public string Album { get; set; }
-        public string MimeType { get; set; }
-    }
-}