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.
sshnet · May 9, 2023 · 8c932fb · 8c932fb
1 parent cf85100
commit 8c932fb
Show file tree

Hide file tree

Showing 79 changed files with 60 additions and 1,353 deletions.
diff --git a/...sts/Classes/Channels/ChannelDirectTcpipTest_Dispose_SessionIsConnectedAndChannelIsOpen.cs b/...sts/Classes/Channels/ChannelDirectTcpipTest_Dispose_SessionIsConnectedAndChannelIsOpen.cs
@@ -5,9 +5,6 @@
 using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
-#if !FEATURE_SOCKET_DISPOSE
-using Renci.SshNet.Common;
-#endif // !FEATURE_SOCKET_DISPOSE
 using Renci.SshNet.Channels;
 using Renci.SshNet.Messages.Connection;
 using Renci.SshNet.Tests.Common;

diff --git a/src/Renci.SshNet.Tests/Classes/Common/CountdownEventTest.cs b/src/Renci.SshNet.Tests/Classes/Common/CountdownEventTest.cs
@@ -2,9 +2,6 @@
 using System.Diagnostics;
 using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-#if !FEATURE_THREAD_COUNTDOWNEVENT
-using CountdownEvent = Renci.SshNet.Common.CountdownEvent;
-#endif
 
 namespace Renci.SshNet.Tests.Classes.Common
 {

diff --git a/src/Renci.SshNet.Tests/Classes/Common/CountdownEventTest_Dispose_NotSet.cs b/src/Renci.SshNet.Tests/Classes/Common/CountdownEventTest_Dispose_NotSet.cs
@@ -1,10 +1,6 @@
 using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-#if !FEATURE_THREAD_COUNTDOWNEVENT
-using CountdownEvent = Renci.SshNet.Common.CountdownEvent;
-#else
 using System.Threading;
-#endif
 
 namespace Renci.SshNet.Tests.Classes.Common
 {

diff --git a/src/Renci.SshNet.Tests/Classes/Common/CountdownEventTest_Dispose_Set.cs b/src/Renci.SshNet.Tests/Classes/Common/CountdownEventTest_Dispose_Set.cs
@@ -1,10 +1,6 @@
 using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-#if !FEATURE_THREAD_COUNTDOWNEVENT
-using CountdownEvent = Renci.SshNet.Common.CountdownEvent;
-#else
 using System.Threading;
-#endif
 
 namespace Renci.SshNet.Tests.Classes.Common
 {

diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamAsyncTestBase.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamAsyncTestBase.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -66,4 +65,3 @@ protected byte[] GenerateRandom(uint length, Random random)
         }
     }
 }
-#endif
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileAccessInvalid.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileAccessInvalid.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -54,4 +53,3 @@ public void CtorShouldHaveThrownArgumentException()
         }
     }
 }
-#endif
diff --git a/...i.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeAppend_FileAccessRead.cs b/...i.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeAppend_FileAccessRead.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -55,4 +54,3 @@ public void CtorShouldHaveThrownArgumentException()
         }
     }
 }
-#endif
diff --git a/...Net.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeAppend_FileAccessReadWrite.cs b/...Net.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeAppend_FileAccessReadWrite.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -55,4 +54,3 @@ public void CtorShouldHaveThrownArgumentException()
         }
     }
 }
-#endif
diff --git a/....SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeAppend_FileAccessWrite.cs b/....SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeAppend_FileAccessWrite.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -152,4 +151,3 @@ public void RequestFStatOnSftpSessionShouldBeInvokedOnce()
         }
     }
 }
-#endif
diff --git a/...shNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreateNew_FileAccessRead.cs b/...shNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreateNew_FileAccessRead.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -55,4 +54,3 @@ public void CtorShouldHaveThrownArgumentException()
         }
     }
 }
-#endif
diff --git a/....Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreateNew_FileAccessReadWrite.cs b/....Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreateNew_FileAccessReadWrite.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -133,4 +132,3 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
         }
     }
 }
-#endif
diff --git a/...hNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreateNew_FileAccessWrite.cs b/...hNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreateNew_FileAccessWrite.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -133,4 +132,3 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
         }
     }
 }
-#endif
diff --git a/...i.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreate_FileAccessRead.cs b/...i.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreate_FileAccessRead.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -55,4 +54,3 @@ public void CtorShouldHaveThrownArgumentException()
         }
     }
 }
-#endif
diff --git a/.../Sftp/SftpFileStreamTest_OpenAsync_FileModeCreate_FileAccessReadWrite_FileDoesNotExist.cs b/.../Sftp/SftpFileStreamTest_OpenAsync_FileModeCreate_FileAccessReadWrite_FileDoesNotExist.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -133,4 +132,3 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
         }
     }
 }
