move nullable to Directory.Build.props and fix all null warnings

campersau · campersau · commit 80fbfce0dac9 · 2026-03-07T20:22:05.000+01:00
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -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>
diff --git a/src/Docker.DotNet.BasicAuth/Docker.DotNet.BasicAuth.csproj b/src/Docker.DotNet.BasicAuth/Docker.DotNet.BasicAuth.csproj
@@ -4,9 +4,6 @@
     <PackageId>Docker.DotNet.Enhanced.BasicAuth</PackageId>
     <Description>A Docker.DotNet extension that adds Basic Authentication for remote Docker Engine connections.</Description>
   </PropertyGroup>
-  <PropertyGroup>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Docker.DotNet.Handler.Abstractions\Docker.DotNet.Handler.Abstractions.csproj" />
   </ItemGroup>
diff --git a/src/Docker.DotNet.Handler.Abstractions/Docker.DotNet.Handler.Abstractions.csproj b/src/Docker.DotNet.Handler.Abstractions/Docker.DotNet.Handler.Abstractions.csproj
@@ -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>
diff --git a/src/Docker.DotNet.LegacyHttp/Docker.DotNet.LegacyHttp.csproj b/src/Docker.DotNet.LegacyHttp/Docker.DotNet.LegacyHttp.csproj
@@ -4,9 +4,6 @@
     <PackageId>Docker.DotNet.Enhanced.LegacyHttp</PackageId>
     <Description>A Docker.DotNet transport implementation for HTTP(S) Docker Engine connections.</Description>
   </PropertyGroup>
-  <PropertyGroup>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
   <PropertyGroup>
     <BundleMicrosoftNetHttpClient>true</BundleMicrosoftNetHttpClient>
   </PropertyGroup>
diff --git a/src/Docker.DotNet.NPipe/Docker.DotNet.NPipe.csproj b/src/Docker.DotNet.NPipe/Docker.DotNet.NPipe.csproj
@@ -4,9 +4,6 @@
     <PackageId>Docker.DotNet.Enhanced.NPipe</PackageId>
     <Description>A Docker.DotNet transport implementation for Windows named pipe (npipe) Docker Engine connections.</Description>
   </PropertyGroup>
-  <PropertyGroup>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
   <PropertyGroup>
     <BundleMicrosoftNetHttpClient>true</BundleMicrosoftNetHttpClient>
   </PropertyGroup>
diff --git a/src/Docker.DotNet.NativeHttp/Docker.DotNet.NativeHttp.csproj b/src/Docker.DotNet.NativeHttp/Docker.DotNet.NativeHttp.csproj
@@ -4,9 +4,6 @@
     <PackageId>Docker.DotNet.Enhanced.NativeHttp</PackageId>
     <Description>A Docker.DotNet transport implementation for HTTP(S) Docker Engine connections.</Description>
   </PropertyGroup>
-  <PropertyGroup>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Docker.DotNet.Handler.Abstractions\Docker.DotNet.Handler.Abstractions.csproj" />
   </ItemGroup>
diff --git a/src/Docker.DotNet.Unix/Docker.DotNet.Unix.csproj b/src/Docker.DotNet.Unix/Docker.DotNet.Unix.csproj
@@ -4,9 +4,6 @@
     <PackageId>Docker.DotNet.Enhanced.Unix</PackageId>
     <Description>A Docker.DotNet transport implementation for Unix domain socket Docker Engine connections.</Description>
   </PropertyGroup>
-  <PropertyGroup>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
   <PropertyGroup>
     <BundleMicrosoftNetHttpClient>true</BundleMicrosoftNetHttpClient>
   </PropertyGroup>
diff --git a/src/Docker.DotNet.X509/Docker.DotNet.X509.csproj b/src/Docker.DotNet.X509/Docker.DotNet.X509.csproj
@@ -4,9 +4,6 @@
     <PackageId>Docker.DotNet.Enhanced.X509</PackageId>
     <Description>A Docker.DotNet extension that adds X.509 client certificate authentication for remote Docker Engine connections.</Description>
   </PropertyGroup>
-  <PropertyGroup>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
   <PropertyGroup>
     <BundleMicrosoftNetHttpClient>true</BundleMicrosoftNetHttpClient>
   </PropertyGroup>
diff --git a/src/Docker.DotNet/Docker.DotNet.csproj b/src/Docker.DotNet/Docker.DotNet.csproj
@@ -4,9 +4,6 @@
     <PackageId>Docker.DotNet.Enhanced</PackageId>
     <Description>A .NET client for the Docker Engine API with fully asynchronous, non-blocking, object-oriented APIs.</Description>
   </PropertyGroup>
-  <PropertyGroup>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
   </ItemGroup>
