nullability step 2

Capnp.Net.Runtime/AnyPointer.cs

@@ -1,5 +1,4 @@
-#nullable enable
+namespace Capnp
-namespace Capnp
 {
     /// <summary>
     /// Generic <see cref="ICapnpSerializable"/> implementation, based on a wrapper around <see cref="DeserializerState"/>.
@@ -29,5 +28,4 @@ namespace Capnp
             Reserializing.DeepCopy(State, state);
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Capnp.Net.Runtime.csproj

@@ -4,6 +4,8 @@
     <TargetFrameworks>netstandard2.0;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
     <RootNamespace>Capnp</RootNamespace>
     <LangVersion>8.0</LangVersion>
+    <Nullable>Enable</Nullable>
+    <WarningsAsErrors>CS8600;CS8602;CS8603</WarningsAsErrors>
     <AssemblyName>Capnp.Net.Runtime</AssemblyName>
     <PackageId>Capnp.Net.Runtime</PackageId>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

Capnp.Net.Runtime/CapnpSerializable.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -171,5 +170,4 @@ namespace Capnp
             return (T?)GetSerializer(typeof(T))(state);
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/DeserializationException.cs

@@ -1,6 +1,5 @@
 using System;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -23,5 +22,4 @@ namespace Capnp
         {
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/DeserializerState.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -695,8 +693,7 @@ namespace Capnp
             if (Caps == null)
                 throw new InvalidOperationException("Capability table not set. This is a bug.");
 
-            return Rpc.CapabilityReflection.CreateProxy<T>(Caps[(int)CapabilityIndex]) as T;
+            return (Rpc.CapabilityReflection.CreateProxy<T>(Caps[(int)CapabilityIndex]) as T)!;
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/DynamicSerializerState.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -226,5 +225,4 @@ namespace Capnp
             }
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/EmptyList.cs

@@ -3,7 +3,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -36,5 +35,4 @@ namespace Capnp
             return GetEnumerator();
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/EmptyListDeserializer.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -86,5 +85,4 @@ namespace Capnp
         /// </summary>
         public override IReadOnlyList<ushort> CastUShort() => new EmptyList<ushort>();
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/FramePump.cs

@@ -2,14 +2,11 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
-using System.Net.Sockets;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -196,5 +193,4 @@ namespace Capnp
             _tracers.Add(tracer);
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/FrameTracing/IFrameTracer.cs

@@ -1,6 +1,5 @@
 using System;
 
-#nullable enable
 namespace Capnp.FrameTracing
 {
     /// <summary>
@@ -32,4 +31,3 @@ namespace Capnp.FrameTracing
         void TraceFrame(FrameDirection direction, WireFrame frame);
     }
 }
-#nullable restore

Capnp.Net.Runtime/FrameTracing/RpcFrameTracer.cs

@@ -6,7 +6,6 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 
-#nullable enable
 namespace Capnp.FrameTracing
 {
     /// <summary>
@@ -245,5 +244,4 @@ namespace Capnp.FrameTracing
             }
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Framing.cs

@@ -3,7 +3,6 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -107,5 +106,4 @@ namespace Capnp
             }
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/ICapnpSerializable.cs

