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"/>.
@@ -30,4 +29,3 @@ namespace Capnp
         }
     }
 }
-#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>
@@ -172,4 +171,3 @@ namespace Capnp
         }
     }
 }
-#nullable restore

Capnp.Net.Runtime/DeserializationException.cs

@@ -1,6 +1,5 @@
 using System;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -24,4 +23,3 @@ 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>
@@ -227,4 +226,3 @@ 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>
@@ -37,4 +36,3 @@ namespace Capnp
         }
     }
 }
-#nullable restore

Capnp.Net.Runtime/EmptyListDeserializer.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -87,4 +86,3 @@ namespace Capnp
         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>
@@ -197,4 +194,3 @@ namespace Capnp
         }
     }
 }
-#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>
@@ -246,4 +245,3 @@ 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>
@@ -108,4 +107,3 @@ 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
@@ -20,4 +19,3 @@ namespace Capnp
         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>
@@ -28,4 +27,3 @@ namespace Capnp
         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>
@@ -21,4 +20,3 @@ namespace Capnp
         ulong StructReadData(ulong bitOffset, int bitCount);
     }
 }
-#nullable restore

Capnp.Net.Runtime/IStructSerializer.cs

@@ -1,6 +1,5 @@
 using System;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -26,4 +25,3 @@ namespace Capnp
         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>
@@ -402,4 +401,3 @@ namespace Capnp
         }
     }
 }
-#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.
@@ -47,4 +46,3 @@ namespace Capnp
         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>
@@ -78,4 +77,3 @@ namespace Capnp
         }
     }
 }
-#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>
@@ -97,4 +96,3 @@ 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>
@@ -71,4 +69,3 @@ namespace Capnp
         }
     }
 }
-#nullable restore

Capnp.Net.Runtime/ListOfCapsSerializer.cs

@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -109,4 +108,3 @@ namespace Capnp
         }
     }
 }
-#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>
@@ -65,4 +64,3 @@ namespace Capnp
         }
     }
 }
-#nullable restore

Capnp.Net.Runtime/ListOfEmptySerializer.cs

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

Capnp.Net.Runtime/ListOfPointersDeserializer.cs

@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -90,4 +89,3 @@ namespace Capnp
         }
     }
 }
-#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>
@@ -116,4 +113,3 @@ namespace Capnp
         }
     }
 }
-#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>
@@ -233,4 +232,3 @@ namespace Capnp
         }
     }
 }
-#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>
@@ -95,4 +93,3 @@ 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>
@@ -80,4 +78,3 @@ namespace Capnp
         }
     }
 }
-#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>
@@ -94,4 +93,3 @@ namespace Capnp
         }
     }
 }
-#nullable restore

Capnp.Net.Runtime/ListOfTextSerializer.cs

@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -110,5 +109,3 @@ namespace Capnp
         }
     }
 }
-
-#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>
@@ -22,4 +20,3 @@ namespace Capnp
         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>
@@ -102,4 +99,3 @@ namespace Capnp
         internal List<Rpc.ConsumedCapability?>? Caps => _capTable;
     }
 }
-#nullable restore

Capnp.Net.Runtime/ObjectKind.cs

@@ -1,6 +1,5 @@
 using System;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -72,4 +71,3 @@ namespace Capnp
         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
@@ -46,4 +43,3 @@ namespace Capnp
         }
     }
 }
-#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>
@@ -72,4 +70,3 @@ namespace Capnp
         }
     }
 }
-#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>
@@ -104,4 +102,3 @@ namespace Capnp
         }
     }
 }
-#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
@@ -42,4 +41,3 @@ namespace Capnp.Rpc
         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.
@@ -51,4 +50,3 @@ namespace Capnp.Rpc
         }
     }
 }
-#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>
@@ -287,4 +285,3 @@ namespace Capnp.Rpc
         }
     }
 }
-#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
@@ -23,4 +22,3 @@ namespace Capnp.Rpc
         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
@@ -32,4 +27,3 @@ namespace Capnp.Rpc
 #endif
     }
 }
-#nullable restore

Capnp.Net.Runtime/Rpc/IConnection.cs

@@ -1,7 +1,6 @@
 using Capnp.FrameTracing;
 using System;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     /// <summary>
@@ -59,4 +58,3 @@ namespace Capnp.Rpc
         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"/>.
