Merge remote-tracking branch 'refs/remotes/origin/master' into develop

This commit is contained in:
drieseng
2016-12-16 13:03:22 +01:00
4 changed files with 8 additions and 11 deletions
+2 -2
View File
@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>SSH.NET</id>
<version>2016.0.0</version>
<version>2016.1.0-beta1</version>
<title>SSH.NET</title>
<authors>Renci</authors>
<owners>olegkap,drieseng</owners>
@@ -10,7 +10,7 @@
<projectUrl>https://github.com/sshnet/SSH.NET/</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>SSH.NET is a Secure Shell (SSH) library for .NET, optimized for parallelism and with broad framework support.</description>
<releaseNotes>https://github.com/sshnet/SSH.NET/releases/tag/2016.0.0</releaseNotes>
<releaseNotes>https://github.com/sshnet/SSH.NET/releases/tag/2016.1.0-beta1</releaseNotes>
<summary>A Secure Shell (SSH) library for .NET, optimized for parallelism.</summary>
<copyright>2012-2016, RENCI</copyright>
<language>en-US</language>
@@ -1,14 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
using Renci.SshNet.Channels;
using Renci.SshNet.Common;
using Renci.SshNet.Sftp;
using Renci.SshNet.Sftp.Responses;
namespace Renci.SshNet.Tests.Classes.Sftp
{
@@ -9,9 +9,9 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("2016.1.9999")]
[assembly: AssemblyFileVersion("2016.1.9999")]
[assembly: AssemblyInformationalVersion("2016.1.9999-dev")]
[assembly: AssemblyVersion("2016.1.0")]
[assembly: AssemblyFileVersion("2016.1.0")]
[assembly: AssemblyInformationalVersion("2016.1.0-beta1")]
[assembly: CLSCompliant(false)]
// Setting ComVisible to false makes the types in this assembly not visible
+3 -4
View File
@@ -1,5 +1,4 @@
using System;
using System.Linq;
using System.Text;
using System.Threading;
using Renci.SshNet.Common;
@@ -90,7 +89,7 @@ namespace Renci.SshNet.Sftp
if (realPathFiles != null)
{
canonizedPath = realPathFiles.First().Key;
canonizedPath = realPathFiles[0].Key;
}
if (!string.IsNullOrEmpty(canonizedPath))
@@ -114,7 +113,7 @@ namespace Renci.SshNet.Sftp
if (realPathFiles != null)
{
canonizedPath = realPathFiles.First().Key;
canonizedPath = realPathFiles[0].Key;
}
if (string.IsNullOrEmpty(canonizedPath))
@@ -158,7 +157,7 @@ namespace Renci.SshNet.Sftp
}
// Resolve current directory
WorkingDirectory = RequestRealPath(".").First().Key;
WorkingDirectory = RequestRealPath(".")[0].Key;
}
protected override void OnDataReceived(byte[] data)