Removing old target frameworks

appveyor.yml

@@ -1,4 +1,4 @@
-os: Visual Studio 2019
+os: Visual Studio 2022
 
 before_build:
   - nuget restore src\Renci.SshNet.VS2019.sln
@@ -9,6 +9,6 @@ build:
 
 test_script:
 - cmd: >-
-    vstest.console /logger:Appveyor src\Renci.SshNet.Tests\bin\Debug\net35\Renci.SshNet.Tests.dll /TestCaseFilter:"TestCategory!=integration&TestCategory!=LongRunning"
-
-    vstest.console /logger:Appveyor src\Renci.SshNet.Tests\bin\Debug\net472\Renci.SshNet.Tests.dll /TestCaseFilter:"TestCategory!=integration&TestCategory!=LongRunning"
+    vstest.console /logger:Appveyor src\Renci.SshNet.Tests\bin\Debug\net472\Renci.SshNet.Tests.dll /TestCaseFilter:"TestCategory!=integration&TestCategory!=LongRunning" --blame
+    
+    vstest.console /logger:Appveyor src\Renci.SshNet.Tests\bin\Debug\net7.0\Renci.SshNet.Tests.dll /TestCaseFilter:"TestCategory!=integration&TestCategory!=LongRunning" --blame

src/Renci.SshNet.Tests/Classes/BaseClientTest_Connected_KeepAliveInterval_NotNegativeOne.cs

@@ -57,7 +57,11 @@ protected override void Act()
             _client.KeepAliveInterval = _keepAliveInterval;
 
             // allow keep-alive to be sent a few times
+#if NETFRAMEWORK
             Thread.Sleep(195);
+#else
+            Thread.Sleep(180);
+#endif
         }
 
         [TestMethod]

src/Renci.SshNet.Tests/Classes/ClientAuthenticationTest.cs

@@ -28,7 +28,7 @@ public void Ctor_PartialSuccessLimit_Zero()
             catch (ArgumentOutOfRangeException ex)
             {
                 Assert.IsNull(ex.InnerException);
-                Assert.AreEqual(string.Format("Cannot be less than one.{0}Parameter name: {1}", Environment.NewLine, ex.ParamName), ex.Message);
+                Assert.AreEqual(new ArgumentOutOfRangeException("partialSuccessLimit", "Cannot be less than one.").Message, ex.Message);
                 Assert.AreEqual("partialSuccessLimit", ex.ParamName);
             }
         }
@@ -46,7 +46,7 @@ public void Ctor_PartialSuccessLimit_Negative()
             catch (ArgumentOutOfRangeException ex)
             {
                 Assert.IsNull(ex.InnerException);
-                Assert.AreEqual(string.Format("Cannot be less than one.{0}Parameter name: {1}", Environment.NewLine, ex.ParamName), ex.Message);
+                Assert.AreEqual(new ArgumentOutOfRangeException("partialSuccessLimit", "Cannot be less than one.").Message, ex.Message);
                 Assert.AreEqual("partialSuccessLimit", ex.ParamName);
             }
         }

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

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 #if !FEATURE_THREAD_COUNTDOWNEVENT
@@ -111,16 +112,17 @@ public void Wait_TimeoutInfinite_ShouldBlockUntilCountdownEventIsSet()
                 threads[i].Start();
             }
 
-            var start = DateTime.Now;
+            var watch = new Stopwatch();
+            watch.Start();
             var actual = countdownEvent.Wait(timeout);
-            var elapsedTime = DateTime.Now - start;
+            watch.Stop();
 
             Assert.IsTrue(actual);
             Assert.AreEqual(expectedSignalCount, signalCount);
             Assert.IsTrue(countdownEvent.IsSet);
             Assert.IsTrue(countdownEvent.WaitHandle.WaitOne(0));
-            Assert.IsTrue(elapsedTime >= sleep);
-            Assert.IsTrue(elapsedTime <= sleep.Add(TimeSpan.FromMilliseconds(100)));
+            Assert.IsTrue(watch.Elapsed >= sleep);
+            Assert.IsTrue(watch.Elapsed <= sleep.Add(TimeSpan.FromMilliseconds(100)));
 
             countdownEvent.Dispose();
         }
