From 2e7c233f6c9bf6430672b39f970a3324deba79dd Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 6 Apr 2022 21:48:55 -0400
Subject: enable nullable annotations by default (#837)

This adds `#nullable disable` to all existing code (except where null is impossible like enum files), so it can be migrated incrementally.
---
 src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs')

diff --git a/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs b/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs
index b56a776c..56bd5a8b 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.IO;
 using Mono.Cecil;
 
-- 
cgit 


From 4adf8611131a5d86b15f017a42a0366837d14528 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 13 Apr 2022 21:07:43 -0400
Subject: enable nullable annotations in the rest of SMAPI core (#837)

---
 src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs')

diff --git a/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs b/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs
index 56bd5a8b..b133f8d6 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs
@@ -1,5 +1,5 @@
-#nullable disable
-
+using System;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using Mono.Cecil;
 
@@ -15,11 +15,15 @@ namespace StardewModdingAPI.Framework.ModLoading
         public readonly FileInfo File;
 
         /// <summary>The assembly definition.</summary>
-        public readonly AssemblyDefinition Definition;
+        public readonly AssemblyDefinition? Definition;
 
         /// <summary>The result of the assembly load.</summary>
         public AssemblyLoadStatus Status;
 
+        /// <summary>Whether the <see cref="Definition"/> is loaded and ready (i.e. the <see cref="Status"/> is not <see cref="AssemblyLoadStatus.AlreadyLoaded"/> or <see cref="AssemblyLoadStatus.Failed"/>).</summary>
+        [MemberNotNullWhen(true, nameof(AssemblyParseResult.Definition))]
+        public bool HasDefinition => this.Status == AssemblyLoadStatus.Okay;
+
 
         /*********
         ** Public methods
@@ -28,11 +32,14 @@ namespace StardewModdingAPI.Framework.ModLoading
         /// <param name="file">The original assembly file.</param>
         /// <param name="assembly">The assembly definition.</param>
         /// <param name="status">The result of the assembly load.</param>
-        public AssemblyParseResult(FileInfo file, AssemblyDefinition assembly, AssemblyLoadStatus status)
+        public AssemblyParseResult(FileInfo file, AssemblyDefinition? assembly, AssemblyLoadStatus status)
         {
             this.File = file;
             this.Definition = assembly;
             this.Status = status;
+
+            if (status == AssemblyLoadStatus.Okay && assembly == null)
+                throw new InvalidOperationException($"Invalid assembly parse result: load status {status} with a null assembly.");
         }
     }
 }
-- 
cgit