Merge branch 'develop' into copilot/refactor-collection-assertions

Resolved conflicts by:
- Adopting Assert.HasCount from develop (replacing Assert.AreEqual for length checks)
- Keeping CollectionAssert.AreEqual for collection comparisons (our refactoring)

Co-authored-by: Rob-Hague <5132141+Rob-Hague@users.noreply.github.com>

Author: Copilot

.github/workflows/build.yml

@@ -48,7 +48,7 @@ jobs:
           test/Renci.SshNet.IntegrationTests/
 
     - name: Archive Coverlet Results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
           name: Coverlet Results Linux
           path: coverlet
@@ -74,7 +74,7 @@ jobs:
       run: dotnet pack
 
     - name: Archive NuGet Package
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: NuGet Package
         path: src/Renci.SshNet/bin/Release/*.*nupkg
@@ -140,7 +140,7 @@ jobs:
           test\Renci.SshNet.IntegrationTests\
 
     - name: Archive Coverlet Results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: Coverlet Results Windows .NET Framework
         path: coverlet
@@ -182,7 +182,7 @@ jobs:
           test\Renci.SshNet.IntegrationTests\
 
     - name: Archive Coverlet Results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: Coverlet Results Windows .NET
         path: coverlet
@@ -200,7 +200,7 @@ jobs:
       - Windows-Integration-Tests-Net
     steps:
       - name: Download NuGet Package
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: NuGet Package
 
@@ -229,7 +229,7 @@ jobs:
       - Windows-Integration-Tests-Net
     steps:
       - name: Download NuGet Package
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: NuGet Package
 

Directory.Packages.props

@@ -11,9 +11,10 @@
     <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
     <PackageVersion Include="Meziantou.Analyzer" Version="2.0.220" />
     <!-- Should stay on LTS .NET releases. -->
+    <PackageVersion Include="Microsoft.Bcl.Cryptography" Version="10.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.9" />
-    <PackageVersion Include="MSTest" Version="3.9.3" />
+    <PackageVersion Include="MSTest" Version="4.0.2" />
     <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="Nerdbank.GitVersioning" Version="3.7.115" />
     <PackageVersion Include="PolySharp" Version="1.15.0" />

src/Renci.SshNet/Renci.SshNet.csproj

@@ -49,7 +49,11 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" !$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0')) ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
+    <PackageReference Include="Microsoft.Bcl.Cryptography" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="System.Formats.Asn1" />
   </ItemGroup>
 

src/Renci.SshNet/Security/Cryptography/Ciphers/AesGcmCipher.BclImpl.cs

@@ -1,4 +1,4 @@
-#if NET
+#if !NETSTANDARD
 using System;
 using System.Security.Cryptography;
 

src/Renci.SshNet/Security/Cryptography/Ciphers/AesGcmCipher.cs

@@ -15,7 +15,7 @@ internal sealed partial class AesGcmCipher : SymmetricCipher, IDisposable
         private const int TagSizeInBytes = 16;
         private readonly byte[] _iv;
         private readonly int _aadLength;
-#if NET
+#if !NETSTANDARD
         private readonly Impl _impl;
 #else
         private readonly BouncyCastleImpl _impl;
@@ -62,7 +62,7 @@ public AesGcmCipher(byte[] key, byte[] iv, int aadLength)
             // SSH AES-GCM requires a 12-octet Initial IV
             _iv = iv.Take(12);
             _aadLength = aadLength;
-#if NET
+#if !NETSTANDARD
             if (System.Security.Cryptography.AesGcm.IsSupported)
             {
                 _impl = new BclImpl(key, _iv);

test/.editorconfig

@@ -102,6 +102,12 @@ dotnet_diagnostic.SA1623.severity = none
 # For unit test projects, we do not care about documentation.
 dotnet_diagnostic.SA1629.severity = none
 
+# Workaround https://github.com/SonarSource/sonar-dotnet/issues/9767
+dotnet_diagnostic.S1450.severity = none
+dotnet_diagnostic.S1764.severity = none
+dotnet_diagnostic.S3260.severity = none
+dotnet_diagnostic.S5445.severity = none
+
 #### .NET Compiler Platform analysers rules ####
 
 # CA1001: Types that own disposable fields should be disposable

test/Renci.SshNet.IntegrationBenchmarks/Properties/AssemblyInfo.cs

@@ -0,0 +1 @@
+[assembly: DoNotParallelize]

test/Renci.SshNet.IntegrationTests/AuthenticationTests.cs

@@ -436,7 +436,7 @@ public void KeyboardInteractive_NoResponseSet_ThrowsSshAuthenticationException()
                 catch (SshAuthenticationException ex)
                 {
                     Assert.IsNull(ex.InnerException);
-                    Assert.IsTrue(ex.Message.StartsWith("AuthenticationPrompt.Response is null for prompt \"Password: \""), $"Message was \"{ex.Message}\"");
+                    Assert.StartsWith("AuthenticationPrompt.Response is null for prompt \"Password: \"", ex.Message);
                 }
             }
         }

test/Renci.SshNet.IntegrationTests/ConnectivityTests.cs

@@ -432,7 +432,7 @@ public void Common_HostKeyAlgorithms_NoMatch()
                 var ex = Assert.Throws<SshConnectionException>(client.Connect);
 
                 Assert.AreEqual(DisconnectReason.KeyExchangeFailed, ex.DisconnectReason);
-                Assert.IsTrue(ex.Message.StartsWith("No matching host key algorithm"), ex.Message);
+                Assert.StartsWith("No matching host key algorithm", ex.Message);
             }
         }
 

test/Renci.SshNet.IntegrationTests/Logging/TestConsoleLogger.cs

@@ -0,0 +1,40 @@
+#nullable enable
+using Microsoft.Extensions.Logging;
+
+namespace Renci.SshNet.IntegrationTests.Logging
+{
+    internal class TestConsoleLogger(string categoryName) : ILogger
+    {
+        public IDisposable? BeginScope<TState>(TState state)
+            where TState : notnull
+        {
+            return null;
+        }
+
+        public bool IsEnabled(LogLevel logLevel)
+        {
+            return true;
+        }
+
+        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append(logLevel);
+            sb.Append(": ");
+            sb.Append(categoryName);
+            sb.Append(": ");
+
+            string message = formatter(state, exception);
+            sb.Append(message);
+
+            if (exception != null)
+            {
+                sb.Append(": ");
+                sb.Append(exception);
+            }
+
+            string line = sb.ToString();
+            Console.WriteLine(line);
+        }
+    }
+}