@@ -150,16 +152,17 @@ public void Wait_ShouldReturnTrueWhenCountdownEventIsSetBeforeTimeoutExpires()
                 threads[i].Start();
             }
 
-            var start = DateTime.Now;
+            var watch = new Stopwatch();
+            watch.Start();
             var actual = countdownEvent.Wait(timeout);
-            var elapsedTime = DateTime.Now - start;
+            watch.Stop();
 
             Assert.IsTrue(actual);
             Assert.AreEqual(expectedSignalCount, signalCount);
             Assert.IsTrue(countdownEvent.IsSet);
             Assert.IsTrue(countdownEvent.WaitHandle.WaitOne(0));
-            Assert.IsTrue(elapsedTime >= sleep);
-            Assert.IsTrue(elapsedTime <= timeout);
+            Assert.IsTrue(watch.Elapsed >= sleep);
+            Assert.IsTrue(watch.Elapsed <= timeout);
 
             countdownEvent.Dispose();
         }
@@ -189,14 +192,14 @@ public void Wait_ShouldReturnFalseWhenTimeoutExpiresBeforeCountdownEventIsSet()
                 threads[i].Start();
             }
 
-            var start = DateTime.Now;
+            var watch = new Stopwatch();
+            watch.Start();
             var actual = countdownEvent.Wait(timeout);
-            var elapsedTime = DateTime.Now - start;
+            watch.Stop();
 
             Assert.IsFalse(actual);
             Assert.IsFalse(countdownEvent.IsSet);
             Assert.IsFalse(countdownEvent.WaitHandle.WaitOne(0));
-            Assert.IsTrue(elapsedTime >= timeout);
 
             countdownEvent.Wait(Session.InfiniteTimeSpan);
             countdownEvent.Dispose();
@@ -239,16 +242,17 @@ public void WaitHandle_WaitOne_TimeoutInfinite_ShouldBlockUntilCountdownEventIsS
                 threads[i].Start();
             }
 
-            var start = DateTime.Now;
+            var watch = new Stopwatch();
+            watch.Start();
             var actual = countdownEvent.WaitHandle.WaitOne(timeout);
-            var elapsedTime = DateTime.Now - start;
+            watch.Stop();
 
             Assert.IsTrue(actual);
             Assert.AreEqual(expectedSignalCount, signalCount);
             Assert.IsTrue(countdownEvent.IsSet);
             Assert.IsTrue(countdownEvent.WaitHandle.WaitOne(0));
-            Assert.IsTrue(elapsedTime >= sleep);
-            Assert.IsTrue(elapsedTime <= sleep.Add(TimeSpan.FromMilliseconds(100)));
+            Assert.IsTrue(watch.Elapsed >= sleep);
+            Assert.IsTrue(watch.Elapsed <= sleep.Add(TimeSpan.FromMilliseconds(100)));
 
             countdownEvent.Dispose();
         }
@@ -278,16 +282,17 @@ public void WaitHandle_WaitOne_ShouldReturnTrueWhenCountdownEventIsSetBeforeTime
                 threads[i].Start();
             }
 
-            var start = DateTime.Now;
+            var watch = new Stopwatch();
+            watch.Start();
             var actual = countdownEvent.Wait(timeout);
-            var elapsedTime = DateTime.Now - start;
+            watch.Stop();
 
             Assert.IsTrue(actual);
             Assert.AreEqual(expectedSignalCount, signalCount);
             Assert.IsTrue(countdownEvent.IsSet);
             Assert.IsTrue(countdownEvent.WaitHandle.WaitOne(0));
-            Assert.IsTrue(elapsedTime >= sleep);
-            Assert.IsTrue(elapsedTime <= timeout);
+            Assert.IsTrue(watch.Elapsed >= sleep);
+            Assert.IsTrue(watch.Elapsed <= timeout);
 
             countdownEvent.Dispose();
         }
@@ -317,14 +322,14 @@ public void WaitHandle_WaitOne_ShouldReturnFalseWhenTimeoutExpiresBeforeCountdow
                 threads[i].Start();
             }
 
-            var start = DateTime.Now;
+            var watch = new Stopwatch();
+            watch.Start();
             var actual = countdownEvent.WaitHandle.WaitOne(timeout);
