Merge branch 'develop' into SshCommandInputStream

WojciechNagorski · web-flow · commit c4f8992f0054 · 2024-02-06T13:55:14.000+01:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -19,13 +19,14 @@ for:
           
   build_script:
     - echo build
-    - dotnet build Renci.SshNet.sln -c Debug -f net8.0
+    - dotnet build -f net8.0 -c Debug test/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
+    - dotnet build -f net8.0 -c Debug test/Renci.SshNet.IntegrationTests/Renci.SshNet.IntegrationTests.csproj
 
   test_script:
     - sh: echo "Run unit tests"
     - sh: dotnet test -f net8.0 -c Debug --no-restore --no-build --results-directory artifacts --logger Appveyor --logger "console;verbosity=normal" --logger "liquid.md;LogFileName=linux_unit_test_net_8_report.md" -p:CollectCoverage=true -p:CoverletOutputFormat=cobertura -p:CoverletOutput=../../artifacts/linux_unit_test_net_8_coverage.xml test/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj
     - sh: echo "Run integration tests"
-    - sh: dotnet test -c Debug --no-restore --no-build --results-directory artifacts --logger Appveyor --logger "console;verbosity=normal" --logger "liquid.md;LogFileName=linux_integration_test_net_8_report.md" -p:CollectCoverage=true -p:CoverletOutputFormat=cobertura -p:CoverletOutput=../../artifacts/linux_integration_test_net_8_coverage.xml test/Renci.SshNet.IntegrationTests/Renci.SshNet.IntegrationTests.csproj
+    - sh: dotnet test -f net8.0 -c Debug --no-restore --no-build --results-directory artifacts --logger Appveyor --logger "console;verbosity=normal" --logger "liquid.md;LogFileName=linux_integration_test_net_8_report.md" -p:CollectCoverage=true -p:CoverletOutputFormat=cobertura -p:CoverletOutput=../../artifacts/linux_integration_test_net_8_coverage.xml test/Renci.SshNet.IntegrationTests/Renci.SshNet.IntegrationTests.csproj
 
 #  on_failure:
 #    - sh: appveyor PushArtifact artifacts/tcpdump.pcap
diff --git a/src/Renci.SshNet/Session.cs b/src/Renci.SshNet/Session.cs
diff --git a/test/Renci.SshNet.IntegrationTests/App.config b/test/Renci.SshNet.IntegrationTests/App.config
diff --git a/test/Renci.SshNet.IntegrationTests/Common/DateTimeExtensions.cs b/test/Renci.SshNet.IntegrationTests/Common/DateTimeExtensions.cs
@@ -4,9 +4,7 @@ public static class DateTimeExtensions
     {
         public static DateTime TruncateToWholeSeconds(this DateTime dateTime)
         {
-            return dateTime.AddMilliseconds(-dateTime.Millisecond)
-                           .AddMicroseconds(-dateTime.Microsecond)
-                           .AddTicks(-(dateTime.Nanosecond / 100));
+            return new DateTime(dateTime.Ticks - (dateTime.Ticks % TimeSpan.TicksPerSecond), dateTime.Kind);
         }
     }
 }
