Enable IsAotCompatible

Author: campersau

.github/workflows/ci.yml

@@ -132,13 +132,9 @@ jobs:
           exit 1
 
       - name: Test (${{ matrix.docker.name }})
-        run: >-
-          dotnet test
-          --configuration Release
-          --framework ${{ matrix.dotnet.tfm }}
-          --no-restore
-          --no-build
-          --logger console
+        run: |
+          ./test/Docker.DotNet.Tests/bin/Release/${{ matrix.dotnet.tfm }}/linux-x64/publish/Docker.DotNet.Tests
+          ./test/Docker.DotNet.TestsV2/bin/Release/${{ matrix.dotnet.tfm }}/linux-x64/publish/Docker.DotNet.TestsV2
         env:
           DOCKER_HOST: ${{ matrix.docker.docker_host }}
           DOCKER_TLS_VERIFY: ${{ matrix.docker.tls_verify }}

Directory.Packages.props

@@ -11,8 +11,7 @@
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
     <PackageVersion Include="BouncyCastle.Cryptography" Version="2.5.1" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
-    <PackageVersion Include="xunit" Version="2.9.2" />
+    <PackageVersion Include="xunit.v3.mtp-v2" Version="4.0.0-pre.33" />
+    <PackageVersion Include="xunit.v3.aot.mtp-v2" Version="4.0.0-pre.33" />
   </ItemGroup>
 </Project>

global.json

@@ -0,0 +1,5 @@
+{
+  "test": {
+    "runner": "Microsoft.Testing.Platform"
+  }
+}

src/Directory.Build.props

@@ -20,6 +20,7 @@
 
     <PropertyGroup>
         <Nullable>enable</Nullable>
+        <IsAotCompatible>true</IsAotCompatible>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">

src/Docker.DotNet.NPipe/DockerHandlerFactory.cs

@@ -45,10 +45,10 @@ public ResolvedTransport CreateHandler(NPipeTransportOptions transportOptions, C
 
             var dockerStream = new DockerPipeStream(clientStream);
 
-#if NETSTANDARD
-            var namedPipeConnectTimeout = (int)transportOptions.ConnectTimeout.TotalMilliseconds;
-#else
+#if NET
             var namedPipeConnectTimeout = transportOptions.ConnectTimeout;
+#else
+            var namedPipeConnectTimeout = (int)transportOptions.ConnectTimeout.TotalMilliseconds;
 #endif
 
             await clientStream.ConnectAsync(namedPipeConnectTimeout, cancellationToken)

src/Docker.DotNet.NativeHttp/DockerHandlerFactory.cs

@@ -29,7 +29,7 @@ public ResolvedTransport CreateHandler(NativeHttpTransportOptions transportOptio
         var scheme = clientOptions.AuthProvider.TlsEnabled ? Uri.UriSchemeHttps : Uri.UriSchemeHttp;
         var uri = new UriBuilder(clientOptions.Endpoint) { Scheme = scheme }.Uri;
 
-#if NET6_0_OR_GREATER
+#if NET
         var handler = new SocketsHttpHandler
         {
             MaxConnectionsPerServer = MaxConnectionsPerServer,

src/Docker.DotNet.NativeHttp/NativeHttpTransportOptions.cs

@@ -5,7 +5,7 @@ namespace Docker.DotNet.NativeHttp;
 /// </summary>
 public sealed record NativeHttpTransportOptions
 {
-#if NET6_0_OR_GREATER
+#if NET
     /// <summary>
     /// Gets a callback that configures the created <see cref="SocketsHttpHandler"/> instance.
     /// </summary>

src/Docker.DotNet.X509/CertificateCredentials.cs

@@ -15,7 +15,7 @@ public CertificateCredentials(X509Certificate2? certificate)
 
     public HttpMessageHandler ConfigureHandler(HttpMessageHandler handler)
     {
-#if NET6_0_OR_GREATER
+#if NET
         if (handler is SocketsHttpHandler socketsHandler)
         {
             if (_certificate != null)

src/Docker.DotNet.X509/DockerTlsCertificates.cs

@@ -64,7 +64,7 @@ public static X509Certificate2 LoadCertificateFromPemFiles(string certPemPath, s
         }
 
         return certificate;
-#elif NET6_0_OR_GREATER
+#elif NET
         var certificate = X509Certificate2.CreateFromPemFile(certPemPath, keyPemPath);
 
         if (OperatingSystem.IsWindows())
@@ -75,10 +75,8 @@ public static X509Certificate2 LoadCertificateFromPemFiles(string certPemPath, s
         }
 
         return certificate;
-#elif NETSTANDARD
-        return Polyfills.X509Certificate2.CreateFromPemFile(certPemPath, keyPemPath);
 #else
-        return X509Certificate2.CreateFromPemFile(certPemPath, keyPemPath);
+        return Polyfills.X509Certificate2.CreateFromPemFile(certPemPath, keyPemPath);
 #endif
     }
 
@@ -141,7 +139,7 @@ public static RemoteCertificateValidationCallback CreateCertificateAuthorityVali
             using var chain = new X509Chain();
             chain.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;
 
-#if NET5_0_OR_GREATER
+#if NET
             chain.ChainPolicy.TrustMode = X509ChainTrustMode.CustomRootTrust;
             chain.ChainPolicy.CustomTrustStore.Add(certificateAuthorityCertificate);
             return chain.Build(serverCertificate2);

src/Docker.DotNet/DockerClient.cs

@@ -370,7 +370,7 @@ private async Task<HttpResponseMessage> PrivateMakeRequestAsync(
 
         if (Timeout.InfiniteTimeSpan == timeout)
         {
-#if NET6_0_OR_GREATER
+#if NET
             return await _client.SendAsync(request, completionOption, cancellationToken)
                 .ConfigureAwait(false);
 #else