-            var elapsedTime = DateTime.Now - start;
+            watch.Stop();
 
             Assert.IsFalse(actual);
             Assert.IsFalse(countdownEvent.IsSet);
             Assert.IsFalse(countdownEvent.WaitHandle.WaitOne(0));
-            Assert.IsTrue(elapsedTime >= timeout);
 
             countdownEvent.Wait(Session.InfiniteTimeSpan);
             countdownEvent.Dispose();

src/Renci.SshNet.Tests/Classes/Common/PacketDumpTest.cs

@@ -37,11 +37,9 @@ public void Create_ByteArrayAndIndentLevel_IndentLevelLessThanZero()
             catch (ArgumentOutOfRangeException ex)
             {
                 Assert.IsNull(ex.InnerException);
-#if NETFRAMEWORK
-                Assert.AreEqual(string.Format("Cannot be less than zero.{0}Parameter name: {1}", Environment.NewLine, ex.ParamName), ex.Message);
-#else
-                Assert.AreEqual(string.Format("Cannot be less than zero. (Parameter '{1}')", Environment.NewLine, ex.ParamName), ex.Message);
-#endif
+
+                Assert.AreEqual(new ArgumentOutOfRangeException("indentLevel", "Cannot be less than zero.").Message, ex.Message);
+
                 Assert.AreEqual("indentLevel", ex.ParamName);
             }
         }

src/Renci.SshNet.Tests/Classes/Common/PipeStream_Close_BlockingWrite.cs

@@ -32,7 +32,6 @@ protected override void Arrange()
                     catch (Exception ex)
                     {
                         _writeException = ex;
-                        throw;
                     }
                 });
             _writehread.Start();

src/Renci.SshNet.Tests/Classes/Common/PipeStream_Flush_BytesRemainingAfterRead.cs

@@ -88,7 +88,7 @@ public void ReadingMoreBytesThanAvailableDoesNotBlock()
             Assert.AreEqual(0, buffer[2]);
             Assert.AreEqual(0, buffer[3]);
         }
-
+#if NETFRAMEWORK
         [TestMethod]
         public void WriteCausesSubsequentReadToBlockUntilRequestedNumberOfBytesAreAvailable()
         {
@@ -104,13 +104,17 @@ public void WriteCausesSubsequentReadToBlockUntilRequestedNumberOfBytesAreAvaila
             readThread.Start();
 
             Assert.IsFalse(readThread.Join(500));
+
+            // Thread Abort method is obsolete: https://learn.microsoft.com/en-us/dotnet/core/compatibility/core-libraries/5.0/thread-abort-obsolete
             readThread.Abort();
+
 
             Assert.AreEqual(int.MaxValue, bytesRead);
             Assert.AreEqual(0, buffer[0]);
             Assert.AreEqual(0, buffer[1]);
             Assert.AreEqual(0, buffer[2]);
             Assert.AreEqual(0, buffer[3]);
         }
+#endif
     }
 }

src/Renci.SshNet.Tests/Classes/Common/PosixPathTest_CreateAbsoluteOrRelativeFilePath.cs

@@ -37,7 +37,7 @@ public void Path_Empty()
             catch (ArgumentException ex)
             {
                 Assert.IsNull(ex.InnerException);
-                Assert.AreEqual(string.Format("The path is a zero-length string.{0}Parameter name: {1}", Environment.NewLine, ex.ParamName), ex.Message);
+                Assert.AreEqual(new ArgumentException("The path is a zero-length string.", "path").Message, ex.Message);
                 Assert.AreEqual("path", ex.ParamName);
             }
         }

src/Renci.SshNet.Tests/Classes/Common/SemaphoreLightTest.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Common;
@@ -58,12 +59,13 @@ public void WaitTest()
             const int initialCount = 2;
             var target = new SemaphoreLight(initialCount);
 
-            var start = DateTime.Now;
+            var watch = new Stopwatch();
+            watch.Start();
 
             target.Wait();
             target.Wait();
