Skip to content

Commit 351e3c0

Browse files
driesengdrieseng
committed
Merge remote-tracking branch 'refs/remotes/origin/develop'
2 parents fe5e57b + 32becde commit 351e3c0

File tree

120 files changed

+3312
-1269
lines changed

Some content is hidden

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

120 files changed

+3312
-1269
lines changed

‎appveyor.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ test:
1111
assemblies: src\Renci.SshNet.Tests\bin\Debug\Renci.SshNet.Tests.dll
1212
categories:
1313
except:
14-
- integration
14+
- integration
15+
- LongRunning

‎src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<DebugType>full</DebugType>
1919
<Optimize>false</Optimize>
2020
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>TRACE;DEBUG;FEATURE_REGEX_COMPILE;FEATURE_BINARY_SERIALIZATION;FEATURE_RNG_CREATE;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_ENCODING_ASCII</DefineConstants>
21+
<DefineConstants>TRACE;DEBUG;FEATURE_REGEX_COMPILE;FEATURE_BINARY_SERIALIZATION;FEATURE_RNG_CREATE;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_ENCODING_ASCII</DefineConstants>
2222
<ErrorReport>prompt</ErrorReport>
2323
<WarningLevel>4</WarningLevel>
2424
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -28,7 +28,7 @@
2828
<DebugType>none</DebugType>
2929
<Optimize>true</Optimize>
3030
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE;FEATURE_REGEX_COMPILE;FEATURE_BINARY_SERIALIZATION;FEATURE_RNG_CREATE;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_ENCODING_ASCII</DefineConstants>
31+
<DefineConstants>TRACE;FEATURE_REGEX_COMPILE;FEATURE_BINARY_SERIALIZATION;FEATURE_RNG_CREATE;FEATURE_SOCKET_SYNC;FEATURE_SOCKET_EAP;FEATURE_SOCKET_APM;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_SOCKET_POLL;FEATURE_STREAM_APM;FEATURE_DNS_SYNC;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_HASH_MD5;FEATURE_HASH_SHA1_CREATE;FEATURE_HASH_SHA256_CREATE;FEATURE_HASH_SHA384_CREATE;FEATURE_HASH_SHA512_CREATE;FEATURE_HASH_RIPEMD160_CREATE;FEATURE_HMAC_MD5;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256;FEATURE_HMAC_SHA384;FEATURE_HMAC_SHA512;FEATURE_HMAC_RIPEMD160;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_DIAGNOSTICS_TRACESOURCE;FEATURE_ENCODING_ASCII</DefineConstants>
3232
<ErrorReport>prompt</ErrorReport>
3333
<WarningLevel>4</WarningLevel>
3434
<DocumentationFile>bin\Release\Renci.SshNet.xml</DocumentationFile>
@@ -165,6 +165,9 @@
165165
<Compile Include="..\Renci.SshNet\Common\ChannelRequestEventArgs.cs">
166166
<Link>Common\ChannelRequestEventArgs.cs</Link>
167167
</Compile>
168+
<Compile Include="..\Renci.SshNet\Common\CountdownEvent.cs">
169+
<Link>Common\CountdownEvent.cs</Link>
170+
</Compile>
168171
<Compile Include="..\Renci.SshNet\Common\DerData.cs">
169172
<Link>Common\DerData.cs</Link>
170173
</Compile>
@@ -279,6 +282,9 @@
279282
<Compile Include="..\Renci.SshNet\ForwardedPortRemote.cs">
280283
<Link>ForwardedPortRemote.cs</Link>
281284
</Compile>
285+
<Compile Include="..\Renci.SshNet\ForwardedPortStatus.cs">
286+
<Link>ForwardedPortStatus.cs</Link>
287+
</Compile>
282288
<Compile Include="..\Renci.SshNet\HashInfo.cs">
283289
<Link>HashInfo.cs</Link>
284290
</Compile>
@@ -913,7 +919,7 @@
913919
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
914920
<ProjectExtensions>
915921
<VisualStudio>
916-
<UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
922+
<UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
917923
</VisualStudio>
918924
</ProjectExtensions>
919925
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/Renci.SshNet.NETCore/project.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,12 @@
6565
"FEATURE_RNG_CREATE",
6666
"FEATURE_SOCKET_TAP",
6767
"FEATURE_SOCKET_EAP",
68-
"FEATURE_SOCKET_POLL",
6968
"FEATURE_SOCKET_SYNC",
69+
"FEATURE_SOCKET_SETSOCKETOPTION",
70+
"FEATURE_SOCKET_POLL",
7071
"FEATURE_DNS_TAP",
7172
"FEATURE_STREAM_TAP",
73+
"FEATURE_THREAD_COUNTDOWNEVENT",
7274
"FEATURE_THREAD_THREADPOOL",
7375
"FEATURE_THREAD_SLEEP",
7476
"FEATURE_HASH_MD5",

