Skip to content

Commit 06c83f0

Browse files
driesengdrieseng
committed
Merge remote-tracking branch 'refs/remotes/origin/develop'
2 parents 7342357 + 7c92997 commit 06c83f0

File tree

98 files changed

+758
-47602
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+758
-47602
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ src/TestResults/
1212
*.user
1313

1414
# NuGet packages
15-
#packages/
15+
packages/
1616

1717
# Visual Studio 2015 cache/options directory
1818
src/.vs/

‎README.md

Lines changed: 41 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -59,41 +59,47 @@ This project was inspired by **Sharp.SSH** library which was ported from java an
5959

6060
In our codebase, we use the following conditional compilation symbols to identity features supported by a given target framework:
6161

62-
Symbol | Description
63-
:------------------------------- | :--------------------------------------------------------------------------------
64-
FEATURE_DIAGNOSTICS_TRACESOURCE | [TraceSource](https://msdn.microsoft.com/en-us/library/system.diagnostics.tracesource.aspx) is available
65-
FEATURE_RNG_CSP | RandomNumberGenerator can be created using default ctor of RNGCryptoServiceProvider
66-
FEATURE_RNG_CREATE | RandomNumberGenerator can be created using static Create method on RandomNumberGenerator
67-
FEATURE_HASH_MD5 |
68-
FEATURE_HASH_SHA1 |
69-
FEATURE_HASH_SHA256 |
70-
FEATURE_HASH_SHA384 |
71-
FEATURE_HASH_SHA512 |
72-
FEATURE_HASH_RIPEMD160 |
73-
FEATURE_HMAC_MD5 |
74-
FEATURE_HMAC_SHA1 |
75-
FEATURE_HMAC_SHA256 |
76-
FEATURE_HMAC_SHA384 |
77-
FEATURE_HMAC_SHA512 |
78-
FEATURE_HMAC_RIPEMD160 |
79-
FEATURE_THREAD_SLEEP | Current thread can be suspended using static Sleep method on Thread class
80-
FEATURE_THREAD_TAP | Task-based Asynchronous Pattern is supported
81-
FEATURE_THREAD_THREADPOOL | ThreadPool is supported
82-
FEATURE_MEMORYSTREAM_GETBUFFER | [MemoryStream](https://msdn.microsoft.com/en-us/library/system.io.memorystream.aspx) features a [GetBuffer()](https://msdn.microsoft.com/en-us/library/system.io.memorystream.getbuffer.aspx) method which allows access to the byte array from which this stream was created, or the underlying array
83-
FEATURE_MEMORYSTREAM_TRYGETBUFFER| [MemoryStream](https://msdn.microsoft.com/en-us/library/system.io.memorystream.aspx) features a [TryGetBuffer(out ArraySegment<byte>)](https://msdn.microsoft.com/en-us/library/system.io.memorystream.trygetbuffer.aspx) method which allows access to the byte array from which this stream was created, or the underlying array
84-
FEATURE_STREAM_TAP | [Stream](https://msdn.microsoft.com/en-us/library/system.io.stream.aspx) supports Task-based Asynchronous Pattern (TAP)
85-
FEATURE_STREAM_APM | [Stream](https://msdn.microsoft.com/en-us/library/system.io.stream.aspx) supports Asynchronous Programming Model (APM)
86-
FEATURE_STREAM_SYNC | [Stream](https://msdn.microsoft.com/en-us/library/system.io.stream.aspx) supports synchronous execution
87-
FEATURE_SOCKET_TAP | [Socket](https://msdn.microsoft.com/en-us/library/system.net.sockets.socket.aspx) supports Task-based Asynchronous Pattern (TAP)
88-
FEATURE_SOCKET_EAP | [Socket](https://msdn.microsoft.com/en-us/library/system.net.sockets.socket.aspx) supports Event-based Asynchronous Pattern (EAP)
89-
FEATURE_SOCKET_APM | [Socket](https://msdn.microsoft.com/en-us/library/system.net.sockets.socket.aspx) supports Asynchronous Programming Model (APM)
90-
FEATURE_SOCKET_SYNC | [Socket](https://msdn.microsoft.com/en-us/library/system.net.sockets.socket.aspx) supports synchronous execution
91-
FEATURE_SOCKET_POLL | [Socket](https://msdn.microsoft.com/en-us/library/system.net.sockets.socket.aspx) features a [Poll(Int32,SelectMode)](https://msdn.microsoft.com/en-us/library/system.net.sockets.socket.poll.aspx) method
92-
FEATURE_DNS_TAP | [Dns](https://msdn.microsoft.com/en-us/library/system.net.dns.aspx) supports Task-based Asynchronous Pattern (TAP)
93-
FEATURE_DNS_EAP | [Dns](https://msdn.microsoft.com/en-us/library/system.net.dns.aspx) supports Event-based Asynchronous Pattern (EAP)
94-
FEATURE_DNS_APM | [Dns](https://msdn.microsoft.com/en-us/library/system.net.dns.aspx) supports Asynchronous Programming Model (APM)
95-
FEATURE_DNS_SYNC | [Dns](https://msdn.microsoft.com/en-us/library/system.net.dns.aspx) supports synchronous execution
96-
FEATURE_REFLECTION_TYPEINFO |
62+
Symbol | Description
63+
:----------------------------------- | :--------------------------------------------------------------------------------
64+
FEATURE_ENCODING_ASCII | [Encoding.ASCII](https://msdn.microsoft.com/en-us/library/system.text.encoding.ascii(v=vs.110).aspx) is available
65+
FEATURE_BINARY_SERIALIZATION | Binary serialization is supported.
66+
FEATURE_DIAGNOSTICS_TRACESOURCE | [TraceSource](https://msdn.microsoft.com/en-us/library/system.diagnostics.tracesource.aspx) is available
67+
FEATURE_DIRECTORYINFO_ENUMERATEFILES | [DirectoryInfo.EnumerationFiles(string)](https://msdn.microsoft.com/en-us/library/dd413343(v=vs.110).aspx) is available
68+
FEATURE_RNG_CSP | RandomNumberGenerator can be created using default ctor of RNGCryptoServiceProvider
69+
FEATURE_RNG_CREATE | RandomNumberGenerator can be created using static Create method on RandomNumberGenerator
70+
FEATURE_HASH_MD5 |
71+
FEATURE_HASH_SHA1_CREATE |
72+
FEATURE_HASH_SHA1_MANAGED |
73+
FEATURE_HASH_SHA256_CREATE |
74+
FEATURE_HASH_SHA256_MANAGED |
75+
FEATURE_HASH_SHA384_CREATE |
76+
FEATURE_HASH_SHA384_MANAGED |
77+
FEATURE_HASH_SHA512_CREATE |
78+
FEATURE_HASH_SHA512_MANAGED |
79+
FEATURE_HASH_RIPEMD160_CREATE |
80+
FEATURE_HASH_RIPEMD160_MANAGED |
81+
FEATURE_HMAC_MD5 |
82+
FEATURE_HMAC_SHA1 |
83+
FEATURE_HMAC_SHA256 |
84+
FEATURE_HMAC_SHA384 |
85+
FEATURE_HMAC_SHA512 |
86+
FEATURE_HMAC_RIPEMD160 |
87+
FEATURE_THREAD_SLEEP | Current thread can be suspended using static Sleep method on Thread class
88+
FEATURE_THREAD_TAP | Task-based Asynchronous Pattern is supported
89+
FEATURE_THREAD_THREADPOOL | ThreadPool is supported
90+
FEATURE_MEMORYSTREAM_GETBUFFER | [MemoryStream](https://msdn.microsoft.com/en-us/library/system.io.memorystream.aspx) features a [GetBuffer()](https://msdn.microsoft.com/en-us/library/system.io.memorystream.getbuffer.aspx) method which allows access to the byte array from which this stream was created, or the underlying array
91+
FEATURE_MEMORYSTREAM_TRYGETBUFFER | [MemoryStream](https://msdn.microsoft.com/en-us/library/system.io.memorystream.aspx) features a [TryGetBuffer(out ArraySegment<byte>)](https://msdn.microsoft.com/en-us/library/system.io.memorystream.trygetbuffer.aspx) method which allows access to the byte array from which this stream was created, or the underlying array
92+
FEATURE_STREAM_TAP | [Stream](https://msdn.microsoft.com/en-us/library/system.io.stream.aspx) supports Task-based Asynchronous Pattern (TAP)
93+
FEATURE_STREAM_APM | [Stream](https://msdn.microsoft.com/en-us/library/system.io.stream.aspx) supports Asynchronous Programming Model (APM)
94+
FEATURE_SOCKET_TAP | [Socket](https://msdn.microsoft.com/en-us/library/system.net.sockets.socket.aspx) supports Task-based Asynchronous Pattern (TAP)
95+
FEATURE_SOCKET_EAP | [Socket](https://msdn.microsoft.com/en-us/library/system.net.sockets.socket.aspx) supports Event-based Asynchronous Pattern (EAP)
96+
FEATURE_SOCKET_APM | [Socket](https://msdn.microsoft.com/en-us/library/system.net.sockets.socket.aspx) supports Asynchronous Programming Model (APM)
97+
FEATURE_SOCKET_SYNC | [Socket](https://msdn.microsoft.com/en-us/library/system.net.sockets.socket.aspx) supports synchronous execution
98+
FEATURE_SOCKET_POLL | [Socket](https://msdn.microsoft.com/en-us/library/system.net.sockets.socket.aspx) features a [Poll(Int32,SelectMode)](https://msdn.microsoft.com/en-us/library/system.net.sockets.socket.poll.aspx) method
99+
FEATURE_DNS_TAP | [Dns](https://msdn.microsoft.com/en-us/library/system.net.dns.aspx) supports Task-based Asynchronous Pattern (TAP)
100+
FEATURE_DNS_APM | [Dns](https://msdn.microsoft.com/en-us/library/system.net.dns.aspx) supports Asynchronous Programming Model (APM)
101+
FEATURE_DNS_SYNC | [Dns](https://msdn.microsoft.com/en-us/library/system.net.dns.aspx) supports synchronous execution
102+
FEATURE_REFLECTION_TYPEINFO |
97103

98104
##Building SSH.NET
99105

‎build/build.proj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
<OutputDirectory>Renci.SshNet\bin\$(Configuration)</OutputDirectory>
2323
<Moniker>net40</Moniker>
2424
</TargetFramework>
25+
<TargetFramework Include=".NETStandard 1.3">
26+
<OutputDirectory>Renci.SshNet.NETCore\bin\$(Configuration)\netstandard1.3</OutputDirectory>
27+
<Moniker>netstandard1.3</Moniker>
28+
</TargetFramework>
2529
<TargetFramework Include="Windows Phone Silverlight 7.1">
2630
<OutputDirectory>Renci.SshNet.WindowsPhone\bin\$(Configuration)</OutputDirectory>
2731
<Moniker>wp71</Moniker>

‎build/nuget/SSH.NET.nuspec

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,22 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>SSH.NET</id>
5-
<version>2016.0.0-beta2</version>
5+
<version>2016.0.0-beta3</version>
66
<title>SSH.NET</title>
77
<authors>Renci</authors>
88
<owners>olegkap,drieseng</owners>
99
<licenseUrl>https://github.com/sshnet/SSH.NET/blob/master/LICENSE</licenseUrl>
1010
<projectUrl>https://github.com/sshnet/SSH.NET/</projectUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1212
<description>SSH.NET is a Secure Shell (SSH) library for .NET, optimized for parallelism and with broad framework support.</description>
13-
<releaseNotes>2016.0.0-beta2
13+
<releaseNotes>2016.0.0-beta3
14+
==============
15+
16+
New Features:
17+
18+
* Added support for .NET Core 1.0 (.NETStandard 1.3)
19+
20+
2016.0.0-beta2
1421
==============
1522

1623
Changes:
@@ -127,21 +134,47 @@ Fixes:
127134
<language>en-US</language>
128135
<tags>ssh scp sftp</tags>
129136
<dependencies>
137+
<group targetFramework="net35" />
138+
<group targetFramework="net40" />
139+
<group targetFramework="netstandard1.3">
140+
<dependency id="Microsoft.CSharp" version="4.0.1" />
141+
<dependency id="SshNet.Security.Cryptography" version="[1.2.0]" />
142+
<dependency id="System.Diagnostics.Debug" version="4.0.11" />
143+
<dependency id="System.Diagnostics.Tools" version="4.0.1" />
144+
<dependency id="System.Diagnostics.TraceSource" version="4.0.0" />
145+
<dependency id="System.Globalization" version="4.0.11" />
146+
<dependency id="System.IO" version="4.1.0" />
147+
<dependency id="System.IO.FileSystem" version="4.0.1" />
148+
<dependency id="System.IO.FileSystem.Primitives" version="4.0.1" />
149+
<dependency id="System.Linq" version="4.1.0" />
150+
<dependency id="System.Net.NameResolution" version="4.0.0" />
151+
<dependency id="System.Net.Sockets" version="4.1.0" />
152+
<dependency id="System.Reflection.Extensions" version="4.0.1" />
153+
<dependency id="System.Runtime.Extensions" version="4.1.0" />
154+
<dependency id="System.Security.Cryptography.Algorithms" version="4.2.0" />
155+
<dependency id="System.Text.RegularExpressions" version="4.1.0" />
156+
<dependency id="System.Threading" version="4.0.11" />
157+
<dependency id="System.Threading.Thread" version="4.0.0" />
158+
<dependency id="System.Threading.ThreadPool" version="4.0.10" />
159+
<dependency id="System.Threading.Timer" version="4.0.1" />
160+
<dependency id="System.Xml.XmlDocument" version="4.0.1" />
161+
<dependency id="System.Xml.XPath.XmlDocument" version="4.0.1" />
162+
</group>
130163
<group targetFramework="sl4">
131-
<dependency id="SshNet.Security.Cryptography" version="[1.0.0]" />
164+
<dependency id="SshNet.Security.Cryptography" version="[1.2.0]" />
132165
</group>
133166
<group targetFramework="sl5">
134-
<dependency id="SshNet.Security.Cryptography" version="[1.0.0]" />
167+
<dependency id="SshNet.Security.Cryptography" version="[1.2.0]" />
135168
</group>
136169
<group targetFramework="wp71">
137-
<dependency id="SshNet.Security.Cryptography" version="[1.0.0]" />
170+
<dependency id="SshNet.Security.Cryptography" version="[1.2.0]" />
138171
</group>
139172
<group targetFramework="wp8">
140-
<dependency id="SshNet.Security.Cryptography" version="[1.0.0]" />
173+
<dependency id="SshNet.Security.Cryptography" version="[1.2.0]" />
141174
</group>
142175
<group targetFramework="uap10.0">
143-
<dependency id="SshNet.Security.Cryptography" version="[1.0.0]" />
144-
<dependency id="System.Xml.XPath.XmlDocument" version="4.0.0" />
176+
<dependency id="SshNet.Security.Cryptography" version="[1.2.0]" />
177+
<dependency id="System.Xml.XPath.XmlDocument" version="4.0.1" />
145178
</group>
146179
</dependencies>
147180
</metadata>

‎packages/Moq.4.2.1409.1722/Moq.4.2.1409.1722.nupkg

-630 KB
Binary file not shown.

‎packages/Moq.4.2.1409.1722/lib/net35/Moq.dll

-662 KB
Binary file not shown.

0 commit comments

Comments
 (0)