feat: Update to Docker Engine v29

README.md

@@ -163,7 +163,7 @@ To obtain this stream you can use:
 ```csharp
 Stream stream = await client.System.MonitorEventsAsync(
     new ContainerEventsParameters(),
-    new Progress<JSONMessage>(),
+    new Progress<Message>(),
     CancellationToken.None);
 ```
 

src/Docker.DotNet/Base64Converter.cs

@@ -0,0 +1,16 @@
+namespace Docker.DotNet;
+
+internal class Base64Converter : JsonConverter<IList<byte>>
+{
+    public override IList<byte> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        var base64String = reader.GetString();
+        return base64String == null ? null : Convert.FromBase64String(base64String);
+    }
+
+    public override void Write(Utf8JsonWriter writer, IList<byte> value, JsonSerializerOptions options)
+    {
+        var base64String = Convert.ToBase64String(value.ToArray());
+        writer.WriteStringValue(base64String);
+    }
+}

src/Docker.DotNet/Endpoints/ExecOperations.cs

@@ -58,6 +58,6 @@ public async Task<MultiplexedStream> StartContainerExecAsync(string id, Containe
         var stream = await _client.MakeRequestForHijackedStreamAsync([NoSuchContainerHandler], HttpMethod.Post, $"exec/{id}/start", null, data, null, cancellationToken)
             .ConfigureAwait(false);
 
-        return new MultiplexedStream(stream, !parameters.Tty);
+        return new MultiplexedStream(stream, !parameters.TTY);
     }
 }

src/Docker.DotNet/Endpoints/IPluginOperations.cs

@@ -28,7 +28,7 @@ public interface IPluginOperations
     /// 200 - No error.
     /// 500 - Server error.
     /// </remarks>
-    Task<IList<PluginPrivilege>> GetPluginPrivilegesAsync(PluginGetPrivilegeParameters parameters, CancellationToken cancellationToken = default(CancellationToken));
+    Task<IList<PluginPrivilege>> GetPrivilegesAsync(PluginGetPrivilegeParameters parameters, CancellationToken cancellationToken = default(CancellationToken));
 
     /// <summary>
     /// Install a plugin.

src/Docker.DotNet/Endpoints/ISecretsOperations.cs

@@ -20,7 +20,7 @@ public interface ISecretsOperations
     /// 409 - Name conflicts with an existing object.
     /// 500 - Server error.
     /// </remarks>
-    Task<SecretCreateResponse> CreateAsync(SecretSpec body, CancellationToken cancellationToken = default(CancellationToken));
+    Task<SecretCreateResponse> CreateAsync(SwarmSecretSpec body, CancellationToken cancellationToken = default(CancellationToken));
 
     /// <summary>
     /// Inspect a secret

src/Docker.DotNet/Endpoints/PluginOperations.cs

@@ -24,7 +24,7 @@ internal PluginOperations(DockerClient client)
         return await _client.MakeRequestAsync<Plugin[]>(_client.NoErrorHandlers, HttpMethod.Get, "plugins", queryParameters, cancellationToken).ConfigureAwait(false);
     }
 
