Skip to content

Commit 1c94d5c

Browse files
WojciechNagorskidrieseng
WojciechNagorski
authored and
drieseng
committed
Remove old features [Part 1] (#1117)
Remove obsolete feature switches (now that we've remove support for legacy target frameworks) and remove corresponding conditional code.
1 parent dd5ed9d commit 1c94d5c

File tree

79 files changed

+60
-1353
lines changed

Some content is hidden

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

79 files changed

+60
-1353
lines changed

‎src/Renci.SshNet.Tests/Classes/Channels/ChannelDirectTcpipTest_Dispose_SessionIsConnectedAndChannelIsOpen.cs

-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
using System.Threading;
66
using Microsoft.VisualStudio.TestTools.UnitTesting;
77
using Moq;
8-
#if !FEATURE_SOCKET_DISPOSE
9-
using Renci.SshNet.Common;
10-
#endif // !FEATURE_SOCKET_DISPOSE
118
using Renci.SshNet.Channels;
129
using Renci.SshNet.Messages.Connection;
1310
using Renci.SshNet.Tests.Common;

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

-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
using System.Diagnostics;
33
using System.Threading;
44
using Microsoft.VisualStudio.TestTools.UnitTesting;
5-
#if !FEATURE_THREAD_COUNTDOWNEVENT
6-
using CountdownEvent = Renci.SshNet.Common.CountdownEvent;
7-
#endif
85

96
namespace Renci.SshNet.Tests.Classes.Common
107
{

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

-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
using System;
22
using Microsoft.VisualStudio.TestTools.UnitTesting;
3-
#if !FEATURE_THREAD_COUNTDOWNEVENT
4-
using CountdownEvent = Renci.SshNet.Common.CountdownEvent;
5-
#else
63
using System.Threading;
7-
#endif
84

95
namespace Renci.SshNet.Tests.Classes.Common
106
{

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

-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
using System;
22
using Microsoft.VisualStudio.TestTools.UnitTesting;
3-
#if !FEATURE_THREAD_COUNTDOWNEVENT
4-
using CountdownEvent = Renci.SshNet.Common.CountdownEvent;
5-
#else
63
using System.Threading;
7-
#endif
84

95
namespace Renci.SshNet.Tests.Classes.Common
106
{

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamAsyncTestBase.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.Threading.Tasks;
43
using Microsoft.VisualStudio.TestTools.UnitTesting;
54
using Moq;
@@ -66,4 +65,3 @@ protected byte[] GenerateRandom(uint length, Random random)
6665
}
6766
}
6867
}
69-
#endif

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileAccessInvalid.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading.Tasks;
54
using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -54,4 +53,3 @@ public void CtorShouldHaveThrownArgumentException()
5453
}
5554
}
5655
}
57-
#endif

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeAppend_FileAccessRead.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading.Tasks;
54
using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -55,4 +54,3 @@ public void CtorShouldHaveThrownArgumentException()
5554
}
5655
}
5756
}
58-
#endif

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeAppend_FileAccessReadWrite.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading.Tasks;
54
using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -55,4 +54,3 @@ public void CtorShouldHaveThrownArgumentException()
5554
}
5655
}
5756
}
58-
#endif

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeAppend_FileAccessWrite.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading;
54
using System.Threading.Tasks;
@@ -152,4 +151,3 @@ public void RequestFStatOnSftpSessionShouldBeInvokedOnce()
152151
}
153152
}
154153
}
155-
#endif

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreateNew_FileAccessRead.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading.Tasks;
54
using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -55,4 +54,3 @@ public void CtorShouldHaveThrownArgumentException()
5554
}
5655
}
5756
}
58-
#endif

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreateNew_FileAccessReadWrite.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading;
54
using System.Threading.Tasks;
@@ -133,4 +132,3 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
133132
}
134133
}
135134
}
136-
#endif

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreateNew_FileAccessWrite.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading;
54
using System.Threading.Tasks;
@@ -133,4 +132,3 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
133132
}
134133
}
135134
}
136-
#endif

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreate_FileAccessRead.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading.Tasks;
54
using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -55,4 +54,3 @@ public void CtorShouldHaveThrownArgumentException()
5554
}
5655
}
5756
}
58-
#endif

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreate_FileAccessReadWrite_FileDoesNotExist.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading;
54
using System.Threading.Tasks;
@@ -133,4 +132,3 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
133132
}
134133
}
135134
}
136-
#endif

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreate_FileAccessReadWrite_FileExists.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading;
54
using System.Threading.Tasks;
@@ -133,4 +132,3 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
133132
}
134133
}
135134
}
136-
#endif

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreate_FileAccessWrite_FileDoesNotExist.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading;
54
using System.Threading.Tasks;
@@ -132,5 +131,4 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnceWithTruncateAndOnceWithCr
132131
SftpSessionMock.Verify(p => p.RequestOpenAsync(_path, Flags.Write | Flags.CreateNewOrOpen | Flags.Truncate, _cancellationToken), Times.Once);
133132
}
134133
}
135-
}
136-
#endif
134+
}

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreate_FileAccessWrite_FileExists.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading;
54
using System.Threading.Tasks;
@@ -132,5 +131,4 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
132131
SftpSessionMock.Verify(p => p.RequestOpenAsync(_path, Flags.Write | Flags.CreateNewOrOpen | Flags.Truncate, _cancellationToken), Times.Once);
133132
}
134133
}
135-
}
136-
#endif
134+
}

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeInvalid.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading.Tasks;
54
using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -54,4 +53,3 @@ public void CtorShouldHaveThrownArgumentException()
5453
}
5554
}
5655
}
57-
#endif

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeOpenOrCreate_FileAccessRead.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading;
54
using System.Threading.Tasks;
@@ -137,5 +136,4 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
137136
SftpSessionMock.Verify(p => p.RequestOpenAsync(_path, Flags.Read | Flags.CreateNewOrOpen, _cancellationToken), Times.Once);
138137
}
139138
}
140-
}
141-
#endif
139+
}

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeOpenOrCreate_FileAccessReadWrite.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading;
54
using System.Threading.Tasks;
@@ -133,4 +132,3 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
133132
}
134133
}
135134
}
136-
#endif

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeOpenOrCreate_FileAccessWrite.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading;
54
using System.Threading.Tasks;
@@ -133,4 +132,3 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
133132
}
134133
}
135134
}
136-
#endif

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeOpen_FileAccessRead.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading;
54
using System.Threading.Tasks;
@@ -139,4 +138,3 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
139138
}
140139
}
141140
}
142-
#endif

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeOpen_FileAccessReadWrite.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading;
54
using System.Threading.Tasks;
@@ -133,4 +132,3 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
133132
}
134133
}
135134
}
136-
#endif

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeOpen_FileAccessWrite.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading;
54
using System.Threading.Tasks;
@@ -133,4 +132,3 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
133132
}
134133
}
135134
}
136-
#endif

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeTruncate_FileAccessRead.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading;
54
using System.Threading.Tasks;
@@ -56,4 +55,3 @@ public void CtorShouldHaveThrownArgumentException()
5655
}
5756
}
5857
}
59-
#endif

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeTruncate_FileAccessReadWrite.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading;
54
using System.Threading.Tasks;
@@ -133,4 +132,3 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
133132
}
134133
}
135134
}
136-
#endif

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeTruncate_FileAccessWrite.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading;
54
using System.Threading.Tasks;
@@ -132,5 +131,4 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
132131
SftpSessionMock.Verify(p => p.RequestOpenAsync(_path, Flags.Write | Flags.Truncate, _cancellationToken), Times.Once);
133132
}
134133
}
135-
}
136-
#endif
134+
}

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadAsync_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndEqualToBufferSize.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading.Tasks;
54
using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -155,5 +154,4 @@ public async Task ReadShouldReturnAllRemaningBytesFromReadBufferAndReadAgainWhen
155154
SftpSessionMock.Verify(p => p.RequestReadAsync(_handle, (ulong)(_serverData1Length + _serverData2Length), _readBufferSize, default));
156155
}
157156
}
158-
}
159-
#endif
157+
}

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadAsync_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndLessThanBufferSize.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using System.Threading.Tasks;
54
using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -149,4 +148,3 @@ public async Task SubsequentReadShouldReadAgainFromCurrentPositionFromServerAndN
149148
}
150149
}
151150
}
152-
#endif

‎src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadAsync_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if FEATURE_TAP
2-
using System;
1+
using System;
32
using System.IO;
43
using Microsoft.VisualStudio.TestTools.UnitTesting;
54
using Moq;
@@ -140,4 +139,3 @@ public async Task SubsequentReadShouldReturnAllRemaningBytesFromReadBufferAndRea
140139
}
141140
}
142141
}
143-
#endif

0 commit comments

Comments
 (0)