diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-11-03 19:59:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-03 19:59:50 -0400 |
| commit | c53745548ac2130f4cfbbe0d7a2804c36c8ae4eb (patch) | |
| tree | 6ee298ebb5470c4f3bcbef8d814a0354901469c4 /MediaBrowser.Common | |
| parent | 338b04a0c58729ec70aed89924ea6bd12422872b (diff) | |
| parent | 405a5f69c5967b4d919b5fe91396f12cb83e8aa8 (diff) | |
Merge pull request #2267 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Common')
| -rw-r--r-- | MediaBrowser.Common/Net/HttpRequestOptions.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Common/Properties/AssemblyInfo.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Common/Updates/IInstallationManager.cs | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/MediaBrowser.Common/Net/HttpRequestOptions.cs b/MediaBrowser.Common/Net/HttpRequestOptions.cs index f70986d67..e1ecd6595 100644 --- a/MediaBrowser.Common/Net/HttpRequestOptions.cs +++ b/MediaBrowser.Common/Net/HttpRequestOptions.cs @@ -17,7 +17,7 @@ namespace MediaBrowser.Common.Net /// <value>The URL.</value> public string Url { get; set; } - public DecompressionMethods? DecompressionMethod { get; set; } + public CompressionMethod? DecompressionMethod { get; set; } /// <summary> /// Gets or sets the accept header. @@ -141,4 +141,10 @@ namespace MediaBrowser.Common.Net None = 0, Unconditional = 1 } + + public enum CompressionMethod + { + Deflate, + Gzip + } } diff --git a/MediaBrowser.Common/Properties/AssemblyInfo.cs b/MediaBrowser.Common/Properties/AssemblyInfo.cs index d7bbb6f3a..09fd68f93 100644 --- a/MediaBrowser.Common/Properties/AssemblyInfo.cs +++ b/MediaBrowser.Common/Properties/AssemblyInfo.cs @@ -18,9 +18,6 @@ using System.Runtime.InteropServices; // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("cdec1bb7-6ffd-409f-b41f-0524a73df9be")] - // Version information for an assembly consists of the following four values: // // Major Version diff --git a/MediaBrowser.Common/Updates/IInstallationManager.cs b/MediaBrowser.Common/Updates/IInstallationManager.cs index f7a202f97..636526567 100644 --- a/MediaBrowser.Common/Updates/IInstallationManager.cs +++ b/MediaBrowser.Common/Updates/IInstallationManager.cs @@ -2,7 +2,6 @@ using MediaBrowser.Model.Events; using MediaBrowser.Model.Updates; using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; @@ -24,7 +23,7 @@ namespace MediaBrowser.Common.Updates /// <summary> /// The completed installations /// </summary> - ConcurrentBag<InstallationInfo> CompletedInstallations { get; set; } + IEnumerable<InstallationInfo> CompletedInstallations { get; } /// <summary> /// Occurs when [plugin uninstalled]. |