Update to 3.5.2 and .net core 2.1

1 files changed, 5 insertions, 7 deletions

diff --git a/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs b/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
index 4a9e417f2..d53606e87 100644
--- a/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
+++ b/Emby.Server.Implementations/HttpClientManager/HttpClientManager.cs
@@ -41,13 +41,12 @@ namespace Emby.Server.Implementations.HttpClientManager
         private readonly IApplicationPaths _appPaths;
 
         private readonly IFileSystem _fileSystem;
-        private readonly IMemoryStreamFactory _memoryStreamProvider;
         private readonly Func<string> _defaultUserAgentFn;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="HttpClientManager" /> class.
         /// </summary>
-        public HttpClientManager(IApplicationPaths appPaths, ILogger logger, IFileSystem fileSystem, IMemoryStreamFactory memoryStreamProvider, Func<string> defaultUserAgentFn)
+        public HttpClientManager(IApplicationPaths appPaths, ILogger logger, IFileSystem fileSystem, Func<string> defaultUserAgentFn)
         {
             if (appPaths == null)
             {
@@ -60,7 +59,6 @@ namespace Emby.Server.Implementations.HttpClientManager
 
             _logger = logger;
             _fileSystem = fileSystem;
-            _memoryStreamProvider = memoryStreamProvider;
             _appPaths = appPaths;
             _defaultUserAgentFn = defaultUserAgentFn;
 
@@ -310,7 +308,7 @@ namespace Emby.Server.Implementations.HttpClientManager
                 {
                     using (var stream = _fileSystem.GetFileStream(responseCachePath, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.Read, true))
                     {
-                        var memoryStream = _memoryStreamProvider.CreateNew();
+                        var memoryStream = new MemoryStream();
 
                         await stream.CopyToAsync(memoryStream).ConfigureAwait(false);
                         memoryStream.Position = 0;
@@ -343,7 +341,7 @@ namespace Emby.Server.Implementations.HttpClientManager
 
             using (var responseStream = response.Content)
             {
-                var memoryStream = _memoryStreamProvider.CreateNew();
+                var memoryStream = new MemoryStream();
                 await responseStream.CopyToAsync(memoryStream).ConfigureAwait(false);
                 memoryStream.Position = 0;
 
@@ -458,7 +456,7 @@ namespace Emby.Server.Implementations.HttpClientManager
 
                     using (var stream = httpResponse.GetResponseStream())
                     {
-                        var memoryStream = _memoryStreamProvider.CreateNew();
+                        var memoryStream = new MemoryStream();
 
                         await stream.CopyToAsync(memoryStream).ConfigureAwait(false);
 
@@ -636,7 +634,7 @@ namespace Emby.Server.Implementations.HttpClientManager
                     {
                         using (var fs = _fileSystem.GetFileStream(tempFile, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, true))
                         {
-                            await StreamHelper.CopyToAsync(httpResponse.GetResponseStream(), fs, StreamDefaults.DefaultCopyToBufferSize, options.Progress, contentLength.Value, options.CancellationToken).ConfigureAwait(false);
+                            await httpResponse.GetResponseStream().CopyToAsync(fs, StreamDefaults.DefaultCopyToBufferSize, options.CancellationToken).ConfigureAwait(false);
                         }
                     }