diff --git a/src/Docker.DotNet/EnumerableQueryStringConverter.cs b/src/Docker.DotNet/EnumerableQueryStringConverter.cs
@@ -7,7 +7,7 @@ internal class EnumerableQueryStringConverter : IQueryStringConverter
 {
     public bool CanConvert(Type t)
     {
-        return typeof (IEnumerable).GetTypeInfo().IsAssignableFrom(t.GetTypeInfo());
+        return typeof(IEnumerable).GetTypeInfo().IsAssignableFrom(t.GetTypeInfo());
     }
 
     public string[] Convert(object o)
@@ -16,12 +16,12 @@ public string[] Convert(object o)
         Debug.Assert(o is IEnumerable);
 
         var items = new List<string>();
-        foreach (var e in ((IEnumerable) o))
+        foreach (var e in (IEnumerable)o!)
         {
             if (e is ValueType ||
                 e is string)
             {
-                items.Add(e.ToString());
+                items.Add(e.ToString()!);
             }
             else
             {
diff --git a/src/Docker.DotNet/JsonEnumMemberConverter.cs b/src/Docker.DotNet/JsonEnumMemberConverter.cs
@@ -5,7 +5,7 @@ internal sealed class JsonEnumMemberConverter<TEnum> : JsonConverter<TEnum> wher
     private readonly Dictionary<string, string> _enumFields = typeof(TEnum).GetFields(BindingFlags.Public | BindingFlags.Static)
         .Select(field => (Name: field.Name, Attribute: field.GetCustomAttribute<EnumMemberAttribute>()))
         .Where(item => item.Attribute != null && item.Attribute.Value != null)
-        .ToDictionary(item => item.Name, item => item.Attribute.Value);
+        .ToDictionary(item => item.Name, item => item.Attribute!.Value!);
 
     public override TEnum Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
diff --git a/src/Docker.DotNet/JsonSerializer.cs b/src/Docker.DotNet/JsonSerializer.cs
@@ -48,12 +48,12 @@ public byte[] SerializeToUtf8Bytes<T>(T value)
 
     public T Deserialize<T>(byte[] json)
     {
-        return System.Text.Json.JsonSerializer.Deserialize<T>(json, _options);
+        return System.Text.Json.JsonSerializer.Deserialize<T>(json, _options)!;
     }
 
     public Task<T> DeserializeAsync<T>(HttpContent content, CancellationToken cancellationToken)
     {
-        return content.ReadFromJsonAsync<T>(_options, cancellationToken);
+        return content.ReadFromJsonAsync<T>(_options, cancellationToken)!;
     }
 
     public async IAsyncEnumerable<T> DeserializeAsync<T>(Stream stream, [EnumeratorCancellation] CancellationToken cancellationToken)
@@ -69,7 +69,7 @@ public async IAsyncEnumerable<T> DeserializeAsync<T>(Stream stream, [EnumeratorC
 
             while (!buffer.IsEmpty && TryParseJson(ref buffer, out var jsonDocument))
             {
-                yield return jsonDocument.Deserialize<T>(_options);
+                yield return jsonDocument!.Deserialize<T>(_options)!;
             }
 
             if (result.IsCompleted)
@@ -83,7 +83,7 @@ public async IAsyncEnumerable<T> DeserializeAsync<T>(Stream stream, [EnumeratorC
         await reader.CompleteAsync();
     }
 
-    private static bool TryParseJson(ref ReadOnlySequence<byte> buffer, out JsonDocument jsonDocument)
+    private static bool TryParseJson(ref ReadOnlySequence<byte> buffer, out JsonDocument? jsonDocument)
     {
         var reader = new Utf8JsonReader(buffer, isFinalBlock: false, default);
 
diff --git a/src/Docker.DotNet/QueryString.cs b/src/Docker.DotNet/QueryString.cs
@@ -4,7 +4,7 @@ internal class QueryString<T> : IQueryString where T : class
 {
     private T Object { get; }
 
-    private Tuple<PropertyInfo, QueryStringParameterAttribute>[] AttributedPublicProperties { get; }
+    private Dictionary<PropertyInfo, QueryStringParameterAttribute> AttributedPublicProperties { get; }
 
     private IQueryStringConverterInstanceFactory QueryStringConverterInstanceFactory { get; }
 
@@ -25,8 +25,8 @@ public IDictionary<string, string[]> GetKeyValuePairs()
         var queryParameters = new Dictionary<string, string[]>();
         foreach (var pair in AttributedPublicProperties)
         {
-            var property = pair.Item1;
-            var attribute = pair.Item2;
+            var property = pair.Key;
+            var attribute = pair.Value;
             var value = property.GetValue(Object, null);
 
             // 'Required' check
@@ -43,12 +43,12 @@ public IDictionary<string, string[]> GetKeyValuePairs()
                 string[] valueStr;
                 if (attribute.ConverterType == null)
                 {
-                    valueStr = new[] { value.ToString() };
+                    valueStr = [value!.ToString()!];
                 }
                 else
                 {
                     var converter = QueryStringConverterInstanceFactory.GetConverterInstance(attribute.ConverterType);
-                    valueStr = ConvertValue(converter, value);
+                    valueStr = ConvertValue(converter, value!);
 
                     if (valueStr == null)
                     {
@@ -76,7 +76,7 @@ public string GetQueryString()
                         v => $"{Uri.EscapeDataString(pair.Key)}={Uri.EscapeDataString(v)}"))));
     }
 
-    private string[] ConvertValue(IQueryStringConverter converter, object value)
+    private static string[] ConvertValue(IQueryStringConverter converter, object value)
     {
         if (!converter.CanConvert(value.GetType()))
         {
@@ -86,27 +86,30 @@ private string[] ConvertValue(IQueryStringConverter converter, object value)
         return converter.Convert(value);
     }
 
-    private Tuple<PropertyInfo, TAttribType>[] FindAttributedPublicProperties<TValue, TAttribType>() where TAttribType : Attribute
+    private static Dictionary<PropertyInfo, TAttribType> FindAttributedPublicProperties<TValue, TAttribType>() where TAttribType : Attribute
     {
         var t = typeof(TValue);
-        var ofAttributeType = typeof(TAttribType);
+        Dictionary<PropertyInfo, TAttribType>? attributedPublicProperties = null;
 
-        var properties = t.GetProperties();
-        var publicProperties = properties.Where(p => p.GetGetMethod(false).IsPublic);
-        if (!publicProperties.Any())
+        foreach (var prop in t.GetProperties())
         {
-            throw new InvalidOperationException($"No public property getters found on type {t.FullName}.");
+            if (prop.GetGetMethod(false)?.IsPublic == true)
+            {
+                var attribute = prop.GetCustomAttribute<TAttribType>();
+                if (attribute != null)
+                {
+                    attributedPublicProperties ??= new Dictionary<PropertyInfo, TAttribType>();
+                    attributedPublicProperties.Add(prop, attribute);
+                }
+            }
         }
 
-        var attributedPublicProperties = properties.Where(p => p.GetCustomAttribute<TAttribType>() != null).ToArray();
-        if (!attributedPublicProperties.Any())
+        if (attributedPublicProperties == null)
         {
-            throw new InvalidOperationException(
-                $"No public properties attributed with [{ofAttributeType.FullName}] found on type {t.FullName}.");
+            throw new InvalidOperationException($"No public properties attributed with [{typeof(TAttribType).FullName}] found on type {t.FullName}.");
         }
 
-        return attributedPublicProperties.Select(pi =>
-            new Tuple<PropertyInfo, TAttribType>(pi, pi.GetCustomAttribute<TAttribType>())).ToArray();
+        return attributedPublicProperties;
     }
 
     private static bool IsDefaultOfType(object? o)
diff --git a/src/Microsoft.Net.Http.Client/HttpConnection.cs b/src/Microsoft.Net.Http.Client/HttpConnection.cs
@@ -126,7 +126,7 @@ private async Task<List<string>> ReadResponseLinesAsync(CancellationToken cancel
                 break;
             }
 
-            lines.Add(line);
+            lines.Add(line!);
         }
         while (true);
 
diff --git a/src/Microsoft.Net.Http.Client/Microsoft.Net.Http.Client.csproj b/src/Microsoft.Net.Http.Client/Microsoft.Net.Http.Client.csproj
@@ -2,9 +2,6 @@
   <PropertyGroup>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
-  <PropertyGroup>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Docker.DotNet.Handler.Abstractions\Docker.DotNet.Handler.Abstractions.csproj" />
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ internal class EnumerableQueryStringConverter : IQueryStringConverter`
`7`	`7`	`{`
`8`	`8`	`public bool CanConvert(Type t)`
`9`	`9`	`{`
`10`		`- return typeof (IEnumerable).GetTypeInfo().IsAssignableFrom(t.GetTypeInfo());`
	`10`	`+ return typeof(IEnumerable).GetTypeInfo().IsAssignableFrom(t.GetTypeInfo());`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`public string[] Convert(object o)`
`@@ -16,12 +16,12 @@ public string[] Convert(object o)`
`16`	`16`	`Debug.Assert(o is IEnumerable);`
`17`	`17`
`18`	`18`	`var items = new List<string>();`
`19`		`- foreach (var e in ((IEnumerable) o))`
	`19`	`+ foreach (var e in (IEnumerable)o!)`
`20`	`20`	`{`
`21`	`21`	`if (e is ValueType \|\|`
`22`	`22`	`e is string)`
`23`	`23`	`{`
`24`		`- items.Add(e.ToString());`
	`24`	`+ items.Add(e.ToString()!);`
`25`	`25`	`}`
`26`	`26`	`else`
`27`	`27`	`{`