From b22690d98536032f5146e8ec7ddf2175ce1f30bd Mon Sep 17 00:00:00 2001 From: Gert Driesen Date: Mon, 6 Feb 2017 15:15:27 +0100 Subject: [PATCH 1/3] Remove ServiceFactory argument from SftpSession. --- .../Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs | 4 +--- .../Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs | 4 +--- src/Renci.SshNet/ServiceFactory.cs | 2 +- src/Renci.SshNet/Sftp/SftpSession.cs | 4 +--- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs index 86fac6d0..7b05b583 100644 --- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs +++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestRead.cs @@ -14,7 +14,6 @@ namespace Renci.SshNet.Tests.Classes.Sftp public class SftpSessionTest_Connected_RequestRead { private Mock _sessionMock; - private Mock _serviceFactoryMock; private Mock _channelSessionMock; private SftpSession _sftpSession; private int _operationTimeout; @@ -40,7 +39,6 @@ namespace Renci.SshNet.Tests.Classes.Sftp _sessionMock = new Mock(MockBehavior.Strict); _channelSessionMock = new Mock(MockBehavior.Strict); - _serviceFactoryMock = new Mock(MockBehavior.Strict); var sequence = new MockSequence(); @@ -84,7 +82,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp } ); - _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding, _serviceFactoryMock.Object); + _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding); _sftpSession.Connect(); } diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs index 923d87a9..e1075a94 100644 --- a/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs +++ b/src/Renci.SshNet.Tests/Classes/Sftp/SftpSessionTest_Connected_RequestStatVfs.cs @@ -14,7 +14,6 @@ namespace Renci.SshNet.Tests.Classes.Sftp { private Mock _sessionMock; private Mock _channelSessionMock; - private Mock _serviceFactoryMock; private SftpSession _sftpSession; private int _operationTimeout; private SftpFileSytemInformation _actual; @@ -40,7 +39,6 @@ namespace Renci.SshNet.Tests.Classes.Sftp _sessionMock = new Mock(MockBehavior.Strict); _channelSessionMock = new Mock(MockBehavior.Strict); - _serviceFactoryMock = new Mock(MockBehavior.Strict); var sequence = new MockSequence(); @@ -84,7 +82,7 @@ namespace Renci.SshNet.Tests.Classes.Sftp } ); - _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding, _serviceFactoryMock.Object); + _sftpSession = new SftpSession(_sessionMock.Object, _operationTimeout, _encoding); _sftpSession.Connect(); } diff --git a/src/Renci.SshNet/ServiceFactory.cs b/src/Renci.SshNet/ServiceFactory.cs index 47377d1c..b9ad0e95 100644 --- a/src/Renci.SshNet/ServiceFactory.cs +++ b/src/Renci.SshNet/ServiceFactory.cs @@ -51,7 +51,7 @@ namespace Renci.SshNet /// public ISftpSession CreateSftpSession(ISession session, int operationTimeout, Encoding encoding) { - return new SftpSession(session, operationTimeout, encoding, this); + return new SftpSession(session, operationTimeout, encoding); } /// diff --git a/src/Renci.SshNet/Sftp/SftpSession.cs b/src/Renci.SshNet/Sftp/SftpSession.cs index d26cd33f..4f74f884 100644 --- a/src/Renci.SshNet/Sftp/SftpSession.cs +++ b/src/Renci.SshNet/Sftp/SftpSession.cs @@ -17,7 +17,6 @@ namespace Renci.SshNet.Sftp private readonly Dictionary _requests = new Dictionary(); //FIXME: obtain from SftpClient! private readonly List _data = new List(32 * 1024); - private readonly IServiceFactory _serviceFactory; private EventWaitHandle _sftpVersionConfirmed = new AutoResetEvent(false); private IDictionary _supportedExtensions; @@ -50,10 +49,9 @@ namespace Renci.SshNet.Sftp } } - public SftpSession(ISession session, int operationTimeout, Encoding encoding, IServiceFactory serviceFactory) + public SftpSession(ISession session, int operationTimeout, Encoding encoding) : base(session, "sftp", operationTimeout, encoding) { - _serviceFactory = serviceFactory; } /// From 38aff42168c0914f1f944fa5fa90340fe1111055 Mon Sep 17 00:00:00 2001 From: Gert Driesen Date: Mon, 6 Feb 2017 15:15:35 +0100 Subject: [PATCH 2/3] Sync project files. --- src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj | 5 +---- .../Renci.SshNet.Silverlight.csproj | 14 +++++++++++++- .../Renci.SshNet.Silverlight5.csproj | 14 +++++++++++++- src/Renci.SshNet.UAP10/Renci.SshNet.UAP10.csproj | 12 ++++++++++++ .../Renci.SshNet.WindowsPhone.csproj | 12 ++++++++++++ .../Renci.SshNet.WindowsPhone8.csproj | 14 +++++++++++++- 6 files changed, 64 insertions(+), 7 deletions(-) diff --git a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj index 79e43247..73ea2655 100644 --- a/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj +++ b/src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj @@ -890,9 +890,6 @@ Sftp\SftpOpenAsyncResult.cs - - Sftp\SftpOpenDirAsyncResult.cs - Sftp\SftpReadAsyncResult.cs @@ -947,7 +944,7 @@ - +