diff --git a/test/Renci.SshNet.IntegrationTests/HostConfig.cs b/test/Renci.SshNet.IntegrationTests/HostConfig.cs
@@ -29,7 +29,11 @@ public static HostConfig Read(ScpClient scpClient, string path)
                     while ((line = sr.ReadLine()) != null)
                     {
                         // skip comments
+#if NET
                         if (line.StartsWith('#'))
+#else
+                        if (line.StartsWith("#"))
+#endif
                         {
                             continue;
                         }
diff --git a/test/Renci.SshNet.IntegrationTests/OldIntegrationTests/ForwardedPortLocalTest.cs b/test/Renci.SshNet.IntegrationTests/OldIntegrationTests/ForwardedPortLocalTest.cs
@@ -1,4 +1,7 @@
 ﻿using System.Diagnostics;
+#if !NET6_0_OR_GREATER
+using System.Net;
+#endif
 
 using Renci.SshNet.Common;
 
@@ -46,8 +49,8 @@ public void Test_PortForwarding_Local_Stop_Hangs_On_Wait()
                                                  .GetAwaiter()
                                                  .GetResult();
 #else
-                            var request = (HttpWebRequest) WebRequest.Create(url);
-                            var response = (HttpWebResponse) request.GetResponse();
+                        var request = (HttpWebRequest) WebRequest.Create(url);
+                        var response = (HttpWebResponse) request.GetResponse();
 #endif // NET6_0_OR_GREATER
 
                         Assert.IsNotNull(response);
@@ -122,10 +125,10 @@ public void Test_PortForwarding_Local_Without_Connecting()
                                      {
                                          var data = ReadStream(response.Content.ReadAsStream());
 #else
-                                        var request = (HttpWebRequest) WebRequest.Create("http://localhost:8084");
-                                        using (var response = (HttpWebResponse) request.GetResponse())
-                                        {
-                                            var data = ReadStream(response.GetResponseStream());
+                                     var request = (HttpWebRequest) WebRequest.Create("http://localhost:8084");
+                                     using (var response = (HttpWebResponse) request.GetResponse())
+                                     {
+                                         var data = ReadStream(response.GetResponseStream());
 #endif // NET6_0_OR_GREATER
                                          var end = DateTime.Now;
 
diff --git a/test/Renci.SshNet.IntegrationTests/OldIntegrationTests/SftpClientTest.cs b/test/Renci.SshNet.IntegrationTests/OldIntegrationTests/SftpClientTest.cs
@@ -14,7 +14,11 @@ protected static string CalculateMD5(string fileName)
         {
             using (FileStream file = new FileStream(fileName, FileMode.Open))
             {
-                var hash = MD5.HashData(file);
+                byte[] hash;
+                using (var md5 = MD5.Create())
+                {
+                    hash = md5.ComputeHash(file);
+                }
 
                 file.Close();
 
diff --git a/test/Renci.SshNet.IntegrationTests/OldIntegrationTests/SshCommandTest.cs b/test/Renci.SshNet.IntegrationTests/OldIntegrationTests/SshCommandTest.cs
@@ -442,47 +442,18 @@ public void Test_Execute_Invalid_Command()
             }
         }
 
-        [TestMethod]
-        public void Test_MultipleThread_Example_MultipleConnections()
-        {
-            try
-            {
-#region Example SshCommand RunCommand Parallel
-                Parallel.For(0, 100,
-                    () =>
-                    {
-                        var client = new SshClient(SshServerHostName, SshServerPort, User.UserName, User.Password);
-                        client.Connect();
-                        return client;
-                    },
-                    (int counter, ParallelLoopState pls, SshClient client) =>
-                    {
-                        var result = client.RunCommand("echo 123");
-                        Debug.WriteLine(string.Format("TestMultipleThreadMultipleConnections #{0}", counter));
-                        return client;
-                    },
-                    (SshClient client) =>
-                    {
-                        client.Disconnect();
-                        client.Dispose();
-                    }
-                );
-#endregion
-
-            }
-            catch (Exception exp)
-            {
-                Assert.Fail(exp.ToString());
-            }
-        }
-
         [TestMethod]
         
         public void Test_MultipleThread_100_MultipleConnections()
         {
             try
             {
-                Parallel.For(0, 100,
+                var options = new ParallelOptions()
+                {
+                    MaxDegreeOfParallelism = 8
+                };
+
+                Parallel.For(0, 100, options,
                     () =>
                     {
                         var client = new SshClient(SshServerHostName, SshServerPort, User.UserName, User.Password);
diff --git a/test/Renci.SshNet.IntegrationTests/Program.cs b/test/Renci.SshNet.IntegrationTests/Program.cs
diff --git a/test/Renci.SshNet.IntegrationTests/Renci.SshNet.IntegrationTests.csproj b/test/Renci.SshNet.IntegrationTests/Renci.SshNet.IntegrationTests.csproj
@@ -1,11 +1,12 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net48;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
     <NoWarn>$(NoWarn);SYSLIB0021;SYSLIB1045;SYSLIB0014;IDE0220;IDE0010</NoWarn>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/Renci.SshNet.IntegrationTests/SftpTests.cs b/test/Renci.SshNet.IntegrationTests/SftpTests.cs
@@ -83,7 +83,7 @@ public void Sftp_ConnectDisconnect_Serial()
         public void Sftp_ConnectDisconnect_Parallel()
         {
             const int iterations = 10;
-            const int threads = 20;
+            const int threads = 5;
 
             var startEvent = new ManualResetEvent(false);
 
diff --git a/test/Renci.SshNet.TestTools.OpenSSH/Renci.SshNet.TestTools.OpenSSH.csproj b/test/Renci.SshNet.TestTools.OpenSSH/Renci.SshNet.TestTools.OpenSSH.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <NoWarn>$(NoWarn);SYSLIB0021;SYSLIB1045</NoWarn>
diff --git a/test/Renci.SshNet.TestTools.OpenSSH/SshdConfig.cs b/test/Renci.SshNet.TestTools.OpenSSH/SshdConfig.cs
@@ -329,7 +329,7 @@ private static void ProcessGlobalOption(SshdConfig sshdConfig, string line)
                     sshdConfig.KeyboardInteractiveAuthentication = ToBool(value);
                     break;
                 case "LogLevel":
-                    sshdConfig.LogLevel = Enum.Parse<LogLevel>(value, ignoreCase: true);
+                    sshdConfig.LogLevel = (LogLevel)Enum.Parse(typeof(LogLevel), value, ignoreCase: true);
                     break;
                 case "Subsystem":
                     sshdConfig.Subsystems.Add(Subsystem.FromConfig(value));

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,7 @@ public static class DateTimeExtensions`
`4`	`4`	`{`
`5`	`5`	`public static DateTime TruncateToWholeSeconds(this DateTime dateTime)`
`6`	`6`	`{`
`7`		`- return dateTime.AddMilliseconds(-dateTime.Millisecond)`
`8`		`- .AddMicroseconds(-dateTime.Microsecond)`
`9`		`- .AddTicks(-(dateTime.Nanosecond / 100));`
	`7`	`+ return new DateTime(dateTime.Ticks - (dateTime.Ticks % TimeSpan.TicksPerSecond), dateTime.Kind);`
`10`	`8`	`}`
`11`	`9`	`}`
`12`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,11 @@ public static HostConfig Read(ScpClient scpClient, string path)`
`29`	`29`	`while ((line = sr.ReadLine()) != null)`
`30`	`30`	`{`
`31`	`31`	`// skip comments`
	`32`	`+#if NET`
`32`	`33`	`if (line.StartsWith('#'))`
	`34`	`+#else`
	`35`	`+ if (line.StartsWith("#"))`
	`36`	`+#endif`
`33`	`37`	`{`
`34`	`38`	`continue;`
`35`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,11 @@ protected static string CalculateMD5(string fileName)`
`14`	`14`	`{`
`15`	`15`	`using (FileStream file = new FileStream(fileName, FileMode.Open))`
`16`	`16`	`{`
`17`		`- var hash = MD5.HashData(file);`
	`17`	`+ byte[] hash;`
	`18`	`+ using (var md5 = MD5.Create())`
	`19`	`+ {`
	`20`	`+ hash = md5.ComputeHash(file);`
	`21`	`+ }`
`18`	`22`
`19`	`23`	`file.Close();`
`20`	`24`