@@ -17,4 +16,3 @@ namespace Capnp.Rpc
         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.
@@ -12,4 +11,3 @@ namespace Capnp.Rpc
         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>
@@ -26,4 +25,3 @@ namespace Capnp.Rpc
         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
 {
 
@@ -23,4 +22,3 @@ namespace Capnp.Rpc
             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>
@@ -14,4 +13,3 @@ namespace Capnp.Rpc
         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
@@ -20,4 +17,3 @@ namespace Capnp.Rpc
         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>
@@ -253,4 +252,3 @@ namespace Capnp.Rpc
         }
     }
 }
-#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.
@@ -53,4 +50,3 @@ 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
     {
@@ -43,4 +42,3 @@ 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>
@@ -22,4 +21,3 @@ namespace Capnp.Rpc.Interception
         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.
@@ -27,4 +26,3 @@ namespace Capnp.Rpc.Interception
         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>
@@ -114,4 +113,3 @@ 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.
@@ -23,4 +22,3 @@ 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
@@ -107,4 +106,3 @@ namespace Capnp.Rpc
         }
     }
 }
-#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
@@ -51,4 +50,3 @@ 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
@@ -88,4 +87,3 @@ namespace Capnp.Rpc
         }
     }
 }
-#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
@@ -70,4 +68,3 @@ 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>
@@ -193,4 +192,3 @@ 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
@@ -200,4 +198,3 @@ 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>
@@ -379,4 +376,3 @@ 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>
@@ -72,4 +71,3 @@ 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
@@ -259,4 +257,3 @@ namespace Capnp.Rpc
         }
     }
 }
-#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>
@@ -240,4 +238,3 @@ namespace Capnp.Rpc
 #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>
@@ -29,4 +26,3 @@ namespace Capnp.Rpc
         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
@@ -113,4 +111,3 @@ 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
@@ -260,4 +257,3 @@ namespace Capnp.Rpc
         }
     }
 }
-#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
 {
 
@@ -42,4 +39,3 @@ namespace Capnp.Rpc
         }
     }
 }
-#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
@@ -128,4 +127,3 @@ 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
     {
@@ -43,4 +42,3 @@ 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>
@@ -1509,4 +1505,3 @@ 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.
@@ -21,4 +20,3 @@ 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>
@@ -300,4 +296,3 @@ namespace Capnp.Rpc
         }
     }
 }
-#nullable restore

Capnp.Net.Runtime/Rpc/SkeletonAttribute.cs

@@ -1,6 +1,5 @@
 using System;
 
-#nullable enable
 namespace Capnp.Rpc
 {
     /// <summary>
@@ -33,4 +32,3 @@ namespace Capnp.Rpc
         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>
@@ -269,4 +264,3 @@ namespace Capnp.Rpc
         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>
@@ -322,4 +321,3 @@ namespace Capnp.Rpc
         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
@@ -71,4 +68,3 @@ namespace Capnp.Rpc
         }
     }
 }
-#nullable restore

Capnp.Net.Runtime/Rpc/rpc.cs

@@ -1,4 +1,5 @@
 #pragma warning disable CS1591
+#nullable disable
 
 using Capnp;
 using Capnp.Rpc;
@@ -2641,3 +2642,5 @@ namespace Capnp.Rpc
         }
     }
 }
+
+#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.
@@ -17,4 +16,3 @@ namespace Capnp
         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>
@@ -146,4 +144,3 @@ namespace Capnp
         }
     }
 }
-#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)
@@ -19,4 +16,3 @@ namespace Capnp
         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>
@@ -340,4 +339,3 @@ namespace Capnp
         }
     }
 }
-#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>
@@ -1407,4 +1405,3 @@ namespace Capnp
         }
     }
 }
-#nullable restore

Capnp.Net.Runtime/TypeIdAttribute.cs

@@ -1,6 +1,5 @@
 using System;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -26,4 +25,3 @@ namespace Capnp
         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>
@@ -80,4 +79,3 @@ namespace Capnp
 #endif
     }
 }
-#nullable restore

Capnp.Net.Runtime/WireFrame.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 
-#nullable enable
 namespace Capnp
 {
     /// <summary>
@@ -23,4 +22,3 @@ namespace Capnp
         }
     }
 }
-#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>
@@ -229,4 +226,3 @@ namespace Capnp
         }
     }
 }
-#nullable restore