-#endif
diff --git a/...lasses/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreate_FileAccessReadWrite_FileExists.cs b/...lasses/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreate_FileAccessReadWrite_FileExists.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -133,4 +132,3 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
         }
     }
 }
-#endif
diff --git a/...sses/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreate_FileAccessWrite_FileDoesNotExist.cs b/...sses/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreate_FileAccessWrite_FileDoesNotExist.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -132,5 +131,4 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnceWithTruncateAndOnceWithCr
             SftpSessionMock.Verify(p => p.RequestOpenAsync(_path, Flags.Write | Flags.CreateNewOrOpen | Flags.Truncate, _cancellationToken), Times.Once);
         }
     }
-}
-#endif
+}
diff --git a/...ts/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreate_FileAccessWrite_FileExists.cs b/...ts/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeCreate_FileAccessWrite_FileExists.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -132,5 +131,4 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
             SftpSessionMock.Verify(p => p.RequestOpenAsync(_path, Flags.Write | Flags.CreateNewOrOpen | Flags.Truncate, _cancellationToken), Times.Once);
         }
     }
-}
-#endif
+}
diff --git a/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeInvalid.cs b/src/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeInvalid.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -54,4 +53,3 @@ public void CtorShouldHaveThrownArgumentException()
         }
     }
 }
-#endif
diff --git a/...et.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeOpenOrCreate_FileAccessRead.cs b/...et.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeOpenOrCreate_FileAccessRead.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -137,5 +136,4 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
             SftpSessionMock.Verify(p => p.RequestOpenAsync(_path, Flags.Read | Flags.CreateNewOrOpen, _cancellationToken), Times.Once);
         }
     }
-}
-#endif
+}
diff --git a/...sts/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeOpenOrCreate_FileAccessReadWrite.cs b/...sts/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeOpenOrCreate_FileAccessReadWrite.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -133,4 +132,3 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
         }
     }
 }
-#endif
diff --git a/...t.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeOpenOrCreate_FileAccessWrite.cs b/...t.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeOpenOrCreate_FileAccessWrite.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -133,4 +132,3 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
         }
     }
 }
-#endif
diff --git a/...nci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeOpen_FileAccessRead.cs b/...nci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeOpen_FileAccessRead.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -139,4 +138,3 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
         }
     }
 }
-#endif
diff --git a/...shNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeOpen_FileAccessReadWrite.cs b/...shNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeOpen_FileAccessReadWrite.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -133,4 +132,3 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
         }
     }
 }
-#endif
diff --git a/...ci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeOpen_FileAccessWrite.cs b/...ci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeOpen_FileAccessWrite.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -133,4 +132,3 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
         }
     }
 }
-#endif
diff --git a/...SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeTruncate_FileAccessRead.cs b/...SshNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeTruncate_FileAccessRead.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -56,4 +55,3 @@ public void CtorShouldHaveThrownArgumentException()
         }
     }
 }
-#endif
diff --git a/...t.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeTruncate_FileAccessReadWrite.cs b/...t.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeTruncate_FileAccessReadWrite.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -133,4 +132,3 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
         }
     }
 }
-#endif
diff --git a/...shNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeTruncate_FileAccessWrite.cs b/...shNet.Tests/Classes/Sftp/SftpFileStreamTest_OpenAsync_FileModeTruncate_FileAccessWrite.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -132,5 +131,4 @@ public void RequestOpenOnSftpSessionShouldBeInvokedOnce()
             SftpSessionMock.Verify(p => p.RequestOpenAsync(_path, Flags.Write | Flags.Truncate, _cancellationToken), Times.Once);
         }
     }
-}
-#endif
+}
diff --git a/...c_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndEqualToBufferSize.cs b/...c_ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndEqualToBufferSize.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -155,5 +154,4 @@ public async Task ReadShouldReturnAllRemaningBytesFromReadBufferAndReadAgainWhen
             SftpSessionMock.Verify(p => p.RequestReadAsync(_handle, (ulong)(_serverData1Length + _serverData2Length), _readBufferSize, default));
         }
     }
-}
-#endif
+}
diff --git a/..._ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndLessThanBufferSize.cs b/..._ReadMode_NoDataInReaderBufferAndReadLessBytesFromServerThanCountAndLessThanBufferSize.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -149,4 +148,3 @@ public async Task SubsequentReadShouldReadAgainFromCurrentPositionFromServerAndN
         }
     }
 }
-#endif
diff --git a/...eStreamTest_ReadAsync_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount.cs b/...eStreamTest_ReadAsync_ReadMode_NoDataInReaderBufferAndReadMoreBytesFromServerThanCount.cs
@@ -1,5 +1,4 @@
-#if FEATURE_TAP
-using System;
+using System;
 using System.IO;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -140,4 +139,3 @@ public async Task SubsequentReadShouldReturnAllRemaningBytesFromReadBufferAndRea
         }
     }
 }
-#endif