Merge branch 'master' into nullable3

25 files changed, 326 insertions, 469 deletions

diff --git a/MediaBrowser.Model/Activity/ActivityLogEntry.cs b/MediaBrowser.Model/Activity/ActivityLogEntry.cs
index 865d07b2c4..1d47ef9f69 100644
--- a/MediaBrowser.Model/Activity/ActivityLogEntry.cs
+++ b/MediaBrowser.Model/Activity/ActivityLogEntry.cs
@@ -60,6 +60,7 @@ namespace MediaBrowser.Model.Activity
         /// Gets or sets the user primary image tag.
         /// </summary>
         /// <value>The user primary image tag.</value>
+        [Obsolete("UserPrimaryImageTag is not used.")]
         public string UserPrimaryImageTag { get; set; }
 
         /// <summary>
diff --git a/MediaBrowser.Model/Activity/IActivityManager.cs b/MediaBrowser.Model/Activity/IActivityManager.cs
index f336f5272c..9dab5e77b7 100644
--- a/MediaBrowser.Model/Activity/IActivityManager.cs
+++ b/MediaBrowser.Model/Activity/IActivityManager.cs
@@ -1,6 +1,9 @@
 #pragma warning disable CS1591
 
 using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Jellyfin.Data.Entities;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Querying;
 
@@ -10,10 +13,15 @@ namespace MediaBrowser.Model.Activity
     {
         event EventHandler<GenericEventArgs<ActivityLogEntry>> EntryCreated;
 
-        void Create(ActivityLogEntry entry);
+        void Create(ActivityLog entry);
 
-        QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit);
+        Task CreateAsync(ActivityLog entry);
 
-        QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, bool? hasUserId, int? x, int? y);
+        QueryResult<ActivityLogEntry> GetPagedResult(int? startIndex, int? limit);
+
+        QueryResult<ActivityLogEntry> GetPagedResult(
+            Func<IQueryable<ActivityLog>, IQueryable<ActivityLog>> func,
+            int? startIndex,
+            int? limit);
     }
 }
diff --git a/MediaBrowser.Model/Activity/IActivityRepository.cs b/MediaBrowser.Model/Activity/IActivityRepository.cs
deleted file mode 100644
index 66144ec478..0000000000
--- a/MediaBrowser.Model/Activity/IActivityRepository.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma warning disable CS1591
-
-using System;
-using MediaBrowser.Model.Querying;
-
-namespace MediaBrowser.Model.Activity
-{
-    public interface IActivityRepository
-    {
-        void Create(ActivityLogEntry entry);
-
-        QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, bool? z, int? startIndex, int? limit);
-    }
-}
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 333805e316..60b1e6eae6 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -16,12 +16,16 @@ namespace MediaBrowser.Model.Configuration
         private string _baseUrl;
 
         /// <summary>
-        /// Gets or sets a value indicating whether [enable u pn p].
+        /// Gets or sets a value indicating whether to enable automatic port forwarding.
         /// </summary>
-        /// <value><c>true</c> if [enable u pn p]; otherwise, <c>false</c>.</value>
         public bool EnableUPnP { get; set; }
 
         /// <summary>
+        /// Gets or sets a value indicating whether to enable prometheus metrics exporting.
+        /// </summary>
+        public bool EnableMetrics { get; set; }
+
+        /// <summary>
         /// Gets or sets the public mapped port.
         /// </summary>
         /// <value>The public mapped port.</value>