@@ -1,5 +1,4 @@
-#nullable enable
+namespace Capnp
-namespace Capnp
 {
     /// <summary>
     /// This interface is intended to be implemented by schema-generated domain classes which support deserialization from
@@ -19,5 +18,4 @@ namespace Capnp
         /// <param name="state">Source deserializer state</param>
         void Deserialize(DeserializerState state);
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/ISegmentAllocator.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -27,5 +26,4 @@ namespace Capnp
         /// <returns>Whether allocation was successful</returns>
         bool Allocate(uint nwords, uint preferredSegment, out SegmentSlice slice, bool forcePreferredSegment);
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/IStructDeserializer.cs

@@ -1,6 +1,5 @@
 using System;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -20,5 +19,4 @@ namespace Capnp
         /// <exception cref="DeserializationException">this state does not represent a struct</exception>
         ulong StructReadData(ulong bitOffset, int bitCount);
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/IStructSerializer.cs

@@ -1,6 +1,5 @@
 using System;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -25,5 +24,4 @@ namespace Capnp
         /// </summary>
         Span<ulong> StructDataSection { get; }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/ListDeserializer.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -401,5 +400,4 @@ namespace Capnp
             return Cast(sd => sd.ReadDataDouble(0));
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/ListKind.cs

@@ -1,5 +1,4 @@
-#nullable enable
+namespace Capnp
-namespace Capnp
 {
     /// <summary>
     /// Enumerates the list element categories which are defined by Cap'n Proto.
@@ -46,5 +45,4 @@ namespace Capnp
         /// </summary>
         ListOfStructs = 7
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/ListOfBitsDeserializer.cs

@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -77,5 +76,4 @@ namespace Capnp
             throw new NotSupportedException("Cannot cast a list of bits to anything else");
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/ListOfBitsSerializer.cs

@@ -3,7 +3,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -96,5 +95,4 @@ namespace Capnp
 
         IEnumerator IEnumerable.GetEnumerator() => this.ToArray().GetEnumerator();
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/ListOfCapsDeserializer.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Text;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -70,5 +68,4 @@ namespace Capnp
             return GetEnumerator();
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/ListOfCapsSerializer.cs

@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -108,5 +107,4 @@ namespace Capnp
             return GetEnumerator();
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/ListOfEmptyDeserializer.cs

@@ -3,7 +3,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -64,5 +63,4 @@ namespace Capnp
             return GetEnumerator();
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/ListOfEmptySerializer.cs

@@ -1,6 +1,5 @@
 using System;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -31,5 +30,4 @@ namespace Capnp
             SetListOfValues(0, count);
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/ListOfPointersDeserializer.cs

@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -89,5 +88,4 @@ namespace Capnp
             return this.LazyListSelect(d => d.RequireCapList<T>());
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/ListOfPointersSerializer.cs

@@ -1,10 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -115,5 +112,4 @@ namespace Capnp
             return GetEnumerator();
         }
     }
-}
+}
-#nullable enable

Capnp.Net.Runtime/ListOfPrimitivesDeserializer.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -232,5 +231,4 @@ namespace Capnp
             return GetEnumerator();
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/ListOfPrimitivesSerializer.cs

@@ -2,9 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -94,5 +92,4 @@ namespace Capnp
 
         IEnumerator IEnumerable.GetEnumerator() => Data.ToArray().GetEnumerator();
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/ListOfStructsDeserializer.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -79,5 +77,4 @@ namespace Capnp
             return GetEnumerator();
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/ListOfStructsSerializer.cs

@@ -3,7 +3,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -93,5 +92,4 @@ namespace Capnp
             return GetEnumerator();
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/ListOfTextSerializer.cs

@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -109,6 +108,4 @@ namespace Capnp
             return GetEnumerator();
         }
     }
-}
+}
-
-#nullable restore

Capnp.Net.Runtime/Logging.cs

@@ -1,7 +1,5 @@
-using System;
+using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -21,5 +19,4 @@ namespace Capnp
         /// <returns>The logger instance</returns>
         public static ILogger CreateLogger<T>() => LoggerFactory.CreateLogger<T>();
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/MessageBuilder.cs

@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Text;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -101,5 +98,4 @@ namespace Capnp
         public ISegmentAllocator Allocator => _allocator;
         internal List<Rpc.ConsumedCapability?>? Caps => _capTable;
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/ObjectKind.cs

@@ -1,6 +1,5 @@
 using System;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -71,5 +70,4 @@ namespace Capnp
         /// </summary>
         Value = 16
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/PrimitiveCoder.cs