‎src/Renci.SshNet.Silverlight/Renci.SshNet.Silverlight.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,9 @@
183183
<Compile Include="..\Renci.SshNet\Common\ChannelRequestEventArgs.cs">
184184
<Link>Common\ChannelRequestEventArgs.cs</Link>
185185
</Compile>
186+
<Compile Include="..\Renci.SshNet\Common\CountdownEvent.cs">
187+
<Link>Common\CountdownEvent.cs</Link>
188+
</Compile>
186189
<Compile Include="..\Renci.SshNet\Common\DerData.cs">
187190
<Link>Common\DerData.cs</Link>
188191
</Compile>
@@ -288,6 +291,9 @@
288291
<Compile Include="..\Renci.SshNet\ForwardedPortRemote.cs">
289292
<Link>ForwardedPortRemote.cs</Link>
290293
</Compile>
294+
<Compile Include="..\Renci.SshNet\ForwardedPortStatus.cs">
295+
<Link>ForwardedPortStatus.cs</Link>
296+
</Compile>
291297
<Compile Include="..\Renci.SshNet\HashInfo.cs">
292298
<Link>HashInfo.cs</Link>
293299
</Compile>

‎src/Renci.SshNet.Silverlight/Session.SilverlightShared.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System.Linq;
2-
3-
namespace Renci.SshNet
1+
namespace Renci.SshNet
42
{
53
public partial class Session
64
{

‎src/Renci.SshNet.Silverlight5/Renci.SshNet.Silverlight5.csproj‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<DebugType>full</DebugType>
3030
<Optimize>false</Optimize>
3131
<OutputPath>Bin\Debug</OutputPath>
32-
<DefineConstants>TRACE;DEBUG;FEATURE_DIRECTORYINFO_ENUMERATEFILES;FEATURE_RNG_CSP;FEATURE_SOCKET_EAP;FEATURE_STREAM_APM;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_HASH_SHA1_MANAGED;FEATURE_HASH_SHA256_MANAGED;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256</DefineConstants>
32+
<DefineConstants>TRACE;DEBUG;FEATURE_DIRECTORYINFO_ENUMERATEFILES;FEATURE_RNG_CSP;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_STREAM_APM;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_HASH_SHA1_MANAGED;FEATURE_HASH_SHA256_MANAGED;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256</DefineConstants>
3333
<NoStdLib>true</NoStdLib>
3434
<NoConfig>true</NoConfig>
3535
<ErrorReport>prompt</ErrorReport>
@@ -42,7 +42,7 @@
4242
<DebugType>none</DebugType>
4343
<Optimize>true</Optimize>
4444
<OutputPath>Bin\Release</OutputPath>
45-
<DefineConstants>TRACE;FEATURE_DIRECTORYINFO_ENUMERATEFILES;FEATURE_RNG_CSP;FEATURE_SOCKET_EAP;FEATURE_STREAM_APM;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_HASH_SHA1_MANAGED;FEATURE_HASH_SHA256_MANAGED;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256</DefineConstants>
45+
<DefineConstants>TRACE;FEATURE_DIRECTORYINFO_ENUMERATEFILES;FEATURE_RNG_CSP;FEATURE_SOCKET_EAP;FEATURE_SOCKET_SETSOCKETOPTION;FEATURE_STREAM_APM;FEATURE_THREAD_THREADPOOL;FEATURE_THREAD_SLEEP;FEATURE_MEMORYSTREAM_GETBUFFER;FEATURE_HASH_SHA1_MANAGED;FEATURE_HASH_SHA256_MANAGED;FEATURE_HMAC_SHA1;FEATURE_HMAC_SHA256</DefineConstants>
4646
<NoStdLib>true</NoStdLib>
4747
<NoConfig>true</NoConfig>
4848
<ErrorReport>prompt</ErrorReport>
@@ -195,6 +195,9 @@
195195
<Compile Include="..\Renci.SshNet\Common\ChannelRequestEventArgs.cs">
196196
<Link>Common\ChannelRequestEventArgs.cs</Link>
197197
</Compile>
198+
<Compile Include="..\Renci.SshNet\Common\CountdownEvent.cs">
199+
<Link>Common\CountdownEvent.cs</Link>
200+
</Compile>
198201
<Compile Include="..\Renci.SshNet\Common\DerData.cs">
199202
<Link>Common\DerData.cs</Link>
200203
</Compile>
@@ -303,6 +306,9 @@
303306
<Compile Include="..\Renci.SshNet\ForwardedPortRemote.cs">
304307
<Link>ForwardedPortRemote.cs</Link>
305308
</Compile>
309+
<Compile Include="..\Renci.SshNet\ForwardedPortStatus.cs">
310+
<Link>ForwardedPortStatus.cs</Link>
311+
</Compile>
306312
<Compile Include="..\Renci.SshNet\HashInfo.cs">
307313
<Link>HashInfo.cs</Link>
308314
</Compile>
@@ -917,7 +923,7 @@
917923
<FlavorProperties GUID="{A1591282-1198-4647-A2B1-27E5FF5F6F3B}">
918924
<SilverlightProjectProperties />
919925
</FlavorProperties>
920-
<UserProperties ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" />
926+
<UserProperties ProjectLinkReference="2f5f8c90-0bd1-424f-997c-7bc6280919d1" ProjectLinkerExcludeFilter="\\?desktop(\\.*)?$;\\?silverlight(\\.*)?$;\.desktop;\.silverlight;\.xaml;^service references(\\.*)?$;\.clientconfig;^web references(\\.*)?$" />
921927
</VisualStudio>
922928
</ProjectExtensions>
923929
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/Renci.SshNet.Tests.NET35/Renci.SshNet.Tests.NET35.csproj‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,18 @@
6565
<Compile Include="..\..\test\Renci.SshNet.Shared.Tests\Abstractions\ThreadAbstraction_ExecuteThread.cs">
6666
<Link>Classes\Abstraction\ThreadAbstraction_ExecuteThread.cs</Link>
6767
</Compile>
68+
<Compile Include="..\..\test\Renci.SshNet.Shared.Tests\ForwardedPortStatusTest_Started.cs">
69+
<Link>Classes\ForwardedPortStatusTest_Started.cs</Link>
70+
</Compile>
71+
<Compile Include="..\..\test\Renci.SshNet.Shared.Tests\ForwardedPortStatusTest_Starting.cs">
72+
<Link>Classes\ForwardedPortStatusTest_Starting.cs</Link>
73+
</Compile>
74+
<Compile Include="..\..\test\Renci.SshNet.Shared.Tests\ForwardedPortStatusTest_Stopped.cs">
75+
<Link>Classes\ForwardedPortStatusTest_Stopped.cs</Link>
76+
</Compile>
77+
<Compile Include="..\..\test\Renci.SshNet.Shared.Tests\ForwardedPortStatusTest_Stopping.cs">
78+
<Link>Classes\ForwardedPortStatusTest_Stopping.cs</Link>
79+
</Compile>
6880
<Compile Include="..\Renci.SshNet.Tests\Classes\Channels\ChannelDirectTcpipTest.cs">
6981
<Link>Classes\Channels\ChannelDirectTcpipTest.cs</Link>
7082
</Compile>
@@ -251,6 +263,9 @@
251263
<Compile Include="..\Renci.SshNet.Tests\Classes\Common\ChannelRequestEventArgsTest.cs">
252264
<Link>Classes\Common\ChannelRequestEventArgsTest.cs</Link>
253265
</Compile>
266+
<Compile Include="..\Renci.SshNet.Tests\Classes\Common\CountdownEventTest.cs">
267+
<Link>Classes\Common\CountdownEventTest.cs</Link>
268+
</Compile>
254269
<Compile Include="..\Renci.SshNet.Tests\Classes\Common\DerDataTest.cs">
255270
<Link>Classes\Common\DerDataTest.cs</Link>
256271
</Compile>
@@ -269,6 +284,18 @@
269284
<Compile Include="..\Renci.SshNet.Tests\Classes\Common\PipeStreamTest.cs">
270285
<Link>Classes\Common\PipeStreamTest.cs</Link>
271286
</Compile>
287+
<Compile Include="..\Renci.SshNet.Tests\Classes\Common\PipeStream_Close_BlockingRead.cs">
288+
<Link>Classes\Common\PipeStream_Close_BlockingRead.cs</Link>
289+
</Compile>
290+
<Compile Include="..\Renci.SshNet.Tests\Classes\Common\PipeStream_Close_BlockingWrite.cs">
291+
<Link>Classes\Common\PipeStream_Close_BlockingWrite.cs</Link>
292+
</Compile>
293+
<Compile Include="..\Renci.SshNet.Tests\Classes\Common\PipeStream_Flush_BytesRemainingAfterRead.cs">
294+
<Link>Classes\Common\PipeStream_Flush_BytesRemainingAfterRead.cs</Link>
295+
</Compile>
296+
<Compile Include="..\Renci.SshNet.Tests\Classes\Common\PipeStream_Flush_NoBytesRemainingAfterRead.cs">
297+
<Link>Classes\Common\PipeStream_Flush_NoBytesRemainingAfterRead.cs</Link>
298+
</Compile>
272299
<Compile Include="..\Renci.SshNet.Tests\Classes\Common\PortForwardEventArgsTest.cs">
273300
<Link>Classes\Common\PortForwardEventArgsTest.cs</Link>
274301
</Compile>

‎src/Renci.SshNet.Tests/Classes/CipherInfoTest.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ public class CipherInfoTest : TestBase
1515
/// <summary>
1616
///A test for CipherInfo Constructor
1717
///</summary>
18-
[TestMethod()]
18+
[TestMethod]
19+
[Ignore] // placeholder
1920
public void CipherInfoConstructorTest()
2021
{
2122
int keySize = 0; // TODO: Initialize to an appropriate value

‎src/Renci.SshNet.Tests/Classes/Common/ASCIIEncodingTest.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@ public void IsSingleByte()
148148
}
149149

150150
[TestMethod]
151+
[TestCategory("LongRunning")]
152+
[TestCategory("Performance")]
151153
public void GetBytes_Performance()
152154
{
153155
const string input = "eererzfdfdsfsfsfsqdqseererzfdfdsfsfsfsqdqseererzfdfdsfsfsfsqdqseererzfdfdsfsfsfsqdqseererzfdfdsfsfsfsqdqseererzfdfdsfsfsfsqdqseererzfdfdsfsfsfsqdqseererzfdfdsfsfsfsqdqseererzfdfdsfsfsfsqdqs";
@@ -191,6 +193,8 @@ public void GetBytes_Performance()
191193
}
192194

193195
[TestMethod]
196+
[TestCategory("LongRunning")]
197+
[TestCategory("Performance")]
194198
public void GetChars_Performance()
195199
{
196200
var input = new byte[2000];

‎src/Renci.SshNet.Tests/Classes/Common/BigIntegerTest.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1560,6 +1560,8 @@ public void Bug16526()
15601560
}
15611561

15621562
[TestMethod]
1563+
[TestCategory("LongRunning")]
1564+
[TestCategory("Performance")]
15631565
public void ToArray_Performance()
15641566
{
15651567
const int loopCount = 100000000;
@@ -1586,6 +1588,8 @@ public void ToArray_Performance()
15861588
}
15871589

15881590
[TestMethod]
1591+
[TestCategory("LongRunning")]
1592+
[TestCategory("Performance")]
15891593
public void Ctor_ByteArray_Performance()
15901594
{
15911595
const int loopCount = 100000000;

0 commit comments

Comments
 (0)