Merge remote-tracking branch 'upstream/master' into 3.1.7

3 files changed, 4 insertions, 4 deletions

diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index d9a84be5c..155e8cb8a 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -10,6 +10,7 @@ using System.Net.Mime;
 using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Data.Entities;
+using Jellyfin.Data.Events;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Progress;
 using MediaBrowser.Controller;
@@ -23,7 +24,6 @@ using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Subtitles;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Events;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Providers;
diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/AlbumProvider.cs b/MediaBrowser.Providers/Plugins/MusicBrainz/AlbumProvider.cs
index 3550614dd..7f10e6922 100644
--- a/MediaBrowser.Providers/Plugins/MusicBrainz/AlbumProvider.cs
+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/AlbumProvider.cs
@@ -740,11 +740,11 @@ namespace MediaBrowser.Providers.Music
 
             // MusicBrainz request a contact email address is supplied, as comment, in user agent field:
             // https://musicbrainz.org/doc/XML_Web_Service/Rate_Limiting#User-Agent
-            options.Headers.UserAgent.Add(new ProductInfoHeaderValue(string.Format(
+            options.Headers.UserAgent.ParseAdd(string.Format(
                 CultureInfo.InvariantCulture,
                 "{0} ( {1} )",
                 _appHost.ApplicationUserAgent,
-                _appHost.ApplicationUserAgentAddress)));
+                _appHost.ApplicationUserAgentAddress));
 
             HttpResponseMessage response;
             var attempts = 0u;
diff --git a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
index 51c0b7e83..d8918bb6b 100644
--- a/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
@@ -382,7 +382,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
         /// </summary>
         internal Task<HttpResponseMessage> GetMovieDbResponse(HttpRequestMessage message)
         {
-            message.Headers.UserAgent.Add(new ProductInfoHeaderValue(_appHost.ApplicationUserAgent));
+            message.Headers.UserAgent.ParseAdd(_appHost.ApplicationUserAgent);
             return _httpClientFactory.CreateClient().SendAsync(message);
         }