Skip to content

Commit d90735e

Browse files
committed
Enable nullable
1 parent dd3ec3c commit d90735e

14 files changed

Lines changed: 89 additions & 60 deletions

File tree

src/Docker.DotNet.BasicAuth/Docker.DotNet.BasicAuth.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
<PackageId>Docker.DotNet.Enhanced.BasicAuth</PackageId>
55
<Description>A Docker.DotNet extension that adds Basic Authentication for remote Docker Engine connections.</Description>
66
</PropertyGroup>
7+
<PropertyGroup>
8+
<Nullable>enable</Nullable>
9+
</PropertyGroup>
710
<ItemGroup>
811
<ProjectReference Include="..\Docker.DotNet.Handler.Abstractions\Docker.DotNet.Handler.Abstractions.csproj" />
912
</ItemGroup>

src/Docker.DotNet.LegacyHttp/Docker.DotNet.LegacyHttp.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
<PackageId>Docker.DotNet.Enhanced.LegacyHttp</PackageId>
55
<Description>A Docker.DotNet transport implementation for HTTP(S) Docker Engine connections.</Description>
66
</PropertyGroup>
7+
<PropertyGroup>
8+
<Nullable>enable</Nullable>
9+
</PropertyGroup>
710
<PropertyGroup>
811
<BundleMicrosoftNetHttpClient>true</BundleMicrosoftNetHttpClient>
912
</PropertyGroup>

src/Docker.DotNet.NPipe/Docker.DotNet.NPipe.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
<PackageId>Docker.DotNet.Enhanced.NPipe</PackageId>
55
<Description>A Docker.DotNet transport implementation for Windows named pipe (npipe) Docker Engine connections.</Description>
66
</PropertyGroup>
7+
<PropertyGroup>
8+
<Nullable>enable</Nullable>
9+
</PropertyGroup>
710
<PropertyGroup>
811
<BundleMicrosoftNetHttpClient>true</BundleMicrosoftNetHttpClient>
912
</PropertyGroup>

src/Docker.DotNet.NativeHttp/Docker.DotNet.NativeHttp.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
<PackageId>Docker.DotNet.Enhanced.NativeHttp</PackageId>
55
<Description>A Docker.DotNet transport implementation for HTTP(S) Docker Engine connections.</Description>
66
</PropertyGroup>
7+
<PropertyGroup>
8+
<Nullable>enable</Nullable>
9+
</PropertyGroup>
710
<ItemGroup>
811
<ProjectReference Include="..\Docker.DotNet.Handler.Abstractions\Docker.DotNet.Handler.Abstractions.csproj" />
912
</ItemGroup>

src/Docker.DotNet.Unix/Docker.DotNet.Unix.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
<PackageId>Docker.DotNet.Enhanced.Unix</PackageId>
55
<Description>A Docker.DotNet transport implementation for Unix domain socket Docker Engine connections.</Description>
66
</PropertyGroup>
7+
<PropertyGroup>
8+
<Nullable>enable</Nullable>
9+
</PropertyGroup>
710
<PropertyGroup>
811
<BundleMicrosoftNetHttpClient>true</BundleMicrosoftNetHttpClient>
912
</PropertyGroup>

src/Docker.DotNet.X509/CertificateCredentials.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public CertificateCredentials(X509Certificate2 certificate)
1111

1212
public bool TlsEnabled => true;
1313

14-
public RemoteCertificateValidationCallback ServerCertificateValidationCallback { get; set; }
14+
public RemoteCertificateValidationCallback? ServerCertificateValidationCallback { get; set; }
1515

1616
public HttpMessageHandler ConfigureHandler(HttpMessageHandler handler)
1717
{
@@ -35,7 +35,10 @@ public HttpMessageHandler ConfigureHandler(HttpMessageHandler handler)
3535
httpHandler.ClientCertificates.Add(_certificate);
3636
}
3737

38-
httpHandler.ServerCertificateCustomValidationCallback = (message, certificate, chain, sslPolicyErrors) => ServerCertificateValidationCallback(message, certificate, chain, sslPolicyErrors);
38+
if (ServerCertificateValidationCallback is { } serverCertificateValidationCallback)
39+
{
40+
httpHandler.ServerCertificateCustomValidationCallback = (message, certificate, chain, sslPolicyErrors) => serverCertificateValidationCallback(message, certificate, chain, sslPolicyErrors);
41+
}
3942
return httpHandler;
4043
}
4144
#endif

src/Docker.DotNet.X509/Docker.DotNet.X509.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
<PackageId>Docker.DotNet.Enhanced.X509</PackageId>
55
<Description>A Docker.DotNet extension that adds X.509 client certificate authentication for remote Docker Engine connections.</Description>
66
</PropertyGroup>
7+
<PropertyGroup>
8+
<Nullable>enable</Nullable>
9+
</PropertyGroup>
710
<PropertyGroup>
811
<BundleMicrosoftNetHttpClient>true</BundleMicrosoftNetHttpClient>
912
</PropertyGroup>

src/Docker.DotNet/Models/ObjectExtensionData.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ namespace Docker.DotNet.Models;
33
public class ObjectExtensionData
44
{
55
[JsonExtensionData]
6-
public IDictionary<string, object> ExtensionData { get; set; }
6+
public IDictionary<string, object>? ExtensionData { get; set; }
77
}

src/Docker.DotNet/QueryString.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ private Tuple<PropertyInfo, TAttribType>[] FindAttributedPublicProperties<TValue
109109
new Tuple<PropertyInfo, TAttribType>(pi, pi.GetCustomAttribute<TAttribType>())).ToArray();
110110
}
111111

112-
private static bool IsDefaultOfType(object o)
112+
private static bool IsDefaultOfType(object? o)
113113
{
114114
if (o is ValueType)
115115
{

src/Microsoft.Net.Http.Client/BufferedReadStream.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ internal sealed class BufferedReadStream : WriteClosableStream, IPeekableStream
44
{
55
private readonly Stream _inner;
66

7-
private readonly Socket _socket;
7+
private readonly Socket? _socket;
88

99
private readonly byte[] _buffer;
1010

@@ -16,14 +16,14 @@ internal sealed class BufferedReadStream : WriteClosableStream, IPeekableStream
1616

1717
private int _bufferCount;
1818

19-
private MemoryStream _readLineBuffer;
19+
private MemoryStream? _readLineBuffer;
2020

21-
public BufferedReadStream(Stream inner, Socket socket, ILogger logger)
21+
public BufferedReadStream(Stream inner, Socket? socket, ILogger logger)
2222
: this(inner, socket, 8192, logger)
2323
{
2424
}
2525

26-
public BufferedReadStream(Stream inner, Socket socket, int bufferLength, ILogger logger)
26+
public BufferedReadStream(Stream inner, Socket? socket, int bufferLength, ILogger logger)
2727
{
2828
_inner = inner ?? throw new ArgumentNullException(nameof(inner));
2929
_socket = socket;
@@ -146,7 +146,7 @@ public bool Peek(byte[] buffer, uint toPeek, out uint peeked, out uint available
146146
throw new NotSupportedException("_inner stream isn't a peekable stream");
147147
}
148148

149-
public async Task<string> ReadLineAsync(CancellationToken cancellationToken)
149+
public async Task<string?> ReadLineAsync(CancellationToken cancellationToken)
150150
{
151151
if (_readLineBuffer == null)
152152
{

0 commit comments

Comments
 (0)