From e3ab167f2bbd81332b64dcee48bf84927142e8da Mon Sep 17 00:00:00 2001 From: Andre Hofmeister <9199345+HofmeisterAn@users.noreply.github.com> Date: Fri, 22 Jul 2022 19:32:16 +0200 Subject: [PATCH] refactor: Remove unnecessary preprocessor directives (target is always >= netstandard2.0) --- README.md | 1 - .../BasicAuthCredentials.cs | 4 --- .../MaybeSecureString.cs | 33 ------------------- .../CertificateCredentials.cs | 8 ++--- src/Docker.DotNet.X509/RSAUtil.cs | 5 --- src/Docker.DotNet/DockerClient.cs | 10 ++---- .../ManagedHandler.cs | 9 ----- .../UnixDomainSocketEndPoint.cs | 4 --- .../QueryStringParameterAttribute.cs | 3 -- 9 files changed, 4 insertions(+), 73 deletions(-) diff --git a/README.md b/README.md index f92c073ec..eead4201e 100644 --- a/README.md +++ b/README.md @@ -200,7 +200,6 @@ The `CertFile` in the example above should be a .pfx file (PKCS12 format), if yo // // You can do this globally for all certificates: -// (Note: This is not available on netstandard1.6) ServicePointManager.ServerCertificateValidationCallback += (o, c, ch, er) => true; // Or you can do this on a credential by credential basis: diff --git a/src/Docker.DotNet.BasicAuth/BasicAuthCredentials.cs b/src/Docker.DotNet.BasicAuth/BasicAuthCredentials.cs index 261a40459..16e0a3b12 100644 --- a/src/Docker.DotNet.BasicAuth/BasicAuthCredentials.cs +++ b/src/Docker.DotNet.BasicAuth/BasicAuthCredentials.cs @@ -1,7 +1,5 @@ using System.Net.Http; -#if !NETSTANDARD1_6 using System.Security; -#endif namespace Docker.DotNet.BasicAuth { @@ -17,12 +15,10 @@ public override HttpMessageHandler GetHandler(HttpMessageHandler innerHandler) return new BasicAuthHandler(_username, _password, innerHandler); } -#if !NETSTANDARD1_6 public BasicAuthCredentials(SecureString username, SecureString password, bool isTls = false) : this(new MaybeSecureString(username), new MaybeSecureString(password), isTls) { } -#endif public BasicAuthCredentials(string username, string password, bool isTls = false) : this(new MaybeSecureString(username), new MaybeSecureString(password), isTls) diff --git a/src/Docker.DotNet.BasicAuth/MaybeSecureString.cs b/src/Docker.DotNet.BasicAuth/MaybeSecureString.cs index fa8107109..8ce953039 100644 --- a/src/Docker.DotNet.BasicAuth/MaybeSecureString.cs +++ b/src/Docker.DotNet.BasicAuth/MaybeSecureString.cs @@ -1,15 +1,11 @@ using System; -#if !NETSTANDARD1_6 using System.Security; using System.Runtime.InteropServices; -#endif namespace Docker.DotNet.BasicAuth { internal class MaybeSecureString : IDisposable { -#if !NETSTANDARD1_6 - public SecureString Value { get; } public MaybeSecureString(string str) @@ -66,34 +62,5 @@ public override string ToString() Marshal.ZeroFreeGlobalAllocUnicode(unmanagedString); } } - -#else - - public string Value { get; } - - public MaybeSecureString(string str) - { - if (string.IsNullOrEmpty(str)) - { - throw new ArgumentNullException(nameof(str)); - } - - Value = str; - } - - public void Dispose() - { - } - - public MaybeSecureString Copy() - { - return this; - } - - public override string ToString() - { - return Value; - } -#endif } } \ No newline at end of file diff --git a/src/Docker.DotNet.X509/CertificateCredentials.cs b/src/Docker.DotNet.X509/CertificateCredentials.cs index 44ab93ce0..852bb34ff 100644 --- a/src/Docker.DotNet.X509/CertificateCredentials.cs +++ b/src/Docker.DotNet.X509/CertificateCredentials.cs @@ -1,7 +1,4 @@ -#if !NETSTANDARD1_6 -using System.Net; -#endif - +using System.Net; using System.Net.Http; using System.Security.Cryptography.X509Certificates; using Microsoft.Net.Http.Client; @@ -29,12 +26,11 @@ public override HttpMessageHandler GetHandler(HttpMessageHandler innerHandler) }; handler.ServerCertificateValidationCallback = this.ServerCertificateValidationCallback; -#if !NETSTANDARD1_6 + if (handler.ServerCertificateValidationCallback == null) { handler.ServerCertificateValidationCallback = ServicePointManager.ServerCertificateValidationCallback; } -#endif return handler; } diff --git a/src/Docker.DotNet.X509/RSAUtil.cs b/src/Docker.DotNet.X509/RSAUtil.cs index e2dd4b8ab..34a50346b 100644 --- a/src/Docker.DotNet.X509/RSAUtil.cs +++ b/src/Docker.DotNet.X509/RSAUtil.cs @@ -3,10 +3,7 @@ using System.Text; using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; - -#if !NETSTANDARD1_6 using System.Security; -#endif namespace Docker.DotNet.X509 { @@ -19,7 +16,6 @@ public static X509Certificate2 GetCertFromPFX(string pfxFilePath, string passwor return new X509Certificate2(pfxFilePath, password); } -#if !NETSTANDARD1_6 public static X509Certificate2 GetCertFromPFXSecure(string pfxFilePath, SecureString password) { return new X509Certificate2(pfxFilePath, password); @@ -31,7 +27,6 @@ public static X509Certificate2 GetCertFromPEMFiles(string certFilePath, string k cert.PrivateKey = RSAUtil.ReadFromPemFile(keyFilePath); return cert; } -#endif private static RSACryptoServiceProvider ReadFromPemFile(string pemFilePath) { diff --git a/src/Docker.DotNet/DockerClient.cs b/src/Docker.DotNet/DockerClient.cs index bbb07c82a..9c0b7d540 100644 --- a/src/Docker.DotNet/DockerClient.cs +++ b/src/Docker.DotNet/DockerClient.cs @@ -5,14 +5,11 @@ using System.Linq; using System.Net; using System.Net.Http; +using System.Net.Sockets; using System.Threading; using System.Threading.Tasks; using Microsoft.Net.Http.Client; -#if (NETSTANDARD1_6 || NETSTANDARD2_0) -using System.Net.Sockets; -#endif - namespace Docker.DotNet { public sealed class DockerClient : IDockerClient @@ -100,19 +97,16 @@ internal DockerClient(DockerClientConfiguration configuration, Version requested case "https": handler = new ManagedHandler(); break; - -#if (NETSTANDARD1_6 || NETSTANDARD2_0) case "unix": var pipeString = uri.LocalPath; handler = new ManagedHandler(async (string host, int port, CancellationToken cancellationToken) => { var sock = new Socket(AddressFamily.Unix, SocketType.Stream, ProtocolType.Unspecified); - await sock.ConnectAsync(new UnixDomainSocketEndPoint(pipeString)); + await sock.ConnectAsync(new Microsoft.Net.Http.Client.UnixDomainSocketEndPoint(pipeString)); return sock; }); uri = new UriBuilder("http", uri.Segments.Last()).Uri; break; -#endif default: throw new Exception($"Unknown URL scheme {configuration.EndpointBaseUri.Scheme}"); diff --git a/src/Docker.DotNet/Microsoft.Net.Http.Client/ManagedHandler.cs b/src/Docker.DotNet/Microsoft.Net.Http.Client/ManagedHandler.cs index 48d2d2825..6d92f6c00 100644 --- a/src/Docker.DotNet/Microsoft.Net.Http.Client/ManagedHandler.cs +++ b/src/Docker.DotNet/Microsoft.Net.Http.Client/ManagedHandler.cs @@ -332,16 +332,7 @@ private static async Task TCPSocketOpenerAsync(string host, int port, Ca var s = new Socket(address.AddressFamily, SocketType.Stream, ProtocolType.Tcp); try { -#if (NETSTANDARD1_3 || NETSTANDARD1_6 || NETSTANDARD2_0) await s.ConnectAsync(address, port).ConfigureAwait(false); -#else - await Task.Factory.FromAsync( - s.BeginConnect, - s.EndConnect, - new IPEndPoint(address, port), - null - ).ConfigureAwait(false); -#endif connectedSocket = s; break; } diff --git a/src/Docker.DotNet/Microsoft.Net.Http.Client/UnixDomainSocketEndPoint.cs b/src/Docker.DotNet/Microsoft.Net.Http.Client/UnixDomainSocketEndPoint.cs index 8cdbd9b1d..b89bd36fb 100644 --- a/src/Docker.DotNet/Microsoft.Net.Http.Client/UnixDomainSocketEndPoint.cs +++ b/src/Docker.DotNet/Microsoft.Net.Http.Client/UnixDomainSocketEndPoint.cs @@ -2,8 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE-MIT.txt file for more information. -#if (NETSTANDARD1_6 || NETSTANDARD2_0) - using System; using System.Diagnostics; using System.Text; @@ -95,5 +93,3 @@ public override SocketAddress Serialize() public override string ToString() => _path; } } - -#endif \ No newline at end of file diff --git a/src/Docker.DotNet/QueryStringParameterAttribute.cs b/src/Docker.DotNet/QueryStringParameterAttribute.cs index 34c228a5e..b085a1d6a 100644 --- a/src/Docker.DotNet/QueryStringParameterAttribute.cs +++ b/src/Docker.DotNet/QueryStringParameterAttribute.cs @@ -1,8 +1,5 @@ using System; using System.Linq; -#if (NETSTANDARD1_3 || NETSTANDARD1_6 || NETSTANDARD2_0) -using System.Reflection; -#endif namespace Docker.DotNet {