-
-            Assert.IsTrue((DateTime.Now - start).TotalMilliseconds < 50);
+            
+            Assert.IsTrue(watch.ElapsedMilliseconds < 50);
 
             var releaseThread = new Thread(
                 () =>
@@ -75,11 +77,10 @@ public void WaitTest()
 
             target.Wait();
 
-            var end = DateTime.Now;
-            var elapsed = end - start;
+            watch.Stop();
 
-            Assert.IsTrue(elapsed.TotalMilliseconds > 200);
-            Assert.IsTrue(elapsed.TotalMilliseconds < 250);
+            Assert.IsTrue(watch.ElapsedMilliseconds > 200);
+            Assert.IsTrue(watch.ElapsedMilliseconds < 250);
         }
 
         [TestMethod]

src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTestBase.cs

@@ -1,6 +1,7 @@
 using Moq;
 using Renci.SshNet.Connection;
 using Renci.SshNet.Tests.Common;
+using System.Threading;
 
 namespace Renci.SshNet.Tests.Classes.Connection
 {
@@ -25,6 +26,12 @@ protected virtual void SetupMocks()
         {
         }
 
+        protected override void AfterAct()
+        {
+            // Give some time to process all messages
+            Thread.Sleep(400);
+        }
+
         protected sealed override void Arrange()
         {
             CreateMocks();

src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseContainsNullCharacter.cs

@@ -8,6 +8,7 @@
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
+using System.Threading;
 
 namespace Renci.SshNet.Tests.Classes.Connection
 {
@@ -83,6 +84,9 @@ protected void Act()
             {
                 _actualException = ex;
             }
+
+            // Give some time to process all messages
+            Thread.Sleep(200);
         }
 
         [TestMethod]

src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTestBase.cs

@@ -2,6 +2,7 @@
 using Renci.SshNet.Connection;
 using Renci.SshNet.Tests.Common;
 using System.Net;
+using System.Threading;
 
 namespace Renci.SshNet.Tests.Classes.Connection
 {
@@ -33,6 +34,12 @@ protected sealed override void Arrange()
             SetupMocks();
         }
 
+        protected override void AfterAct()
+        {
+            // Give some time to process all messages
+            Thread.Sleep(200);
+        }
+
         protected ConnectionInfo CreateConnectionInfo(string proxyUser, string proxyPassword)
         {
             return new ConnectionInfo(IPAddress.Loopback.ToString(),

src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTestBase.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Net;
 using System.Text;
+using System.Threading;
 
 namespace Renci.SshNet.Tests.Classes.Connection
 {
@@ -35,6 +36,12 @@ protected sealed override void Arrange()
             SetupMocks();
         }
 
+        protected override void AfterAct()
+        {
+            // Give some time to process all messages
+            Thread.Sleep(200);
+        }
+
         protected ConnectionInfo CreateConnectionInfo(string proxyUser, string proxyPassword)
         {
             return new ConnectionInfo(IPAddress.Loopback.ToString(),

src/Renci.SshNet.Tests/Classes/NetConfClientTest.cs

@@ -86,7 +86,7 @@ public void OperationTimeout_LessThanLowerLimit()
             catch (ArgumentOutOfRangeException ex)
             {
                 Assert.IsNull(ex.InnerException);
-                Assert.AreEqual("The timeout must represent a value between -1 and Int32.MaxValue, inclusive." + Environment.NewLine + "Parameter name: " + ex.ParamName, ex.Message);
+                Assert.AreEqual(new ArgumentOutOfRangeException("value", "The timeout must represent a value between -1 and Int32.MaxValue, inclusive.").Message, ex.Message);
                 Assert.AreEqual("value", ex.ParamName);
             }
         }
@@ -105,7 +105,7 @@ public void OperationTimeout_GreaterThanLowerLimit()
             catch (ArgumentOutOfRangeException ex)
             {
                 Assert.IsNull(ex.InnerException);
-                Assert.AreEqual("The timeout must represent a value between -1 and Int32.MaxValue, inclusive." + Environment.NewLine + "Parameter name: " + ex.ParamName, ex.Message);
+                Assert.AreEqual(new ArgumentOutOfRangeException("value", "The timeout must represent a value between -1 and Int32.MaxValue, inclusive.").Message, ex.Message);
                 Assert.AreEqual("value", ex.ParamName);
             }
         }