Small improvements

appveyor.yml

@@ -10,7 +10,7 @@ build_script:
 test_script:
 - mkdir artifacts
 - sudo tcpdump -i docker0 -w artifacts/tcpdump.pcap -U &
-- dotnet test -c Debug --no-restore --no-build --results-directory artifacts --logger "console;verbosity=detailed" --logger "liquid.md;LogFileName=TestReport.md" -p:CollectCoverage=true -p:CoverletOutputFormat=cobertura -p:CoverletOutput=artifacts/coverage.xml test/Renci.SshNet.IntegrationTests/Renci.SshNet.IntegrationTests.csproj
+- dotnet test -c Debug --no-restore --no-build --results-directory artifacts --logger "console;verbosity=normal" --logger "liquid.md;LogFileName=TestReport.md" -p:CollectCoverage=true -p:CoverletOutputFormat=cobertura -p:CoverletOutput=artifacts/coverage.xml test/Renci.SshNet.IntegrationTests/Renci.SshNet.IntegrationTests.csproj
 - killall tcpdump
 - ls artifacts
 

src/Renci.SshNet/Abstractions/DiagnosticAbstraction.cs

@@ -59,7 +59,7 @@ public static class DiagnosticAbstraction
         /// <param name="text">The message to log.</param>
         /// <param name="type">The trace event type.</param>
         [Conditional("DEBUG")]
-        public static void Log(string text, TraceEventType type = TraceEventType.Information)
+        public static void Log(string text, TraceEventType type = TraceEventType.Verbose)
         {
             Source.TraceEvent(type,
                               System.Environment.CurrentManagedThreadId,

src/Renci.SshNet/Common/AsyncHelper.cs

@@ -6,6 +6,10 @@
 namespace Renci.SshNet.Common
 {
 #pragma warning disable CA2008
+
+    /// <summary>
+    /// AsyncHelper based on https://github.com/aspnet/AspNetIdentity/blob/main/src/Microsoft.AspNet.Identity.Core/AsyncHelper.cs
+    /// </summary>
     internal static class AsyncHelper
     {
         private static readonly TaskFactory MyTaskFactory = new TaskFactory(

src/Renci.SshNet/Session.cs

@@ -1053,7 +1053,7 @@ internal void SendMessage(Message message)
                 WaitOnHandle(_keyExchangeCompletedWaitHandle);
             }
 
-            DiagnosticAbstraction.Log(string.Format("[{0}] Sending message '{1}' to server: '{2}'.", ToHex(SessionId), message.GetType().Name, message), TraceEventType.Verbose);
+            DiagnosticAbstraction.Log(string.Format("[{0}] Sending message '{1}' to server: '{2}'.", ToHex(SessionId), message.GetType().Name, message));
 
             var paddingMultiplier = _clientCipher is null ? (byte) 8 : Math.Max((byte) 8, _serverCipher.MinimumSize);
             var packetData = message.GetPacket(paddingMultiplier, _clientCompression);
@@ -1712,7 +1712,7 @@ private Message LoadMessage(byte[] data, int offset, int count)
             var message = _sshMessageFactory.Create(messageType);
             message.Load(data, offset + 1, count - 1);
 
-            DiagnosticAbstraction.Log(string.Format("[{0}] Received message '{1}' from server: '{2}'.", ToHex(SessionId), message.GetType().Name, message), TraceEventType.Verbose);
+            DiagnosticAbstraction.Log(string.Format("[{0}] Received message '{1}' from server: '{2}'.", ToHex(SessionId), message.GetType().Name, message));
 
             return message;
         }

test/Renci.SshNet.IntegrationTests/OldIntegrationTests/ForwardedPortLocalTest.cs

@@ -10,6 +10,18 @@ namespace Renci.SshNet.IntegrationTests.OldIntegrationTests
     [TestClass]
     public class ForwardedPortLocalTest : IntegrationTestBase
     {
+        [TestInitialize]
+        public void SetUp()
+        {
+            EnableTracing();
+        }
+
+        [TestCleanup]
+        public void TearDown()
+        {
+            DisableTracing();
+        }
+
         [TestMethod]
         [WorkItem(713)]
         [Owner("Kenneth_aa")]
@@ -21,7 +33,7 @@ public void Test_PortForwarding_Local_Stop_Hangs_On_Wait()
             {
                 client.Connect();
 
-                using var port1 = new ForwardedPortLocal("localhost", 8084, "www.google.com", 80);
+                using var port1 = new ForwardedPortLocal("localhost", 8085, "www.google.com", 80);
                 client.AddForwardedPort(port1);
                 port1.Exception += delegate (object sender, ExceptionEventArgs e)
                 {

test/Renci.SshNet.IntegrationTests/Renci.SshNet.IntegrationTests.csproj

@@ -12,7 +12,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
     <PackageReference Include="Testcontainers" Version="3.6.0" />

test/Renci.SshNet.IntegrationTests/TestsFixtures/InfrastructureFixture.cs

@@ -38,10 +38,6 @@ public static InfrastructureFixture Instance
 
         public async Task InitializeAsync()
         {
-            DiagnosticAbstraction.Source.Switch = new SourceSwitch("sourceSwitch", nameof(TraceEventType.Information));
-            DiagnosticAbstraction.Source.Listeners.Remove("Default");
-            DiagnosticAbstraction.Source.Listeners.Add(new ConsoleTraceListener());
-
             _sshServerImage = new ImageFromDockerfileBuilder()
                 .WithName("renci-ssh-tests-server-image")
                 .WithDockerfileDirectory(CommonDirectoryPath.GetSolutionDirectory(), Path.Combine("test", "Renci.SshNet.IntegrationTests"))

test/Renci.SshNet.IntegrationTests/TestsFixtures/IntegrationTestBase.cs

@@ -1,4 +1,8 @@
-namespace Renci.SshNet.IntegrationTests.TestsFixtures
+using System.Diagnostics;
+
+using Renci.SshNet.Abstractions;
+
+namespace Renci.SshNet.IntegrationTests.TestsFixtures
 {
     /// <summary>
     /// The base class for integration tests
@@ -59,10 +63,6 @@ protected IntegrationTestBase()
 
         private void ShowInfrastructureInformation()
         {
-            Console.WriteLine($"HTTP_PROXY: {Environment.GetEnvironmentVariable("HTTP_PROXY")}");
-            Console.WriteLine($"HTTPS_PROXY: {Environment.GetEnvironmentVariable("HTTPS_PROXY")}");
-            Console.WriteLine($"NO_PROXY: {Environment.GetEnvironmentVariable("NO_PROXY")}");
-
             Console.WriteLine($"SSH Server host name: {_infrastructureFixture.SshServerHostName}");
             Console.WriteLine($"SSH Server port: {_infrastructureFixture.SshServerPort}");
         }
@@ -85,5 +85,18 @@ protected void CreateTestFile(string fileName, int size)
                 }
             }
         }
+
+        protected void EnableTracing()
+        {
+            DiagnosticAbstraction.Source.Switch = new SourceSwitch("sourceSwitch", nameof(TraceEventType.Verbose));
+            DiagnosticAbstraction.Source.Listeners.Remove("Default");
+            DiagnosticAbstraction.Source.Listeners.Add(new ConsoleTraceListener() { Name = "TestConsoleLogger" });
+        }
+
+        protected void DisableTracing()
+        {
+            DiagnosticAbstraction.Source.Switch = null;
+            DiagnosticAbstraction.Source.Listeners.Remove("TestConsoleLogger");
+        }
     }
 }