From 20d611f9c2ee6bf8f7d98f5a9851fc86d33d6828 Mon Sep 17 00:00:00 2001 From: Jean-Sebastien Carle <29762210+jscarle@users.noreply.github.com> Date: Sat, 17 Feb 2024 10:39:10 -0500 Subject: [PATCH 1/3] Updated dependencies. --- Directory.Build.props | 4 ++-- src/Renci.SshNet/.editorconfig | 4 ++++ src/Renci.SshNet/Renci.SshNet.csproj | 5 +++-- .../Renci.SshNet.Benchmarks.csproj | 3 ++- .../Renci.SshNet.IntegrationBenchmarks/.editorconfig | 4 ++++ .../Renci.SshNet.IntegrationBenchmarks.csproj | 4 +--- .../Renci.SshNet.IntegrationTests.csproj | 11 ++++++----- .../Renci.SshNet.TestTools.OpenSSH.csproj | 5 ++++- test/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj | 12 ++++++------ 9 files changed, 32 insertions(+), 20 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 65a489ddc..b373ddf22 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -34,7 +34,7 @@ --> - - + + diff --git a/src/Renci.SshNet/.editorconfig b/src/Renci.SshNet/.editorconfig index c5f4bdf61..fce5e66b4 100644 --- a/src/Renci.SshNet/.editorconfig +++ b/src/Renci.SshNet/.editorconfig @@ -159,3 +159,7 @@ dotnet_diagnostic.IDE0048.severity = none # IDE0305: Collection initialization can be simplified # https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/ide0305 dotnet_diagnostic.IDE0305.severity = none + +# IDE0005: Remove unnecessary using directives +# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/ide0005 +dotnet_diagnostic.IDE0005.severity = suggestion diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj index f1ce038ba..c4592c0a8 100644 --- a/src/Renci.SshNet/Renci.SshNet.csproj +++ b/src/Renci.SshNet/Renci.SshNet.csproj @@ -1,4 +1,5 @@  + Renci.SshNet SSH.NET @@ -37,7 +38,7 @@ - + @@ -51,4 +52,4 @@ - \ No newline at end of file + diff --git a/test/Renci.SshNet.Benchmarks/Renci.SshNet.Benchmarks.csproj b/test/Renci.SshNet.Benchmarks/Renci.SshNet.Benchmarks.csproj index 244b4d722..1b49138db 100644 --- a/test/Renci.SshNet.Benchmarks/Renci.SshNet.Benchmarks.csproj +++ b/test/Renci.SshNet.Benchmarks/Renci.SshNet.Benchmarks.csproj @@ -1,4 +1,5 @@  + Exe net8.0 @@ -7,7 +8,7 @@ - + diff --git a/test/Renci.SshNet.IntegrationBenchmarks/.editorconfig b/test/Renci.SshNet.IntegrationBenchmarks/.editorconfig index e903a76d8..9570f2b85 100644 --- a/test/Renci.SshNet.IntegrationBenchmarks/.editorconfig +++ b/test/Renci.SshNet.IntegrationBenchmarks/.editorconfig @@ -70,3 +70,7 @@ dotnet_diagnostic.MA0053.severity = suggestion # CA2000: Dispose objects before losing scope # https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca2000 dotnet_diagnostic.CA2000.severity = suggestion + +# Error CS8892: Method 'TestingPlatformEntryPoint.Main(string[])' will not be used as an entry point because a synchronous entry point 'Program.Main(string[])' was found. +# https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/compiler-messages/warning-waves#cs8892---method-will-not-be-used-as-an-entry-point-because-a-synchronous-entry-point-method-was-found +dotnet_diagnostic.CS8892.severity = suggestion diff --git a/test/Renci.SshNet.IntegrationBenchmarks/Renci.SshNet.IntegrationBenchmarks.csproj b/test/Renci.SshNet.IntegrationBenchmarks/Renci.SshNet.IntegrationBenchmarks.csproj index 2af6c25ce..aef8d5daa 100644 --- a/test/Renci.SshNet.IntegrationBenchmarks/Renci.SshNet.IntegrationBenchmarks.csproj +++ b/test/Renci.SshNet.IntegrationBenchmarks/Renci.SshNet.IntegrationBenchmarks.csproj @@ -8,9 +8,7 @@ - - - + diff --git a/test/Renci.SshNet.IntegrationTests/Renci.SshNet.IntegrationTests.csproj b/test/Renci.SshNet.IntegrationTests/Renci.SshNet.IntegrationTests.csproj index ed0a5d0c0..e8bd8df03 100644 --- a/test/Renci.SshNet.IntegrationTests/Renci.SshNet.IntegrationTests.csproj +++ b/test/Renci.SshNet.IntegrationTests/Renci.SshNet.IntegrationTests.csproj @@ -10,10 +10,10 @@ - - - - + + + + - + @@ -46,4 +46,5 @@ + diff --git a/test/Renci.SshNet.TestTools.OpenSSH/Renci.SshNet.TestTools.OpenSSH.csproj b/test/Renci.SshNet.TestTools.OpenSSH/Renci.SshNet.TestTools.OpenSSH.csproj index a6dbd202d..a7b18cf8b 100644 --- a/test/Renci.SshNet.TestTools.OpenSSH/Renci.SshNet.TestTools.OpenSSH.csproj +++ b/test/Renci.SshNet.TestTools.OpenSSH/Renci.SshNet.TestTools.OpenSSH.csproj @@ -1,13 +1,16 @@  + netstandard2.0 enable enable $(NoWarn);SYSLIB0021;SYSLIB1045 + - \ No newline at end of file + + diff --git a/test/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/test/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj index 5ba659daa..2bf14b250 100644 --- a/test/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj +++ b/test/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj @@ -1,4 +1,5 @@  + net462;net6.0;net7.0;net8.0 @@ -8,11 +9,10 @@ - - - - - + + + + @@ -23,10 +23,10 @@ build; native; contentfiles; analyzers; buildtransitive all - + From 1e45412de95a9812270aefb531d460175e59e283 Mon Sep 17 00:00:00 2001 From: Jean-Sebastien Carle <29762210+jscarle@users.noreply.github.com> Date: Sun, 18 Feb 2024 11:23:50 -0500 Subject: [PATCH 2/3] Reverted Microsoft.Bcl.AsyncInterfaces back to version 1.0.0. Also added a note so we no longer try to upgrade it. --- src/Renci.SshNet/Renci.SshNet.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Renci.SshNet/Renci.SshNet.csproj b/src/Renci.SshNet/Renci.SshNet.csproj index c4592c0a8..a9e2a1f85 100644 --- a/src/Renci.SshNet/Renci.SshNet.csproj +++ b/src/Renci.SshNet/Renci.SshNet.csproj @@ -38,7 +38,8 @@ - + + From efe07ce4fecf06166816321ddfc2527c0e7311d3 Mon Sep 17 00:00:00 2001 From: Jean-Sebastien Carle <29762210+jscarle@users.noreply.github.com> Date: Tue, 20 Feb 2024 12:25:02 -0500 Subject: [PATCH 3/3] Reverted back to Moq. --- test/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj b/test/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj index 2bf14b250..08b744b39 100644 --- a/test/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj +++ b/test/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj @@ -12,7 +12,7 @@ - +