Merge remote-tracking branch 'origin/main' into fork/j4587698/fix/console-size-serialization

Author: HofmeisterAn

.devcontainer/devcontainer.json

@@ -10,10 +10,11 @@
   "features": {
     "ghcr.io/devcontainers/features/git:1": {},
     "ghcr.io/devcontainers/features/git-lfs:1": {},
+    "ghcr.io/devcontainers/features/go:1": {},
     "ghcr.io/devcontainers/features/docker-in-docker:2": {
       "moby": true
     },
-    "ghcr.io/devcontainers/features/dotnet:2.4.1": {
+    "ghcr.io/devcontainers/features/dotnet:2.4.2": {
       "version": "10.0",
       "installUsingApt": false
     }
@@ -25,10 +26,10 @@
         "ms-dotnettools.csdevkit"
       ],
       "settings": {
-        "dotnet.defaultSolution": "${containerWorkspaceFolder}/Docker.DotNet.sln"
+        "dotnet.defaultSolution": "${containerWorkspaceFolder}/Docker.DotNet.slnx"
       }
     }
   },
   "postCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder} && git lfs checkout",
-  "postStartCommand": ["dotnet", "build", "${containerWorkspaceFolder}/Docker.DotNet.sln", "/consoleLoggerParameters:NoSummary", "/property:GenerateFullPaths=true", "/property:Configuration=Debug", "/property:Platform=Any CPU"]
+  "postStartCommand": ["dotnet", "build", "${containerWorkspaceFolder}/Docker.DotNet.slnx", "/consoleLoggerParameters:NoSummary", "/property:GenerateFullPaths=true", "/property:Configuration=Debug"]
 }

Docker.DotNet.sln

@@ -0,0 +1,25 @@
+<Solution>
+  <Folder Name="/Solution Items/">
+    <File Path=".gitignore" />
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Packages.props" />
+    <File Path="README.md" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src/Docker.DotNet.BasicAuth/Docker.DotNet.BasicAuth.csproj" />
+    <Project Path="src/Docker.DotNet.Handler.Abstractions/Docker.DotNet.Handler.Abstractions.csproj" />
+    <Project Path="src/Docker.DotNet.LegacyHttp/Docker.DotNet.LegacyHttp.csproj" />
+    <Project Path="src/Docker.DotNet.NativeHttp/Docker.DotNet.NativeHttp.csproj" />
+    <Project Path="src/Docker.DotNet.NPipe/Docker.DotNet.NPipe.csproj" />
+    <Project Path="src/Docker.DotNet.Unix/Docker.DotNet.Unix.csproj" />
+    <Project Path="src/Docker.DotNet.X509/Docker.DotNet.X509.csproj" />
+    <Project Path="src/Docker.DotNet/Docker.DotNet.csproj" />
+    <Project Path="src/Microsoft.Net.Http.Client/Microsoft.Net.Http.Client.csproj" />
+    <File Path="src/Directory.Build.props" />
+    <File Path="src/Directory.Build.targets" />
+  </Folder>
+  <Folder Name="/test/">
+    <Project Path="test/Docker.DotNet.Tests/Docker.DotNet.Tests.csproj" />
+    <Project Path="test/Docker.DotNet.TestsV2/Docker.DotNet.TestsV2.csproj" />
+  </Folder>
+</Solution>

Docker.DotNet.slnx

@@ -18,6 +18,10 @@
         <PackageIconUrl>https://github.com/testcontainers/Docker.DotNet/raw/main/icon.png</PackageIconUrl>
     </PropertyGroup>
 
+    <PropertyGroup>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
     <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
         <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
     </PropertyGroup>

src/Directory.Build.props

@@ -23,4 +23,5 @@
       <BuildOutputInPackage Include="$(MSBuildThisFileDirectory)Microsoft.Net.Http.Client\bin\$(Configuration)\$(TargetFramework)\Microsoft.Net.Http.Client.pdb" Condition="Exists('$(MSBuildThisFileDirectory)Microsoft.Net.Http.Client\bin\$(Configuration)\$(TargetFramework)\Microsoft.Net.Http.Client.pdb')" />
     </ItemGroup>
   </Target>
+
 </Project>

src/Directory.Build.targets

@@ -6,7 +6,7 @@ public class BasicAuthCredentials : IAuthProvider
 
     private readonly string _password;
 
-    private BasicAuthCredentials(string username, string password, bool tlsEnabled = false)
+    public BasicAuthCredentials(string username, string password, bool tlsEnabled = false)
     {
         _username = username;
         _password = password;

src/Docker.DotNet.BasicAuth/BasicAuthCredentials.cs

@@ -4,9 +4,6 @@
     <PackageId>Docker.DotNet.Enhanced.Handler.Abstractions</PackageId>
     <Description>An abstraction layer for Docker.DotNet that defines the classes and interfaces for implementing Docker Engine handlers.</Description>
   </PropertyGroup>
-  <PropertyGroup>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
   </ItemGroup>

src/Docker.DotNet.Handler.Abstractions/Docker.DotNet.Handler.Abstractions.csproj

@@ -10,6 +10,6 @@ public interface IDockerHandlerFactory : IStreamHijacker
     /// </summary>
     /// <param name="clientOptions">The client options.</param>
     /// <param name="logger">The logger instance.</param>
-    /// <returns>A tuple containing the configured handler and normalized endpoint URI.</returns>
-    Tuple<HttpMessageHandler, Uri> CreateHandler(ClientOptions clientOptions, ILogger logger);
+    /// <returns>The resolved transport.</returns>
+    ResolvedTransport CreateHandler(ClientOptions clientOptions, ILogger logger);
 }