Merge pull request #65 from sharwell/nullable

Enable nullable reference types

Author: sharwell

.editorconfig

@@ -133,3 +133,6 @@ csharp_space_between_method_declaration_name_and_open_parenthesis = false
 csharp_space_between_method_declaration_parameter_list_parentheses = false
 csharp_space_between_parentheses = false
 csharp_space_between_square_brackets = false
+
+# RS0041: Public members should not use oblivious types
+dotnet_diagnostic.RS0041.severity = none

Directory.Build.props

@@ -2,10 +2,21 @@
 <Project>
 
   <PropertyGroup>
-    <LangVersion>7.3</LangVersion>
+    <LangVersion>8.0</LangVersion>
     <Features>strict</Features>
   </PropertyGroup>
 
+  <!-- Enable nullable reference types -->
+  <PropertyGroup>
+    <Nullable>enable</Nullable>
+    <GenerateNullableAttributes>false</GenerateNullableAttributes>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="TunnelVisionLabs.ReferenceAssemblyAnnotator" Version="1.0.0-alpha.154" PrivateAssets="all" />
+    <PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[3.1.0]" />
+  </ItemGroup>
+
   <PropertyGroup Condition="'$(BuildingInsideVisualStudio)' != 'true'">
     <!-- Ideally this is always enabled, but that tends to hurt developer productivity -->
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -58,7 +69,7 @@
 
   <!-- Public API -->
   <ItemGroup>
-    <PackageReference Include="DotNetAnalyzers.PublicApiAnalyzer" Version="1.0.0-beta.12" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.0-beta3.20367.1" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

NuGet.Config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
+  </packageSources>
+  <disabledPackageSources>
+    <clear />
+  </disabledPackageSources>
+</configuration>

TunnelVisionLabs.Collections.Trees.Experimental/PublicAPI.Shipped.txt

@@ -0,0 +1 @@
+#nullable enable

TunnelVisionLabs.Collections.Trees.Experimental/PublicAPI.Unshipped.txt

@@ -0,0 +1 @@
+#nullable enable

TunnelVisionLabs.Collections.Trees.Experimental/TunnelVisionLabs.Collections.Trees.Experimental.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard1.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard1.1;netstandard2.0;netstandard2.1</TargetFrameworks>
     <RootNamespace>TunnelVisionLabs.Collections.Trees</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>

TunnelVisionLabs.Collections.Trees.Test/AbstractSetTest.cs

