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

Author: drieseng

.gitattributes

@@ -2,10 +2,10 @@
 
 *.cs text
 *.xaml text
-*.sln text eol=crlf
-*.csproj text eol=crlf
-*.shproj text eol=crlf
-*.appxmanifest text eol=crlf
+*.sln eol=crlf
+*.csproj eol=crlf
+*.shproj eol=crlf
+*.appxmanifest eol=crlf
 
 *.png binary
 *.jpg binary

README.md

@@ -1,7 +1,14 @@
-#Introduction#
+SSH.NET
+=======
+SSH.NET is a Secure Shell (SSH) library for .NET, optimized for parallelism.
+
+[![Version](https://img.shields.io/nuget/vpre/SSH.NET.svg)](https://www.nuget.org/packages/SSH.NET)
+[![Build status](https://ci.appveyor.com/api/projects/status/ih77qu6tap3o92gu/branch/develop?svg=true)](https://ci.appveyor.com/api/projects/status/ih77qu6tap3o92gu/branch/develop)
+
+##Introduction
 This project was inspired by **Sharp.SSH** library which was ported from java and it seems like was not supported for quite some time. This library is a complete rewrite, without any third party dependencies, using parallelism to achieve the best performance possible.
 
-#Features#
+##Features
 * Execution of SSH command using both synchronous and asynchronous methods
 * Return command execution exit status and other information 
 * Provide SFTP functionality for both synchronous and asynchronous operations
@@ -18,15 +25,15 @@ This project was inspired by **Sharp.SSH** library which was ported from java an
 * Supports two-factor or higher authentication
 * Supports SOCKS4, SOCKS5 and HTTP Proxy
 
-#Key Exchange Method#
+##Key Exchange Method
 
 **SSH.NET** supports the following key exchange methods:
 * diffie-hellman-group-exchange-sha256
 * diffie-hellman-group-exchange-sha1
 * diffie-hellman-group14-sha1
 * diffie-hellman-group1-sha1
 
-#Message Authentication Code#
+##Message Authentication Code
 
 **SSH.NET** supports the following MAC algorithms:
 * hmac-md5
@@ -40,7 +47,7 @@ This project was inspired by **Sharp.SSH** library which was ported from java an
 * hmac-ripemd160
 * [email protected]
 
-#Framework Support#
+##Framework Support
 **SSH.NET** supports the following target frameworks:
 * .NET Framework 3.5 
 * .NET Framework 4.0 
@@ -88,7 +95,7 @@ FEATURE_DNS_APM                  | [Dns](https://msdn.microsoft.com/en-us/librar
 FEATURE_DNS_SYNC                 | [Dns](https://msdn.microsoft.com/en-us/library/system.net.dns.aspx) supports synchronous execution
 FEATURE_REFLECTION_TYPEINFO      |
 
-#Building SSH.NET#
+##Building SSH.NET
 
 Software                          | .NET 3.5 | .NET 4.0 | SL 4 | SL 5 | WP 71 | WP 80 | UAP10
 --------------------------------- | :------: | :------: | :--: | :--: | :---: | :---: | :---:

appveyor.yml

@@ -0,0 +1,14 @@
+os: Visual Studio 2015
+
+before_build:
+  - nuget restore
+
+build:
+  project: src\Renci.SshNet.VS2015.sln
+  verbosity: minimal
+
+test:
+  assemblies: src\Renci.SshNet.Tests\bin\Debug\Renci.SshNet.Tests.dll
+  categories:
+    except:
+    - integration

build/nuget/SSH.NET.nuspec

@@ -10,7 +10,19 @@
         <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>2016.0.0-beta1
+        <releaseNotes>2016.0.0-beta2
+==============
+
+Changes:
+
+    * Improved performance of ScpClient (GitHub issue #21)
+
+Fixes:
+
+    * Terminal width (pixels) is not passed in pty-req
+    * Stopping ForwardedPortDynamic without ever having started would result in a NRE
+
+2016.0.0-beta1
 ==============
 
 New Features:

src/References/X.690-0207.txt

@@ -1,3 +1,3 @@
-Source = http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf
-Code   = .\Renci.SshNet\Common\DerData.cs
+Source = http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf
+Code   = .\Renci.SshNet\Common\DerData.cs
 Uncyclo   = http://en.wikipedia.org/wiki/Distinguished_Encoding_Rules

src/Renci.SshNet.NET35/Common/Extensions.NET35.cs

@@ -1,66 +1,66 @@
-using System;
-using System.Diagnostics;
-using System.Net.Sockets;
-using System.Security.Cryptography;
-using System.Text;
-using System.Threading;
-
-namespace Renci.SshNet
-{
-    /// <summary>
-    /// Collection of different extension method specific for .NET 3.5
-    /// </summary>
-    internal static partial class Extensions
-    {
-        /// <summary>
-        /// Disposes the specified socket.
-        /// </summary>
-        /// <param name="socket">The socket.</param>
-        [DebuggerNonUserCode]
-        internal static void Dispose(this Socket socket)
-        {
-            if (socket == null)
-                throw new NullReferenceException();
-
-            socket.Close();
-        }
-
-        /// <summary>
-        /// Disposes the specified handle.
-        /// </summary>
-        /// <param name="handle">The handle.</param>
-        [DebuggerNonUserCode]
-        internal static void Dispose(this WaitHandle handle)
-        {
-            if (handle == null)
-                throw new NullReferenceException();
-
-            handle.Close();
-        }
-
-        /// <summary>
-        /// Disposes the specified algorithm.
-        /// </summary>
-        /// <param name="algorithm">The algorithm.</param>
-        [DebuggerNonUserCode]
-        internal static void Dispose(this HashAlgorithm algorithm)
-        {
-            if (algorithm == null)
-                throw new NullReferenceException();
-
-            algorithm.Clear();
-        }
-
-        /// <summary>
-        ///     Clears the contents of the string builder.
-        /// </summary>
-        /// <param name="value">
-        ///     The <see cref="StringBuilder"/> to clear.
-        /// </param>
-        public static void Clear(this StringBuilder value)
-        {
-            value.Length = 0;
-            value.Capacity = 16;
-        }
-    }
-}
+using System;
+using System.Diagnostics;
+using System.Net.Sockets;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading;
+
+namespace Renci.SshNet
+{
+    /// <summary>
+    /// Collection of different extension method specific for .NET 3.5
+    /// </summary>
+    internal static partial class Extensions
+    {
+        /// <summary>
+        /// Disposes the specified socket.
+        /// </summary>
+        /// <param name="socket">The socket.</param>
+        [DebuggerNonUserCode]
+        internal static void Dispose(this Socket socket)
+        {
+            if (socket == null)
+                throw new NullReferenceException();
+
+            socket.Close();
+        }
+
+        /// <summary>
+        /// Disposes the specified handle.
+        /// </summary>
+        /// <param name="handle">The handle.</param>
+        [DebuggerNonUserCode]
+        internal static void Dispose(this WaitHandle handle)
+        {
+            if (handle == null)
+                throw new NullReferenceException();
+
+            handle.Close();
+        }
+
+        /// <summary>
+        /// Disposes the specified algorithm.
+        /// </summary>
+        /// <param name="algorithm">The algorithm.</param>
+        [DebuggerNonUserCode]
+        internal static void Dispose(this HashAlgorithm algorithm)
+        {
+            if (algorithm == null)
+                throw new NullReferenceException();
+
+            algorithm.Clear();
+        }
+
+        /// <summary>
+        ///     Clears the contents of the string builder.
+        /// </summary>
+        /// <param name="value">
+        ///     The <see cref="StringBuilder"/> to clear.
+        /// </param>
+        public static void Clear(this StringBuilder value)
+        {
+            value.Length = 0;
+            value.Capacity = 16;
+        }
+    }
+}

src/Renci.SshNet.NET35/Properties/AssemblyInfo.cs

@@ -1,8 +1,8 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("SSH.NET .NET 3.5")]
-[assembly: Guid("a9698831-4993-469b-81f1-aed4e5379252")]
-[assembly: InternalsVisibleTo("Renci.SshNet.Tests.NET35, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f9194e1eb66b7e2575aaee115ee1d27bc100920e7150e43992d6f668f9737de8b9c7ae892b62b8a36dd1d57929ff1541665d101dc476d6e02390846efae7e5186eec409710fdb596e3f83740afef0d4443055937649bc5a773175b61c57615dac0f0fd10f52b52fedf76c17474cc567b3f7a79de95dde842509fb39aaf69c6c2")]
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("SSH.NET .NET 3.5")]
+[assembly: Guid("a9698831-4993-469b-81f1-aed4e5379252")]
+[assembly: InternalsVisibleTo("Renci.SshNet.Tests.NET35, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f9194e1eb66b7e2575aaee115ee1d27bc100920e7150e43992d6f668f9737de8b9c7ae892b62b8a36dd1d57929ff1541665d101dc476d6e02390846efae7e5186eec409710fdb596e3f83740afef0d4443055937649bc5a773175b61c57615dac0f0fd10f52b52fedf76c17474cc567b3f7a79de95dde842509fb39aaf69c6c2")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]