@@ -46,17 +50,24 @@ namespace MediaBrowser.Model.Configuration
         public int HttpsPortNumber { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether [use HTTPS].
+        /// Gets or sets a value indicating whether to use HTTPS.
         /// </summary>
-        /// <value><c>true</c> if [use HTTPS]; otherwise, <c>false</c>.</value>
+        /// <remarks>
+        /// In order for HTTPS to be used, in addition to setting this to true, valid values must also be
+        /// provided for <see cref="CertificatePath"/> and <see cref="CertificatePassword"/>.
+        /// </remarks>
         public bool EnableHttps { get; set; }
+
         public bool EnableNormalizedItemByNameIds { get; set; }
 
         /// <summary>
-        /// Gets or sets the value pointing to the file system where the ssl certificate is located..
+        /// Gets or sets the filesystem path of an X.509 certificate to use for SSL.
         /// </summary>
-        /// <value>The value pointing to the file system where the ssl certificate is located..</value>
         public string CertificatePath { get; set; }
+
+        /// <summary>
+        /// Gets or sets the password required to access the X.509 certificate data in the file specified by <see cref="CertificatePath"/>.
+        /// </summary>
         public string CertificatePassword { get; set; }
 
         /// <summary>
@@ -66,8 +77,9 @@ namespace MediaBrowser.Model.Configuration
         public bool IsPortAuthorized { get; set; }
 
         public bool AutoRunWebApp { get; set; }
+
         public bool EnableRemoteAccess { get; set; }
-        public bool CameraUploadUpgraded { get; set; }
+
         public bool CollectionsUpgraded { get; set; }
 
         /// <summary>
@@ -83,6 +95,7 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         /// <value>The metadata path.</value>
         public string MetadataPath { get; set; }
+
         public string MetadataNetworkPath { get; set; }
 
         /// <summary>
@@ -205,15 +218,26 @@ namespace MediaBrowser.Model.Configuration
         public int RemoteClientBitrateLimit { get; set; }
 
         public bool EnableFolderView { get; set; }
+
         public bool EnableGroupingIntoCollections { get; set; }
+
         public bool DisplaySpecialsWithinSeasons { get; set; }
+
         public string[] LocalNetworkSubnets { get; set; }
+
         public string[] LocalNetworkAddresses { get; set; }
+
         public string[] CodecsUsed { get; set; }
+
         public bool IgnoreVirtualInterfaces { get; set; }
+
         public bool EnableExternalContentInSuggestions { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the server should force connections over HTTPS.
+        /// </summary>
         public bool RequireHttps { get; set; }
-        public bool IsBehindProxy { get; set; }
+
         public bool EnableNewOmdbSupport { get; set; }
 
         public string[] RemoteIPFilter { get; set; }
@@ -248,6 +272,7 @@ namespace MediaBrowser.Model.Configuration
             PublicHttpsPort = DefaultHttpsPort;
             HttpServerPortNumber = DefaultHttpPort;
             HttpsPortNumber = DefaultHttpsPort;
+            EnableMetrics = false;
             EnableHttps = false;
             EnableDashboardResponseCaching = true;
             EnableCaseSensitiveItemIds = true;
@@ -255,7 +280,7 @@ namespace MediaBrowser.Model.Configuration
             AutoRunWebApp = true;
             EnableRemoteAccess = true;
 
-            EnableUPnP = true;
+            EnableUPnP = false;
             MinResumePct = 5;
             MaxResumePct = 90;
 
diff --git a/MediaBrowser.Model/Devices/DeviceOptions.cs b/MediaBrowser.Model/Devices/DeviceOptions.cs
new file mode 100644
index 0000000000..8b77fd7fc3
--- /dev/null
+++ b/MediaBrowser.Model/Devices/DeviceOptions.cs
@@ -0,0 +1,9 @@
+#pragma warning disable CS1591
+
+namespace MediaBrowser.Model.Devices
+{
+    public class DeviceOptions
+    {
+        public string CustomName { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Devices/DevicesOptions.cs b/MediaBrowser.Model/Devices/DevicesOptions.cs
deleted file mode 100644
index 327b5836f7..0000000000
--- a/MediaBrowser.Model/Devices/DevicesOptions.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-#nullable disable
-#pragma warning disable CS1591
-
-using System;
-
-namespace MediaBrowser.Model.Devices
-{
-    public class DevicesOptions
-    {
-        public string[] EnabledCameraUploadDevices { get; set; }
-
-        public string CameraUploadPath { get; set; }
-
-        public bool EnableCameraUploadSubfolders { get; set; }
-
-        public DevicesOptions()
-        {
-            EnabledCameraUploadDevices = Array.Empty<string>();
-        }
-    }
-
-    public class DeviceOptions
-    {
-        public string CustomName { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/Dlna/CodecProfile.cs b/MediaBrowser.Model/Dlna/CodecProfile.cs
index cc5b840c76..d4fd3e6730 100644
--- a/MediaBrowser.Model/Dlna/CodecProfile.cs
+++ b/MediaBrowser.Model/Dlna/CodecProfile.cs
@@ -2,8 +2,8 @@
 #pragma warning disable CS1591
 
 using System;
+using System.Linq;
 using System.Xml.Serialization;
-using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Dlna
 {
@@ -58,7 +58,7 @@ namespace MediaBrowser.Model.Dlna
 
             foreach (var val in codec)
             {
-                if (ListHelper.ContainsIgnoreCase(codecs, val))
+                if (codecs.Contains(val, StringComparer.OrdinalIgnoreCase))
                 {
                     return true;
                 }
diff --git a/MediaBrowser.Model/Dlna/ConditionProcessor.cs b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
index f3aaef9307..faf1ee41be 100644
--- a/MediaBrowser.Model/Dlna/ConditionProcessor.cs
+++ b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
@@ -1,8 +1,8 @@
 #pragma warning disable CS1591
 
 using System;
+using System.Linq;
 using System.Globalization;
-using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.MediaInfo;
 
 namespace MediaBrowser.Model.Dlna
@@ -167,9 +167,7 @@ namespace MediaBrowser.Model.Dlna
             switch (condition.Condition)
             {
                 case ProfileConditionType.EqualsAny:
-                    {
-                        return ListHelper.ContainsIgnoreCase(expected.Split('|'), currentValue);
-                    }
+                    return expected.Split('|').Contains(currentValue, StringComparer.OrdinalIgnoreCase);
                 case ProfileConditionType.Equals:
                     return string.Equals(currentValue, expected, StringComparison.OrdinalIgnoreCase);
                 case ProfileConditionType.NotEquals:
diff --git a/MediaBrowser.Model/Dlna/ContainerProfile.cs b/MediaBrowser.Model/Dlna/ContainerProfile.cs
index 1d18da6a01..f77d9b2675 100644
--- a/MediaBrowser.Model/Dlna/ContainerProfile.cs
+++ b/MediaBrowser.Model/Dlna/ContainerProfile.cs
@@ -2,8 +2,8 @@
 #pragma warning disable CS1591
 
 using System;
+using System.Linq;
 using System.Xml.Serialization;
-using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Dlna
 {
@@ -74,7 +74,7 @@ namespace MediaBrowser.Model.Dlna
 
                 foreach (var container in allInputContainers)
                 {
-                    if (ListHelper.ContainsIgnoreCase(profileContainers, container))
+                    if (profileContainers.Contains(container, StringComparer.OrdinalIgnoreCase))
                     {
                         return false;
                     }
@@ -88,7 +88,7 @@ namespace MediaBrowser.Model.Dlna
 
                 foreach (var container in allInputContainers)
                 {
-                    if (ListHelper.ContainsIgnoreCase(profileContainers, container))
+                    if (profileContainers.Contains(container, StringComparer.OrdinalIgnoreCase))
                     {
                         return true;
                     }
diff --git a/MediaBrowser.Model/Dlna/DeviceProfile.cs b/MediaBrowser.Model/Dlna/DeviceProfile.cs
index 704d4ec375..6462ffdc13 100644
--- a/MediaBrowser.Model/Dlna/DeviceProfile.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfile.cs
@@ -2,8 +2,8 @@
 #pragma warning disable CS1591
 
 using System;
+using System.Linq;
 using System.Xml.Serialization;
-using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.MediaInfo;
 
 namespace MediaBrowser.Model.Dlna
@@ -94,14 +94,14 @@ namespace MediaBrowser.Model.Dlna
 
         public DeviceProfile()
         {
-            DirectPlayProfiles = new DirectPlayProfile[] { };
-            TranscodingProfiles = new TranscodingProfile[] { };
-            ResponseProfiles = new ResponseProfile[] { };
-            CodecProfiles = new CodecProfile[] { };
-            ContainerProfiles = new ContainerProfile[] { };
+            DirectPlayProfiles = Array.Empty<DirectPlayProfile>();
+            TranscodingProfiles = Array.Empty<TranscodingProfile>();
+            ResponseProfiles = Array.Empty<ResponseProfile>();
+            CodecProfiles = Array.Empty<CodecProfile>();
+            ContainerProfiles = Array.Empty<ContainerProfile>();
             SubtitleProfiles = Array.Empty<SubtitleProfile>();
 
-            XmlRootAttributes = new XmlAttribute[] { };
+            XmlRootAttributes = Array.Empty<XmlAttribute>();
 
             SupportedMediaTypes = "Audio,Photo,Video";
             MaxStreamingBitrate = 8000000;
@@ -130,13 +130,14 @@ namespace MediaBrowser.Model.Dlna
                     continue;
                 }
 
-                if (!ListHelper.ContainsIgnoreCase(i.GetAudioCodecs(), audioCodec ?? string.Empty))
+                if (!i.GetAudioCodecs().Contains(audioCodec ?? string.Empty, StringComparer.OrdinalIgnoreCase))
                 {
                     continue;
                 }
 
                 return i;
             }
+
             return null;
         }
 
@@ -156,7 +157,7 @@ namespace MediaBrowser.Model.Dlna
                     continue;
                 }
 
-                if (!ListHelper.ContainsIgnoreCase(i.GetAudioCodecs(), audioCodec ?? string.Empty))
+                if (!i.GetAudioCodecs().Contains(audioCodec ?? string.Empty, StringComparer.OrdinalIgnoreCase))
                 {
                     continue;
                 }
@@ -186,7 +187,7 @@ namespace MediaBrowser.Model.Dlna
                 }
 
                 var audioCodecs = i.GetAudioCodecs();
-                if (audioCodecs.Length > 0 && !ListHelper.ContainsIgnoreCase(audioCodecs, audioCodec ?? string.Empty))
+                if (audioCodecs.Length > 0 && !audioCodecs.Contains(audioCodec ?? string.Empty, StringComparer.OrdinalIgnoreCase))
                 {
                     continue;
                 }
@@ -289,13 +290,13 @@ namespace MediaBrowser.Model.Dlna
                 }
 
                 var audioCodecs = i.GetAudioCodecs();
-                if (audioCodecs.Length > 0 && !ListHelper.ContainsIgnoreCase(audioCodecs, audioCodec ?? string.Empty))
+                if (audioCodecs.Length > 0 && !audioCodecs.Contains(audioCodec ?? string.Empty, StringComparer.OrdinalIgnoreCase))
                 {
                     continue;
                 }
 
                 var videoCodecs = i.GetVideoCodecs();
-                if (videoCodecs.Length > 0 && !ListHelper.ContainsIgnoreCase(videoCodecs, videoCodec ?? string.Empty))
+                if (videoCodecs.Length > 0 && !videoCodecs.Contains(videoCodec ?? string.Empty, StringComparer.OrdinalIgnoreCase))
                 {
                     continue;
                 }
diff --git a/MediaBrowser.Model/Dlna/SubtitleProfile.cs b/MediaBrowser.Model/Dlna/SubtitleProfile.cs
index f565fb0250..01e3c696b5 100644
--- a/MediaBrowser.Model/Dlna/SubtitleProfile.cs
+++ b/MediaBrowser.Model/Dlna/SubtitleProfile.cs
@@ -1,8 +1,9 @@
 #nullable disable
 #pragma warning disable CS1591
 
+using System;
+using System.Linq;
 using System.Xml.Serialization;
-using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Dlna
 {
@@ -41,7 +42,7 @@ namespace MediaBrowser.Model.Dlna
             }
 
             var languages = GetLanguages();
-            return languages.Length == 0 || ListHelper.ContainsIgnoreCase(languages, subLanguage);
+            return languages.Length == 0 || languages.Contains(subLanguage, StringComparer.OrdinalIgnoreCase);
         }
     }
 }
diff --git a/MediaBrowser.Model/Dto/PublicUserDto.cs b/MediaBrowser.Model/Dto/PublicUserDto.cs
new file mode 100644
index 0000000000..b6bfaf2e9b
--- /dev/null
+++ b/MediaBrowser.Model/Dto/PublicUserDto.cs
@@ -0,0 +1,48 @@
+using System;
+
+namespace MediaBrowser.Model.Dto
+{
+    /// <summary>
+    /// Class PublicUserDto. Its goal is to show only public information about a user
+    /// </summary>
+    public class PublicUserDto : IItemDto
+    {
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the primary image tag.
+        /// </summary>
+        /// <value>The primary image tag.</value>
+        public string PrimaryImageTag { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance has password.
+        /// </summary>
+        /// <value><c>true</c> if this instance has password; otherwise, <c>false</c>.</value>
+        public bool HasPassword { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance has configured password.
+        /// Note that in this case this method should not be here, but it is necessary when changing password at the
+        /// first login.
+        /// </summary>
+        /// <value><c>true</c> if this instance has configured password; otherwise, <c>false</c>.</value>
+        public bool HasConfiguredPassword { get; set; }
+
+        /// <summary>
+        /// Gets or sets the primary image aspect ratio.
+        /// </summary>
+        /// <value>The primary image aspect ratio.</value>
+        public double? PrimaryImageAspectRatio { get; set; }
+
+        /// <inheritdoc />
+        public override string ToString()
+        {
+            return Name ?? base.ToString();
+        }
+    }
+}
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index d68f37c9c6..fa09cc5134 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -35,8 +35,22 @@ namespace MediaBrowser.Model.Entities
         /// <value>The language.</value>
         public string Language { get; set; }
 
+        /// <summary>
+        /// Gets or sets the color transfer.
+        /// </summary>
+        /// <value>The color transfer.</value>
         public string ColorTransfer { get; set; }
+
+        /// <summary>
+        /// Gets or sets the color primaries.
+        /// </summary>
+        /// <value>The color primaries.</value>
         public string ColorPrimaries { get; set; }
+
+        /// <summary>
+        /// Gets or sets the color space.
+        /// </summary>
+        /// <value>The color space.</value>
         public string ColorSpace { get; set; }
 
         /// <summary>
@@ -45,11 +59,28 @@ namespace MediaBrowser.Model.Entities
         /// <value>The comment.</value>
         public string Comment { get; set; }
 
+        /// <summary>
+        /// Gets or sets the time base.
+        /// </summary>
+        /// <value>The time base.</value>
         public string TimeBase { get; set; }
+
+        /// <summary>
+        /// Gets or sets the codec time base.
+        /// </summary>
+        /// <value>The codec time base.</value>
         public string CodecTimeBase { get; set; }
 
+        /// <summary>
+        /// Gets or sets the title.
+        /// </summary>
+        /// <value>The title.</value>
         public string Title { get; set; }
 
+        /// <summary>
+        /// Gets or sets the video range.
+        /// </summary>
+        /// <value>The video range.</value>
         public string VideoRange
         {
             get
@@ -61,7 +92,8 @@ namespace MediaBrowser.Model.Entities
 
                 var colorTransfer = ColorTransfer;
 
-                if (string.Equals(colorTransfer, "smpte2084", StringComparison.OrdinalIgnoreCase))
+                if (string.Equals(colorTransfer, "smpte2084", StringComparison.OrdinalIgnoreCase)
+                    || string.Equals(colorTransfer, "arib-std-b67", StringComparison.OrdinalIgnoreCase))
                 {
                     return "HDR";
                 }
@@ -71,7 +103,9 @@ namespace MediaBrowser.Model.Entities
         }
 
         public string localizedUndefined { get; set; }
+
         public string localizedDefault { get; set; }
+
         public string localizedForced { get; set; }
 
         public string DisplayTitle
@@ -198,34 +232,34 @@ namespace MediaBrowser.Model.Entities
                 {
                     if (i.IsInterlaced)
                     {
-                        return "1440I";
+                        return "1440i";
                     }
-                    return "1440P";
+                    return "1440p";
                 }
                 if (width >= 1900 || height >= 1000)
                 {
                     if (i.IsInterlaced)
                     {
-                        return "1080I";
+                        return "1080i";
                     }
-                    return "1080P";
+                    return "1080p";
                 }
                 if (width >= 1260 || height >= 700)
                 {
                     if (i.IsInterlaced)
                     {
-                        return "720I";
+                        return "720i";
                     }
-                    return "720P";
+                    return "720p";
                 }
                 if (width >= 700 || height >= 440)
                 {
 
                     if (i.IsInterlaced)
                     {
-                        return "480I";
+                        return "480i";
                     }
-                    return "480P";
+                    return "480p";
                 }
 
                 return "SD";
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index eb306906da..70b5cf3b7a 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -1,5 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <!-- ProjectGuid is only included as a requirement for SonarQube analysis -->
+  <PropertyGroup>
+    <ProjectGuid>{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}</ProjectGuid>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
     <PackageId>Jellyfin.Model</PackageId>
@@ -18,9 +23,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.4" />
     <PackageReference Include="System.Globalization" Version="4.3.0" />
-    <PackageReference Include="System.Text.Json" Version="4.7.1" />
+    <PackageReference Include="System.Text.Json" Version="4.7.2" />
   </ItemGroup>
 
   <ItemGroup>
@@ -34,6 +39,9 @@
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
     <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Jellyfin.Data\Jellyfin.Data.csproj" />
+  </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <CodeAnalysisRuleSet>../jellyfin.ruleset</CodeAnalysisRuleSet>
diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs
index cfac4d1e2d..771ca84f7c 100644
--- a/MediaBrowser.Model/Net/MimeTypes.cs
+++ b/MediaBrowser.Model/Net/MimeTypes.cs
@@ -17,112 +17,134 @@ namespace MediaBrowser.Model.Net
         /// </summary>
         private static readonly HashSet<string> _videoFileExtensions = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
         {
-            ".mkv",
-            ".m2t",
-            ".m2ts",
+            ".3gp",
+            ".asf",
+            ".avi",
+            ".divx",
+            ".dvr-ms",
+            ".f4v",
+            ".flv",
             ".img",
             ".iso",
+            ".m2t",
+            ".m2ts",
+            ".m2v",
+            ".m4v",
             ".mk3d",
-            ".ts",
-            ".rmvb",
+            ".mkv",
             ".mov",
-            ".avi",
+            ".mp4",
             ".mpg",
             ".mpeg",
-            ".wmv",
-            ".mp4",
-            ".divx",
-            ".dvr-ms",
-            ".wtv",
+            ".mts",
+            ".ogg",
             ".ogm",
             ".ogv",
-            ".asf",
-            ".m4v",
-            ".flv",
-            ".f4v",
-            ".3gp",
+            ".rec",
+            ".ts",
+            ".rmvb",
             ".webm",
-            ".mts",
-            ".m2v",
-            ".rec"
+            ".wmv",
+            ".wtv",
         };
 
         // http://en.wikipedia.org/wiki/Internet_media_type
+        // https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
+        // http://www.iana.org/assignments/media-types/media-types.xhtml
         // Add more as needed
         private static readonly Dictionary<string, string> _mimeTypeLookup = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
         {
             // Type application
+            { ".7z", "application/x-7z-compressed" },
+            { ".azw", "application/vnd.amazon.ebook" },
+            { ".azw3", "application/vnd.amazon.ebook" },
             { ".cbz", "application/x-cbz" },
             { ".cbr", "application/epub+zip" },
             { ".eot", "application/vnd.ms-fontobject" },
             { ".epub", "application/epub+zip" },
             { ".js", "application/x-javascript" },
             { ".json", "application/json" },
+            { ".m3u8", "application/x-mpegURL" },
             { ".map", "application/x-javascript" },
+            { ".mobi", "application/x-mobipocket-ebook" },
+            { ".opf", "application/oebps-package+xml" },
             { ".pdf", "application/pdf" },
+            { ".rar", "application/vnd.rar" },
+            { ".srt", "application/x-subrip" },
             { ".ttml", "application/ttml+xml" },
-            { ".m3u8", "application/x-mpegURL" },
-            { ".mobi", "application/x-mobipocket-ebook" },
-            { ".xml", "application/xml" },
             { ".wasm", "application/wasm" },
+            { ".xml", "application/xml" },
+            { ".zip", "application/zip" },
 
             // Type image
+            { ".bmp", "image/bmp" },
+            { ".gif", "image/gif" },
+            { ".ico", "image/vnd.microsoft.icon" },
             { ".jpg", "image/jpeg" },
             { ".jpeg", "image/jpeg" },
-            { ".tbn", "image/jpeg" },
             { ".png", "image/png" },
-            { ".gif", "image/gif" },
-            { ".tiff", "image/tiff" },
-            { ".webp", "image/webp" },
-            { ".ico", "image/vnd.microsoft.icon" },
             { ".svg", "image/svg+xml" },
             { ".svgz", "image/svg+xml" },
+            { ".tbn", "image/jpeg" },
+            { ".tif", "image/tiff" },
+            { ".tiff", "image/tiff" },
+            { ".webp", "image/webp" },
 
             // Type font
             { ".ttf" , "font/ttf" },
             { ".woff" , "font/woff" },
+            { ".woff2" , "font/woff2" },
 
             // Type text
             { ".ass", "text/x-ssa" },
             { ".ssa", "text/x-ssa" },
             { ".css", "text/css" },
             { ".csv", "text/csv" },
+            { ".edl", "text/plain" },
+            { ".rtf", "text/rtf" },
             { ".txt", "text/plain" },
             { ".vtt", "text/vtt" },
 
             // Type video
-            { ".mpg", "video/mpeg" },
-            { ".ogv", "video/ogg" },
-            { ".mov", "video/quicktime" },
-            { ".webm", "video/webm" },
-            { ".mkv", "video/x-matroska" },
-            { ".wmv", "video/x-ms-wmv" },
-            { ".flv", "video/x-flv" },
-            { ".avi", "video/x-msvideo" },
-            { ".asf", "video/x-ms-asf" },
-            { ".m4v", "video/x-m4v" },
-            { ".m4s", "video/mp4" },
             { ".3gp", "video/3gpp" },
             { ".3g2", "video/3gpp2" },
+            { ".asf", "video/x-ms-asf" },
+            { ".avi", "video/x-msvideo" },
+            { ".flv", "video/x-flv" },
+            { ".mp4", "video/mp4" },
+            { ".m4s", "video/mp4" },
+            { ".m4v", "video/x-m4v" },
+            { ".mpegts", "video/mp2t" },
+            { ".mpg", "video/mpeg" },
+            { ".mkv", "video/x-matroska" },
+            { ".mov", "video/quicktime" },
             { ".mpd", "video/vnd.mpeg.dash.mpd" },
+            { ".ogv", "video/ogg" },
             { ".ts", "video/mp2t" },
+            { ".webm", "video/webm" },
+            { ".wmv", "video/x-ms-wmv" },
 
             // Type audio
-            { ".mp3", "audio/mpeg" },
-            { ".m4a", "audio/mp4" },
             { ".aac", "audio/mp4" },
-            { ".webma", "audio/webm" },
-            { ".wav", "audio/wav" },
-            { ".wma", "audio/x-ms-wma" },
-            { ".ogg", "audio/ogg" },
-            { ".oga", "audio/ogg" },
-            { ".opus", "audio/ogg" },
             { ".ac3", "audio/ac3" },
+            { ".ape", "audio/x-ape" },
             { ".dsf", "audio/dsf" },
-            { ".m4b", "audio/m4b" },
-            { ".xsp", "audio/xsp" },
             { ".dsp", "audio/dsp" },
             { ".flac", "audio/flac" },
+            { ".m4a", "audio/mp4" },
+            { ".m4b", "audio/m4b" },
+            { ".mid", "audio/midi" },
+            { ".midi", "audio/midi" },
+            { ".mp3", "audio/mpeg" },
+            { ".oga", "audio/ogg" },
+            { ".ogg", "audio/ogg" },
+            { ".opus", "audio/ogg" },
+            { ".vorbis", "audio/vorbis" },
+            { ".wav", "audio/wav" },
+            { ".webma", "audio/webm" },
+            { ".wma", "audio/x-ms-wma" },
+            { ".wv", "audio/x-wavpack" },
+            { ".xsp", "audio/xsp" },
         };
 
         private static readonly Dictionary<string, string> _extensionLookup = CreateExtensionLookup();
diff --git a/MediaBrowser.Model/Net/WebSocketMessage.cs b/MediaBrowser.Model/Net/WebSocketMessage.cs
index 962b81b959..660eebeda6 100644
--- a/MediaBrowser.Model/Net/WebSocketMessage.cs
+++ b/MediaBrowser.Model/Net/WebSocketMessage.cs
@@ -1,6 +1,8 @@
 #nullable disable
 #pragma warning disable CS1591
 
+using System;
+
 namespace MediaBrowser.Model.Net
 {
     /// <summary>
@@ -14,7 +16,9 @@ namespace MediaBrowser.Model.Net
         /// </summary>
         /// <value>The type of the message.</value>
         public string MessageType { get; set; }
-        public string MessageId { get; set; }
+
+        public Guid MessageId { get; set; }
+
         public string ServerId { get; set; }
 
         /// <summary>
@@ -23,5 +27,4 @@ namespace MediaBrowser.Model.Net
         /// <value>The data.</value>
         public T Data { get; set; }
     }
-
 }
diff --git a/MediaBrowser.Model/Notifications/NotificationOptions.cs b/MediaBrowser.Model/Notifications/NotificationOptions.cs
index 7b299b1aaa..9e570ef1c3 100644
--- a/MediaBrowser.Model/Notifications/NotificationOptions.cs
+++ b/MediaBrowser.Model/Notifications/NotificationOptions.cs
@@ -2,7 +2,7 @@
 #pragma warning disable CS1591
 
 using System;
-using MediaBrowser.Model.Extensions;
+using System.Linq;
 using MediaBrowser.Model.Users;
 
 namespace MediaBrowser.Model.Notifications
@@ -93,7 +93,7 @@ namespace MediaBrowser.Model.Notifications
             NotificationOption opt = GetOptions(notificationType);
 
             return opt == null ||
-                   !ListHelper.ContainsIgnoreCase(opt.DisabledServices, service);
+                   !opt.DisabledServices.Contains(service, StringComparer.OrdinalIgnoreCase);
         }
 
         public bool IsEnabledToMonitorUser(string type, Guid userId)
@@ -101,7 +101,7 @@ namespace MediaBrowser.Model.Notifications
             NotificationOption opt = GetOptions(type);
 
             return opt != null && opt.Enabled &&
-                   !ListHelper.ContainsIgnoreCase(opt.DisabledMonitorUsers, userId.ToString(""));
+                   !opt.DisabledMonitorUsers.Contains(userId.ToString(""), StringComparer.OrdinalIgnoreCase);
         }
 
         public bool IsEnabledToSendToUser(string type, string userId, UserPolicy userPolicy)
@@ -120,7 +120,7 @@ namespace MediaBrowser.Model.Notifications
                     return true;
                 }
 
-                return ListHelper.ContainsIgnoreCase(opt.SendToUsers, userId);
+                return opt.SendToUsers.Contains(userId, StringComparer.OrdinalIgnoreCase);
             }
 
             return false;
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index 7582cb7485..a67c38c3ac 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -27,8 +27,6 @@ namespace MediaBrowser.Model.System
     /// </summary>
     public class SystemInfo : PublicSystemInfo
     {
-        public PackageVersionClass SystemUpdateLevel { get; set; }
-
         /// <summary>
         /// Gets or sets the display name of the operating system.
         /// </summary>
@@ -118,24 +116,6 @@ namespace MediaBrowser.Model.System
         public string TranscodingTempPath { get; set; }
 
         /// <summary>
-        /// Gets or sets the HTTP server port number.
-        /// </summary>
-        /// <value>The HTTP server port number.</value>
-        public int HttpServerPortNumber { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether [enable HTTPS].
-        /// </summary>
-        /// <value><c>true</c> if [enable HTTPS]; otherwise, <c>false</c>.</value>
-        public bool SupportsHttps { get; set; }
-
-        /// <summary>
-        /// Gets or sets the HTTPS server port number.
-        /// </summary>
-        /// <value>The HTTPS server port number.</value>
-        public int HttpsPortNumber { get; set; }
-
-        /// <summary>
         /// Gets or sets a value indicating whether this instance has update available.
         /// </summary>
         /// <value><c>true</c> if this instance has update available; otherwise, <c>false</c>.</value>
diff --git a/MediaBrowser.Model/Updates/CheckForUpdateResult.cs b/MediaBrowser.Model/Updates/CheckForUpdateResult.cs
deleted file mode 100644
index 9c59a7c886..0000000000
--- a/MediaBrowser.Model/Updates/CheckForUpdateResult.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-#nullable disable
-namespace MediaBrowser.Model.Updates
-{
-    /// <summary>
-    /// Class CheckForUpdateResult.
-    /// </summary>
-    public class CheckForUpdateResult
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance is update available.
-        /// </summary>
-        /// <value><c>true</c> if this instance is update available; otherwise, <c>false</c>.</value>
-        public bool IsUpdateAvailable { get; set; }
-
-        /// <summary>
-        /// Gets or sets the available version.
-        /// </summary>
-        /// <value>The available version.</value>
-        public string AvailableVersion
-        {
-            get => Package != null ? Package.versionStr : "0.0.0.1";
-            set { } // need this for the serializer
-        }
-
-        /// <summary>
-        /// Get or sets package information for an available update
-        /// </summary>
-        public PackageVersionInfo Package { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/Updates/InstallationInfo.cs b/MediaBrowser.Model/Updates/InstallationInfo.cs
index 4651a4169d..57dc746aca 100644
--- a/MediaBrowser.Model/Updates/InstallationInfo.cs
+++ b/MediaBrowser.Model/Updates/InstallationInfo.cs
@@ -9,10 +9,10 @@ namespace MediaBrowser.Model.Updates
     public class InstallationInfo
     {
         /// <summary>
-        /// Gets or sets the id.
+        /// Gets or sets the guid.
         /// </summary>
-        /// <value>The id.</value>
-        public Guid Id { get; set; }
+        /// <value>The guid.</value>
+        public string Guid { get; set; }
 
         /// <summary>
         /// Gets or sets the name.
@@ -21,21 +21,9 @@ namespace MediaBrowser.Model.Updates
         public string Name { get; set; }
 
         /// <summary>
-        /// Gets or sets the assembly guid.
-        /// </summary>
-        /// <value>The guid of the assembly.</value>
-        public string AssemblyGuid { get; set; }
-
-        /// <summary>
         /// Gets or sets the version.
         /// </summary>
         /// <value>The version.</value>
         public string Version { get; set; }
-
-        /// <summary>
-        /// Gets or sets the update class.
-        /// </summary>
-        /// <value>The update class.</value>
-        public PackageVersionClass UpdateClass { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Updates/PackageInfo.cs b/MediaBrowser.Model/Updates/PackageInfo.cs
index b5a5068e7b..d9eb1386ef 100644
--- a/MediaBrowser.Model/Updates/PackageInfo.cs
+++ b/MediaBrowser.Model/Updates/PackageInfo.cs
@@ -10,72 +10,24 @@ namespace MediaBrowser.Model.Updates
     public class PackageInfo
     {
         /// <summary>
-        /// The internal id of this package.
-        /// </summary>
-        /// <value>The id.</value>
-        public string id { get; set; }
-
-        /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
         public string name { get; set; }
 
         /// <summary>
-        /// Gets or sets the short description.
+        /// Gets or sets a long description of the plugin containing features or helpful explanations.
         /// </summary>
-        /// <value>The short description.</value>
-        public string shortDescription { get; set; }
+        /// <value>The description.</value>
+        public string description { get; set; }
 
         /// <summary>
-        /// Gets or sets the overview.
+        /// Gets or sets a short overview of what the plugin does.
         /// </summary>
         /// <value>The overview.</value>
         public string overview { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether this instance is premium.
-        /// </summary>
-        /// <value><c>true</c> if this instance is premium; otherwise, <c>false</c>.</value>
-        public bool isPremium { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance is adult only content.
-        /// </summary>
-        /// <value><c>true</c> if this instance is adult; otherwise, <c>false</c>.</value>
-        public bool adult { get; set; }
-
-        /// <summary>
-        /// Gets or sets the rich desc URL.
-        /// </summary>
-        /// <value>The rich desc URL.</value>
-        public string richDescUrl { get; set; }
-
-        /// <summary>
-        /// Gets or sets the thumb image.
-        /// </summary>
-        /// <value>The thumb image.</value>
-        public string thumbImage { get; set; }
-
-        /// <summary>
-        /// Gets or sets the preview image.
-        /// </summary>
-        /// <value>The preview image.</value>
-        public string previewImage { get; set; }
-
-        /// <summary>
-        /// Gets or sets the type.
-        /// </summary>
-        /// <value>The type.</value>
-        public string type { get; set; }
-
-        /// <summary>
-        /// Gets or sets the target filename.
-        /// </summary>
-        /// <value>The target filename.</value>
-        public string targetFilename { get; set; }
-
-        /// <summary>
         /// Gets or sets the owner.
         /// </summary>
         /// <value>The owner.</value>
@@ -88,90 +40,24 @@ namespace MediaBrowser.Model.Updates
         public string category { get; set; }
 
         /// <summary>
-        /// Gets or sets the catalog tile color.
-        /// </summary>
-        /// <value>The owner.</value>
-        public string tileColor { get; set; }
-
-        /// <summary>
-        /// Gets or sets the feature id of this package (if premium).
-        /// </summary>
-        /// <value>The feature id.</value>
-        public string featureId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the registration info for this package (if premium).
-        /// </summary>
-        /// <value>The registration info.</value>
-        public string regInfo { get; set; }
-
-        /// <summary>
-        /// Gets or sets the price for this package (if premium).
-        /// </summary>
-        /// <value>The price.</value>
-        public float price { get; set; }
-
-        /// <summary>
-        /// Gets or sets the target system for this plug-in (Server, MBTheater, MBClassic).
-        /// </summary>
-        /// <value>The target system.</value>
-        public PackageTargetSystem targetSystem { get; set; }
-
-        /// <summary>
-        /// The guid of the assembly associated with this package (if a plug-in).
+        /// The guid of the assembly associated with this plugin.
         /// This is used to identify the proper item for automatic updates.
         /// </summary>
         /// <value>The name.</value>
         public string guid { get; set; }
 
         /// <summary>
-        /// Gets or sets the total number of ratings for this package.
-        /// </summary>
-        /// <value>The total ratings.</value>
-        public int? totalRatings { get; set; }
-
-        /// <summary>
-        /// Gets or sets the average rating for this package .
-        /// </summary>
-        /// <value>The rating.</value>
-        public float avgRating { get; set; }
-
-        /// <summary>
-        /// Gets or sets whether or not this package is registered.
-        /// </summary>
-        /// <value>True if registered.</value>
-        public bool isRegistered { get; set; }
-
-        /// <summary>
-        /// Gets or sets the expiration date for this package.
-        /// </summary>
-        /// <value>Expiration Date.</value>
-        public DateTime expDate { get; set; }
-
-        /// <summary>
         /// Gets or sets the versions.
         /// </summary>
         /// <value>The versions.</value>
-        public IReadOnlyList<PackageVersionInfo> versions { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether [enable in application store].
-        /// </summary>
-        /// <value><c>true</c> if [enable in application store]; otherwise, <c>false</c>.</value>
-        public bool enableInAppStore { get; set; }
-
-        /// <summary>
-        /// Gets or sets the installs.
-        /// </summary>
-        /// <value>The installs.</value>
-        public int installs { get; set; }
+        public IReadOnlyList<VersionInfo> versions { get; set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PackageInfo"/> class.
         /// </summary>
         public PackageInfo()
         {
-            versions = Array.Empty<PackageVersionInfo>();
+            versions = Array.Empty<VersionInfo>();
         }
     }
 }
diff --git a/MediaBrowser.Model/Updates/PackageTargetSystem.cs b/MediaBrowser.Model/Updates/PackageTargetSystem.cs
deleted file mode 100644
index 11af7f02dd..0000000000
--- a/MediaBrowser.Model/Updates/PackageTargetSystem.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace MediaBrowser.Model.Updates
-{
-    /// <summary>
-    /// Enum PackageType.
-    /// </summary>
-    public enum PackageTargetSystem
-    {
-        /// <summary>
-        /// Server.
-        /// </summary>
-        Server,
-
-        /// <summary>
-        /// MB Theater.
-        /// </summary>
-        MBTheater,
-
-        /// <summary>
-        /// MB Classic.
-        /// </summary>
-        MBClassic
-    }
-}
diff --git a/MediaBrowser.Model/Updates/PackageVersionClass.cs b/MediaBrowser.Model/Updates/PackageVersionClass.cs
deleted file mode 100644
index f813f2c974..0000000000
--- a/MediaBrowser.Model/Updates/PackageVersionClass.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace MediaBrowser.Model.Updates
-{
-    /// <summary>
-    /// Enum PackageVersionClass.
-    /// </summary>
-    public enum PackageVersionClass
-    {
-        /// <summary>
-        /// The release.
-        /// </summary>
-        Release = 0,
-
-        /// <summary>
-        /// The beta.
-        /// </summary>
-        Beta = 1,
-
-        /// <summary>
-        /// The dev.
-        /// </summary>
-        Dev = 2
-    }
-}
diff --git a/MediaBrowser.Model/Updates/PackageVersionInfo.cs b/MediaBrowser.Model/Updates/PackageVersionInfo.cs
deleted file mode 100644
index 9ef67966bc..0000000000
--- a/MediaBrowser.Model/Updates/PackageVersionInfo.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-#nullable disable
-#pragma warning disable CS1591
-
-using System;
-using System.Text.Json.Serialization;
-
-namespace MediaBrowser.Model.Updates
-{
-    /// <summary>
-    /// Class PackageVersionInfo.
-    /// </summary>
-    public class PackageVersionInfo
-    {
-        /// <summary>
-        /// Gets or sets the name.
-        /// </summary>
-        /// <value>The name.</value>
-        public string name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the guid.
-        /// </summary>
-        /// <value>The guid.</value>
-        public string guid { get; set; }
-
-        /// <summary>
-        /// Gets or sets the version STR.
-        /// </summary>
-        /// <value>The version STR.</value>
-        public string versionStr { get; set; }
-
-        /// <summary>
-        /// The _version
-        /// </summary>
-        private Version _version;
-
-        /// <summary>
-        /// Gets or sets the version.
-        /// Had to make this an interpreted property since Protobuf can't handle Version
-        /// </summary>
-        /// <value>The version.</value>
-        [JsonIgnore]
-        public Version Version
-        {
-            get
-            {
-                if (_version == null)
-                {
-                    var ver = versionStr;
-                    _version = new Version(string.IsNullOrEmpty(ver) ? "0.0.0.1" : ver);
-                }
-
-                return _version;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the classification.
-        /// </summary>
-        /// <value>The classification.</value>
-        public PackageVersionClass classification { get; set; }
-
-        /// <summary>
-        /// Gets or sets the description.
-        /// </summary>
-        /// <value>The description.</value>
-        public string description { get; set; }
-
-        /// <summary>
-        /// Gets or sets the required version STR.
-        /// </summary>
-        /// <value>The required version STR.</value>
-        public string requiredVersionStr { get; set; }
-
-        /// <summary>
-        /// Gets or sets the source URL.
-        /// </summary>
-        /// <value>The source URL.</value>
-        public string sourceUrl { get; set; }
-
-        /// <summary>
-        /// Gets or sets the source URL.
-        /// </summary>
-        /// <value>The source URL.</value>
-        public string checksum { get; set; }
-
-        /// <summary>
-        /// Gets or sets the target filename.
-        /// </summary>
-        /// <value>The target filename.</value>
-        public string targetFilename { get; set; }
-
-        public string infoUrl { get; set; }
-
-        public string runtimes { get; set; }
-    }
-}
diff --git a/MediaBrowser.Model/Updates/VersionInfo.cs b/MediaBrowser.Model/Updates/VersionInfo.cs
new file mode 100644
index 0000000000..fe5826ad2f
--- /dev/null
+++ b/MediaBrowser.Model/Updates/VersionInfo.cs
@@ -0,0 +1,58 @@
+using System;
+
+namespace MediaBrowser.Model.Updates
+{
+    /// <summary>
+    /// Class PackageVersionInfo.
+    /// </summary>
+    public class VersionInfo
+    {
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the guid.
+        /// </summary>
+        /// <value>The guid.</value>
+        public string guid { get; set; }
+
+        /// <summary>
+        /// Gets or sets the version.
+        /// </summary>
+        /// <value>The version.</value>
+        public Version version { get; set; }
+
+        /// <summary>
+        /// Gets or sets the changelog for this version.
+        /// </summary>
+        /// <value>The changelog.</value>
+        public string changelog { get; set; }
+
+        /// <summary>
+        /// Gets or sets the ABI that this version was built against.
+        /// </summary>
+        /// <value>The target ABI version.</value>
+        public string targetAbi { get; set; }
+
+        /// <summary>
+        /// Gets or sets the source URL.
+        /// </summary>
+        /// <value>The source URL.</value>
+        public string sourceUrl { get; set; }
+
+        /// <summary>
+        /// Gets or sets a checksum for the binary.
+        /// </summary>
+        /// <value>The checksum.</value>
+        public string checksum { get; set; }
+
+        /// <summary>
+        /// Gets or sets the target filename for the downloaded binary.
+        /// </summary>
+        /// <value>The target filename.</value>
+        public string filename { get; set; }
+    }
+}