@@ -16,7 +16,7 @@ public abstract class AbstractSetTest
         public void TestUnionWith()
         {
             ISet<int> set = CreateSet<int>();
-            Assert.Throws<ArgumentNullException>(() => set.UnionWith(null));
+            Assert.Throws<ArgumentNullException>(() => set.UnionWith(null!));
 
             set.UnionWith(TransformEnumerableForSetOperation(Enumerable.Range(0, 7)));
             set.UnionWith(TransformEnumerableForSetOperation(Enumerable.Range(5, 5)));
@@ -27,7 +27,7 @@ public void TestUnionWith()
         public void TestExceptWith()
         {
             ISet<int> set = CreateSet<int>();
-            Assert.Throws<ArgumentNullException>(() => set.ExceptWith(null));
+            Assert.Throws<ArgumentNullException>(() => set.ExceptWith(null!));
 
             // Return without iterating if the set is already empty
             set.ExceptWith(EverythingThrowsEnumerable<int>.Instance);
@@ -49,7 +49,7 @@ public void TestExceptWith()
         public void TestIntersectWith()
         {
             ISet<int> set = CreateSet<int>();
-            Assert.Throws<ArgumentNullException>(() => set.IntersectWith(null));
+            Assert.Throws<ArgumentNullException>(() => set.IntersectWith(null!));
 
             // Return without iterating if the set is already empty
             set.IntersectWith(EverythingThrowsEnumerable<int>.Instance);
@@ -76,7 +76,7 @@ public void TestSymmetricExceptWith()
         {
             ISet<int> set = CreateSet<int>();
             ISet<int> second = CreateSet<int>();
-            Assert.Throws<ArgumentNullException>(() => set.SymmetricExceptWith(null));
+            Assert.Throws<ArgumentNullException>(() => set.SymmetricExceptWith(null!));
 
             // Test behavior when the current set is empty
             set.SymmetricExceptWith(TransformEnumerableForSetOperation(new[] { 1, 5, 3 }));
@@ -110,7 +110,7 @@ public void TestSymmetricExceptWith()
         public void TestIsProperSubsetOf()
         {
             ISet<int> set = CreateSet<int>();
-            Assert.Throws<ArgumentNullException>(() => set.IsProperSubsetOf(null));
+            Assert.Throws<ArgumentNullException>(() => set.IsProperSubsetOf(null!));
 
             // Test behavior when the current set is empty
             Assert.False(set.IsProperSubsetOf(TransformEnumerableForSetOperation(Enumerable.Empty<int>())));
@@ -145,7 +145,7 @@ public void TestIsProperSubsetOf()
         public void TestIsProperSupersetOf()
         {
             ISet<int> set = CreateSet<int>();
-            Assert.Throws<ArgumentNullException>(() => set.IsProperSupersetOf(null));
+            Assert.Throws<ArgumentNullException>(() => set.IsProperSupersetOf(null!));
 
             // Return without iterating if the set is already empty
             Assert.False(set.IsProperSupersetOf(EverythingThrowsEnumerable<int>.Instance));
@@ -183,7 +183,7 @@ public void TestIsProperSupersetOf()
         public void TestIsSubsetOf()
         {
             ISet<int> set = CreateSet<int>();
-            Assert.Throws<ArgumentNullException>(() => set.IsSubsetOf(null));
+            Assert.Throws<ArgumentNullException>(() => set.IsSubsetOf(null!));
 
             // Return without iterating if the set is already empty
             Assert.True(set.IsSubsetOf(EverythingThrowsEnumerable<int>.Instance));
@@ -217,7 +217,7 @@ public void TestIsSubsetOf()
         public void TestIsSupersetOf()
         {
             ISet<int> set = CreateSet<int>();
-            Assert.Throws<ArgumentNullException>(() => set.IsSupersetOf(null));
+            Assert.Throws<ArgumentNullException>(() => set.IsSupersetOf(null!));
 
             // Test IsSupersetOf self
             set.Add(1);
@@ -252,7 +252,7 @@ public void TestIsSupersetOf()
         public void TestOverlaps()
         {
             ISet<int> set = CreateSet<int>();
-            Assert.Throws<ArgumentNullException>(() => set.Overlaps(null));
+            Assert.Throws<ArgumentNullException>(() => set.Overlaps(null!));
 
             // Return without iterating if the set is already empty
             Assert.False(set.Overlaps(EverythingThrowsEnumerable<int>.Instance));
@@ -272,7 +272,7 @@ public void TestOverlaps()
         public void TestSetEquals()
         {
             ISet<int> set = CreateSet<int>();
-            Assert.Throws<ArgumentNullException>(() => set.SetEquals(null));
+            Assert.Throws<ArgumentNullException>(() => set.SetEquals(null!));
 
             // Test behavior when the current set is empty
             Assert.True(set.SetEquals(TransformEnumerableForSetOperation(Enumerable.Empty<int>())));
@@ -341,7 +341,7 @@ protected static void TestICollectionInterfaceImpl(ICollection collection, bool
             {
                 var copy = new object[collection.Count];
 
-                Assert.Throws<ArgumentNullException>(() => collection.CopyTo(null, 0));
+                Assert.Throws<ArgumentNullException>(() => collection.CopyTo(null!, 0));
                 Assert.Throws<ArgumentException>(() => collection.CopyTo(new object[1, collection.Count], 0));
                 Assert.Throws<ArgumentException>(() => collection.CopyTo(Array.CreateInstance(typeof(object), lengths: new[] { collection.Count }, lowerBounds: new[] { -1 }), 0));
                 Assert.Throws<ArgumentOutOfRangeException>(() => collection.CopyTo(copy, -1));
@@ -368,7 +368,7 @@ protected static void TestICollectionInterfaceImpl(ICollection collection, bool
             {
                 var copy = new int[collection.Count];
 
-                Assert.Throws<ArgumentNullException>(() => collection.CopyTo(null, 0));
+                Assert.Throws<ArgumentNullException>(() => collection.CopyTo(null!, 0));
                 Assert.Throws<ArgumentException>(() => collection.CopyTo(new int[1, collection.Count], 0));
                 Assert.Throws<ArgumentException>(() => collection.CopyTo(Array.CreateInstance(typeof(int), lengths: new[] { collection.Count }, lowerBounds: new[] { -1 }), 0));
                 Assert.Throws<ArgumentOutOfRangeException>(() => collection.CopyTo(copy, -1));

TunnelVisionLabs.Collections.Trees.Test/GeneratorTest.cs

@@ -3,6 +3,7 @@
 
 namespace TunnelVisionLabs.Collections.Trees.Test
 {
+    using System.Diagnostics;
     using System.Reflection;
     using Xunit;
 
@@ -23,7 +24,8 @@ public void TestSeed()
 
             void ResetSeed(int? seed)
             {
-                FieldInfo seedField = typeof(Generator).GetField("_seed", BindingFlags.Static | BindingFlags.NonPublic);
+                FieldInfo? seedField = typeof(Generator).GetField("_seed", BindingFlags.Static | BindingFlags.NonPublic);
+                Debug.Assert(seedField is object, $"Assertion failed: {nameof(seedField)} is object");
                 seedField.SetValue(null, seed);
             }
         }

TunnelVisionLabs.Collections.Trees.Test/Immutable/AbstractImmutableDictionaryTest.cs

@@ -162,6 +162,7 @@ public void TestRemove()
                 dictionary.Remove(1));
         }
 
-        protected abstract IImmutableDictionary<TKey, TValue> CreateDictionary<TKey, TValue>();
+        protected abstract IImmutableDictionary<TKey, TValue> CreateDictionary<TKey, TValue>()
+            where TKey : notnull;
     }
 }

TunnelVisionLabs.Collections.Trees.Test/Immutable/AbstractImmutableSetTest.cs

@@ -331,7 +331,7 @@ protected static void TestICollectionInterfaceImpl(ICollection collection, bool
             Assert.NotNull(collection.SyncRoot);
             Assert.Same(collection, collection.SyncRoot);
 
-            Assert.Throws<ArgumentNullException>("array", () => collection.CopyTo(null, 0));
+            Assert.Throws<ArgumentNullException>("array", () => collection.CopyTo(null!, 0));
             Assert.Throws<ArgumentException>(() => collection.CopyTo(new int[collection.Count, 1], 0));
 
             void CopyToArrayWithNonZeroLowerBound() => collection.CopyTo(Array.CreateInstance(typeof(int), lengths: new[] { collection.Count }, lowerBounds: new[] { 1 }), 0);