@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
-#nullable enable
 namespace Capnp
 {
     class PrimitiveCoder
@@ -45,5 +42,4 @@ namespace Capnp
                 throw new NotSupportedException("Generic type argument is not a supported primitive type, no coder defined");
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/ReadOnlyListExtensions.cs

@@ -2,9 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -71,5 +69,4 @@ namespace Capnp
             return source.Select(selector).ToList().AsReadOnly();
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Reserializing.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -103,5 +101,4 @@ namespace Capnp
             to.InheritFrom(ds);
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/AnswerOrCounterquestion.cs

@@ -1,5 +1,4 @@
-#nullable enable
+namespace Capnp.Rpc
-namespace Capnp.Rpc
 {
     /// <summary>
     /// Helper struct to support tail calls
@@ -41,5 +40,4 @@ namespace Capnp.Rpc
         /// </summary>
         public PendingQuestion? Counterquestion => _obj as PendingQuestion;
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/BareProxy.cs

@@ -1,5 +1,4 @@
-#nullable enable
+namespace Capnp.Rpc
-namespace Capnp.Rpc
 {
     /// <summary>
     /// Generic Proxy implementation which exposes the (usually protected) Call method.
@@ -50,5 +49,4 @@ namespace Capnp.Rpc
             return base.Call(interfaceId, methodId, args, default);
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/CapabilityReflection.cs

@@ -1,9 +1,7 @@
 using System;
-using System.Diagnostics;
 using System.Linq;
 using System.Runtime.CompilerServices;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     /// <summary>
@@ -286,5 +284,4 @@ namespace Capnp.Rpc
             return proxy;
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/ConnectionState.cs

@@ -1,5 +1,4 @@
-#nullable enable
+namespace Capnp.Rpc
-namespace Capnp.Rpc
 {
     /// <summary>
     /// State of an RPC connection
@@ -22,5 +21,4 @@ namespace Capnp.Rpc
         /// </summary>
         Down
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/ConsumedCapability.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Capnp.Rpc
-using System.Threading;
-using System.Threading.Tasks;
-
-#nullable enable
-namespace Capnp.Rpc
 {
     /// <summary>
     /// Base class for a low-level capability at consumer side. It is created by the <see cref="RpcEngine"/>. An application does not directly interact with it
@@ -31,5 +26,4 @@ namespace Capnp.Rpc
         public int CreatorLineNumber { get; set; }
 #endif
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/IConnection.cs

@@ -1,7 +1,6 @@
 using Capnp.FrameTracing;
 using System;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     /// <summary>
@@ -58,5 +57,4 @@ namespace Capnp.Rpc
         /// </summary>
         void Close();
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/IEndpoint.cs

@@ -1,5 +1,4 @@
-#nullable enable
+namespace Capnp.Rpc
-namespace Capnp.Rpc
 {
     /// <summary>
     /// A uni-directional endpoint, used in conjunction with the <see cref="RpcEngine"/>.
@@ -16,5 +15,4 @@ namespace Capnp.Rpc
         /// </summary>
         void Dismiss();
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/IMonoSkeleton.cs

@@ -1,5 +1,4 @@
-#nullable enable
+namespace Capnp.Rpc
-namespace Capnp.Rpc
 {
     /// <summary>
     /// A mono skeleton (as opposed to <see cref="PolySkeleton"/>) is a skeleton which implements one particular RPC interface.
@@ -11,5 +10,4 @@ namespace Capnp.Rpc
         /// </summary>
         ulong InterfaceId { get; }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/IPromisedAnswer.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     /// <summary>
@@ -25,5 +24,4 @@ namespace Capnp.Rpc
         /// <returns>Pipelined low-level capability</returns>
         ConsumedCapability? Access(MemberAccessPath access);
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/IProvidedCapability.cs

@@ -2,7 +2,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
 
@@ -22,5 +21,4 @@ namespace Capnp.Rpc
         Task<AnswerOrCounterquestion> Invoke(ulong interfaceId, ushort methodId,
             DeserializerState args, CancellationToken cancellationToken = default);
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/IResolvingCapability.cs

@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     /// <summary>
@@ -13,5 +12,4 @@ namespace Capnp.Rpc
         /// </summary>
         Task<Proxy> WhenResolved { get; }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/IRpcEndpoint.cs

@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Threading;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     internal interface IRpcEndpoint
@@ -19,5 +16,4 @@ namespace Capnp.Rpc
         Task RequestSenderLoopback(Action<MessageTarget.WRITER> writer);
         void DeleteQuestion(PendingQuestion question);
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/Impatient.cs

@@ -3,7 +3,6 @@ using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     /// <summary>
@@ -252,5 +251,4 @@ namespace Capnp.Rpc
             return MaybeTailCall(task, (ValueTuple<T1, T2, T3, T4, T5, T6, T7> t) => func(t.Item1, t.Item2, t.Item3, t.Item4, t.Item5, t.Item6, t.Item7));
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/ImportedCapability.cs

@@ -1,7 +1,4 @@
-using System.Threading.Tasks;
+namespace Capnp.Rpc
-
-#nullable enable
-namespace Capnp.Rpc
 {
     /// <summary>
     /// Low-level capability which as imported from a remote peer.
@@ -52,5 +49,4 @@ namespace Capnp.Rpc
             }
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/Interception/CallContext.cs

@@ -1,11 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc.Interception
 {
 
@@ -357,4 +353,3 @@ namespace Capnp.Rpc.Interception
         }
     }
 }
-#nullable restore

Capnp.Net.Runtime/Rpc/Interception/CensorCapability.cs

@@ -1,5 +1,4 @@
-#nullable enable
+namespace Capnp.Rpc.Interception
-namespace Capnp.Rpc.Interception
 {
     class CensorCapability : RefCountingCapability
     {
@@ -42,5 +41,4 @@ namespace Capnp.Rpc.Interception
         {
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/Interception/IInterceptionPolicy.cs

@@ -1,6 +1,5 @@
 using System;
 
-#nullable enable
 namespace Capnp.Rpc.Interception
 {
     /// <summary>
@@ -21,5 +20,4 @@ namespace Capnp.Rpc.Interception
         /// <param name="callContext"></param>
         void OnReturnFromBob(CallContext callContext);
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/Interception/InterceptionState.cs

@@ -1,5 +1,4 @@
-#nullable enable
+namespace Capnp.Rpc.Interception
-namespace Capnp.Rpc.Interception
 {
     /// <summary>
     /// The state of an intercepted call from Alice to Bob.
@@ -26,5 +25,4 @@ namespace Capnp.Rpc.Interception
         /// </summary>
         ReturnedToAlice
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/Interception/Interceptor.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
-#nullable enable
 namespace Capnp.Rpc.Interception
 {
     /// <summary>
@@ -113,5 +112,4 @@ namespace Capnp.Rpc.Interception
             }
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/InvalidCapabilityInterfaceException.cs

@@ -1,5 +1,4 @@
-#nullable enable
+namespace Capnp.Rpc
-namespace Capnp.Rpc
 {
     /// <summary>
     /// Will be thrown if a type did not qualify as capability interface.
@@ -22,5 +21,4 @@ namespace Capnp.Rpc
         {
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/LazyCapability.cs

@@ -2,7 +2,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     class LazyCapability : RefCountingCapability, IResolvingCapability
@@ -106,5 +105,4 @@ namespace Capnp.Rpc
             return new LocalAnswer(cts, CallImpl(interfaceId, methodId, args, cts.Token));
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/LocalAnswer.cs

@@ -2,7 +2,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     class LocalAnswer : IPromisedAnswer
@@ -50,5 +49,4 @@ namespace Capnp.Rpc
             }
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/LocalAnswerCapability.cs

@@ -2,7 +2,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     class LocalAnswerCapability : RefCountingCapability, IResolvingCapability
@@ -87,5 +86,4 @@ namespace Capnp.Rpc
             this.DisposeWhenResolved();
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/LocalCapability.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Runtime.CompilerServices;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     class LocalCapability : ConsumedCapability
@@ -69,5 +67,4 @@ namespace Capnp.Rpc
         {
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/MemberAccessPath.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     /// <summary>
@@ -192,5 +191,4 @@ namespace Capnp.Rpc
             }
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/PendingAnswer.cs

@@ -1,9 +1,7 @@
 using System;
-using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     class PendingAnswer: IDisposable
@@ -199,5 +197,4 @@ namespace Capnp.Rpc
             }
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/PendingQuestion.cs

@@ -1,10 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Threading;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     /// <summary>
@@ -378,5 +375,4 @@ namespace Capnp.Rpc
         }
         #endregion
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/PolySkeleton.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     /// <summary>
@@ -71,5 +70,4 @@ namespace Capnp.Rpc
             }
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/PromisedCapability.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Diagnostics;
-using System.Threading;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     class PromisedCapability : RemoteResolvingCapability
@@ -258,5 +256,4 @@ namespace Capnp.Rpc
             return call;
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/Proxy.cs

@@ -1,9 +1,7 @@
-using Microsoft.Extensions.Logging;
+using System;
-using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     /// <summary>
@@ -239,5 +237,4 @@ namespace Capnp.Rpc
         public int CreatorLineNumber { get; set; }
 #endif
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/ProxyAttribute.cs

@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     /// <summary>
@@ -28,5 +25,4 @@ namespace Capnp.Rpc
         /// </summary>
         public Type ProxyClass { get; }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/RefCountingCapability.cs

@@ -1,8 +1,6 @@
 using System;
-using System.Threading;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     abstract class RefCountingCapability: ConsumedCapability
@@ -112,5 +110,4 @@ namespace Capnp.Rpc
             }
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/RemoteAnswerCapability.cs

@@ -1,9 +1,6 @@
-using Microsoft.Extensions.Logging;
+using System;
-using System;
-using System.Diagnostics;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     class RemoteAnswerCapability : RemoteResolvingCapability
@@ -259,5 +256,4 @@ namespace Capnp.Rpc
             this.DisposeWhenResolved();
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/RemoteCapability.cs

@@ -1,9 +1,6 @@
 using System;
 using System.Diagnostics;
-using System.Threading;
-using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
 
@@ -41,5 +38,4 @@ namespace Capnp.Rpc
             return call;
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/RemoteResolvingCapability.cs

@@ -3,7 +3,6 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     abstract class RemoteResolvingCapability : RemoteCapability, IResolvingCapability
@@ -127,5 +126,4 @@ namespace Capnp.Rpc
             }
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/ResolvingCapabilityExtensions.cs

@@ -1,5 +1,4 @@
-#nullable enable
+namespace Capnp.Rpc
-namespace Capnp.Rpc
 {
     static class ResolvingCapabilityExtensions
     {
@@ -42,5 +41,4 @@ namespace Capnp.Rpc
             }
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/RpcEngine.cs

@@ -4,13 +4,9 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     /// <summary>
@@ -1508,5 +1504,4 @@ namespace Capnp.Rpc
             }
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/RpcException.cs

@@ -1,5 +1,4 @@
-#nullable enable
+namespace Capnp.Rpc
-namespace Capnp.Rpc
 {
     /// <summary>
     /// Thrown when an RPC-related error condition occurs.
@@ -20,5 +19,4 @@ namespace Capnp.Rpc
         {
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/RpcUnimplementedException.cs

@@ -1,8 +1,6 @@
-#nullable enable
+namespace Capnp.Rpc
-namespace Capnp.Rpc
 {
     class RpcUnimplementedException : System.Exception
     {
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/Skeleton.cs

@@ -1,12 +1,8 @@
-using Microsoft.Extensions.Logging;
+using System;
-using System;
-using System.Diagnostics;
 using System.Runtime.CompilerServices;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     /// <summary>
@@ -299,5 +295,4 @@ namespace Capnp.Rpc
             Impl = (T)impl;
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/SkeletonAttribute.cs

@@ -1,6 +1,5 @@
 using System;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     /// <summary>
@@ -32,5 +31,4 @@ namespace Capnp.Rpc
         /// </summary>
         public Type SkeletonClass { get; }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/TcpRpcClient.cs

@@ -1,16 +1,11 @@
 using Capnp.FrameTracing;
 using Microsoft.Extensions.Logging;
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.Net;
 using System.Net.Sockets;
-using System.Runtime.CompilerServices;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     /// <summary>
@@ -268,5 +263,4 @@ namespace Capnp.Rpc
         /// </summary>
         public bool IsWaitingForData => _pump?.IsWaitingForData ?? false;
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/TcpRpcServer.cs

@@ -6,7 +6,6 @@ using System.Net;
 using System.Net.Sockets;
 using System.Threading;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     /// <summary>
@@ -321,5 +320,4 @@ namespace Capnp.Rpc
         /// </summary>
         public event Action<object, ConnectionEventArgs>? OnConnectionChanged;
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/Vine.cs

@@ -1,10 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     class Vine : Skeleton
@@ -70,5 +67,4 @@ namespace Capnp.Rpc
             base.Dispose(disposing);
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/Rpc/rpc.cs

@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#nullable disable
 
 using Capnp;
 using Capnp.Rpc;
@@ -2640,4 +2641,6 @@ namespace Capnp.Rpc
             unimplemented
         }
     }
-}
+}
+
+#nullable restore

Capnp.Net.Runtime/SecurityOptions.cs

@@ -1,5 +1,4 @@
-#nullable enable
+namespace Capnp
-namespace Capnp
 {
     /// <summary>
     /// Provides the security bounds for defeating amplification and stack overflow DoS attacks.
@@ -16,5 +15,4 @@ namespace Capnp
         /// </summary>
         public static int RecursionLimit { get; set; } = 64;
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/SegmentAllocator.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -145,5 +143,4 @@ namespace Capnp
             return true;
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/SegmentSlice.cs

@@ -1,7 +1,4 @@
-using System;
+namespace Capnp
-
-#nullable enable
-namespace Capnp
 {
     /// <summary>
     /// Helper struct to represent the tuple (segment index, offset)
@@ -18,5 +15,4 @@ namespace Capnp
         /// </summary>
         public int Offset;
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/SerializerExtensions.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -339,5 +338,4 @@ namespace Capnp
             WriteData(d, bitOffset, bits, defaultBits);
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/SerializerState.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -1406,5 +1404,4 @@ namespace Capnp
             return new Rpc.BareProxy(cap);
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/TypeIdAttribute.cs

@@ -1,6 +1,5 @@
 using System;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -25,5 +24,4 @@ namespace Capnp
         /// </summary>
         public ulong Id { get; }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/UtilityExtensions.cs

@@ -4,7 +4,6 @@ using System.Threading.Tasks;
 
 namespace Capnp
 {
-#nullable enable
     internal static class UtilityExtensions
     {
         /// <summary>
@@ -79,5 +78,4 @@ namespace Capnp
         public static float ReplacementInt32ToSingleBits(this int value) => BitConverter.Int32BitsToSingle(value);
 #endif
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/WireFrame.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -22,5 +21,4 @@ namespace Capnp
             Segments = segments;
         }
     }
-}
+}
-#nullable restore

Capnp.Net.Runtime/WirePointer.cs

@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -228,5 +225,4 @@ namespace Capnp
             _ptrData = ((ulong)index << 32) | (ulong)PointerKind.Other;
         }
     }
-}
+}
-#nullable restore