more cleanup

Author: Rob-Hague

test/Renci.SshNet.IntegrationTests/AuthenticationTests.cs

@@ -352,6 +352,8 @@ public void KeyboardInteractive_PasswordExpired()
                             // Password expired, retype new password
                             authenticationPrompt.Response = Users.Regular.Password;
                             break;
+                        default:
+                            break;
                     }
 
                     authenticationPromptCount++;

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

@@ -4,7 +4,6 @@
     <TargetFrameworks>net48;net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsTestProject>true</IsTestProject>
-    <NoWarn>$(NoWarn);SYSLIB0021;SYSLIB1045;SYSLIB0014;IDE0220;IDE0010</NoWarn>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
 
@@ -18,7 +17,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="MSTest.TestAdapter" />

test/Renci.SshNet.IntegrationTests/SshTests.cs

@@ -1,5 +1,8 @@
 using System.ComponentModel;
 using System.Net;
+#if NETFRAMEWORK
+using System.Net.Http;
+#endif
 using System.Net.Sockets;
 
 using Renci.SshNet.Common;
@@ -537,29 +540,16 @@ public void Ssh_LocalPortForwardingCloseChannels()
 
                         try
                         {
-                            var httpRequest = (HttpWebRequest)WebRequest.Create("http://" + localEndPoint);
-                            httpRequest.Host = hostName;
-                            httpRequest.Method = "GET";
-                            httpRequest.AllowAutoRedirect = false;
-
-                            try
-                            {
-                                using (var httpResponse = (HttpWebResponse)httpRequest.GetResponse())
-                                {
-                                    Assert.AreEqual(HttpStatusCode.MovedPermanently, httpResponse.StatusCode);
-                                }
-                            }
-                            catch (WebException ex)
+                            using HttpClientHandler handler = new()
                             {
-                                Assert.AreEqual(WebExceptionStatus.ProtocolError, ex.Status);
-                                Assert.IsNotNull(ex.Response);
+                                AllowAutoRedirect = false
+                            };
 
-                                using (var httpResponse = ex.Response as HttpWebResponse)
-                                {
-                                    Assert.IsNotNull(httpResponse);
-                                    Assert.AreEqual(HttpStatusCode.MovedPermanently, httpResponse.StatusCode);
-                                }
-                            }
+                            using HttpClient httpClient = new(handler);
+
+                            using HttpResponseMessage httpResponse = httpClient.GetAsync("http://" + localEndPoint).Result;
+
+                            Assert.AreEqual(HttpStatusCode.MovedPermanently, httpResponse.StatusCode);
                         }
                         finally
                         {
@@ -606,30 +596,16 @@ public void Ssh_LocalPortForwarding()
 
                     try
                     {
-                        var httpRequest = (HttpWebRequest)WebRequest.Create("http://" + localEndPoint);
-                        httpRequest.Host = hostName;
-                        httpRequest.Method = "GET";
-                        httpRequest.Accept = "text/html";
-                        httpRequest.AllowAutoRedirect = false;
-
-                        try
-                        {
-                            using (var httpResponse = (HttpWebResponse)httpRequest.GetResponse())
-                            {
-                                Assert.AreEqual(HttpStatusCode.MovedPermanently, httpResponse.StatusCode);
-                            }
-                        }
-                        catch (WebException ex)
+                        using HttpClientHandler handler = new()
                         {
-                            Assert.AreEqual(WebExceptionStatus.ProtocolError, ex.Status);
-                            Assert.IsNotNull(ex.Response);
+                            AllowAutoRedirect = false
+                        };
 
-                            using (var httpResponse = ex.Response as HttpWebResponse)
-                            {
-                                Assert.IsNotNull(httpResponse);
-                                Assert.AreEqual(HttpStatusCode.MovedPermanently, httpResponse.StatusCode);
-                            }
-                        }
+                        using HttpClient httpClient = new(handler);
+
+                        using HttpResponseMessage httpResponse = httpClient.GetAsync("http://" + localEndPoint).Result;
+
+                        Assert.AreEqual(HttpStatusCode.MovedPermanently, httpResponse.StatusCode);
                     }
                     finally
                     {

test/Renci.SshNet.IntegrationTests/TestBase.cs

@@ -30,7 +30,7 @@ protected static void FillStream(Stream stream, int size)
 
         protected static string CreateHash(Stream stream)
         {
-            MD5 md5 = new MD5CryptoServiceProvider();
+            using MD5 md5 = MD5.Create();
             var hash = md5.ComputeHash(stream);
             return Encoding.ASCII.GetString(hash);
         }

test/Renci.SshNet.TestTools.OpenSSH/Renci.SshNet.TestTools.OpenSSH.csproj

@@ -4,13 +4,6 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <NoWarn>$(NoWarn);SYSLIB0021;SYSLIB1045</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Properties\**" />
-    <EmbeddedResource Remove="Properties\**" />
-    <None Remove="Properties\**" />
-  </ItemGroup>
-
 </Project>