-    public async Task<IList<PluginPrivilege>> GetPluginPrivilegesAsync(PluginGetPrivilegeParameters parameters, CancellationToken cancellationToken = default(CancellationToken))
+    public async Task<IList<PluginPrivilege>> GetPrivilegesAsync(PluginGetPrivilegeParameters parameters, CancellationToken cancellationToken = default(CancellationToken))
     {
         if (parameters == null)
         {

src/Docker.DotNet/Endpoints/SecretsOperations.cs

@@ -14,14 +14,14 @@ async Task<IList<Secret>> ISecretsOperations.ListAsync(CancellationToken cancell
         return await _client.MakeRequestAsync<IList<Secret>>(_client.NoErrorHandlers, HttpMethod.Get, "secrets", cancellationToken).ConfigureAwait(false);
     }
 
-    async Task<SecretCreateResponse> ISecretsOperations.CreateAsync(SecretSpec body, CancellationToken cancellationToken)
+    async Task<SecretCreateResponse> ISecretsOperations.CreateAsync(SwarmSecretSpec body, CancellationToken cancellationToken)
     {
         if (body == null)
         {
             throw new ArgumentNullException(nameof(body));
         }
 
-        var data = new JsonRequestContent<SecretSpec>(body, DockerClient.JsonSerializer);
+        var data = new JsonRequestContent<SwarmSecretSpec>(body, DockerClient.JsonSerializer);
         return await _client.MakeRequestAsync<SecretCreateResponse>(_client.NoErrorHandlers, HttpMethod.Post, "secrets/create", null, data, cancellationToken).ConfigureAwait(false);
     }
 

src/Docker.DotNet/JsonSerializer.cs

@@ -14,7 +14,6 @@ private JsonSerializer()
         _options.Converters.Add(new JsonEnumMemberConverter<TaskState>());
         _options.Converters.Add(new JsonDateTimeConverter());
         _options.Converters.Add(new JsonNullableDateTimeConverter());
-        _options.Converters.Add(new JsonBase64Converter());
     }
 
     public static JsonSerializer Instance { get; }

src/Docker.DotNet/Models/AuthConfig.Generated.cs

@@ -11,9 +11,6 @@ public class AuthConfig // (registry.AuthConfig)
         [JsonPropertyName("auth")]
         public string Auth { get; set; }
 
-        [JsonPropertyName("email")]
-        public string Email { get; set; }
-
         [JsonPropertyName("serveraddress")]
         public string ServerAddress { get; set; }
 

src/Docker.DotNet/Models/AuthResponse.Generated.cs

@@ -1,6 +1,6 @@
 namespace Docker.DotNet.Models
 {
-    public class AuthResponse // (registry.AuthenticateOKBody)
+    public class AuthResponse // (registry.AuthResponse)
     {
         [JsonPropertyName("IdentityToken")]
         public string IdentityToken { get; set; }

src/Docker.DotNet/Models/Commit.Generated.cs

@@ -4,8 +4,5 @@ public class Commit // (system.Commit)
     {
         [JsonPropertyName("ID")]
         public string ID { get; set; }
-
-        [JsonPropertyName("Expected")]
-        public string Expected { get; set; }
     }
 }

src/Docker.DotNet/Models/CommitContainerChangesParameters.Generated.cs

@@ -29,7 +29,6 @@ public CommitContainerChangesParameters(ContainerConfig Config)
                 this.WorkingDir = Config.WorkingDir;
                 this.Entrypoint = Config.Entrypoint;
                 this.NetworkDisabled = Config.NetworkDisabled;
-                this.MacAddress = Config.MacAddress;
                 this.OnBuild = Config.OnBuild;
                 this.Labels = Config.Labels;
                 this.StopSignal = Config.StopSignal;
@@ -116,9 +115,6 @@ public CommitContainerChangesParameters(ContainerConfig Config)
         [JsonPropertyName("NetworkDisabled")]
         public bool NetworkDisabled { get; set; }
 
-        [JsonPropertyName("MacAddress")]
-        public string MacAddress { get; set; }
-
         [JsonPropertyName("OnBuild")]
         public IList<string> OnBuild { get; set; }
 

src/Docker.DotNet/Models/ComponentVersion.Generated.cs

@@ -1,6 +1,6 @@
 namespace Docker.DotNet.Models
 {
-    public class ComponentVersion // (types.ComponentVersion)
+    public class ComponentVersion // (system.ComponentVersion)
     {
         [JsonPropertyName("Name")]
         public string Name { get; set; }

src/Docker.DotNet/Models/ConsoleSize.Generated.cs

@@ -0,0 +1,11 @@
+namespace Docker.DotNet.Models
+{
+    public class ConsoleSize // (client.ConsoleSize)
+    {
+        [JsonPropertyName("Height")]
+        public ulong Height { get; set; }
+
+        [JsonPropertyName("Width")]
+        public ulong Width { get; set; }
+    }
+}

src/Docker.DotNet/Models/ContainerConfig.Generated.cs

@@ -59,9 +59,6 @@ public class ContainerConfig // (container.Config)
         [JsonPropertyName("NetworkDisabled")]
         public bool NetworkDisabled { get; set; }
 
-        [JsonPropertyName("MacAddress")]
-        public string MacAddress { get; set; }
-
         [JsonPropertyName("OnBuild")]
         public IList<string> OnBuild { get; set; }
 

src/Docker.DotNet/Models/ContainerExecCreateParameters.Generated.cs

@@ -8,11 +8,11 @@ public class ContainerExecCreateParameters // (main.ContainerExecCreateParameter
         [JsonPropertyName("Privileged")]
         public bool Privileged { get; set; }
 
-        [JsonPropertyName("Tty")]
-        public bool Tty { get; set; }
+        [JsonPropertyName("TTY")]
+        public bool TTY { get; set; }
 
         [JsonPropertyName("ConsoleSize")]
-        public ulong[] ConsoleSize { get; set; }
+        public ConsoleSize ConsoleSize { get; set; }
 
         [JsonPropertyName("AttachStdin")]
         public bool AttachStdin { get; set; }
@@ -34,8 +34,5 @@ public class ContainerExecCreateParameters // (main.ContainerExecCreateParameter
 
         [JsonPropertyName("Cmd")]
         public IList<string> Cmd { get; set; }
-
-        [JsonPropertyName("Detach")]
-        public bool Detach { get; set; }
     }
 }

src/Docker.DotNet/Models/ContainerExecInspectResponse.Generated.cs

@@ -1,18 +1,36 @@
 namespace Docker.DotNet.Models
 {
-    public class ContainerExecInspectResponse // (container.ExecInspect)
+    public class ContainerExecInspectResponse // (container.ExecInspectResponse)
     {
         [JsonPropertyName("ID")]
-        public string ExecID { get; set; }
-
-        [JsonPropertyName("ContainerID")]
-        public string ContainerID { get; set; }
+        public string ID { get; set; }
 
         [JsonPropertyName("Running")]
         public bool Running { get; set; }
 
         [JsonPropertyName("ExitCode")]
-        public long ExitCode { get; set; }
+        public long? ExitCode { get; set; }
+
+        [JsonPropertyName("ProcessConfig")]
+        public ExecProcessConfig ProcessConfig { get; set; }
+
+        [JsonPropertyName("OpenStdin")]
+        public bool OpenStdin { get; set; }
+
+        [JsonPropertyName("OpenStderr")]
+        public bool OpenStderr { get; set; }
+
+        [JsonPropertyName("OpenStdout")]
+        public bool OpenStdout { get; set; }
+
+        [JsonPropertyName("CanRemove")]
+        public bool CanRemove { get; set; }
+
+        [JsonPropertyName("ContainerID")]
+        public string ContainerID { get; set; }
+
+        [JsonPropertyName("DetachKeys")]
+        public string DetachKeys { get; set; }
 
         [JsonPropertyName("Pid")]
         public long Pid { get; set; }

src/Docker.DotNet/Models/ContainerExecStartParameters.Generated.cs

@@ -5,10 +5,10 @@ public class ContainerExecStartParameters // (main.ContainerExecStartParameters)
         [JsonPropertyName("Detach")]
         public bool Detach { get; set; }
 
-        [JsonPropertyName("Tty")]
-        public bool Tty { get; set; }
+        [JsonPropertyName("TTY")]
+        public bool TTY { get; set; }
 
         [JsonPropertyName("ConsoleSize")]
-        public ulong[] ConsoleSize { get; set; }
+        public ConsoleSize ConsoleSize { get; set; }
     }
 }

src/Docker.DotNet/Models/ContainerInspectResponse.Generated.cs

@@ -2,39 +2,6 @@ namespace Docker.DotNet.Models
 {
     public class ContainerInspectResponse // (container.InspectResponse)
     {
-        public ContainerInspectResponse()
-        {
-        }
-
-        public ContainerInspectResponse(ContainerJSONBase ContainerJSONBase)
-        {
-            if (ContainerJSONBase != null)
-            {
-                this.ID = ContainerJSONBase.ID;
-                this.Created = ContainerJSONBase.Created;
-                this.Path = ContainerJSONBase.Path;
-                this.Args = ContainerJSONBase.Args;
-                this.State = ContainerJSONBase.State;
-                this.Image = ContainerJSONBase.Image;
-                this.ResolvConfPath = ContainerJSONBase.ResolvConfPath;
-                this.HostnamePath = ContainerJSONBase.HostnamePath;
-                this.HostsPath = ContainerJSONBase.HostsPath;
-                this.LogPath = ContainerJSONBase.LogPath;
-                this.Name = ContainerJSONBase.Name;
-                this.RestartCount = ContainerJSONBase.RestartCount;
-                this.Driver = ContainerJSONBase.Driver;
-                this.Platform = ContainerJSONBase.Platform;
-                this.MountLabel = ContainerJSONBase.MountLabel;
-                this.ProcessLabel = ContainerJSONBase.ProcessLabel;
-                this.AppArmorProfile = ContainerJSONBase.AppArmorProfile;
-                this.ExecIDs = ContainerJSONBase.ExecIDs;
-                this.HostConfig = ContainerJSONBase.HostConfig;
-                this.GraphDriver = ContainerJSONBase.GraphDriver;
-                this.SizeRw = ContainerJSONBase.SizeRw;
-                this.SizeRootFs = ContainerJSONBase.SizeRootFs;
-            }
-        }
-
         [JsonPropertyName("Id")]
         public string ID { get; set; }
 
@@ -95,6 +62,9 @@ public ContainerInspectResponse(ContainerJSONBase ContainerJSONBase)
         [JsonPropertyName("GraphDriver")]
         public DriverData GraphDriver { get; set; }
 
+        [JsonPropertyName("Storage")]
+        public Storage Storage { get; set; }
+
         [JsonPropertyName("SizeRw")]
         public long? SizeRw { get; set; }