Merge branch 'develop' into stable

1 files changed, 11 insertions, 2 deletions

diff --git a/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs b/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs
index b56a776c..b133f8d6 100644
--- a/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs
+++ b/src/SMAPI/Framework/ModLoading/AssemblyParseResult.cs
@@ -1,3 +1,5 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using Mono.Cecil;
 
@@ -13,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
@@ -26,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.");
         }
     }
 }